firebird-checkins — CVS checkins

[Firebird-checkins] CVS: interbase/isql extract.e,1.5,1.6

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/isql
In directory usw-pr-cvs1:/tmp/cvs-serv29553

Modified Files:
	extract.e 
Log Message:
Fix bug of BLOB being returned by value
 To be sincere, this code doesn't cater for the RETURNS PARAMETER syntax but
it would require more surgery than I'm willing to do, since I'm sick of isql
so I started my own metadata extraction utility based on IBO that does this
trick and others.
Claudio Valderrama via MOD



Index: extract.e
===================================================================
RCS file: /cvsroot/firebird/interbase/isql/extract.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -U3 -r1.5 -r1.6
--- extract.e	2001/01/08 16:07:18	1.5
+++ extract.e	2001/04/23 14:22:48	1.6
@@ -2596,9 +2596,18 @@
 
         /* If a return argument, save it for the end, otherwise print */
 
+/*
+// Changed the following to not return a BLOB by value.
+// To be sincere, this code doesn't cater for the RETURNS PARAMETER syntax but
+// it would require more surgery than I'm willing to do, since I'm sick of isql
+// so I started my own metadata extraction utility based on IBO that does this
+// trick and others. 
+// Claudio Valderrama (by way of) MOD 23-Apr-2001
+*/
+
         if (FUN.RDB$RETURN_ARGUMENT == FNA.RDB$ARGUMENT_POSITION)
             sprintf (return_buffer, "RETURNS %s %s %s", type_buffer, 
-                ((SSHORT) abs (FNA.RDB$MECHANISM) == FUN_reference ? "" : "BY VALUE"), 
+                (((SSHORT) abs (FNA.RDB$MECHANISM) == FUN_reference || FNA.RDB$FIELD_TYPE == BLOB) ? "" : "BY VALUE"), 
                 (FNA.RDB$MECHANISM < 0 ? "FREE_IT" : ""));
         else
             {

[Firebird-checkins] CVS: interbase/jrd dyn.e,1.1.1.1,1.2

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv17612

Modified Files:
	dyn.e 
Log Message:
Checkin Claudio Valderrama's changes to fix case sensitivity problems
with grant and revolk commands.


Index: dyn.e
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/dyn.e,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- dyn.e	2000/08/03 20:49:55	1.1.1.1
+++ dyn.e	2001/04/23 13:16:32	1.2
@@ -19,6 +19,9 @@
  *
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
+ *    20-Apr-2001 Claudio Valderrama  - Fix bug in grant/revolk by making user
+ *                                      case insensitive.
+ *                                      
  */
 
 #include <stdio.h>
@@ -1304,8 +1307,11 @@
 	    GET_STRING (ptr, user);
 	    if (DYN_is_it_sql_role (gbl, user, dummy_name, tdbb))
 	        user_type = obj_sql_role;
-	    else
+	    else {
 	        user_type = obj_user;
+		for (ptr1 = user; *ptr1; ptr1++)
+		   *ptr1 = UPPER7 (*ptr1);
+		}
 	    break;
 
 	case isc_dyn_sql_role_name:      /* role name in role_name_list */
@@ -1977,8 +1983,11 @@
 	    GET_STRING (ptr, user);
 	    if (DYN_is_it_sql_role (gbl, user, dummy_name, tdbb))
 	        user_type = obj_sql_role;
-	    else
+	    else {
 	        user_type = obj_user;
+		for (ptr1 = user; *ptr1; ptr1++)
+		   *ptr1 = UPPER7 (*ptr1);
+		}
 	    break;
 
 	case isc_dyn_sql_role_name:       /* role name in role_name_list */

[Firebird-checkins] CVS: interbase/jrd event.c,1.2,1.3 jrd.c,1.2,1.3

[Mike N. <ta...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv19267

Modified Files:
	event.c jrd.c 
Log Message:
Missing parens

Index: event.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/event.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- event.c	2001/04/05 17:05:43	1.2
+++ event.c	2001/04/21 21:51:53	1.3
@@ -573,7 +573,7 @@
 	ACQUIRE;
 
 	process = (PRB) ABS_PTR (EVENT_process_offset);
-	if (!process->prb_flags & PRB_remap)
+	if (!(process->prb_flags & PRB_remap))
 	    break;
 	}
 #endif /* WIN_NT */

Index: jrd.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/jrd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- jrd.c	2000/08/07 01:40:21	1.2
+++ jrd.c	2001/04/21 21:51:53	1.3
@@ -2134,7 +2134,7 @@
 
 ERROR_INIT (env);
 
-if (!attachment->att_user->usr_flags & (USR_locksmith | USR_owner))
+if (!(attachment->att_user->usr_flags & (USR_locksmith | USR_owner)))
     ERR_post (gds__no_priv,
 	    gds_arg_string, "drop",
 	    gds_arg_string, "database",

[Firebird-checkins] CVS: interbase/build_docs ibbuild-win32.txt,1.5,1.6

[Reed F. M. <rf...@us...>]

Update of /cvsroot/firebird/interbase/build_docs
In directory usw-pr-cvs1:/tmp/cvs-serv20626

Modified Files:
	ibbuild-win32.txt 
Log Message:
Update to reflect feedback from Dmitry Kuzmenko and Kevin Curtis,
as well as a couple of other things that were out of date.


Index: ibbuild-win32.txt
===================================================================
RCS file: /cvsroot/firebird/interbase/build_docs/ibbuild-win32.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -U3 -r1.5 -r1.6
--- ibbuild-win32.txt	2000/12/27 21:04:13	1.5
+++ ibbuild-win32.txt	2001/04/21 04:27:47	1.6
@@ -1,13 +1,14 @@
+
 -Building the *****Base server on win32 platforms- 
-ibbuild-win32.txt version 1.0.9 last revised Dec 27, 2000
+ibbuild-win32.txt last revised April 20, 2001
 
-The latest version of this file is available at
+The latest version of this file is available at:
 http://sourceforge.net/docman/display_doc.php?docid=349&group_id=9028
 
 Please send comments and corrections to
-r...@cr... or the ib-build mailing list at mers.com
-the ib-build mailing list is also available as a newsgroup at
-news.mers.com:mers.interbase.build
+r...@cr... or the firebird-devel mailing list at sourceforge
+the firebird-devel mailing list is also available as a newsgroup at
+news.atkin.com:sourceforge.firebird-devel
 
 For more information see the firebird and interbase projects 
 on sourceforge.net (http://www.sourceforge.com/projects/firebird,
@@ -19,8 +20,18 @@
 apply on other windows platforms, but I have not tested it.
 	This document specifically refers to the 'firebird' cvs tree
 on sourceforge. If you are looking for instruction for the original
-source distribution from inprise, please see
+source distribution from inprise, please refer to the borland web site.
+Some slightly outdated information may also be found at: 
 http://www.cruzers.com/~rfm/ib/ibbuild-win32-inpr.txt
+	I assume that the reader already has a working knowledge
+of CVS, make, unix shell, and interbase. If not, you will have to
+do some self-education that is beyond the scope of this document.
+
+NOTE: If you are on a slow internet connection, it is wise
+to keep a clean copy of the CVS tree, and do the setup and
+building described below in a copy. That way, if you mess up,
+you can start over from scratch without downloading the whole
+source tree again.
 
 Directory structure:
 I refer to the directory in which you did cvs checkout as
@@ -43,10 +54,17 @@
 lan working with the interbase code.
 
 Tools requirements:
- * InterBase 6 final binary release. 
- * A borland C compiler (the 'free' one should be ok)
-This is required for the 'make' program, and also to build
-the import library for borland tools.
+ * Installed firebird 0.9.x or InterBase 6 binary. 
+ * A borland C compiler (the 'free' available from the Borland
+web site will work, as will Borland C builder.)
+The compiler itself is not used, but the 'make' program is.
+The 'implib' tool is required to make an import library that can
+be used by the borland tools (if you do not need a borland 
+import library, you can comment out the portion of
+{BUILD_DIR}/build_win32/original/make.jrd which mentions implib)
+Dmitry Kuzmenko has also reported that the 'make' provided
+with Delphi 5 does not work with the makefiles.
+The borland resource compiler (brc32) is also used.
 
  * Microsoft visual C (I used 6, but 5.x should be workable as well)
 
@@ -85,7 +103,7 @@
 }
 --end echo.c
 If you do not use the MKS or cygwin echo for other purposes,
-you can just rename it instead of making your own.
+you can just rename (or delete) it instead of making your own.
 
 PATH requirements:
  * The echo.exe resulting from the above C code MUST be in your path
@@ -177,7 +195,7 @@
 	referring to qli.exe and qli.pdb
 
 Preparing to build for the first time:
-make sure server is running from {INST_DIR} not {BUILD_DIR}
+make sure interbase server is running from {INST_DIR} not {BUILD_DIR}
 
 make sure your {INST_DIR}/isc4.gdb has a user named builder
 with password builder. (or change the ISC_USER and password
@@ -261,4 +279,3 @@
 
 TRADEMARKS:
 All trademarks are property of their respective owners.
-

[Firebird-checkins] CVS: TCS/tcs/tcs makefile.solx86,NONE,1.1

[Konstantin K. <kku...@us...>]

Update of /cvsroot/firebird/TCS/tcs/tcs
In directory usw-pr-cvs1:/tmp/cvs-serv13051

Added Files:
	makefile.solx86 
Log Message:



--- makefile.solx86 ADDED ---

[Firebird-checkins] CVS: TCS/tcs/mu makefile.solx86,NONE,1.1

[Konstantin K. <kku...@us...>]

Update of /cvsroot/firebird/TCS/tcs/mu
In directory usw-pr-cvs1:/tmp/cvs-serv12848

Added Files:
	makefile.solx86 
Log Message:



--- makefile.solx86 ADDED ---

[Firebird-checkins] CVS: TCS/tcs/drop_gdb makefile.solx86,NONE,1.1

[Konstantin K. <kku...@us...>]

Update of /cvsroot/firebird/TCS/tcs/drop_gdb
In directory usw-pr-cvs1:/tmp/cvs-serv12496

Added Files:
	makefile.solx86 
Log Message:



--- makefile.solx86 ADDED ---

[Firebird-checkins] CVS: TCS/tcs/diffs makefile.solx86,NONE,1.1

[Konstantin K. <kku...@us...>]

Update of /cvsroot/firebird/TCS/tcs/diffs
In directory usw-pr-cvs1:/tmp/cvs-serv12139

Added Files:
	makefile.solx86 
Log Message:



--- makefile.solx86 ADDED ---

[Firebird-checkins] CVS: interbase/firebird/skywalker/install/classic CSpostinstall.sh,1.3,1.4

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/firebird/skywalker/install/classic
In directory usw-pr-cvs1:/tmp/cvs-serv24912

Modified Files:
	CSpostinstall.sh 
Log Message:
Changed to make include files readable by general public


Index: CSpostinstall.sh
===================================================================
RCS file: /cvsroot/firebird/interbase/firebird/skywalker/install/classic/CSpostinstall.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- CSpostinstall.sh	2001/04/14 02:15:33	1.3
+++ CSpostinstall.sh	2001/04/17 16:32:14	1.4
@@ -332,6 +332,17 @@
     chmod ug=rw,o= isc4.gdb
 
 
+    # Set a default of read all files in includes
+
+    cd include
+
+    for i in `ls`
+      do
+         chmod a=r  $i
+    done
+
+    cd ..
+
     # Set a default of read all files in examples
 
     cd examples

[Firebird-checkins] CVS: interclient/20/dev/interserver CDR.cpp,1.1.1.1,1.2 CDR.h,1.1.1.1,1.2 Error.cpp,1.1.1.1,1.2 IB_Defines.h,1.2,1.3 JIBSNet.cpp,1.1.1.1,1.2 NetTCP.cpp,1.3,1.4 interserver.cpp,1.1.1.1,1.2

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interclient/20/dev/interserver
In directory usw-pr-cvs1:/tmp/cvs-serv7232

Modified Files:
	CDR.cpp CDR.h Error.cpp IB_Defines.h JIBSNet.cpp NetTCP.cpp 
	interserver.cpp 
Log Message:


Index: CDR.cpp
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/CDR.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- CDR.cpp	2000/08/03 21:07:43	1.1.1.1
+++ CDR.cpp	2001/04/17 12:49:43	1.2
@@ -112,7 +112,18 @@
   else
     old_realbuf = 0;
   oldMessageCertificate = messageCertificate;
+// fr...@us... temporary check
+#ifdef TRACEON
+  debugTraceAPointer ("next ", next);
+  debugTraceAPointer ("messageCertificate ", messageCertificate);
+#endif
+/* fr...@us...
+  ambiguous comparison of signed and unsigned ( UNIT_MAX is often an unsigned type )
+  aborts program on first call with next = 16 and messageCertificate = 0
+
   assert ((next - messageCertificate) < UINT_MAX);
+*/
+
   offset = (unsigned) (next - messageCertificate);
 
   //

Index: CDR.h
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/CDR.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- CDR.h	2000/08/03 21:07:44	1.1.1.1
+++ CDR.h	2001/04/17 12:49:43	1.2
@@ -24,6 +24,8 @@
 #ifdef TRACEON
 void debugTraceALine (char* where, char* what);
 void debugTraceAnInt (char* where, int what);
+//fr...@us... added function
+void debugTraceAPointer (char* where, void* what);
 #endif
 
 #ifdef WIN32
@@ -86,7 +88,12 @@
 #elif SIZEOF_LONG == 8
   typedef long LongLong;
   typedef unsigned long ULongLong;
-#elif defined (_MSC_VER) && _MSC_VER >= 900
+//fr...@us...
+// brought this in line with other header files to work with bcc32 5.2; was VC++ specific
+//#elif defined (_MSC_VER) && _MSC_VER >= 900
+#elif (defined(_MSC_VER) && defined(_WIN32)) || \
+    (defined(__BORLANDC__) && (defined(__WIN32__) || defined(__OS2__)))
+//end fr...@us...
   typedef __int64 LongLong;
   typedef unsigned __int64 ULongLong;
 #else

Index: Error.cpp
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/Error.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- Error.cpp	2000/08/03 21:07:43	1.1.1.1
+++ Error.cpp	2001/04/17 12:49:43	1.2
@@ -178,8 +178,12 @@
 #endif
 
 #ifndef linux
-extern int	sys_nerr;	/* # of error message strings in sys table */
-extern char	*sys_errlist[];	/* the system error message table */
+//fr...@us...
+// commented out as declarations exist in stdlib.h (bcc32 v.5.5)
+// better include with ifdef where necessary
+//extern int	sys_nerr;	/* # of error message strings in sys table */
+//extern char	*sys_errlist[];	/* the system error message table */
+//end fr...@us... 
 #endif
 
 char *

Index: IB_Defines.h
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/IB_Defines.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- IB_Defines.h	2001/02/03 08:32:30	1.2
+++ IB_Defines.h	2001/04/17 12:49:43	1.3
@@ -113,6 +113,8 @@
 #ifdef TRACEON
 void debugTraceALine (char* where, char* what);
 void debugTraceAnInt (char* where, int what);
+//fr...@us... added function
+void debugTraceAPointer (char* where, void* what);
 #endif
 
 void errorLog (char* what);

Index: JIBSNet.cpp
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/JIBSNet.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- JIBSNet.cpp	2000/08/03 21:07:49	1.1.1.1
+++ JIBSNet.cpp	2001/04/17 12:49:43	1.2
@@ -256,7 +256,10 @@
   templen = getLong ();
 
   cdr_.next = cdr_.buffer;
+/* fr...@us...
   if (!cdr_.buffer) // !!!what is this about?
+*/
+  if (cdr_.buffer == NULL)
     cdr_.grow (0);
 
   if (templen > cdr_.length)

Index: NetTCP.cpp
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/NetTCP.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- NetTCP.cpp	2001/02/18 22:17:27	1.3
+++ NetTCP.cpp	2001/04/17 12:49:43	1.4
@@ -142,10 +142,11 @@
 NetTCP::netOpen (int sockfd, int *newSockfd, int inetdflag)
 {
   register int tmpSockfd, childpid;
+// fr...@us... changed socklen_t type to int
   //david jencks 1-19-2001 begin
   //  int clilen, on;
 #ifndef socklen_t //problem on ms compiler
-#define socklen_t size_t  //problem on rhlinux 7, socklen_t is uint, size_t is int
+#define socklen_t int  //problem on rhlinux 7, socklen_t is uint, size_t is int
 #endif
   int on;
   socklen_t clilen;

Index: interserver.cpp
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/interserver/interserver.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- interserver.cpp	2000/08/03 21:07:54	1.1.1.1
+++ interserver.cpp	2001/04/17 12:49:43	1.2
@@ -94,6 +94,16 @@
     fflush (traceStream__);
   }
 }
+//fr...@us... added function
+void debugTraceAPointer (char* where, void* what)
+{
+  if (!traceStream__)
+    traceStream__ = fopen ("debug.log", "w");
+  if (traceStream__) {
+    fprintf (traceStream__, "%s %p\n", where, what);
+    fflush (traceStream__);
+  }
+}
 #endif
 
 // Notice we do not depend on JIBSNet

[Firebird-checkins] CVS: interbase/build_docs README,NONE,1.1 README.linux,NONE,1.1 README.unix,NONE,1.1

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/build_docs
In directory usw-pr-cvs1:/tmp/cvs-serv16945/build_docs

Added Files:
	README README.linux README.unix 
Log Message:
This contains a new build process which incorperates a boot build 
enabling Firebird to be built without a prior version being
installed.
Fixed examples so thay are built as part of the build process.
Integrated the "install" and "packaging" build targets into the 
main make process.


--- NEW FILE ---


The new build process for unix style machines was done in Apr-2001 it 
incorperates a boot build to enable the system to be build without 
already having Firebird already installed.

At this stage the README.<platorm> documents are the latest and the others
have been left currently in case some details have been missed.  They will
eventually be removed.

Mark O'Donohue 17-Apr-2001

--- NEW FILE ---

This README file is a quick quide to building Firebird from the source.  It is
primary a linux build document but should be applicable to most of the unix 
platforms as well.


Regards

Mark O'Donohue 17-Apr-2001



0. PREQUEL

For Linux, I remember that I needed the ncurses package for RedHat6.2 It was
ncurses-4 something, when I loaded my Mandrake-Linux system ncurses-5.1 was 
loaded in the options I chose.


1. GETING THE SOURCE CODE

First you need the source code.

The source code is available as a tarball from:
http://sourceforge.net/projects/firebird 

Or from our cvs repository, which you can get either as an anonymous user:

$CVSROOT=:pserver:ano...@cv...:/cvsroot/firebird
$export CVSROOT
$cvs logon
password:   (just hit return)
$cvs -z3 checkout interbase


Or if you are a member of the Firebird project you can checkout the source using SSH and
this will allow you to commit and changes you make.

$cvs -z3 -d you...@cv...:/cvsroot/firebird checkout interbase


NOTE: If you use CVS to checked out the source make a backup copy of the original
      source checkout.  If you muck up the build and want to start again it
      is easiest to restore from this original backup file (This is due to a
      weakness in the way the current build process works).


2. GETTING THE BOOT BUILD KIT

Firebird needs a running Firebird system to be able to compile itself.  If
you already have Firebird/InterBase installed then you do not need to perform
this step.

Where an existing Firebird install does not yet exist Firebird can still be
build using the boot build method.  The boot build contains preparsed C files
that are used in place of those generated by an existing system.  These 
 "bootstrap" the build 

The boot build kit should be available from our ftp site, 
ftp://ftp.firebird.sourceforge.net:/pub/firebird/bootbuild or from our web site
http://sourceforge.net/projects/firebird.



3. EXTRACTING THE SOURCE FILES


Extract normal build source code

$tar -xzf <FirebirdSrc.tar.gz


And if the boot kit is required extract extra boot source code.

$cd interbase
$tar -xzf ../FirebirdBootKit.tar.gz



4. BUILDING THE SOURCE CODE

Configure the build system for DEV or PROD build

$./Configure.sh DEV|PROD

setup environment variables required for compilation

$source Configure_SetupEnv.sh


# Build either CLASSIC or SUPER architectures.

$make firebird            -- for classic version 
# OR
$make super_firebird      -- for super version.



5. INSTALLING THE SYSTEMS

# Install the built system into /opt/interbase.

$make runClassicInstall
# OR 
$make runSuperInstall



6. TEST YOUR INSTALLATION

Run a quick smoke test to see if it all works ok.

$cd /opt/interbase/examples

$/opt/interbase/bin/isql
>connect employee.gdb;
>select tablename from rdb$tables;
>exit;


(In some cases you may need to provide a password to isql)

$/opt/interbase/bin/isql
>connect employee.gdb user sysdba password <password>;
>select tablename from rdb$tables;
>exit;


Where password will be either masterkey, or in the 
file /opt/interbase/SYSDBA.password.


Enjoy 

The Firebird Team.



TROUBLESHOOTING:

1.  Once you have mucked up a compile it is best to start again from scratch
    as there are intermediate files that need to be updated.

2.  If you want to do the install component again there is usually a 
    file of the form ".classcinstallflg" that you will need to delete
    use "ls -a" to see these files.  They are used as fake targets in 
    the makefile.
     

--- NEW FILE ---

Please see the README.linux file for current details of the new build process.
The instructions should be fairly similar for any unix build/install and
I suspect that over time someone will fill in the difference at the end of this
document

Mark O'Donohue 17-Apr-2001

[Firebird-checkins] CVS: interbase Configure.sh,NONE,1.1 Configure_SetupEnv.sh,NONE,1.1 README,NONE,1.1 setup_dirs,1.14,1.15

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase
In directory usw-pr-cvs1:/tmp/cvs-serv16945

Modified Files:
	setup_dirs 
Added Files:
	Configure.sh Configure_SetupEnv.sh README 
Log Message:
This contains a new build process which incorperates a boot build 
enabling Firebird to be built without a prior version being
installed.
Fixed examples so thay are built as part of the build process.
Integrated the "install" and "packaging" build targets into the 
main make process.


***** Error reading new file: [Errno 2] No such file or directory: 'Configure.sh'
***** Error reading new file: [Errno 2] No such file or directory: 'Configure_SetupEnv.sh'
--- NEW FILE ---

For platform specific help in building Firebird please look in the 
build_docs subdirectory.

If you need more information/assistance then check out the firebird web site at: 
http://firebird.sourceforge.net  

The main build newslist fir...@li... available as a
newsgroup from news:news.atkin.com and archives are available from the firebird
web site.

There are many other sources of information relating to Firebird around the web
suggested starting pounts are:

http://sourceforge.net/projects/firebird
http://www.interbase2000.org
http://www.ibphonix.com

Resources for Borland's Interbase(r) also usually will work with and applicable to 
Firebird as well http://www.borland.com/interbase.


Enjoy

The Firebird Crew

Index: setup_dirs
===================================================================
RCS file: /cvsroot/firebird/interbase/setup_dirs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** setup_dirs	2000/12/08 16:59:30	1.14
--- setup_dirs	2001/04/17 02:41:42	1.15
***************
*** 1,26 ****
  #!/bin/sh
! # The contents of this file are subject to the Interbase Public
! # License Version 1.0 (the "License"); you may not use this file
! # except in compliance with the License. You may obtain a copy
! # of the License at http://www.Inprise.com/IPL.html
! #
! # Software distributed under the License is distributed on an
! # "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
! # or implied. See the License for the specific language governing
! # rights and limitations under the License.
! #
! # The Original Code was created by Inprise Corporation
! # and its predecessors. Portions created by Inprise Corporation are
! # Copyright (C) Inprise Corporation.
! #
! # All Rights Reserved.
! # Contributor(s):
! #	Reed Mideke <rf...@cr...>
! #	______________________________________.
  #
  # $Id$
- # Revision 1.13  2000/12/08 16:18:20  fsg
- # Preliminary changes to get IB_BUILD_NO automatically
- # increased on commits.
  #
  # setup_dirs will create 'jrd/build_no.h' by a call to
--- 1,28 ----
  #!/bin/sh
! 
! #    The contents of this file are free software; you can redistribute it 
! #    and/or modify it under the terms of the Firebird Public Licence, 
! #    available at http://firebird.sourceforge.net/FBPL.html; either 
! #    version 1.0 of the License, or (at your option) any later version.
! #
! #    This program is distributed in the hope that it will be useful,
! #    but WITHOUT ANY WARRANTY; without even the implied warranty of
! #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #    Firebird Public License for more details.
! #
! #    This file was created by members of the firebird development team.  
! #    All individual contributions remain the Copyright (C) of those 
! #    individuals.  Contributors to this file are either listed here or
! #    can be obtained from a CVS history command.
! #
! #    All rights reserved.
! 
! #    Contributor(s):
! #       Tom Coleman TMC Systems <tco...@au...>
! #	    Reed Mideke <rf...@cr...>
! #       Mark O'Donohue <mar...@lu...>
! 
  #
  # $Id$
  #
  # setup_dirs will create 'jrd/build_no.h' by a call to
***************
*** 29,41 ****
  # will be increased automatically in the near future :-)
  #
! # I have changed 'jrd/iblicense.h' to use IB_BUILD_TYPE
! # from 'jrd/build_no.h'.
! # So all changes to version numbers, build types etc. can
! # now be done in 'builds_win32/original/build_no.ksh'.
  #
  #
! # Shell script to set up the InterBase directory structure
! # And now the super server directory structure  
! 
  
  
--- 31,50 ----
  # will be increased automatically in the near future :-)
  #
! # Shell script to set up the Firebird directory structure
  #
  #
! # + MasterSourceDirectory
! #    + interbase     - kit will be built here
! #
! # + refDatabases
! #    + jrd
! #       isc.gdb
! #       metadata.gdb
! #    + msgs
! #       msg.gdb
! #    + qli
! #       help.gdb
! #    + utilities
! #       rebuild.gdb
  
  
***************
*** 108,111 ****
--- 117,137 ----
  #------------------------------------------------------------------------
  #
+ # Build all the directories needed by super server.
+ 
+ buildSuperDirs() {
+     mkdir -p super/client 
+ 
+ # Now populate the directories super/* with symlinks to all the source
+ # files contained in the corresponding top-level directories.
+ 
+     for dir in alice burp dsql intl journal jrd lock register remote utilities wal
+       do
+         buildSuperDir $dir
+       done
+ }
+ 
+ 
+ #------------------------------------------------------------------------
+ #
  # Refresh a link, if it already exists delete it then recreate it
  # otherwise just create it.
***************
*** 161,164 ****
--- 187,223 ----
  
  #------------------------------------------------------------------------
+ # print usage for calling this script
+ 
+ printUsage() {
+     echo "usage is : ./setup_dirs [boot] [system] [DEV|PROD] [refDatabaseDir]"
+     echo ""
+     echo "where system = AIX|AP|AX|DELTA|DG|EPSON|HP700|HP800|HP9.0|"
+     echo "               HP10|IMP|MU|SCO|SGI|SOLARIS|SUN4|UNIXWARE|"
+     echo "               AIX_PPC|LINUX|FREEBSD|NETBSD"
+     echo ""
+     echo "default values are: noboot, uname -s, DEV, ./refDatabases"
+     echo ""
+ 
+ }
+ 
+ #------------------------------------------------------------------------
+ # workout the current OS system type on the machine we are running.
+ 
+ getDefaultSystemType() {
+     SystemName=`uname -s | tr [:lower:] [:upper:]`
+ 
+     case $SystemName in 
+     LINUX|FREEBSD|NETBSD) 
+        BuildHostType=$SystemName
+        ;;
+     IRIX*) 
+        BuildHostType=SGI
+        ;;
+     *)
+        BuildHostType=""
+        ;;
+     esac
+ }
+ #------------------------------------------------------------------------
  # Check initial variables required for build of interbase
  
***************
*** 193,197 ****
       echo ""
       echo "From env. variables:"
!      echo "INTERBASE    (installed database root) : $INTERBASE "
       echo "ISC_USER     (admin user)              : $ISC_USER"
       echo "ISC_PASSWORD (admin password)          : $ISC_PASSWORD"
--- 252,264 ----
       echo ""
       echo "From env. variables:"
! 
!      if [ "$BuildBootFlg" = "Yes" ]
!        then
!          echo "Boot build - Interbase not installed"
!          echo "INTERBASE    (target database root)    : $INTERBASE "
!      else
!          echo "INTERBASE    (installed database root) : $INTERBASE "
!      fi
! 
       echo "ISC_USER     (admin user)              : $ISC_USER"
       echo "ISC_PASSWORD (admin password)          : $ISC_PASSWORD"
***************
*** 205,208 ****
--- 272,355 ----
  }
  
+ 
+ #------------------------------------------------------------------------
+ # copy the boot .c files from the porting subdirectory into the
+ # build structure.
+ 
+ copyFilesFromPortingDir() {
+ 
+ 
+     if [ ! -d porting ]
+       then
+         echo "Unable to find the porting subdirectory for the boot build"
+         echo "Have you installed the firebird_boot kit?"
+         exit
+     fi
+     
+     for dir in `ls porting`
+       do
+          for portfile in `ls porting/$dir`
+            do
+ #              echo "copying porting/$dir/$portfile"
+               cp porting/$dir/$portfile $dir
+            done
+       done
+ }
+ 
+ 
+ #------------------------------------------------------------------------
+ # Build the interbase target dir, and fill it where required from the
+ # currently installed interbase build.
+ 
+ 
+ buildTargetInterbaseDirs() {
+ 
+     if [ -d interbase ] 
+       then
+         echo ""
+         echo ""
+         echo "*** Warning *** "
+         echo "    The installation target directory:"
+         echo "       `pwd`/interbase"
+         echo "    already exists, press return to delete this directory or ^C to abort."
+         echo "*** Warning *** "
+         echo "" 
+         AskQuestion "Press return to continue or ^C to abort"
+         rm -rf interbase
+         echo "Deleted."
+         echo ""
+     fi
+ 
+     mkdir interbase
+ 
+     cd interbase
+ 
+     mkdir bin
+     mkdir lib
+     mkdir help
+     mkdir UDF
+     mkdir -p examples/v3
+     mkdir -p examples/v4
+     mkdir -p examples/v5
+     mkdir include
+     mkdir intl
+ 
+     if [ $BuildBootFlg = "No" ]
+       then
+         cp $INTERBASE/interbase.msg .
+         cp $INTERBASE/isc4.gdb .
+         copyIfExists $INTERBASE/ib_license.dat .
+         cp $INTERBASE/bin/gpre bin
+         cp $INTERBASE/bin/gbak bin
+         copyIfExists $INTERBASE/bin/gds_lock_mgr bin
+         cp $INTERBASE/help/help.gdb help
+     fi
+ 
+     cd ..
+ 
+ 
+ }
+ 
+ 
  #== Main Program ========================================================
  
***************
*** 212,270 ****
  
  PATH=.:$PATH
  
- if [ $# != 3 ]
- then
-     echo 'Usage: setup_dirs {AIX   | AP      | AX   } {DEV}  master_source_dir '
-         echo '                  {DELTA | DG      | EPSON} {PROD}'
-         echo '                  {HP700 | HP800   | HP9.0 | HP10 }'
-         echo '                  {IMP   | MU      | SCO  }'
-         echo '                  {SGI   | SOLARIS | SUN4 }'
-         echo '                  {UNIXWARE | AIX_PPC | LINUX }'
-         echo '                  {FREEBSD | NETBSD}'
-         exit 1
- fi
- 
- export BuildHostType=$1
- export BuildBuildType=$2
- export MasterSourceDir=$3
  
- SYS_TYPE=$1
  
  checkVariables
  
! if [ "$1" = 'SUN4' -o "$1" = 'SUN3_4' -o "$1" = 'SUN386I' ]; then
      SYS_TYPE=SUNOS4
  fi
! if [ $1 = 'AX' -o $1 = 'AP' ]; then
      SYS_TYPE=APOLLO
  fi
! if [ $1 = 'SUN3_3' ]; then
      SYS_TYPE=SUNOS3
  fi
  #
  LOCK_HEADER=lock_header_shmem
! if [ $SYS_TYPE = 'SUNOS4' -o $1 = 'DG' -o $1 = 'SOLARIS' ]; then
      LOCK_HEADER=lock_header_mmap
  fi
  #
  
! echo "Creating jrd/build_no.h"
  sh builds_win32/original/build_no.ksh
  echo "- Setting up the superserver directory structure"
  echo ""
  
! mkdir -p super/client 
  
- # Now populate the directories super/* with symlinks to all the source
- # files contained in the corresponding top-level directories.
  
! for dir in alice burp dsql intl journal jrd lock register remote utilities wal
!   do
!     buildSuperDir $dir
!   done
  
- #
  refreshLink . source
  refreshLink builds/make.interbase make_kit
  refreshLink builds/original/build_kit build_kit
  refreshLink builds/original/set_prot set_prot
--- 359,480 ----
  
  PATH=.:$PATH
+ 
+ 
+ 
+ # Check for boot arg or help arg
+ 
+ BuildBootFlg="No"
+ 
+ if [ $# > 1 ]
+   then
+     if [ "$1" = "boot" ]
+       then
+         BuildBootFlg="Yes"
+         shift
+     fi
+     if [ "$1" = "help" ]
+       then
+         printUsage
+         exit
+     fi
+ fi
  
  
  
+ # Work out the default build parameters
+ BuildHostType=""
+ getDefaultSystemType
+ 
+ BuildBuildType="DEV"
+ MasterSourceDir="source/refDatabases"
+ 
+ export BuildHostType
+ export BuildBuildType
+ export MasterSourceDir
+ 
+ 
+ # Check the command line arguments
+ 
+ if [ $# -ge 1 ]
+   then
+     BuildHostType=$1
+ fi
+ if [ $# -ge 2 ]
+   then
+     BuildBuildType=$2
+ fi
+ if [ $# -ge 3 ]
+   then
+     MasterSourceDir=$3
+ fi
+ 
+ SYS_TYPE=$BuildHostType
+ 
+ 
+ if [ "$SYS_TYPE" = "" ]
+   then
+     echo "Unable to automatically determine the OS system type for the build"
+     echo "you will need to specify it manually"
+     echo ""
+     printUsage
+     exit
+ fi
+ 
  checkVariables
+ 
  
! # Some checking for old systems, 
! 
! if [ "$BuildHostType" = 'SUN4' -o "$BuildHostType" = 'SUN3_4' -o "$BuildHostType" = 'SUN386I' ]; then
      SYS_TYPE=SUNOS4
  fi
! if [ $BuildHostType = 'AX' -o $BuildHostType = 'AP' ]; then
      SYS_TYPE=APOLLO
  fi
! if [ $BuildHostType = 'SUN3_3' ]; then
      SYS_TYPE=SUNOS3
  fi
  #
  LOCK_HEADER=lock_header_shmem
! if [ $SYS_TYPE = 'SUNOS4' -o $BuildHostType = 'DG' -o $BuildHostType = 'SOLARIS' ]; then
      LOCK_HEADER=lock_header_mmap
  fi
  #
+ 
+ 
  
! # Here we ensure that the build_no version strings are automatically set to 
! # the correct current values ( thanks to Frank for this).
! 
! echo "- Setting build version strings in file jrd/build_no.h"
! echo ""
  sh builds_win32/original/build_no.ksh
+ 
+ 
+ 
+ 
+ # The boot build copies a number of already precompiled C files into
+ # the build structure.
+ 
+ if [ $BuildBootFlg = "Yes" ]
+   then
+     echo "- Copying boot files into build tree"
+     echo ""
+     copyFilesFromPortingDir
+ fi
+ 
+ 
  echo "- Setting up the superserver directory structure"
  echo ""
  
! buildSuperDirs
  
  
! # Refresh/create a few links
  
  refreshLink . source
+ 
  refreshLink builds/make.interbase make_kit
+ 
  refreshLink builds/original/build_kit build_kit
  refreshLink builds/original/set_prot set_prot
***************
*** 276,347 ****
  refreshLink builds/original/fetch_comp fetch_comp
  refreshLink builds/original/maketar maketar
  refreshLink builds/refresh refresh
  refreshLink builds/refresh.all refresh.all
  refreshLink builds/special_opt special_opt
  
! if [ $1 = 'SCO' ]; then
!         refreshLink builds/original/sco_ship sco_ship
  fi
  
  
- if [ $SYS_TYPE = 'LINUX' -o $SYS_TYPE = 'FREEBSD' -o $SYS_TYPE = 'NETBSD' ]
- then
- 		# TODO this does not belong in the linux/*bsd section
-         if [ -d interbase ] 
-           then
-             echo ""
-             echo ""
-             echo "*** Warning *** "
-             echo "    The installation target directory:"
-             echo "       `pwd`/interbase"
-             echo "    already exists, press return to delete this directory or ^C to abort."
-             echo "*** Warning *** "
-             echo "" 
-             AskQuestion "Press return to continue or ^C to abort"
-             rm -rf interbase
-             echo "Deleted."
-             echo ""
-         fi
-         mkdir interbase
-         cd interbase
-         cp $INTERBASE/interbase.msg .
-         cp $INTERBASE/isc4.gdb .
-         copyIfExists $INTERBASE/ib_license.dat .
-         mkdir bin
-         cp $INTERBASE/bin/gpre bin
-         cp $INTERBASE/bin/gbak bin
-         copyIfExists $INTERBASE/bin/gds_lock_mgr bin
-         mkdir lib
-         mkdir help
-         cp $INTERBASE/help/help.gdb help
-         mkdir UDF
-         mkdir -p examples/v5
-         mkdir include
- 		mkdir intl
-         cd ..
- 
-         cd jrd
-         refreshLink $MasterSourceDir/jrd/isc.gdb isc.gdb
-         refreshLink $MasterSourceDir/jrd/metadata.gdb yachts.gdb
-         cd ..
- 
-         cd super/jrd                                  # TMC 081100
-         refreshLink ../../jrd/yachts.gdb yachts.gdb   # TMC 081100
-         refreshLink ../../jrd/isc.gdb    isc.gdb      # FSG 090800
-         cd ../..                                      # TMC 081100 
  
  echo "- Creating messages link"
  echo ""
  
!         cd msgs
!         refreshLink $MasterSourceDir/msgs/msg.gdb msg.gdb
!         cd ..
!   # Link these to the ones we will build, so we can do -lgds and -lgds_pyxis
!         cd jrd
!         refreshLink source/interbase/lib/gds.so libgds.so
!         refreshLink source/interbase/lib/gds_pyxis.a libgds_pyxis.a
!         cd ..
  fi
  
  echo "- Setting up makefile and database links"
  echo ""
--- 486,550 ----
  refreshLink builds/original/fetch_comp fetch_comp
  refreshLink builds/original/maketar maketar
+ 
  refreshLink builds/refresh refresh
  refreshLink builds/refresh.all refresh.all
  refreshLink builds/special_opt special_opt
  
! 
! if [ $BuildHostType = 'SCO' ]
!   then
!     refreshLink builds/original/sco_ship sco_ship
  fi
  
  
  
+ # Build the empty target interbase directories 
+ 
+ buildTargetInterbaseDirs
+ 
+ 
+ # Update the metadata/isc links
+ cd jrd
+ refreshLink $MasterSourceDir/jrd/isc.gdb isc.gdb
+ refreshLink $MasterSourceDir/jrd/metadata.gdb yachts.gdb
+ cd ..
+ 
+ cd super/jrd                                  # TMC 081100
+ refreshLink ../../jrd/yachts.gdb yachts.gdb   # TMC 081100
+ refreshLink ../../jrd/isc.gdb    isc.gdb      # FSG 090800
+ cd ../..                                      # TMC 081100 
+ 
+ 
+ 
  echo "- Creating messages link"
  echo ""
  
! cd msgs
! refreshLink $MasterSourceDir/msgs/msg.gdb msg.gdb
! cd ..
! # Link these to the ones we will build, so we can do -lgds and -lgds_pyxis
! cd jrd
! refreshLink source/interbase/lib/gds.so libgds.so
! refreshLink source/interbase/lib/gds_pyxis.a libgds_pyxis.a
! cd ..
! 
! 
! if [ $BuildBootFlg = 'Yes' ]
!   then
! #
! #     INTERBASE in the level above is the source root directory
! #
!     touch interbase/interbase.msg
! 
!     cd interbase/lib
!     refreshLink gds.so libgds.so.1.0
!     refreshLink libgds.so.1.0 libgds.so.1
!     refreshLink libgds.so.1 libgds.so
!     refreshLink gds_pyxis.a libgds_pyxis.a
!     refreshLink gds.a libgds.a
!     cd ../..
  fi
  
+ 
  echo "- Setting up makefile and database links"
  echo ""
***************
*** 423,426 ****
--- 626,630 ----
  refreshLink source/jrd/yachts.gdb isql/yachts.lnk
  refreshLink source/builds/make.isql isql/makefile
+ 
  # Journal
  refreshLink .. journal/source
***************
*** 431,437 ****
--- 635,643 ----
  refreshLink $MasterSourceDir/journal/journal.gdb super/journal/journal.gdb
  refreshLink source/builds/make.journal_ss super/journal/makefile
+ 
  # Jrd
  refreshLink .. jrd/source
  refreshLink yachts.gdb jrd/yachts.lnk
+ refreshLink $MasterSourceDir/msgs/msg.gdb msgs/msg.gdb  # TMC 082100
  refreshLink source/msgs/msg.gdb jrd/msg.gdb   # TMC 081100
  refreshLink source/builds/make.jrd jrd/makefile
***************
*** 449,458 ****
  refreshLink source/builds/original/bind_csilib.apollo csv/bind_csilib
  refreshLink source/builds/original/bind_remotelib.apollo remote/bind_remotelib
! if [ $1 = 'DELTA' -o $1 = 'IMP' -o $1 = 'MU' -o $1 = 'NXT' -o $1 = 'SCO' -o $1 = 'UL' ]; then
      refreshLink source/interbase/lib/gds_b.a jrd/libgds_b.a
  else
      refreshLink gds_b.a jrd/libgds_b.a
  fi
! if [ $SYS_TYPE = 'SUNOS4' ]; then
      refreshLink source/interbase/lib/gdslib.so.1.0 jrd/libgdslib.so.1.0
      refreshLink source/interbase/lib/gdslib.so.0.1 jrd/libgdslib.so.0.1
--- 655,668 ----
  refreshLink source/builds/original/bind_csilib.apollo csv/bind_csilib
  refreshLink source/builds/original/bind_remotelib.apollo remote/bind_remotelib
! 
! if [ $BuildHostType = 'DELTA' -o $BuildHostType = 'IMP' -o $BuildHostType = 'MU' -o $BuildHostType = 'NXT' -o $BuildHostType = 'SCO' -o $BuildHostType = 'UL' ]
!   then
      refreshLink source/interbase/lib/gds_b.a jrd/libgds_b.a
  else
      refreshLink gds_b.a jrd/libgds_b.a
  fi
! 
! if [ $SYS_TYPE = 'SUNOS4' ]
!   then
      refreshLink source/interbase/lib/gdslib.so.1.0 jrd/libgdslib.so.1.0
      refreshLink source/interbase/lib/gdslib.so.0.1 jrd/libgdslib.so.0.1
***************
*** 460,471 ****
      refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
  fi
! if [ $1 = 'AIX' -o $1 = 'AIX_PPC' -o $1 = 'DECOSF' -o $1 = 'SGI' ]; then
      refreshLink source/builds/original/bind_gds.generic jrd/gds.bind
      refreshLink source/builds/original/bind_gds5.generic jrd/gds5.bind
  fi
! if [ $1 = 'AIX' -o $1 = 'AIX_PPC' ]; then
      refreshLink source/interbase/lib/gdsshr.a jrd/libgdsshr.a
  fi
! if [ $1 = 'DG' ]; then
      refreshLink source/interbase/lib/gds.so.0 jrd/libgds.so.0
      refreshLink source/jrd/libgds.so.0 jrd/libgds.so
--- 670,693 ----
      refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
  fi
! 
! if [ $BuildHostType = 'AIX' -o $BuildHostType = 'DECOSF' -o $BuildHostType = 'SGI' ]
!   then
      refreshLink source/builds/original/bind_gds.generic jrd/gds.bind
      refreshLink source/builds/original/bind_gds5.generic jrd/gds5.bind
  fi
! if [ $BuildHostType = 'AIX_PPC' ]
!   then
!    refreshLink source/builds/original/bind_gds.aix_ppc jrd/gds.bind
!    refreshLink source/builds/original/bind_gdsintl.aix_ppc intl/gdsintl.bind
! fi
! 
! 
! if [ $BuildHostType = 'AIX' -o $BuildHostType = 'AIX_PPC' ]
!   then
      refreshLink source/interbase/lib/gdsshr.a jrd/libgdsshr.a
  fi
! 
! if [ $BuildHostType = 'DG' ]
!   then
      refreshLink source/interbase/lib/gds.so.0 jrd/libgds.so.0
      refreshLink source/jrd/libgds.so.0 jrd/libgds.so
***************
*** 473,481 ****
      refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
  fi
! if [ $1 = 'EPSON' -o $1 = 'DECOSF' -o $1 = 'UNIXWARE' -o $1 = 'M88K' ]; then
      refreshLink source/interbase/lib/gds.so.0 jrd/libgds.so.0
      refreshLink source/jrd/libgds.so.0 jrd/libgds.so
  fi
! if [ $1 = 'HP700' -o $1 = 'HP9.0' -o $1 = 'HP10' ]; then
      if [ -d super ]; then
         refreshLink source/builds/original/bind_gds.hp super/remote/gds.bind
--- 695,703 ----
      refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
  fi
! if [ $BuildHostType = 'EPSON' -o $BuildHostType = 'DECOSF' -o $BuildHostType = 'UNIXWARE' -o $BuildHostType = 'M88K' ]; then
      refreshLink source/interbase/lib/gds.so.0 jrd/libgds.so.0
      refreshLink source/jrd/libgds.so.0 jrd/libgds.so
  fi
! if [ $BuildHostType = 'HP700' -o $BuildHostType = 'HP9.0' -o $BuildHostType = 'HP10' ]; then
      if [ -d super ]; then
         refreshLink source/builds/original/bind_gds.hp super/remote/gds.bind
***************
*** 487,491 ****
      refreshLink source/builds/original/bind_gds5.hp jrd/gds5.bind
  fi
! if [ $1 = 'SOLARIS' -o $1 = 'SGI' -o $1 = 'SCO_EV' ]; then
      refreshLink source/interbase/lib/gdsmt.so.1 jrd/libgdsmt.so.1
      refreshLink source/interbase/lib/gdsmt.so.0 jrd/libgdsmt.so.0
--- 709,713 ----
      refreshLink source/builds/original/bind_gds5.hp jrd/gds5.bind
  fi
! if [ $BuildHostType = 'SOLARIS' -o $BuildHostType = 'SGI' -o $BuildHostType = 'SCO_EV' ]; then
      refreshLink source/interbase/lib/gdsmt.so.1 jrd/libgdsmt.so.1
      refreshLink source/interbase/lib/gdsmt.so.0 jrd/libgdsmt.so.0
***************
*** 495,510 ****
      refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
  fi
! if [ $1 = 'SCO' -o $1 = 'IMP' ]; then
      refreshLink source/interbase/lib/gds_s.a jrd/libgds_s.a
      refreshLink source/interbase/lib/gdsf_s.a jrd/libgdsf_s.a
!     if [ $1 = 'SCO' ]; then
          refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
      fi
  fi
! if [ $1 = 'IMP' ]; then
      refreshLink source/builds/original/bind_gds_s.im jrd/gds_s.bind
      refreshLink source/builds/original/bind_gdsf_s.im jrd/gdsf_s.bind
  fi
! if [ $1 = 'SCO' ]; then
      refreshLink source/builds/original/bind_gds_s.sco jrd/gds_s.bind
      refreshLink source/builds/original/bind_gdsf_s.sco jrd/gdsf_s.bind
--- 717,732 ----
      refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
  fi
! if [ $BuildHostType = 'SCO' -o $BuildHostType = 'IMP' ]; then
      refreshLink source/interbase/lib/gds_s.a jrd/libgds_s.a
      refreshLink source/interbase/lib/gdsf_s.a jrd/libgdsf_s.a
!     if [ $BuildHostType = 'SCO' ]; then
          refreshLink source/interbase/lib/gds_pyxis.a jrd/libgds_pyxis.a
      fi
  fi
! if [ $BuildHostType = 'IMP' ]; then
      refreshLink source/builds/original/bind_gds_s.im jrd/gds_s.bind
      refreshLink source/builds/original/bind_gdsf_s.im jrd/gdsf_s.bind
  fi
! if [ $BuildHostType = 'SCO' ]; then
      refreshLink source/builds/original/bind_gds_s.sco jrd/gds_s.bind
      refreshLink source/builds/original/bind_gdsf_s.sco jrd/gdsf_s.bind
***************
*** 546,549 ****
--- 768,772 ----
  refreshLink .. super/remote/source
  refreshLink source/builds/make.remote_ss super/remote/makefile
+ 
  # Super
  refreshLink . super/source
***************
*** 553,559 ****
  refreshLink builds/special_opt super/special_opt
  
! if [ $1 = "DG" ]; then
      refreshLink source/interbase/examples/v3/gds_blk_data.f testing/gds_blk_data.f
  fi
  # Utilities
  refreshLink .. utilities/source
--- 776,783 ----
  refreshLink builds/special_opt super/special_opt
  
! if [ $BuildHostType = "DG" ]; then
      refreshLink source/interbase/examples/v3/gds_blk_data.f testing/gds_blk_data.f
  fi
+ 
  # Utilities
  refreshLink .. utilities/source
***************
*** 567,570 ****
--- 791,795 ----
  refreshLink source/builds/make.utilities_ss super/utilities/makefile
  refreshLink $MasterSourceDir/utilities/rebuild.gdb super/utilities/rebuild.gdb
+ 
  # Wal
  refreshLink .. wal/source
***************
*** 572,577 ****
--- 797,804 ----
  refreshLink .. super/wal/source
  refreshLink source/builds/make.wal_ss super/wal/makefile
+ 
  # Builds
  refreshLink ../.. builds/original/source
+ 
  # System specific directories
  refreshLink .. builds/source
***************
*** 581,592 ****
  else
          refreshLink original/install.unix builds/install
!         if [ $1 = 'SUN3_3' ]; then
              refreshLink original/servers.isc builds/servers.isc
          fi
  fi
! if [ $1 = 'MU' -o $1 = 'UL' ]; then
      refreshLink original/inetd.conf.ultrix builds/inetd.conf.isc
  else
!         if [ $1 = 'IMP' -o $1 = 'SCO' -o $1 = 'EPSON' ]; then
              refreshLink original/inetd.conf.psx builds/inetd.conf.isc
          else
--- 808,820 ----
  else
          refreshLink original/install.unix builds/install
!         if [ $BuildHostType = 'SUN3_3' ]; then
              refreshLink original/servers.isc builds/servers.isc
          fi
  fi
! 
! if [ $BuildHostType = 'MU' -o $BuildHostType = 'UL' ]; then
      refreshLink original/inetd.conf.ultrix builds/inetd.conf.isc
  else
!         if [ $BuildHostType = 'IMP' -o $BuildHostType = 'SCO' -o $BuildHostType = 'EPSON' ]; then
              refreshLink original/inetd.conf.psx builds/inetd.conf.isc
          else
***************
*** 596,609 ****
  
  
  cd builds/original
  chmod +x setup_prots
  ./setup_prots
  
  # Save the production/development flag
! echo "$1" > .platform_type    
! cd ../..
! chmod +x setup_build
  
! ./setup_build $BuildBuildType 
  
  echo "- Directory setup is now complete!"
--- 824,867 ----
  
  
+ 
+ echo "- Setting up plaform specific makefiles"
+ echo ""
+ 
  cd builds/original
+ 
+ 
+ # sfx.interbase.boot has the modes required for a boot build so
+ # we need to replace the original one there.
+ 
+ if [ $BuildBootFlg = "Yes" ]
+   then
+     if [ ! -f noboot.sfx.interbase ]
+       then
+         cp sfx.interbase sfx.interbase.noboot
+     fi
+     cp boot.sfx.interbase sfx.interbase
+ fi
+ 
  chmod +x setup_prots
  ./setup_prots
  
  # Save the production/development flag
! 
! echo "$BuildHostType" > .platform_type    
! echo "$BuildBuildType" > .version_flg
! 
! ./platform $BuildHostType
! 
  
! # Restore the sfx.interbase file to stop problems with CVS 
! if [ $BuildBootFlg = "Yes" ]
!   then
!     if [ -f noboot.sfx.interbase ]
!       then
!         cp noboot.sfx.interbase sfx.interbase
!     fi
! fi
! 
! cd ../..
  
  echo "- Directory setup is now complete!"

[Firebird-checkins] CVS: interbase/builds/original boot.sfx.interbase,NONE,1.1 buildRefDatabases,1.3,1.4 build_kit,1.4,1.5 prefix.linux,1.7,1.8 sfx.interbase,1.9,1.10 sfx.pyxis,1.3,1.4

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory usw-pr-cvs1:/tmp/cvs-serv16945/builds/original

Modified Files:
	buildRefDatabases build_kit prefix.linux sfx.interbase 
	sfx.pyxis 
Added Files:
	boot.sfx.interbase 
Log Message:
This contains a new build process which incorperates a boot build 
enabling Firebird to be built without a prior version being
installed.
Fixed examples so thay are built as part of the build process.
Integrated the "install" and "packaging" build targets into the 
main make process.


***** Error reading new file: [Errno 2] No such file or directory: 'boot.sfx.interbase'
Index: buildRefDatabases
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/buildRefDatabases,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** buildRefDatabases	2000/08/21 21:12:08	1.3
--- buildRefDatabases	2001/04/17 02:41:42	1.4
***************
*** 1,14 ****
  #!/bin/sh
  
  
  printUsage() {
!    echo "usage is : 'buildRefDatabases'"
!    echo "      or : 'buildRefDatabases <destDir>'"
!    echo "      or : 'buildRefDatabases <srcDir> <destDir>'"
     echo ""
     echo "usually as:"
     echo "sh builds/original/buildRefDatabases"
     echo "from the main interbase source directory"
!    echo "where defaults are srcDir=. and destDir=../refDatabases"
     echo ""
  }
--- 1,16 ----
  #!/bin/sh
  
+ # This file builds the reference databases for both the boot build
+ # and the normal builds.
  
  printUsage() {
!    echo "usage is : 'buildRefDatabases [boot]'"
!    echo "      or : 'buildRefDatabases [boot] <destDir>'"
!    echo "      or : 'buildRefDatabases [boot] <srcDir> <destDir>'"
     echo ""
     echo "usually as:"
     echo "sh builds/original/buildRefDatabases"
     echo "from the main interbase source directory"
!    echo "where defaults are srcDir=. and destDir=./refDatabases"
     echo ""
  }
***************
*** 30,57 ****
       export IBBin=$INTERBASE/bin
  
  
!      echo ""
!      echo ""
!      echo ""
!      echo "- Firebird - Reference database build ------------------------"
!      echo ""
!      echo "Parameters :"
!      echo ""
!      echo "INTERBASE    (installed database root) : $INTERBASE "
!      echo "Source code dir root                   : $IBSrc"
!      echo "Dest root dir where to build ref db's  : $IBRefDir"
!      echo ""
!      echo "ISC_USER     (admin user)              : $ISC_USER"
!      echo "ISC_PASSWORD (admin password)          : $ISC_PASSWORD"
!      echo ""
!      echo "If you wish to have different values please set them before running"
!      echo "this script"
!      echo "usage is : 'buildRefDatabases'"
!      echo "      or : 'buildRefDatabases <destDir>'"
!      echo "      or : 'buildRefDatabases <srcDir> <destDir>'"
!      echo ""
!      echo "--------------------------------------------------------------"
!      echo ""
!      AskQuestion "Press return to continue"
  
  
--- 32,60 ----
       export IBBin=$INTERBASE/bin
  
+ # This has become a more core activity of the build process and prompting
+ # or confirmation is not required since it is always done.
  
! #     echo ""
! #     echo ""
! #     echo ""
! #     echo "- Firebird - Reference database build ------------------------"
! #     echo ""
! #     echo "Parameters :"
! #     echo ""
! #     echo "BootBuildFlg (build using boot kit   ) : $BootBuildFlg "
! #     echo "INTERBASE    (installed database root) : $INTERBASE "
! #     echo "Source code dir root                   : $IBSrc"
! #     echo "Dest root dir where to build ref db's  : $IBRefDir"
! #     echo ""
! #     echo "ISC_USER     (admin user)              : $ISC_USER"
! #     echo "ISC_PASSWORD (admin password)          : $ISC_PASSWORD"
! #     echo ""
! #     echo "If you wish to have different values please set them before running"
! #     echo "this script"
! #     echo "usage is : 'buildRefDatabases [boot]'"
! #     echo "      or : 'buildRefDatabases [boot] <destDir>'"
! #     echo "      or : 'buildRefDatabases [boot] <srcDir> <destDir>'"
! #     echo ""
! #     AskQuestion "Press return to continue"
  
  
***************
*** 107,111 ****
--- 110,134 ----
  }
  
+ #--------------------------------------------------------------------
+ # Build the databases needed for a Firebird boot build 
+ 
+ buildBootStdDatabases() {
+     echo "- building boot std databases"
+ 
+ # boot make will create this if it does not exist
+ #   (cd jrd; touch metadata.gdb)
+ 
+ # boot make will create this if it does not exist
+ #   touch msgs/msg.gdb
  
+ # boot make will create this if it does not exist
+ #   touch qli/help.gdb
+ 
+     touch pyxis/forms.gdb
+ 
+     touch utilities/rebuild.gdb
+ }
+ 
+ 
  #--------------------------------------------------------------------
  # Build the standard examples
***************
*** 182,188 ****
      if [ -d $IBRefDir ] 
        then
-          echo "** Warning ** - The reference directory $IBRefDir already exists"
-          AskQuestion "Press return to delete it and continue or ^C to abort"
- 
           rm -rf $IBRefDir
      fi
--- 205,208 ----
***************
*** 197,224 ****
  # Check parameters 
  
- if [ $# = 0 ] 
-   then
-      export IBSrc=`pwd`
-      export IBRefDir=../refDatabases
  
! elif [ $# = 1 ]
!   then
!      export IBSrc=`pwd`
!      export IBRefDir=$1
  
! elif [ $# = 2 ]
!   then
!      export IBSrc=$1
!      export IBRefDir=$2
  
! else
!   printUsage
!   exit
  fi
  
  
! checkVariables
  
  
  createRefDir
  
--- 217,246 ----
  # Check parameters 
  
  
! # Check for boot build.
  
! BootBuildFlg="No"
  
! if [ $# > 0 ]
!   then 
!     if [ "$1" = "boot" ]
!       then
!         BootBuildFlg="Yes"
!         shift
!     fi
!     if [ "$1" = "noprompt" ]
!       then
!         doNotPromptUser="Yes"
!     fi
  fi
  
  
! # Now check the rest of the parameters
  
+ export IBSrc=`pwd`
+ export IBRefDir=refDatabases
  
+ checkVariables
+ 
  createRefDir
  
***************
*** 226,232 ****
  
  mkdir -p msgs qli jrd utilities example4 example5 examples pyxis
  
! buildStdDatabases
! buildExampleDatabases
! #buildExample4Databases
! buildExample5Databases
--- 248,261 ----
  
  mkdir -p msgs qli jrd utilities example4 example5 examples pyxis
+ 
+ if [ $BootBuildFlg = "Yes" ]
+   then
+     buildBootStdDatabases
+ else
+     buildStdDatabases
+     buildExampleDatabases
+     #buildExample4Databases
+     buildExample5Databases
+ fi
  
! cd $IBSrc
\ No newline at end of file

Index: build_kit
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/build_kit,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** build_kit	2000/12/14 19:49:10	1.4
--- build_kit	2001/04/17 02:41:42	1.5
***************
*** 80,92 ****
  #Build superserver if directory source/super exists
  if [ $2 = SUPER ]; then
!     GDS_SUPER="super_targets"
!     export GDS_SUPER
! fi
! if [ $# = 2 ]; then
!     $MAKE -f ./make_kit interbase SYSTEM=$1 SUPER_SERVER="$GDS_SUPER"
  else
!     $MAKE -f ./make_kit interbase CFLAGS="$3" SYSTEM=$1 SUPER_SERVER="$GDS_SUPER"
  fi
! #
  STATUS=$?
  
--- 80,98 ----
  #Build superserver if directory source/super exists
  if [ $2 = SUPER ]; then
!     make super_firebird 
  else
!     make firebird  
  fi
! 
! #if [ $2 = SUPER ]; then
! #    GDS_SUPER="super_targets"
! #    export GDS_SUPER
! #fi
! #if [ $# = 2 ]; then
! #    $MAKE -f ./make_kit interbase SYSTEM=$1 SUPER_SERVER="$GDS_SUPER"
! #else
! #    $MAKE -f ./make_kit interbase CFLAGS="$3" SYSTEM=$1 SUPER_SERVER="$GDS_SUPER"
! #fi
! 
  STATUS=$?
  

Index: prefix.linux
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/prefix.linux,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** prefix.linux	2000/12/08 16:59:31	1.7
--- prefix.linux	2001/04/17 02:41:42	1.8
***************
*** 32,36 ****
  
  PROD_DEBUG_OBJECTS=	nodebug.o
! PROD_SHRLIB_DIR=	
  PROD_VERSION_FLAG=	-DPROD_BUILD
  PROD_CFLAGS=            -O3 -m486 -fpic -DFLINTSTONE
--- 32,36 ----
  
  PROD_DEBUG_OBJECTS=	nodebug.o
! PROD_SHRLIB_DIR=	-Lsource/jrd -Lsource/interbase/lib
  PROD_VERSION_FLAG=	-DPROD_BUILD
  PROD_CFLAGS=            -O3 -m486 -fpic -DFLINTSTONE
***************
*** 38,42 ****
  
  DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
! DEV_SHRLIB_DIR=		-Lsource/jrd
  DEV_VERSION_FLAG=	-DDEV_BUILD
  DEV_CFLAGS=		-ggdb
--- 38,42 ----
  
  DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
! DEV_SHRLIB_DIR=		-Lsource/jrd -Lsource/interbase/lib
  DEV_VERSION_FLAG=	-DDEV_BUILD
  DEV_CFLAGS=		-ggdb
***************
*** 45,49 ****
  SHRLIB_DIR=		$($(VERSION)_SHRLIB_DIR)
  VERSION_FLAG=		$($(VERSION)_VERSION_FLAG)
! CFLAGS_COMMON=		$($(VERSION)_CFLAGS) -DLINUX -Wall -fwritable-strings
  CFLAGS=			$(CFLAGS_COMMON) $(SUPER_FLAG)
  PIC_J_CFLAGS=		$(CFLAGS_COMMON) -DPIPE_IS_SHRLIB -fPIC
--- 45,49 ----
  SHRLIB_DIR=		$($(VERSION)_SHRLIB_DIR)
  VERSION_FLAG=		$($(VERSION)_VERSION_FLAG)
! CFLAGS_COMMON=		$($(VERSION)_CFLAGS) -DLINUX -Wall -fwritable-strings -I$(INTERBASE)/include
  CFLAGS=			$(CFLAGS_COMMON) $(SUPER_FLAG)
  PIC_J_CFLAGS=		$(CFLAGS_COMMON) -DPIPE_IS_SHRLIB -fPIC
***************
*** 52,56 ****
  UDF_CFLAGS=         	-fPIC -mieee-fp
  UDF_LFLAGS=         	-shared
! UDF_SHRLIBS=        	-lgds -lm -lc -mieee-fp -ldl -lcrypt
  
  
--- 52,56 ----
  UDF_CFLAGS=         	-fPIC -mieee-fp
  UDF_LFLAGS=         	-shared
! UDF_SHRLIBS=        	-L$(INTERBASE)/lib  -lgds -lm -lc -mieee-fp -ldl -lcrypt
  
  
***************
*** 103,107 ****
  JRD_P_MISC_OBJECTS=	source/jrd/sun_ftn.bin source/jrd/nodebug.bin
  LANG_OBJECTS=		ada.o ftn.o cob.o
! LANGUAGES=		cc cxx ada sun_ada microfocus_cob make16 gdl1 sun_ftn
  LD_LIBS=		-lc
  LD_LIBS_J=		-lc
--- 103,107 ----
  JRD_P_MISC_OBJECTS=	source/jrd/sun_ftn.bin source/jrd/nodebug.bin
  LANG_OBJECTS=		ada.o ftn.o cob.o
! LANGUAGES=		cc cxx ada microfocus_cob make16 gdl1 sun_ftn
  LD_LIBS=		-lc
  LD_LIBS_J=		-lc
***************
*** 172,175 ****
--- 172,179 ----
  
  V3PRINTER=		source/lock/printv3.o
+ 
+ # Forces library build for linux  TMC 082100
+ PYXIS_LIBRARY= libpyxis.a
+ 
  
  #   End of file prefix.linux:	$(VERSION)	$(PLATFORM)

Index: sfx.interbase
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/sfx.interbase,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** sfx.interbase	2001/01/07 17:24:24	1.9
--- sfx.interbase	2001/04/17 02:41:42	1.10
***************
*** 16,19 ****
--- 16,28 ----
  # Contributor(s): ______________________________________.
  
+ 
+ 
+ #== WARNING ==============================================================
+ #
+ # IF YOU CHANGE THIS FILE YOU MUST REVIEW both:
+ # sfx.interbase and boot.sfx.interbase files
+ #
+ #=========================================================================
+ 
  EXTERNAL_OBJECTS=	$(CSI_OBJS) dsql_objects lock.o $(PYXIS_OBJECTS) rem_objects $(INTL) wal_objects
  EXTERNAL_P_OBJECTS=	$(CSI_P_OBJS) dsql_p_objects lock.bin $(PYXIS_P_OBJS) rem_p_objects $(INTL_P_OBJS) wal_p_objects
***************
*** 35,39 ****
  CMP=		cmp
  
! CODES=/netapp/apps/isc/bin/codes
  
  # removed examples 03-Aug-00 TMC
--- 44,48 ----
  CMP=		cmp
  
! CODES=source/jrd/codes
  
  # removed examples 03-Aug-00 TMC
***************
*** 42,46 ****
  #added completed according to inprise tree
  #FSG  093000
! interbase:	run_codes gds.h includes executables help msgs msgs_intl extlib completed
  
  # Run the codes program, thus generating codes.h, iberror.h, etc
--- 51,76 ----
  #added completed according to inprise tree
  #FSG  093000
! 
! # The only difference between firebird and super_firebird is the executables
! # target and in there super just had one more target "super_targets".  The 
! # difference used to be done via a parameter passed into this makefile, but 
! # I've put the change here to reduce the complexity of the build script files. 
! # MOD 07-Apr-2001.
! 
! firebird:	run_codes gds.h includes executables help msgs msgs_intl extlib completed
! 
! super_firebird:	run_codes gds.h includes super_executables help msgs msgs_intl extlib completed
! 
! executables:	alice burp dudley gpre miscFiles $(INTL) isql locks \
! 	pyxis qli remote spit utilities \
! 	$(SHARED_AM) $(LINKABLE_LIBS)
! 
! super_executables:	alice burp dudley gpre superMiscFiles $(INTL) isql locks \
! 	super_targets pyxis qli remote spit utilities \
! 	$(SHARED_AM) $(LINKABLE_LIBS)
! 	
! super_targets: 	s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils 
! 
! 
  
  # Run the codes program, thus generating codes.h, iberror.h, etc
***************
*** 54,65 ****
  #	build and isn't used for V4 anyway.
  # 1995-June-7 David Schnepper 
- # removed pyxis 3-Aug-00 TMC
- executables:	alice burp dudley gpre install $(INTL) isql locks \
- 	$(SUPER_SERVER) pyxis qli remote spit utilities \
- 	$(SHARED_AM) $(LINKABLE_LIBS)
- 	
- super_targets: 	s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils 
  
  
  #added completed according to inprise tree
  #FSG  093000
--- 84,91 ----
  #	build and isn't used for V4 anyway.
  # 1995-June-7 David Schnepper 
  
  
+ 
+ 
  #added completed according to inprise tree
  #FSG  093000
***************
*** 333,344 ****
  	$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" inet_server.a'
  
- install:	force
- 	$(QUIET_ECHO) "Building miscellaneous install files..."
- 	$(CP) source/$(SYSTEM)/install source/interbase
- 	-$(CP) source/$(SYSTEM)/servers.isc source/interbase
- 	$(CP) source/$(SYSTEM)/inetd.conf.isc source/interbase
- 	$(CP) source/$(SYSTEM)/original/services.isc source/interbase
- 	-$(CP) source/$(SYSTEM)/sys.conf.isc source/interbase
- 
  intl:		force
  	$(QUIET_ECHO) "Building INTL..."
--- 359,362 ----
***************
*** 610,613 ****
--- 628,685 ----
  	jrd/yachts.gdb \
  	msgs/msg.gdb
+ 
+ 
+ 
+ # The installations need to find a better and possibly linux
+ # specific home.  The tar installs should probably work with 
+ # other unix type of systems.
+ 
+ # I have seperated super and classic out since I needed different
+ # files in each case.
+ 
+ miscFiles:	force
+ 	$(QUIET_ECHO) "Building miscellaneous install files..."
+ 	mkdir -p source/interbase/misc
+ 	$(CP) source/$(SYSTEM)/install source/interbase
+ 	-$(CP) source/$(SYSTEM)/servers.isc source/interbase
+ 	$(CP) source/$(SYSTEM)/inetd.conf.isc source/interbase
+ 	$(CP) source/$(SYSTEM)/original/services.isc source/interbase
+ 	-$(CP) source/$(SYSTEM)/sys.conf.isc source/interbase
+ 	$(CP) firebird/skywalker/install/misc/firebird.xinetd source/interbase/misc
+ 
+ superMiscFiles:	force
+ 	$(QUIET_ECHO) "Building miscellaneous install files..."
+ 	$(CP) source/$(SYSTEM)/install source/interbase
+ 	-$(CP) source/$(SYSTEM)/servers.isc source/interbase
+ 	$(CP) source/$(SYSTEM)/inetd.conf.isc source/interbase
+ 	$(CP) source/$(SYSTEM)/original/services.isc source/interbase
+ 	-$(CP) source/$(SYSTEM)/sys.conf.isc source/interbase
+ 	mkdir -p source/interbase/misc
+ 	$(CP) firebird/skywalker/install/misc/firebird.init.d.* source/interbase/misc
+ 
+ install: force
+ 	make -f firebird/skywalker/install/Makefile install
+ 
+ runclassicinstall: force
+ 	make -f firebird/skywalker/install/Makefile runclassicinstall
+ 
+ classicpackages: force
+ 	make -f firebird/skywalker/install/Makefile classicpackages
+ 
+ classictarfile: force
+ 	make -f firebird/skywalker/install/Makefile classictarfile
+ 
+ classicrpmfile: force
+ 	make -f firebird/skywalker/install/Makefile classicrpmfile
+ 
+ 
+ superpackages: force
+ 	make -f firebird/skywalker/install/Makefile superpackages
+ 
+ supertarfile: force
+ 	make -f firebird/skywalker/install/Makefile supertarfile
+ 
+ superrpmfile: force
+ 	make -f firebird/skywalker/install/Makefile superrpmfile
  
  

Index: sfx.pyxis
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/sfx.pyxis,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** sfx.pyxis	2000/08/11 14:33:56	1.3
--- sfx.pyxis	2001/04/17 02:41:42	1.4
***************
*** 26,29 ****
--- 26,32 ----
  LIBPYXIS=	source/interbase/lib/gds_pyxis.a
  
+ # Forces library build for boot  TMC 082100
+ PYXIS_LIBRARY= libpyxis.a
+ 
  JRD_LINK=
  

[Firebird-checkins] CVS: interbase/firebird/skywalker/build refreshPorting.sh,NONE,1.1

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/firebird/skywalker/build
In directory usw-pr-cvs1:/tmp/cvs-serv16945/firebird/skywalker/build

Added Files:
	refreshPorting.sh 
Log Message:
This contains a new build process which incorperates a boot build 
enabling Firebird to be built without a prior version being
installed.
Fixed examples so thay are built as part of the build process.
Integrated the "install" and "packaging" build targets into the 
main make process.


--- NEW FILE ---
#!/bin/sh


# This script file is for refreshing the files in the boot build 
# process.

fbSrcHome=.

# find . -name '*.c' > bootfiles.txt
# find . -name '*.h' >> bootfiles.txt

fbBootFiles=`cat <<e_o_f
./jrd/codes.c
./jrd/blf.c
./jrd/dfw.c
./jrd/envelope.c
./jrd/dpm.c
./jrd/dyn.c
./jrd/fun.c
./jrd/ini.c
./jrd/met.c
./jrd/scl.c
./jrd/stats.c
./jrd/dyn_util.c
./jrd/grant.c
./jrd/dyn_def.c
./jrd/dyn_del.c
./jrd/dyn_mod.c
./jrd/pcmet.c
./qli/help.c
./burp/backup.c
./burp/restore.c
./dsql/blob.c
./dsql/metd.c
./dsql/parse.c
./dsql/array.c
./gpre/met.c
./msgs/check_msgs.c
./msgs/build_file.c
./pyxis/edit.c
./pyxis/save.c
./utilities/dba.c
./utilities/security.c
./jrd/iberror.h
e_o_f`



# Build the directories

for i in burp dsql jrd gpre misc msgs pyxis qli utilities
  do
    mkdir -p porting/$i
  done


# copy the individual files

for i in $fbBootFiles
  do
    cp  $fbSrcHome/$i porting/$i
  done

[Firebird-checkins] CVS: interbase/firebird/skywalker/build - New directory

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/firebird/skywalker/build
In directory usw-pr-cvs1:/tmp/cvs-serv8608/build

Log Message:
Directory /cvsroot/firebird/interbase/firebird/skywalker/build added to the repository

[Firebird-checkins] CVS: interbase/firebird/skywalker/install/misc firebird,1.1,NONE

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/firebird/skywalker/install/misc
In directory usw-pr-cvs1:/tmp/cvs-serv678

Removed Files:
	firebird 
Log Message:
Removed unused file


--- firebird DELETED ---

[Firebird-checkins] CVS: interbase/firebird/skywalker/install/misc firebird.xinetd,NONE,1.1 CSchangeRunUser.sh,1.1,1.2 CSrestoreRootRunUser.sh,1.1,1.2 firebird.xinitd,1.1,NONE

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/firebird/skywalker/install/misc
In directory usw-pr-cvs1:/tmp/cvs-serv486/misc

Modified Files:
	CSchangeRunUser.sh CSrestoreRootRunUser.sh 
Added Files:
	firebird.xinetd 
Removed Files:
	firebird.xinitd 
Log Message:
Changes to install process for classic firebird.


--- NEW FILE ---
# default: on
# description: Interbase server
service gds_db
{
	flags			= REUSE
	socket_type		= stream
	wait			= no
	user			= root
	log_on_success		+= USERID
	log_on_failure 		+= USERID
	server			= /opt/interbase/bin/gds_inet_server
    disable         = no
}

Index: CSchangeRunUser.sh
===================================================================
RCS file: /cvsroot/firebird/interbase/firebird/skywalker/install/misc/CSchangeRunUser.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CSchangeRunUser.sh	2000/12/22 14:23:06	1.1
--- CSchangeRunUser.sh	2001/04/14 02:15:33	1.2
***************
*** 74,78 ****
  }
  
- 
  #------------------------------------------------------------------------
  #  Add new user and group
--- 74,77 ----
***************
*** 80,93 ****
  
  addFirebirdUser() {
  
!     groupadd -g 84 -o -r firebird
  
!     useradd -o -r -m -d /home/firebird -s /bin/bash \
!         -c "Firebird Database Administrator" -g firebird -u 84 firebird 
  
! # >/dev/null 2>&1 
  }
  
  
  #------------------------------------------------------------------------
  #  Delete new user and group
--- 79,103 ----
  
  addFirebirdUser() {
+ 
+     testStr=`grep firebird /etc/group`
  
!     if [ -z "$testStr" ]
!       then
!         groupadd -g 84 -o -r firebird
!     fi
  
!     testStr=`grep firebird /etc/passwd`
!     if [ -z "$testDir" ]
!       then
!         useradd -o -r -m -d $IBRootDir -s /bin/bash \
!             -c "Firebird Database Administrator" -g firebird -u 84 firebird 
  
!         # >/dev/null 2>&1 
!     fi
  }
  
  
+ 
+ 
  #------------------------------------------------------------------------
  #  Delete new user and group
***************
*** 132,135 ****
--- 142,308 ----
  
  
+ #------------------------------------------------------------------------
+ #  changeXinetdServiceUser
+ #  Change the run user of the xinetd service
+ 
+ changeXinetdServiceUser() {
+ 
+     InitFile=/etc/xinetd.d/firebird
+     if [ -f $InitFile ] 
+       then
+         ed -s $InitFile <<EOF
+ /	user	/s/=.*$/= $RunUser/g
+ w
+ q
+ EOF
+     fi
+ }
+ 
+ #------------------------------------------------------------------------
+ #  Update inetd service entry
+ #  This just adds/replaces the service entry line
+ 
+ updateInetdEntry() {
+ 
+     FileName=/etc/inetd.conf
+     newLine="gds_db  stream  tcp     nowait.30000      $RunUser $IBBin/gds_inet_server gds_inet_server # InterBase Database Remote Server"
+     oldLine=`grep "^gds_db" $FileName`
+ 
+     replaceLineInFile "$FileName" "$newLine" "$oldLine"
+ }
+ 
+ #------------------------------------------------------------------------
+ #  Update xinetd service entry
+ 
+ updateXinetdEntry() {
+ 
+     cp $IBRootDir/misc/firebird.xinetd /etc/xinetd.d/firebird
+     changeXinetdServiceUser
+ }
+ 
+ 
+ #------------------------------------------------------------------------
+ #  Update inetd service entry 
+ #  Check to see if we have xinetd installed or plain inetd.  Install differs
+ #  for each of them.
+ 
+ updateInetdServiceEntry() {
+ 
+     if [ -d /etc/xinetd.d ] 
+       then
+         updateXinetdEntry
+     else
+         updateInetdEntry
+     fi
+ 
+ }
+ 
+ 
+ #------------------------------------------------------------------------
+ #  fixFilePermissions
+ #  Change the permissions to restrict access to server programs to 
+ #  firebird group only.  This is MUCH better from a saftey point of 
+ #  view than installing as root user, even if it requires a little 
+ #  more work.
+ 
+ 
+ fixFilePermissions() {
+ 
+     # Turn other access off.
+     chmod -R o= $IBRootDir
+ 
+ 
+     # Now fix up the mess.
+ 
+     # fix up directories 
+     for i in `find $IBRootDir -print`
+     do
+         FileName=$i
+         if [ -d $FileName ]
+         then
+             chmod o=rx $FileName
+         fi
+     done
+ 
+ 
+     cd $IBBin
+ 
+ 
+     # set up the defaults for bin
+     for i in `ls`
+       do
+          chmod ug=rx,o=  $i
+     done
+ 
+     # User can run these programs, they need to talk to server though.
+     # and they cannot actually create a database.
+      
+ 
+     chmod a=rx isql 
+     chmod a=rx qli
+     
+     # SUID is still needed for group direct access.  General users
+     # cannot run though.
+     for i in gds_lock_mgr gds_drop gds_inet_server
+     do
+         chmod ug=rx,o= $i
+         chmod ug+s $i
+     done
+ 
+ 
+     cd $IBRootDir
+ 
+     # Fix lock files
+     for i in isc_init1 isc_lock1 isc_event1 
+       do
+         FileName=$i.`hostname`
+         chmod ug=rw,o= $FileName
+       done
+ 
+ 
+     chmod ug=rw,o= interbase.log
+ 
+     chmod a=r interbase.msg
+     chmod ug=rw,o= help/help.gdb
+     chmod ug=rw,o= isc4.gdb
+ 
+ 
+     # Set a default of read all files in examples
+ 
+     cd examples
+ 
+     for i in `ls`
+       do
+          chmod a=r  $i
+     done
+ 
+     # make examples db's writable by group
+     chmod ug=rw,o= *.gdb
+ 
+ }
+ 
+ 
+ #------------------------------------------------------------------------
+ #  resetXinitdServer
+ #  Check for both inetd and xinetd, only one will be running but script
+ #  will work.
+ 
+ resetInetdServer() {
+ 
+     if [ -f /var/run/inetd.pid ]
+       then
+         kill -HUP `cat /var/run/inetd.pid`
+     fi
+ 
+     if [ -f /var/run/xinetd.pid ]
+       then
+         kill -HUP `cat /var/run/xinetd.pid`
+     fi
+ }
+ 
+ 
+ 
+ #= Main Program ============================================================
+ 
  IBRootDir=/opt/interbase
  IBBin=$IBRootDir/bin
***************
*** 171,186 ****
  
  
! # Update the /etc/inetd.conf
  echo "Updating /etc/services file"
  
  
- FileName=/etc/inetd.conf
- newLine="gds_db  stream  tcp     nowait.30000      $RunUser $IBBin/gds_inet_server gds_inet_server # InterBase Database Remote Server"
- oldLine=`grep "^gds_db" $FileName`
- 
- replaceLineInFile "$FileName" "$newLine" "$oldLine"
- 
- 
- 
  # Update ownership and SUID bits for programs.
  echo "Updating $IBRootDir"
--- 344,352 ----
  
  
! # Update the /etc/inetd.conf or xinetd entry
  echo "Updating /etc/services file"
+ updateInetdServiceEntry
  
  
  # Update ownership and SUID bits for programs.
  echo "Updating $IBRootDir"
***************
*** 188,232 ****
  
  chown -R $RunUser.$RunGroup $IBRootDir
- 
- # Turn everybody option off.
- chmod -R o= $IBRootDir
- 
- # Now fix up the mess.
  
! # fix up directories 
! for i in `find $IBRootDir -print`
!   do
!     FileName=$i
!     if [ -d $FileName ]
!        then
!          chmod o=rx $FileName
!      fi
!   done
  
- 
- 
- cd $IBBin
- 
- 
- # User can run these programs, they need to talk to server though.
- # and they cannot actually create a database.
- 
- chmod o=rx isql 
- chmod o=rx qli
- 
- # SUID is still needed for group direct access.  General users
- # cannot run though.
- for i in gds_lock_mgr gds_drop gds_inet_server
-   do
-     chmod ug+s $i
-   done
- 
- 
  # Get inetd to reread new init files.
! 
! if [ -f /var/run/inetd.pid ]
!   then
!     kill -HUP `cat /var/run/inetd.pid`
! fi
  
  
--- 354,362 ----
  
  chown -R $RunUser.$RunGroup $IBRootDir
  
! fixFilePermissions
  
  # Get inetd to reread new init files.
! resetInetdServer
  
  

Index: CSrestoreRootRunUser.sh
===================================================================
RCS file: /cvsroot/firebird/interbase/firebird/skywalker/install/misc/CSrestoreRootRunUser.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CSrestoreRootRunUser.sh	2000/12/22 14:23:06	1.1
--- CSrestoreRootRunUser.sh	2001/04/14 02:15:33	1.2
***************
*** 132,135 ****
--- 132,215 ----
  
  
+ #------------------------------------------------------------------------
+ #  changeXinetdServiceUser
+ #  Change the run user of the xinetd service
+ 
+ changeXinetdServiceUser() {
+ 
+     InitFile=/etc/xinetd.d/firebird
+     if [ -f $InitFile ] 
+       then
+         ed -s $InitFile <<EOF
+ /	user	/s/=.*$/= $RunUser/g
+ w
+ q
+ EOF
+     fi
+ }
+ 
+ #------------------------------------------------------------------------
+ #  Update inetd service entry
+ #  This just adds/replaces the service entry line
+ 
+ updateInetdEntry() {
+ 
+     FileName=/etc/inetd.conf
+     newLine="gds_db  stream  tcp     nowait.30000      $RunUser $IBBin/gds_inet_server gds_inet_server # InterBase Database Remote Server"
+     oldLine=`grep "^gds_db" $FileName`
+ 
+     replaceLineInFile "$FileName" "$newLine" "$oldLine"
+ }
+ 
+ #------------------------------------------------------------------------
+ #  Update xinetd service entry
+ # we assume the xinetd script file already exists since we are changing user
+ # not installing from scratch.
+ 
+ updateXinetdEntry() {
+ 
+ #    cp $IBRootDir/misc/firebird.xinetd /etc/xinetd.d/firebird
+     changeXinetdServiceUser
+ }
+ 
+ #------------------------------------------------------------------------
+ #  Update inetd service entry 
+ #  Check to see if we have xinetd installed or plain inetd.  Install differs
+ #  for each of them.
+ 
+ updateInetdServiceEntry() {
+ 
+     if [ -d /etc/xinetd.d ] 
+       then
+         updateXinetdEntry
+     else
+         updateInetdEntry
+     fi
+ 
+ }
+ 
+ 
+ #------------------------------------------------------------------------
+ #  resetXinitdServer
+ #  Check for both inetd and xinetd, only one will actually be running.
+ #  depending upon your system.
+ 
+ resetInetdServer() {
+ 
+     if [ -f /var/run/inetd.pid ]
+       then
+         kill -HUP `cat /var/run/inetd.pid`
+     fi
+ 
+     if [ -f /var/run/xinetd.pid ]
+       then
+         kill -HUP `cat /var/run/xinetd.pid`
+     fi
+ }
+ 
+ 
+ #== Main Start ==============================================================
+ 
+ 
  IBRootDir=/opt/interbase
  IBBin=$IBRootDir/bin
***************
*** 237,246 ****
  
  
- # Get inetd to reread new init files.
  
! if [ -f /var/run/inetd.pid ]
!   then
!     kill -HUP `cat /var/run/inetd.pid`
! fi
  
  
--- 317,327 ----
  
  
  
! # Update the /etc/inetd.conf or xinetd entry
! updateInetdServiceEntry
! 
! 
! # Get inetd to reread new init files.
! resetInetdServer
  
  

--- firebird.xinitd DELETED ---

[Firebird-checkins] CVS: interbase/firebird/skywalker/install/classic CSTarInstall.sh,1.2,1.3 CSinstall.sh,1.2,1.3 CSpostinstall.sh,1.2,1.3 CSrpmfiles.txt,1.2,1.3

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/firebird/skywalker/install/classic
In directory usw-pr-cvs1:/tmp/cvs-serv486/classic

Modified Files:
	CSTarInstall.sh CSinstall.sh CSpostinstall.sh CSrpmfiles.txt 
Log Message:
Changes to install process for classic firebird.


Index: CSTarInstall.sh
===================================================================
RCS file: /cvsroot/firebird/interbase/firebird/skywalker/install/classic/CSTarInstall.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CSTarInstall.sh	2000/12/22 14:23:05	1.2
--- CSTarInstall.sh	2001/04/14 02:15:33	1.3
***************
*** 100,103 ****
--- 100,106 ----
        done
  
+     mkdir -p interbase/misc
+     cp $ScriptsSrcDir/misc/firebird.xinetd interbase/misc
+ 
      ($ScriptsSrcDir/classic/CSinstall.sh)
  

Index: CSinstall.sh
===================================================================
RCS file: /cvsroot/firebird/interbase/firebird/skywalker/install/classic/CSinstall.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CSinstall.sh	2000/12/22 14:23:05	1.2
--- CSinstall.sh	2001/04/14 02:15:33	1.3
***************
*** 33,38 ****
      mkdir /opt/interbase/doc 
      mkdir /opt/interbase/UDF 
  
- 
      cp -f interbase/bin/gds_inet_server /opt/interbase/bin/gds_inet_server 
  
--- 33,38 ----
      mkdir /opt/interbase/doc 
      mkdir /opt/interbase/UDF 
+     mkdir /opt/interbase/misc
  
      cp -f interbase/bin/gds_inet_server /opt/interbase/bin/gds_inet_server 
  
***************
*** 93,96 ****
--- 93,98 ----
      cp interbase/services.isc /opt/interbase/services.isc
      cp interbase/README /opt/interbase/README
+ 
+     cp interbase/misc/firebird.xinetd /opt/interbase/misc/firebird.xinetd
  
      # June 23 2000, 6:00AM 

Index: CSpostinstall.sh
===================================================================
RCS file: /cvsroot/firebird/interbase/firebird/skywalker/install/classic/CSpostinstall.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CSpostinstall.sh	2000/12/22 14:23:05	1.2
--- CSpostinstall.sh	2001/04/14 02:15:33	1.3
***************
*** 56,59 ****
--- 56,154 ----
  
  #------------------------------------------------------------------------
+ #  Add new user and group
+ 
+ 
+ addFirebirdUser() {
+ 
+     testStr=`grep firebird /etc/group`
+ 
+     if [ -z "$testStr" ]
+       then
+         groupadd -g 84 -o -r firebird
+     fi
+ 
+     testStr=`grep firebird /etc/passwd`
+     if [ -z "$testDir" ]
+       then
+         useradd -o -r -m -d $IBRootDir -s /bin/bash \
+             -c "Firebird Database Administrator" -g firebird -u 84 firebird 
+ 
+         # >/dev/null 2>&1 
+     fi
+ }
+ 
+ 
+ #------------------------------------------------------------------------
+ #  Delete new user and group
+ 
+ 
+ deleteFirebirdUser() {
+ 
+     userdel firebird
+  #   groupdel firebird
+ 
+ }
+ 
+ 
+ #------------------------------------------------------------------------
+ #  changeXinetdServiceUser
+ #  Change the run user of the xinetd service
+ 
+ changeXinetdServiceUser() {
+ 
+     InitFile=/etc/xinetd.d/firebird
+     if [ -f $InitFile ] 
+       then
+         ed -s $InitFile <<EOF
+ /	user	/s/=.*$/= $RunUser/g
+ w
+ q
+ EOF
+     fi
+ }
+ 
+ #------------------------------------------------------------------------
+ #  Update inetd service entry
+ #  This just adds/replaces the service entry line
+ 
+ updateInetdEntry() {
+ 
+     FileName=/etc/inetd.conf
+     newLine="gds_db  stream  tcp     nowait.30000      $RunUser $IBBin/gds_inet_server gds_inet_server # InterBase Database Remote Server"
+     oldLine=`grep "^gds_db" $FileName`
+ 
+     replaceLineInFile "$FileName" "$newLine" "$oldLine"
+ }
+ 
+ #------------------------------------------------------------------------
+ #  Update xinetd service entry
+ 
+ updateXinetdEntry() {
+ 
+     cp $IBRootDir/misc/firebird.xinetd /etc/xinetd.d/firebird
+     changeXinetdServiceUser
+ }
+ 
+ 
+ #------------------------------------------------------------------------
+ #  Update inetd service entry 
+ #  Check to see if we have xinetd installed or plain inetd.  Install differs
+ #  for each of them.
+ 
+ updateInetdServiceEntry() {
+ 
+     if [ -d /etc/xinetd.d ] 
+       then
+         updateXinetdEntry
+     else
+         updateInetdEntry
+     fi
+ 
+ }
+ 
+ 
+ 
+ 
+ #------------------------------------------------------------------------
  #  Unable to generate the password for the rpm, so put out a message 
  #  instead
***************
*** 73,85 ****
  
      echo "(For superserver you will also want to check the password in the" >> $DBAPasswordFile
!     echo "daemon init routine in the file /etc/rc.d/init.d/firebird)" >> $DBAPasswordFile
      echo "" >> $DBAPasswordFile
      echo "Your should password can be changed to a more suitable one using the" >> $DBAPasswordFile
!     echo "/opt/interbase/bin/gsec program as show below:" >> $DBAPasswordFile
      echo "" >> $DBAPasswordFile
-     echo ">cd /opt/interbase" >> $DBAPasswordFile
-     echo ">bin/gsec -user sysdba -password <password>" >> $DBAPasswordFile
-     echo "GSEC>modify sysdba -pw <newpassword>" >> $DBAPasswordFile
-     echo "GSEC>quit" >> $DBAPasswordFile
  
      chmod u=r,go= $DBAPasswordFile
--- 168,176 ----
  
      echo "(For superserver you will also want to check the password in the" >> $DBAPasswordFile
!     echo "daemon init routine in the file /etc/init.d/firebird)" >> $DBAPasswordFile
      echo "" >> $DBAPasswordFile
      echo "Your should password can be changed to a more suitable one using the" >> $DBAPasswordFile
!     echo "/opt/interbase/bin/changeDBAPassword.sh script" >> $DBAPasswordFile
      echo "" >> $DBAPasswordFile
  
      chmod u=r,go= $DBAPasswordFile
***************
*** 107,116 ****
      echo "" >> $DBAPasswordFile
      echo "Your password can be changed to a more suitable one using the" >> $DBAPasswordFile
!     echo "/opt/interbase/bin/gsec program as show below:" >> $DBAPasswordFile
      echo "" >> $DBAPasswordFile
-     echo ">cd /opt/interbase" >> $DBAPasswordFile
-     echo ">bin/gsec -user sysdba -password <password>" >> $DBAPasswordFile
-     echo "GSEC>modify sysdba -pw <newpassword>" >> $DBAPasswordFile
-     echo "GSEC>quit" >> $DBAPasswordFile
      chmod u=r,go= $DBAPasswordFile
  
--- 198,203 ----
      echo "" >> $DBAPasswordFile
      echo "Your password can be changed to a more suitable one using the" >> $DBAPasswordFile
!     echo "/opt/interbase/bin/changeDBAPassword.sh script" >> $DBAPasswordFile
      echo "" >> $DBAPasswordFile
      chmod u=r,go= $DBAPasswordFile
  
***************
*** 177,230 ****
  
  
! #= Main Post ===============================================================
  
-     # Make sure the links are in place 
-     if [ ! -L /opt/interbase -a ! -d /opt/interbase ] 
-       then 
-     # Main link and... 
-         ln -s $RPM_INSTALL_PREFIX/interbase /opt/interbase 
-     fi 
  
  
!     IBRootDir=/opt/interbase
!     IBBin=$IBRootDir/bin
!     RunUser=root
  
  
!     # Update /etc/services
  
  
-     FileName=/etc/services
-     newLine="gds_db          3050/tcp  # InterBase Database Remote Protocol"
-     oldLine=`grep "^gds_db" $FileName`
  
!     replaceLineInFile "$FileName" "$newLine" "$oldLine"
  
  
  
!     # Update the /etc/inetd.conf
  
  
-     FileName=/etc/inetd.conf
-     newLine="gds_db  stream  tcp     nowait.30000      $RunUser $IBBin/gds_inet_server gds_inet_server # InterBase Database Remote Server"
-     oldLine=`grep "^gds_db" $FileName`
  
!     replaceLineInFile "$FileName" "$newLine" "$oldLine"
  
  
-     # Update ownership and SUID bits for programs.
  
!     chown -R $RunUser.$RunUser $IBRootDir
  
      cd $IBBin
  
!     for i in gds_lock_mgr gds_drop gds_inet_server
        do
          chmod ug+s $i
        done
  
  
!     # Get inetd to reread new init files.
  
      if [ -f /var/run/inetd.pid ]
        then
--- 264,433 ----
  
  
! #------------------------------------------------------------------------
! #  fixFilePermissions
! #  Change the permissions to restrict access to server programs to 
! #  firebird group only.  This is MUCH better from a saftey point of 
! #  view than installing as root user, even if it requires a little 
! #  more work.
  
  
+ fixFilePermissions() {
  
!     # Turn other access off.
!     chmod -R o= $IBRootDir
  
  
!     # Now fix up the mess.
  
+     # fix up directories 
+     for i in `find $IBRootDir -print`
+     do
+         FileName=$i
+         if [ -d $FileName ]
+         then
+             chmod o=rx $FileName
+         fi
+     done
  
  
!     cd $IBBin
  
  
+     # set up the defaults for bin
+     for i in `ls`
+       do
+          chmod ug=rx,o=  $i
+     done
  
!     # User can run these programs, they need to talk to server though.
!     # and they cannot actually create a database.
!      
  
+     chmod a=rx isql 
+     chmod a=rx qli
+     
+     # SUID is still needed for group direct access.  General users
+     # cannot run though.
+     for i in gds_lock_mgr gds_drop gds_inet_server
+     do
+         chmod ug=rx,o= $i
+         chmod ug+s $i
+     done
  
  
!     cd $IBRootDir
  
+     # Fix lock files
+     for i in isc_init1 isc_lock1 isc_event1 
+       do
+         FileName=$i.`hostname`
+         chmod ug=rw,o= $FileName
+       done
  
  
!     chmod ug=rw,o= interbase.log
! 
!     chmod a=r interbase.msg
!     chmod ug=rw,o= help/help.gdb
!     chmod ug=rw,o= isc4.gdb
! 
! 
!     # Set a default of read all files in examples
! 
!     cd examples
! 
!     for i in `ls`
!       do
!          chmod a=r  $i
!     done
! 
!     # make examples db's writable by group
!     chmod ug=rw,o= *.gdb
! 
! }
! 
! 
! #------------------------------------------------------------------------
! #  fixFilePermissionsForRoot
! #  This sets the file permissions up to what you need if you are
! #  running the server as root user.  I hope to remove this mode
! #  of running before the next version, since it's security level
! #  is absolutely woeful.
! 
! 
! fixFilePermissionsRoot() {
! 
!     # Turn other access off.
!     chmod -R o= $IBRootDir
! 
!     # Now fix up the mess.
! 
!     # fix up directories 
!     for i in `find $IBRootDir -print`
!     do
!         FileName=$i
!         if [ -d $FileName ]
!         then
!             chmod o=rx $FileName
!         fi
!     done
! 
  
      cd $IBBin
  
! 
!     # set up the defaults for bin
!     for i in `ls`
        do
+          chmod o=rx  $i
+     done
+ 
+     
+     # SUID is still needed for group direct access.  General users
+     # cannot run though.
+     for i in gds_lock_mgr gds_drop gds_inet_server
+     do
          chmod ug+s $i
+     done
+ 
+ 
+     cd $IBRootDir
+ 
+     # Fix lock files
+     for i in isc_init1 isc_lock1 isc_event1 
+       do
+         FileName=$i.`hostname`
+         chmod a=rw $FileName
        done
  
  
!     chmod a=rw interbase.log
! 
!     chmod a=r interbase.msg
!     chmod a=rw help/help.gdb
!     chmod a=rw isc4.gdb
! 
! 
!     # Set a default of read all files in examples
  
+     cd examples
+ 
+     for i in `ls`
+       do
+          chmod a=r  $i
+     done
+ 
+     # make examples db's writable by group
+     chmod a=rw *.gdb
+ 
+ }
+ 
+ #------------------------------------------------------------------------
+ #  resetXinitdServer
+ #  Check for both inetd and xinetd, only one will actually be running.
+ #  depending upon your system.
+ 
+ resetInetdServer() {
+ 
      if [ -f /var/run/inetd.pid ]
        then
***************
*** 232,241 ****
      fi
  
  
  
  
-     # Lock files
-     # remember isc_guard1 in addition for super
  
      cd $IBRootDir
  
--- 435,477 ----
      fi
  
+     if [ -f /var/run/xinetd.pid ]
+       then
+         kill -HUP `cat /var/run/xinetd.pid`
+     fi
+ }
  
+ #= Main Post ===============================================================
  
+     # Make sure the links are in place 
+     if [ ! -L /opt/interbase -a ! -d /opt/interbase ] 
+       then 
+     # Main link and... 
+         ln -s $RPM_INSTALL_PREFIX/interbase /opt/interbase 
+     fi 
+ 
+ 
+     IBRootDir=/opt/interbase
+     IBBin=$IBRootDir/bin
+     RunUser=root
+ #    RunUser=firebird
  
  
+     # Update /etc/services
+ 
+     FileName=/etc/services
+     newLine="gds_db          3050/tcp  # InterBase Database Remote Protocol"
+     oldLine=`grep "^gds_db" $FileName`
+ 
+     replaceLineInFile "$FileName" "$newLine" "$oldLine"
+ 
+ 
+     # add Firebird user
+     if [ $RunUser = "firebird" ]
+       then
+         addFirebirdUser
+     fi
+ 
+ 
+     # Create Lock files
      cd $IBRootDir
  
***************
*** 244,261 ****
          FileName=$i.`hostname`
          touch $FileName
-         chmod uga+rw $FileName
        done
  
      touch interbase.log
-     chmod uga+rw interbase.log
-     chmod uga+rw help/help.gdb
-     chmod uga+rw isc4.gdb
  
  
!     # make examples writable by anyone 
!     chmod uga+rw examples/*.gdb
  
!     # Change sysdba password
  
      changeDBAPassword
  
--- 480,504 ----
          FileName=$i.`hostname`
          touch $FileName
        done
  
+     # Create log
      touch interbase.log
  
  
!     # Update ownership and SUID bits for programs.
!     chown -R $RunUser.$RunUser $IBRootDir
! #    fixFilePermissions
!     fixFilePermissionsRoot
  
!     # Update the /etc/inetd.conf or xinetd entry
!     updateInetdServiceEntry
! 
  
+     # Get inetd to reread new init files.
+     resetInetdServer
+ 
+ 
+     cd $IBRootDir
+     # Change sysdba password
      changeDBAPassword
  

Index: CSrpmfiles.txt
===================================================================
RCS file: /cvsroot/firebird/interbase/firebird/skywalker/install/classic/CSrpmfiles.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CSrpmfiles.txt	2000/12/22 14:23:05	1.2
--- CSrpmfiles.txt	2001/04/14 02:15:33	1.3
***************
*** 5,8 ****
--- 5,9 ----
  %dir /opt/interbase/intl 
  %dir /opt/interbase/help 
+ %dir /opt/interbase/misc
  
  /opt/interbase/bin/gds_inet_server 
***************
*** 53,57 ****
  /opt/interbase/services.isc 
  
! 
  
  
--- 54,58 ----
  /opt/interbase/services.isc 
  
! /opt/interbase/misc/firebird.xinetd
  
  

[Firebird-checkins] CVS: interbase/firebird/skywalker/install Makefile,1.3,1.4

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/firebird/skywalker/install
In directory usw-pr-cvs1:/tmp/cvs-serv486

Modified Files:
	Makefile 
Log Message:
Changes to install process for classic firebird.


Index: Makefile
===================================================================
RCS file: /cvsroot/firebird/interbase/firebird/skywalker/install/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile	2000/12/29 20:06:34	1.3
--- Makefile	2001/04/14 02:15:33	1.4
***************
*** 28,34 ****
  LastSuperInstallFlg=.superinstallflg
  
! all: 
  	@echo "you need to make a choice here "
! 	@echo "make -f <makefile> target"
  	@echo ""
  	@echo "Firebird classic targets:"
--- 28,34 ----
  LastSuperInstallFlg=.superinstallflg
  
! install: 
  	@echo "you need to make a choice here "
! 	@echo "make target"
  	@echo ""
  	@echo "Firebird classic targets:"
***************
*** 44,48 ****
  	@echo "superrpmfile      - build redhat rpm install file"
  	@echo ""
! 	
  all2: CSrpmscript SSrpmscript csinstall ssinstall
  
--- 44,48 ----
  	@echo "superrpmfile      - build redhat rpm install file"
  	@echo ""
! 
  all2: CSrpmscript SSrpmscript csinstall ssinstall
  

[Firebird-checkins] CVS: interbase/firebird/skywalker/install/misc firebird.init.d.generic,NONE,1.1 firebird.init.d.mandrake,NONE,1.1 firebird.xinitd,NONE,1.1 README,1.1,1.2

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/firebird/skywalker/install/misc
In directory usw-pr-cvs1:/tmp/cvs-serv4162

Modified Files:
	README 
Added Files:
	firebird.init.d.generic firebird.init.d.mandrake 
	firebird.xinitd 
Log Message:
Updated init files for redhat7.0 and mandrake7.2
Support now for xinetd 


--- NEW FILE ---
#!/bin/sh

# chkconfig: 345 20 80
# description: Start/Stop firebird database server
#
# This file belongs in /etc/init.d where it will be run
# on system startup and shutdown to start the background
# Firebird/interbase database server daemon 



: ${INTERBASE:=/opt/interbase}
: ${ISC_USER:=SYSDBA}
: ${ISC_PASSWORD:=masterkey}
: ${FBRunUser:=root}
# WARNING: in a real-world installation, you should not put the 
# SYSDBA password in a publicly-readable file. 
# Eventually this file should not need to contain any passwords.
# as root user alone should be sufficient privledge to stop/start 
# the server. 


export INTERBASE 
export ISC_USER
export ISC_PASSWORD


# Check the file is there and is executable.
[ -x $INTERBASE/bin/ibmgr ] || exit 0



# See how we were called.
case "$1" in
  start)
	echo -n "Starting Firebird server: "
        echo '$INTERBASE/bin/ibmgr -start -forever' | su $FBRunUser
	RETVAL=$?
	;;
  stop)
	echo -n "Stopping Firebird server: "
        $INTERBASE/bin/ibmgr -shut
	RETVAL=$?
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/identd
	;;
  status)
	RETVAL=0
	;;
  restart|reload)
	$0 stop
	$0 start
	RETVAL=$?
	;;
  *)
	echo "Usage: firebird {start|stop|status|restart|reload}"
	exit 1
esac

exit $RETVAL


--- NEW FILE ---
#!/bin/sh

# chkconfig: 345 20 80
# description: Start/Stop firebird database server
#
# This file belongs in /etc/init.d where it will be run
# on system startup and shutdown to start the background
# Firebird/interbase database server daemon 


# This init script contains functions specific for redhat
# and mandrake init scripts.

# Source function library.
. /etc/rc.d/init.d/functions


: ${INTERBASE:=/opt/interbase}
: ${ISC_USER:=SYSDBA}
: ${ISC_PASSWORD:=masterkey}
: ${FBRunUser:=root}
# WARNING: in a real-world installation, you should not put the 
# SYSDBA password in a publicly-readable file. 
# Eventually this file should not need to contain any passwords.
# as root user alone should be sufficient privledge to stop/start 
# the server. 


export INTERBASE 
export ISC_USER
export ISC_PASSWORD


# Check the file is there and is executable.
[ -x $INTERBASE/bin/ibmgr ] || exit 0



# See how we were called.
case "$1" in
  start)
	echo -n "Starting Firebird server: "
	daemon --user $FBRunUser $INTERBASE/bin/ibmgr -start -forever
#    echo '$INTERBASE/bin/ibmgr -start -forever' | su $FBRunUser
	RETVAL=$?
	;;
  stop)
	echo -n "Stopping Firebird server: "
	$INTERBASE/bin/ibmgr -shut
#	killproc ibserver
	RETVAL=$?
#	echo
#	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/identd
	;;
  status)
	status ibserver
	RETVAL=$?
	;;
  restart|reload)
	$0 stop
	$0 start
	RETVAL=$?
	;;
  *)
	echo "Usage: firebird {start|stop|status|restart|reload}"
	exit 1
esac

exit $RETVAL


--- NEW FILE ---
# default: on
# description: Interbase server
service gds_db
{
	flags			= REUSE
	socket_type		= stream
	wait			= no
	user			= root
	log_on_success		+= USERID
	log_on_failure 		+= USERID
	server			= /opt/interbase/bin/gds_inet_server
    disable         = no
}

Index: README
===================================================================
RCS file: /cvsroot/firebird/interbase/firebird/skywalker/install/misc/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** README	2000/10/22 10:32:05	1.1
--- README	2001/04/13 16:48:53	1.2
***************
*** 5,8 ****
--- 5,9 ----
  database engine from: 
  http://firebird.sourceforge.net
+ http://sourceforge.net/projects/firebird
  
  or affiliated sites: 

[Firebird-checkins] CVS: interbase/jrd dyn_mod.e,1.1.1.1,1.2

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv19377

Modified Files:
	dyn_mod.e 
Log Message:
Changes to fix bug report bug N 412417. problem with alter domain and
char(x) to varchar(x-2). 


Index: dyn_mod.e
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/dyn_mod.e,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** dyn_mod.e	2000/08/03 20:50:02	1.1.1.1
--- dyn_mod.e	2001/04/13 15:33:31	1.2
***************
*** 54,57 ****
--- 54,58 ----
  #include "../jrd/thd_proto.h"
  #include "../jrd/vio_proto.h"
+ #include "../jrd/dsc_proto.h"
  #ifndef WINDOWS_ONLY
  #include "../jrd/ail_proto.h"
***************
*** 490,493 ****
--- 491,503 ----
  		    switch (new_dom->dyn_dtype)
  			{
+ 
+             case blr_text:
+             case blr_text2:
+             case blr_varying:
+             case blr_varying2:
+             case blr_cstring:
+             case blr_cstring2:
+                 new_dom->dyn_dsc.dsc_length = DSC_string_length (new_dom);
+                 break; 
  			case blr_short :	
  			    new_dom->dyn_dsc.dsc_length = 2; 
***************
*** 1224,1228 ****
   *	D Y N _ m o d i f y _ p r o c e d u r e
   *
! /**************************************
   *
   * Functional description
--- 1234,1238 ----
   *	D Y N _ m o d i f y _ p r o c e d u r e
   *
!  **************************************
   *
   * Functional description
***************
*** 2210,2217 ****
  		case gds__dyn_fld_type:
  		    dtype = TRUE;
!                     new_fld->dyn_dtype = DYN_get_number (ptr);
  
  		    switch (new_fld->dyn_dtype)
  			{
  			case blr_short :	
  			    new_fld->dyn_dsc.dsc_length = 2; 
--- 2220,2236 ----
  		case gds__dyn_fld_type:
  		    dtype = TRUE;
!             new_fld->dyn_dtype = DYN_get_number (ptr);
  
  		    switch (new_fld->dyn_dtype)
  			{
+             case blr_text:
+             case blr_text2:
+             case blr_varying:
+             case blr_varying2:
+             case blr_cstring:
+             case blr_cstring2:
+                 new_fld->dyn_dsc.dsc_length = DSC_string_length (new_fld);
+                 break; 
+ 
  			case blr_short :	
  			    new_fld->dyn_dsc.dsc_length = 2; 

[Firebird-checkins] CVS: interbase/jrd evl_like.c,1.2,1.3

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv31607/interbase/jrd

Modified Files:
	evl_like.c 
Log Message:
Change to get it compilede under Linux

fsg
 

Index: evl_like.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/evl_like.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** evl_like.c	2001/04/11 15:43:00	1.2
--- evl_like.c	2001/04/13 13:50:20	1.3
***************
*** 1,4 ****
  #ifndef EVL_LIKE_INCLUDED_BY_EVL_C
! #error Don't compile this file stand-alone. It gets included by evl.c!
  #endif
  
--- 1,4 ----
  #ifndef EVL_LIKE_INCLUDED_BY_EVL_C
! #error Do not compile this file stand-alone. It gets included by evl.c!
  #endif
  

[Firebird-checkins] CVS: interbase ChangeLog,1.23,1.24

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase
In directory usw-pr-cvs1:/tmp/cvs-serv554/interbase

Modified Files:
	ChangeLog 
Log Message:
Updated ChangeLog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/interbase/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** ChangeLog	2001/04/11 15:24:32	1.23
--- ChangeLog	2001/04/13 07:39:52	1.24
***************
*** 1,8 ****
! 2001-04-11 tamlin
! 	* gpre/: c_cxx.c, cmd.c, cme.c, cmp.c, exp.c, gpre.c, hsh.c
! 	jrdmet.c, movg.c, msc.c, par.c, pretty.c, sqe.c, sql.c
  
! 	Reduced compiler warnings for gpre and reduced compiler
! 	warnings from gpre generated C code.
  
  2001-04-05 19:05  skywalker
--- 1,64 ----
! 2001-04-11 19:22  tamlin
  
! 	* interbase/remote/cntl.c:
! 	
! 	Removed redundant CloseHandle call
! 
! 2001-04-11 19:13  tamlin
! 
! 	* interbase/jrd/: isc.c, jrn.c, scl.e:
! 	
! 	compiler warnings
! 
! 2001-04-11 17:43  tamlin
! 
! 	* interbase/jrd/: evl.c, evl_like.c:
! 	
! 	compilation guard
! 
! 2001-04-11 17:41  tamlin
! 
! 	* interbase/jrd/: dsc.c, dsc_proto.h:
! 	
! 	compiler warnings and const correctness
! 
! 2001-04-11 17:37  tamlin
! 
! 	* interbase/jrd/cch.c:
! 	
! 	compiler warnings
! 
! 2001-04-11 17:28  tamlin
! 
! 	* interbase/gpre/int.c:
! 	
! 	Reduced compiler warnings from gpre generated C code.
! 
! 2001-04-11 17:22  tamlin
! 
! 	* interbase/gpre/: c_cxx.c, cmd.c, cme.c, cmp.c, exp.c, gpre.c,
! 	hsh.c, jrdmet.c, movg.c, msc.c, par.c, pretty.c, sqe.c, sql.c:
! 	
! 	Reduced compiler warnings for gpre and reduced compiler warnings
! 	from gpre generated C code.
! 
! 2001-04-09 18:56  bellardo
! 
! 	* interbase/firebird/bellardo/darwin/makefile:
! 	
! 	Updated to reflect the name change of the Info.plist file.
! 
! 2001-04-09 18:53  bellardo
! 
! 	* interbase/builds/original/prefix.darwin:
! 	
! 	Removed references to -lcc and added path need to compile in OS X.
! 
! 2001-04-06 01:07  bellardo
! 
! 	* interbase/firebird/bellardo/darwin/: FrameworkInfo.plist,
! 	Info.plist:
! 	
! 	Renamed Info.plist to FrameworkInfo.plist
  
  2001-04-05 19:05  skywalker
***************
*** 562,569 ****
  	
  	Changed all $Log$
! 	Changed all Revision 1.23  2001/04/11 15:24:32  tamlin
! 	Changed all Reduced compiler warnings for gpre and reduced compiler warnings from gpre generated C code.
! 	Changed all
! 	Changed all Revision 1.22  2001/04/05 19:05:47  fsg
  	Changed all Updated ChangeLog
  	Changed all tags to $Id$ BTW this will hopefully set
--- 618,622 ----
  	
  	Changed all $Log$
! 	Changed all Revision 1.24  2001/04/13 07:39:52  fsg
  	Changed all Updated ChangeLog
  	Changed all tags to $Id$ BTW this will hopefully set

[Firebird-checkins] CVS: interbase/remote cntl.c,1.3,1.4

[Mike N. <ta...@us...>]

Update of /cvsroot/firebird/interbase/remote
In directory usw-pr-cvs1:/tmp/cvs-serv5584

Modified Files:
	cntl.c 
Log Message:
Removed redundant CloseHandle call

Index: cntl.c
===================================================================
RCS file: /cvsroot/firebird/interbase/remote/cntl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** cntl.c	2001/04/05 17:05:43	1.3
--- cntl.c	2001/04/11 17:22:26	1.4
***************
*** 197,201 ****
  CloseHandle(cleanup_thread_handle);
  
- CloseHandle (cleanup_thread_handle);
  report_status (SERVICE_STOPPED, last_error, 0, 0);
  }
--- 197,200 ----

[Firebird-checkins] CVS: interbase/jrd scl.e,1.1.1.1,1.2

[Mike N. <ta...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv4033

Modified Files:
	scl.e 
Log Message:
compiler warnings

Index: scl.e
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/scl.e,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** scl.e	2000/08/03 20:51:17	1.1.1.1
--- scl.e	2001/04/11 17:16:19	1.2
***************
*** 23,26 ****
--- 23,28 ----
  
  #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
  #include "../jrd/ibsetjmp.h"
  #include "../jrd/gds.h"
***************
*** 121,125 ****
   **************************************/
  TDBB	tdbb;
! P_NAMES	*names;
  SCL	att_class;
  ATT	attachment;
--- 123,127 ----
   **************************************/
  TDBB	tdbb;
! CONST P_NAMES	*names;
  SCL	att_class;
  ATT	attachment;
***************
*** 184,188 ****
  JMP_BUF env, *old_env;
  
- 
  SET_TDBB (tdbb);
  dbb = tdbb->tdbb_database;
--- 186,189 ----
***************
*** 210,214 ****
  END_FOR;
  
! CMP_release (tdbb, request);
  
  /* check if the relation exixts. It may not have been created yet.
--- 211,215 ----
  END_FOR;
  
! CMP_release (tdbb, (REQ)request);
  
  /* check if the relation exixts. It may not have been created yet.
***************
*** 231,235 ****
      tdbb->tdbb_setjmp = (UCHAR*) old_env;
      if (request)
!         CMP_release (tdbb, request);
      LONGJMP (tdbb->tdbb_setjmp, (int) tdbb->tdbb_status_vector [1]);
      }
--- 232,236 ----
      tdbb->tdbb_setjmp = (UCHAR*) old_env;
      if (request)
!         CMP_release (tdbb, (REQ)request);
      LONGJMP (tdbb->tdbb_setjmp, (int) tdbb->tdbb_status_vector [1]);
      }
***************
*** 262,266 ****
  END_FOR;
  
! CMP_release (tdbb, request);
  
  tdbb->tdbb_setjmp = (UCHAR*) old_env;
--- 263,267 ----
  END_FOR;
  
! CMP_release (tdbb, (REQ)request);
  
  tdbb->tdbb_setjmp = (UCHAR*) old_env;
***************
*** 430,434 ****
  while (*q++ = *p++)
      ;
! s_class->scl_flags = compute_access (tdbb, s_class, NULL_PTR,
  					NULL_PTR, NULL_PTR);
  
--- 431,435 ----
  while (*q++ = *p++)
      ;
! s_class->scl_flags = (USHORT)compute_access (tdbb, s_class, NULL_PTR,
  					NULL_PTR, NULL_PTR);
  
***************
*** 440,444 ****
      }
  
! ALL_release (s_class);
  
  return NULL;
--- 441,445 ----
      }
  
! ALL_release ((FRB)s_class);
  
  return NULL;
***************
*** 602,606 ****
                  REQUEST (irq_get_role_name) = request;
  
! 	    EXE_unwind (tdbb, request);
              ERR_post (isc_login_same_as_role_name, 
                        gds_arg_string, ERR_cstring (login_name), 0);
--- 603,607 ----
                  REQUEST (irq_get_role_name) = request;
  
! 	    EXE_unwind (tdbb, (REQ)request);
              ERR_post (isc_login_same_as_role_name, 
                        gds_arg_string, ERR_cstring (login_name), 0);
***************
*** 653,657 ****
             tdbb->tdbb_attachment->att_security_class = SCL_get_class (X.RDB$SECURITY_CLASS);
      END_FOR;
!     CMP_release (tdbb, handle);
      
      FOR (REQUEST_HANDLE handle1)
--- 654,658 ----
             tdbb->tdbb_attachment->att_security_class = SCL_get_class (X.RDB$SECURITY_CLASS);
      END_FOR;
!     CMP_release (tdbb, (REQ)handle);
      
      FOR (REQUEST_HANDLE handle1)
***************
*** 666,670 ****
  	    }
      END_FOR;
!     CMP_release (tdbb, handle1);
      }
  else
--- 667,671 ----
  	    }
      END_FOR;
!     CMP_release (tdbb, (REQ)handle1);
      }
  else
***************
*** 690,694 ****
   **************************************/
  UCHAR	*p;
! P_NAMES	*priv;
  
  p = *acl_ptr;
--- 691,695 ----
   **************************************/
  UCHAR	*p;
! CONST P_NAMES	*priv;
  
  p = *acl_ptr;
***************
*** 699,705 ****
  CHECK_AND_MOVE (p, ACL_priv_list, *start_ptr, length_ptr);
  
! for (priv = p_names; priv->p_names_priv; priv++)
!     if (mask & priv->p_names_priv)
!     CHECK_AND_MOVE (p, priv->p_names_acl, *start_ptr, length_ptr);
  
  CHECK_AND_MOVE (p, 0, *start_ptr, length_ptr);
--- 700,709 ----
  CHECK_AND_MOVE (p, ACL_priv_list, *start_ptr, length_ptr);
  
! for (priv = p_names; priv->p_names_priv; priv++) {
!     if (mask & priv->p_names_priv) {
! 		assert(priv->p_names_acl <= MAX_UCHAR);
!         CHECK_AND_MOVE (p, (UCHAR)priv->p_names_acl, *start_ptr, length_ptr);
!     }
! }
  
  CHECK_AND_MOVE (p, 0, *start_ptr, length_ptr);
***************
*** 730,734 ****
      return NULL;
  
! s_class->scl_flags = compute_access (tdbb, s_class,
  					NULL_PTR, NULL_PTR, NULL_PTR);
  
--- 734,738 ----
      return NULL;
  
! s_class->scl_flags = (USHORT)compute_access (tdbb, s_class,
  					NULL_PTR, NULL_PTR, NULL_PTR);
  
***************
*** 771,775 ****
  	}
  
! ALL_release (s_class);
  }
  
--- 775,779 ----
  	}
  
! ALL_release ((FRB)s_class);
  }
  
***************
*** 881,885 ****
      tdbb->tdbb_setjmp = (UCHAR*) old_env;
      if (buffer)
!          ALL_release (buffer);
      LONGJMP (tdbb->tdbb_setjmp, (int) tdbb->tdbb_status_vector [1]);
      }
--- 885,889 ----
      tdbb->tdbb_setjmp = (UCHAR*) old_env;
      if (buffer)
!          ALL_release ((FRB)buffer);
      LONGJMP (tdbb->tdbb_setjmp, (int) tdbb->tdbb_status_vector [1]);
      }
***************
*** 911,915 ****
  	    }
  
!         ALL_release (buffer);
          tdbb->tdbb_setjmp = (UCHAR*) old_env;
  	return (n != number);
--- 915,919 ----
  	    }
  
!         ALL_release ((FRB)buffer);
          tdbb->tdbb_setjmp = (UCHAR*) old_env;
  	return (n != number);
***************
*** 997,1001 ****
      tdbb->tdbb_setjmp = (UCHAR*) old_env;
      if (str_buffer)
!          ALL_release (str_buffer);
      LONGJMP (tdbb->tdbb_setjmp, (int) tdbb->tdbb_status_vector [1]);
      }
--- 1001,1005 ----
      tdbb->tdbb_setjmp = (UCHAR*) old_env;
      if (str_buffer)
!          ALL_release ((FRB)str_buffer);
      LONGJMP (tdbb->tdbb_setjmp, (int) tdbb->tdbb_status_vector [1]);
      }
***************
*** 1013,1022 ****
  	REQUEST (irq_l_security) = request;
      privileges |= SCL_exists;
!     blob = BLB_open (tdbb, dbb->dbb_sys_trans, &X.RDB$ACL);
      acl = buffer;
      while (TRUE)
  	{
  	acl += BLB_get_segment (tdbb, blob, acl, 
!                 (length - ((acl - buffer) * (sizeof(buffer[0])))));
  	if (blob->blb_flags & BLB_eof)
  	    break;
--- 1017,1026 ----
  	REQUEST (irq_l_security) = request;
      privileges |= SCL_exists;
!     blob = BLB_open (tdbb, dbb->dbb_sys_trans, (BID)&X.RDB$ACL);
      acl = buffer;
      while (TRUE)
  	{
  	acl += BLB_get_segment (tdbb, blob, acl, 
!                 (USHORT)(length - ((acl - buffer) * (sizeof(buffer[0])))));
  	if (blob->blb_flags & BLB_eof)
  	    break;
***************
*** 1026,1030 ****
  	    ULONG old_offset = (ULONG) (acl - buffer);
              length += BLOB_BUFFER_SIZE;
!             (void) ALL_extend (&str_buffer, length);
              buffer = str_buffer->str_data;
  	    acl = buffer + old_offset;
--- 1030,1034 ----
  	    ULONG old_offset = (ULONG) (acl - buffer);
              length += BLOB_BUFFER_SIZE;
!             (void) ALL_extend ((BLK*)&str_buffer, length);
              buffer = str_buffer->str_data;
  	    acl = buffer + old_offset;
***************
*** 1040,1044 ****
  
  
! ALL_release (str_buffer);
  
  tdbb->tdbb_setjmp = (UCHAR*) old_env;
--- 1044,1048 ----
  
  
! ALL_release ((FRB)str_buffer);
  
  tdbb->tdbb_setjmp = (UCHAR*) old_env;
***************
*** 1100,1104 ****
  USHORT		hit;
  TEXT		c, *p, *role_name;
! BOOLEAN		is_member = FALSE, equivalent_proc_nm;
  VOLATILE BLK    request;
  DBB		dbb;
--- 1104,1108 ----
  USHORT		hit;
  TEXT		c, *p, *role_name;
! BOOLEAN		is_member = FALSE;
  VOLATILE BLK    request;
  DBB		dbb;