- merged DEVEL

Changed files:
    Firebird-chmod.patch -> 1.2
    Firebird-env-overflows.patch -> 1.2
    Firebird-link.patch -> 1.2
    Firebird.spec -> 1.12

diff --git a/Firebird-chmod.patch b/Firebird-chmod.patch
index c9f2d02edf38c37bb697481d5f7786fb7e44efba..829965a68715671544b07086964e6305bd9e9ee8 100644 (file)
--- a/Firebird-chmod.patch
+++ b/Firebird-chmod.patch
@@ -1,15 +1,17 @@
---- firebird-1.0.2.908/builds/original/prefix.linux.orig       2002-03-01 14:16:31.000000000 +0100
-+++ firebird-1.0.2.908/builds/original/prefix.linux    2003-10-29 19:58:41.558232152 +0100
-@@ -65,7 +65,7 @@
- BACKEND_BRIDGE_MISC=  head5.o allp.o
- BIN_PATH=             /usr/isc/bin
- BRIDGE_MISC=          head5.o allp.o
--CHMOD_VAL=            666
-+CHMOD_VAL=            644
+--- firebird-1.5.0.4290/builds/posix/Makefile.in.refDatabases.orig     2003-04-10 09:50:03.000000000 +0200
++++ firebird-1.5.0.4290/builds/posix/Makefile.in.refDatabases  2004-05-24 23:46:47.933836000 +0200
+@@ -107,7 +107,7 @@
+ $(FIREBIRD)/security.fdb:     $(SRC_ROOT)/misc/security.gbak
+       $(BIN)/gbak_static  -R $< $@
+       $(TOUCH) $@
+-      $(CHMOD) 666 $@
++      $(CHMOD) 644 $@

  
  

- #NOTE: I removed CURSES_LIB=  -lbsd because it breaks the build on SuSE systems
- #      and isn't necessary anymore. 
-@@ -163,9 +163,9 @@
+ metadata.fdb: $(SRC_ROOT)/misc/metadata.gbak
+       $(BIN)/gbak_static -MODE read_only -R $< $@
+--- firebird-1.5.0.4290/builds/posix/make.defaults.orig        2003-11-11 02:01:51.000000000 +0100
++++ firebird-1.5.0.4290/builds/posix/make.defaults     2004-05-24 23:47:17.602325704 +0200
+@@ -92,9 +92,9 @@

  SH=                   sh -c
  RM=                   rm -f
  CHMOD=                        chmod
  SH=                   sh -c
  RM=                   rm -f
  CHMOD=                        chmod

diff --git a/Firebird-env-overflows.patch b/Firebird-env-overflows.patch
index f9da09ff4e5e58b0b6a327fec7e0edc3994acaca..d7d87d343fb8b2d3a2e657b4207ed91ab4c2ba43 100644 (file)
--- a/Firebird-env-overflows.patch
+++ b/Firebird-env-overflows.patch
@@ -1,375 +1,59 @@
-Some fixes for overflows through "INTERBASE"* environment variables
-(CAN-2003-0281); not sure if it's complete - overflows may still exist
-in further usage of buffers initialized from env vars truncard to
-MAXPATHLEN...
-
---- firebird-1.0.2.908/wal/wal.c.orig  2000-08-03 22:54:30.000000000 +0200
-+++ firebird-1.0.2.908/wal/wal.c       2003-10-29 21:12:08.203320272 +0100
-@@ -1142,7 +1142,7 @@
-  *
-  **************************************/              
- WALS  WAL_segment;
--TEXT  image_name [256];
-+TEXT  image_name [MAXPATHLEN];
- int   pid;
- 
- gds__prefix (image_name, WAL_WRITER);  
---- firebird-1.0.2.908/utilities/srvrmgr.c.orig        2003-10-29 21:13:23.238913128 +0100
-+++ firebird-1.0.2.908/utilities/srvrmgr.c     2003-10-29 21:13:11.768656872 +0100
-@@ -446,7 +446,7 @@
-  *
-  **************************************/
- TEXT    msg [MSG_LEN];
--TEXT    path[PATHLEN];
-+TEXT    path[MAXPATHLEN];
- TEXT  *argv[4];
- int   retry;
- pid_t pid, ret_value;
-@@ -572,7 +572,7 @@
-  *
-  **************************************/
- STATUS                status[STATUS_BUFLEN];
--TEXT          path[PATHLEN];
-+TEXT          path[MAXPATHLEN];
- TEXT          db_name[128];
- isc_db_handle db_handle = 0L;
- BOOLEAN               ok;
---- firebird-1.0.2.908/remote/inet.c.orig      2002-08-22 07:45:42.000000000 +0200
-+++ firebird-1.0.2.908/remote/inet.c   2003-10-29 21:10:52.813781224 +0100
-@@ -2373,7 +2373,7 @@
-  *
-  **************************************/
- IB_FILE       *proxy;
--TEXT  *p, proxy_file [64], source_user [64], source_host [MAXHOSTLEN],
-+TEXT  *p, proxy_file [MAXPATHLEN], source_user [64], source_host [MAXHOSTLEN],
-       target_user [64], line [128];
- int   c;
- BOOLEAN       result;
---- firebird-1.0.2.908/lock/lock.c.orig        2002-04-11 03:04:25.000000000 +0200
-+++ firebird-1.0.2.908/lock/lock.c     2003-10-29 21:09:57.632170104 +0100
-@@ -2239,8 +2239,8 @@
-     /* The lock file has some problem - copy it for later analysis */
-     {
-     TEXT      *lock_file;
--    TEXT      buffer [256];   
--    TEXT      buffer2 [256];  
-+    TEXT      buffer [MAXPATHLEN*2 + 256];
-+    TEXT      buffer2 [MAXPATHLEN + 256];
-     TEXT      hostname [64];
-     gds__prefix_lock (buffer, LOCK_FILE);
-     lock_file = buffer;
-@@ -3007,7 +3007,7 @@
-  *    Fork lock manager process.
-  *
-  **************************************/
--TEXT          string [256];
-+TEXT          string [MAXPATHLEN];
- struct stat   stat_buf;
- int           pid;
- 
-@@ -3280,7 +3280,7 @@
- #ifdef WINDOWS_ONLY
- TEXT          *buffer = (TEXT*) gds__alloc ((SLONG) BUFFER_MEDIUM);
- #else
--TEXT          buffer [256];
-+TEXT          buffer [MAXPATHLEN];
- #endif
- #endif
- 
---- firebird-1.0.2.908/jrd/gds.c.orig  2002-10-13 07:39:08.000000000 +0200
-+++ firebird-1.0.2.908/jrd/gds.c       2003-10-29 20:43:18.367295320 +0100
-@@ -2710,8 +2710,9 @@
- 
-                               ib_prefix = getenv("ProgramFiles");
-                               if (ib_prefix) {
--                                      strcpy(ib_prefix_val, ib_prefix);
--                                      strcat(ib_prefix_val, "\\Borland\\Interbase\\");
-+                                      ib_prefix_val[MAXPATHLEN - 1] = 0;
-+                                      strncpy(ib_prefix_val, ib_prefix, MAXPATHLEN - 1);
-+                                      strncat(ib_prefix_val, "\\Borland\\Interbase\\", MAXPATHLEN - 1 - strlen(ib_prefix));
-                               } else {
-                                       /* ISC_PREFIX currently defaults to      */
-                                       /* "C:\Program Files\Borland\InterBase\" */
-@@ -2742,16 +2743,28 @@
-             ib_prefix = ib_prefix_val;
-         }
-     }
-+/* ugh. string SHOULD be at least MAXPATHLEN long, but we CAN'T assume this */
-+/* note: strlen(string)==0 here */
- #ifdef mpexl
--    strcat (string, root);
--    strcat (string, ib_prefix);
-+    strncat (string, root, MAXPATHLEN - 1);
-+    if(strlen(root) >= MAXPATHLEN - 1)
-+      string[MAXPATHLEN - 1] = 0;
-+    else {
-+      strncat (string, ib_prefix, MAXPATHLEN - 1 - strlen(root));
-+      if(strlen(root) + strlen(ib_prefix) >= MAXPATHLEN - 1)
-+          string[MAXPATHLEN - 1] = 0;
-+    }
- #else /* mpexl */
--    strcat (string, ib_prefix);
-+    strncat (string, ib_prefix, MAXPATHLEN - 1);
-+    if (strlen(ib_prefix) >= MAXPATHLEN - 1)
-+      string[MAXPATHLEN - 1] = 0;
- #ifndef NETWARE_386
--    if (string [strlen (string) - 1] != '/')
-+    if ((string [strlen (string) - 1] != '/') && (strlen(string) < MAXPATHLEN - 1))
-         strcat (string, "/");
- #endif
--    strcat (string, root);
-+    if(strlen(string) + strlen(root) >= MAXPATHLEN - 1)
-+      string[MAXPATHLEN - 1] = 0;
-+    strncat (string, root, MAXPATHLEN - 1 - strlen(string));
- #endif        /* mpexl */
+--- firebird-1.5.0.4290/src/lock/lock.cpp.orig 2003-11-25 07:37:57.000000000 +0100
++++ firebird-1.5.0.4290/src/lock/lock.cpp      2004-05-29 16:46:45.238245656 +0200
+@@ -2027,7 +2027,7 @@
+               /* The lock file has some problem - copy it for later analysis */
+               {
+                       TEXT *lock_file;
+-                      TEXT buffer[2 * MAXPATHLEN];
++                      TEXT buffer[2 * MAXPATHLEN + 256];
+                       TEXT buffer2[2 * MAXPATHLEN];
+                       TEXT hostname[64];
+                       gds__prefix_lock(buffer, LOCK_FILE);
+--- firebird-1.5.0.4290/src/jrd/gds.cpp.orig   2004-02-06 05:56:28.000000000 +0100
++++ firebird-1.5.0.4290/src/jrd/gds.cpp        2004-05-29 17:54:46.802753536 +0200
+@@ -1573,7 +1573,10 @@
+                       ib_prefix = ib_prefix_val;
+               }
+       }
+-      strcat(resultString, ib_prefix);
++      /* beware of no length check after getenv() */
++      if(strlen(ib_prefix) >= MAXPATHLEN)
++              resultString[MAXPATHLEN - 1] = 0;
++      strncat(resultString, ib_prefix, MAXPATHLEN - 1);
+       safe_concat_path(resultString, file);

  }
  }

- #endif        /* !defined(VMS) */
-@@ -2838,20 +2851,33 @@
-         }
-     else
-         {
--        strcat (ib_prefix_lock_val, ib_prefix_lock); 
-+      ib_prefix_lock_val[MAXPATHLEN - 1] = 0;
-+        strncat (ib_prefix_lock_val, ib_prefix_lock, MAXPATHLEN - 1 - strlen(ib_prefix_lock_val));
-         ib_prefix_lock = ib_prefix_lock_val;
-         }
-     }
-+/* ugh. string SHOULD be at least MAXPATHLEN long, but we CAN'T assume this */
-+/* note: strlen(string)==0 here */
- #ifdef mpexl
--strcat (string, root);
--strcat (string, ib_prefix_lock);
-+strncat (string, root, MAXPATHLEN - 1);
-+if(strlen(root) >= MAXPATHLEN - 1)
-+    string[MAXPATHLEN - 1] = 0;
-+else {
-+    strncat (string, ib_prefix_lock, MAXPATHLEN - 1 - strlen(root));
-+    if(strlen(root) + strlen(ib_prefix_lock) >= MAXPATHLEN - 1)
-+      string[MAXPATHLEN - 1] = 0;
-+}
- #else
--strcat (string, ib_prefix_lock);
-+strncat (string, ib_prefix_lock, MAXPATHLEN - 1);
-+if (strlen(ib_prefix) >= MAXPATHLEN - 1)
-+    string[MAXPATHLEN - 1] = 0;
- #ifndef NETWARE_386
--if (string [strlen (string) - 1] != '/')
-+if ((string [strlen (string) - 1] != '/') && (strlen(string) < MAXPATHLEN - 1))
-     strcat (string, "/");
- #endif
--strcat (string, root);
-+if(strlen(string) + strlen(root) >= MAXPATHLEN - 1)
-+    string[MAXPATHLEN - 1] = 0;
-+strncat (string, root, MAXPATHLEN - 1 - strlen(string));
- #endif
+ #endif /* !defined(VMS) */
+@@ -1662,11 +1665,14 @@
+ #endif
+               }
+               else {
+-                      strcat(ib_prefix_lock_val, ib_prefix_lock);
++                      ib_prefix_lock_val[MAXPATHLEN - 1] = 0;
++                      strncpy(ib_prefix_lock_val, ib_prefix_lock, MAXPATHLEN - 1);
+                       ib_prefix_lock = ib_prefix_lock_val;
+               }
+       }
+-      strcat(string, ib_prefix_lock);
++      if(strlen(ib_prefix_lock) >= MAXPATHLEN)
++              string[MAXPATHLEN - 1] = 0;
++      strncat(string, ib_prefix_lock, MAXPATHLEN - 1);
+       safe_concat_path(string, root);

  }
  #endif
  }
  #endif

-@@ -2939,21 +2965,34 @@
-         }
-     else
-         {
--        strcat (ib_prefix_msg_val, ib_prefix_msg); 
-+      ib_prefix_msg_val[MAXPATHLEN - 1] = 0;
-+        strncat (ib_prefix_msg_val, ib_prefix_msg, MAXPATHLEN - 1 - strlen(ib_prefix_msg_val)); 
-         ib_prefix_msg = ib_prefix_msg_val;
-         }
-     }
- 
-+/* ugh. string SHOULD be at least MAXPATHLEN long, but we CAN'T assume this */
-+/* note: strlen(string)==0 here */
- #ifdef mpexl
--strcat (string, root);
--strcat (string, ib_prefix_msg);
-+strncat (string, root, MAXPATHLEN - 1);
-+if(strlen(root) >= MAXPATHLEN - 1)
-+    string[MAXPATHLEN - 1] = 0;
-+else {
-+    strncat (string, ib_prefix_msg, MAXPATHLEN - 1 - strlen(root));
-+    if(strlen(root) + strlen(ib_prefix_msg) >= MAXPATHLEN - 1)
-+      string[MAXPATHLEN - 1] = 0;
-+}
- #else
--strcat (string, ib_prefix_msg);
-+strncat (string, ib_prefix_msg, MAXPATHLEN - 1);
-+if (strlen(ib_prefix) >= MAXPATHLEN - 1)
-+    string[MAXPATHLEN - 1] = 0;
- #ifndef NETWARE_386
--if (string [strlen (string) - 1] != '/')
-+if ((string [strlen (string) - 1] != '/') && (strlen(string) < MAXPATHLEN - 1))
-     strcat (string, "/");
- #endif
--strcat (string, root);
-+if(strlen(string) + strlen(root) >= MAXPATHLEN - 1)
-+    string[MAXPATHLEN - 1] = 0;
-+strncat (string, root, MAXPATHLEN - 1 - strlen(string));
- #endif
+@@ -1746,11 +1752,14 @@
+                       gds__prefix(ib_prefix_msg, "");
+               }
+               else {
+-                      strcat(ib_prefix_msg_val, ib_prefix_msg);
++                      ib_prefix_msg_val[MAXPATHLEN - 1] = 0;
++                      strncpy(ib_prefix_msg_val, ib_prefix_msg, MAXPATHLEN - 1);
+                       ib_prefix_msg = ib_prefix_msg_val;
+               }
+       }
+-      strcat(string, ib_prefix_msg);
++      if(strlen(ib_prefix_msg) >= MAXPATHLEN)
++              string[MAXPATHLEN - 1] = 0;
++      strncat(string, ib_prefix_msg, MAXPATHLEN - 1);
+       safe_concat_path(string, root);

  }
  #endif
  }
  #endif

---- firebird-1.0.2.908/jrd/builtin.c.orig      2000-12-29 14:05:07.000000000 +0100
-+++ firebird-1.0.2.908/jrd/builtin.c   2003-10-29 20:56:16.270036128 +0100
-@@ -74,7 +74,7 @@
-  *
-  **************************************/
- FN    *function;
--TEXT  *p, temp [256], *ep;
-+TEXT  *p, temp [MAXPATHLEN], *ep;
- TEXT  *modname;
- 
- /* Strip off any preceeding $INTERBASE path location from the 
---- firebird-1.0.2.908/jrd/event.c.orig        2002-06-21 20:56:55.000000000 +0200
-+++ firebird-1.0.2.908/jrd/event.c     2003-10-29 20:57:01.379178496 +0100
-@@ -258,7 +258,7 @@
-  *    exits, otherwise return NULL.
-  *
-  **************************************/
--TEXT  *event_file, buffer [256];
-+TEXT  *event_file, buffer [MAXPATHLEN];
- 
- /* If we're already initialized, there's nothing to do */
- 
---- firebird-1.0.2.908/jrd/isc.c.orig  2002-06-21 20:56:55.000000000 +0200
-+++ firebird-1.0.2.908/jrd/isc.c       2003-10-29 21:00:27.988769064 +0100
-@@ -520,7 +520,7 @@
-     {
-     IB_FILE        *fd;
-     TEXT        *p, *q, buf[80];
--    TEXT        buffer [256];
-+    TEXT        buffer [MAXPATHLEN];
- #ifdef SUPERSERVER
-     int         n;
-     TEXT        dir_name[MAX_PATH_LENGTH];
-@@ -724,7 +724,7 @@
- IB_FILE       *fd = NULL;
- IPCCFG        h;
- struct        cfgtbl *t;
--TEXT  buffer [256];
-+TEXT  buffer [MAXPATHLEN];
- int   ret = 1;
- 
- if (config_file)
---- firebird-1.0.2.908/jrd/isc_cray.c.orig     2000-08-03 22:50:47.000000000 +0200
-+++ firebird-1.0.2.908/jrd/isc_cray.c  2003-10-29 21:01:52.928856208 +0100
-@@ -654,7 +654,7 @@
-  **************************************/
- SLONG msg [3];
- int   status, pipes [2];
--TEXT  process [64], arg [10];
-+TEXT  process [MAXPATHLEN], arg [10];
- 
- status = kill (pid, signal_number);
- 
---- firebird-1.0.2.908/jrd/isc_ipc.c.orig      2002-06-21 20:56:55.000000000 +0200
-+++ firebird-1.0.2.908/jrd/isc_ipc.c   2003-10-29 21:02:12.890821528 +0100
-@@ -773,7 +773,7 @@
-  **************************************/
- SLONG msg [3];
- int   status, pipes [2];
--TEXT  process [64], arg [10];
-+TEXT  process [MAXPATHLEN], arg [10];
- 
- #ifdef NeXT
- /* If not a UNIX signal, send to port watcher */
---- firebird-1.0.2.908/jrd/log.c.orig  2000-08-03 22:50:56.000000000 +0200
-+++ firebird-1.0.2.908/jrd/log.c       2003-10-29 21:03:49.526130728 +0100
-@@ -632,7 +632,7 @@
- DBB   dbb;
- LOG   log;
- #ifndef STACK_REDUCTION
--SCHAR *log_name, buffer [256];
-+SCHAR *log_name, buffer [MAXPATHLEN];
- #else
- SCHAR *log_name, *buffer;
- #endif /* !STACK_REDUCTION */
-@@ -640,7 +640,7 @@
- int   mask;
- 
- #ifdef STACK_REDUCTION
--buffer = (SCHAR *)gds__alloc ((SLONG)BUFFER_MEDIUM);
-+buffer = (SCHAR *)gds__alloc ((SLONG)((BUFFER_MEDIUM > MAXPATHLEN) ? BUFFER_MEDIUM : MAXPATHLEN));
- if(!buffer) /* NOMEM: */
-   {
-   error ("can't open log file (out of memory)");
---- firebird-1.0.2.908/jrd/svc.c.orig  2002-10-07 12:49:25.000000000 +0200
-+++ firebird-1.0.2.908/jrd/svc.c       2003-10-29 21:07:08.137937144 +0100
-@@ -149,7 +149,7 @@
-                                *status++ = (STATUS) ERR_string(svc,strlen(svc)); \
-                                *status++ = isc_arg_end; }
- 
--#define ERR_FILE_IN_USE               { TEXT buffer[256]; \
-+#define ERR_FILE_IN_USE               { TEXT buffer[MAXPATHLEN]; \
-                                 gds__prefix (buffer, LOCK_HEADER); \
-                                 *status++ = isc_file_in_use; \
-                                 *status++ = isc_arg_string; \
-@@ -849,7 +849,7 @@
-  *
-  **************************************/
- SCHAR item, *items, *end_items, *end; 
--UCHAR buffer [256], dbbuf [1024];
-+UCHAR buffer [MAXPATHLEN /* >=256 */], dbbuf [1024];
- USHORT        l, length, version, get_flags;
- STATUS        *status;
- #ifndef WINDOWS_ONLY
-@@ -1361,7 +1361,7 @@
-  *
-  **************************************/
- SCHAR item, *items, *end_items, *end, *p, *q; 
--UCHAR buffer [256];
-+UCHAR buffer [MAXPATHLEN /* >=256 */];
- USHORT        l, length, version, get_flags;
- USHORT  num_att = 0;
- USHORT  num_dbs = 0;
---- firebird-1.0.2.908/gpre/ftn.c.orig 2002-06-21 20:56:55.000000000 +0200
-+++ firebird-1.0.2.908/gpre/ftn.c      2003-10-29 21:01:14.106758064 +0100
-@@ -1551,7 +1551,7 @@
- TPB           tpb;
- REQ           request;
- BOOLEAN               any_extern;
--TEXT          include_buffer[512];
-+TEXT          include_buffer[MAXPATHLEN];
- 
- #ifndef mpexl
- ISC_prefix (include_buffer, INCLUDE_FTN_FILE);
---- firebird-1.0.2.908/intl/dtest.c.orig       2000-08-03 22:49:04.000000000 +0200
-+++ firebird-1.0.2.908/intl/dtest.c    2003-10-29 20:55:40.683446112 +0100
-@@ -124,7 +124,7 @@
- #ifdef LIKE_JRD
-       {
-       char    module[ 200 ];
--      char    path[ 200 ];
-+      char    path[ MAXPATHLEN ];
-       char    entry[ 200 ];
-       int     t_type;
-       t_type = atoi( vector[ i ] );
---- firebird-1.0.2.908/csv/csi.c.orig  2000-08-03 22:43:03.000000000 +0200
-+++ firebird-1.0.2.908/csv/csi.c       2003-10-29 20:53:28.947473024 +0100
-@@ -3733,7 +3733,7 @@
-  *
-  **************************************/
- UCHAR         output [128], error [128], *p, *q, process_name [16],
--              pipe_temp [256], pipe_file [256];
-+              pipe_temp [MAXPATHLEN], pipe_file [256];
- USHORT                i, len;
- ULONG         status, pid, flags, item;
- SLONG         *privileges, procpriv [2], priority;
---- firebird-1.0.2.908/firebird/bellardo/darwin/installpath.c.orig     2001-02-04 05:06:13.000000000 +0100
-+++ firebird-1.0.2.908/firebird/bellardo/darwin/installpath.c  2003-10-29 20:55:01.392419256 +0100
-@@ -7,7 +7,7 @@
- 
- int main()
- {
--    char buff[2048];
-+    char buff[MAXPATHLEN + 10];
-     int offset;
- 
- #ifdef VAR_PATH
---- firebird-1.0.2.908/porting/qli/help.c.orig 2003-01-04 14:08:01.000000000 +0100
-+++ firebird-1.0.2.908/porting/qli/help.c      2003-10-29 20:51:01.799842864 +0100
-@@ -201,7 +201,7 @@
-  **************************************/
- NAM   *ptr, *end, name;
- USHORT        max_level;
--TEXT  target [128], **topic, *topics [16];
-+TEXT  target [MAXPATHLEN /* >=128 */], **topic, *topics [16];
- 
- if (!HELP_DB)
-     {

diff --git a/Firebird-link.patch b/Firebird-link.patch
index 5c6e915d32869609d49873c9c3d8b328ec6bda25..021822f7f2732da76f9cd628c8eb7772158c0c70 100644 (file)
--- a/Firebird-link.patch
+++ b/Firebird-link.patch
@@ -1,11 +1,11 @@
---- firebird-1.0.2.908/builds/original/sfx.jrd.orig    2002-06-21 20:56:54.000000000 +0200
-+++ firebird-1.0.2.908/builds/original/sfx.jrd 2003-10-29 19:54:23.282496032 +0100
-@@ -437,7 +437,7 @@
-               $(CSI_P_MISC) $(DSQL_P_MISC) $(LOCK_P_MISC) \
-               $(REMOTE_P_MISC) $(SECURITY_P_MISC) $(BRIDGE_P_MISC) $(INTL_P_MISC) \
-               $(REGISTER_P_MISC) $(WAL_P_MISC) $(FUNCTIONS) $(GDSF_LIB) \
--              $(LD_LIBS) -o gds.so
-+              $(LD_LIBS) -o gds.so -ldl -lcrypt -soname libgds.so.1
-       $(CHMOD_6) gds.so
-       $(MV) gds.so $(GDSSHR)
-       $(TOUCH) gds.so
+--- firebird-1.5.0.4290/builds/posix/Makefile.in.extlib.orig   2004-02-15 09:51:02.000000000 +0100
++++ firebird-1.5.0.4290/builds/posix/Makefile.in.extlib        2004-05-24 23:58:14.519459120 +0200
+@@ -110,7 +110,7 @@
+ 
+ lib_ib_util: $(LIBIBUTIL_SO)
+ 
+-$(LIBIBUTIL_SO):      LINK_PROD=$(LIBIBUTIL_SO)
++$(LIBIBUTIL_SO):      LINK_PROD=$(IbUtilLibraryName)
+ $(LIBIBUTIL_SO):      $(UTIL_Objects)
+       $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME_LINE) $(LIB_LINK_RPATH_LINE) -o $@ $^
+ #     -$(LN) $(@F) $(LIBFBINTL_SOBASENAME) 

diff --git a/Firebird.spec b/Firebird.spec
index 60eca6e433822beaf05a207ad343c47fa85acd85..3eaea6db74ce23c7e5df86a9f68a8cd5688c1819 100644 (file)
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -2,36 +2,42 @@ Summary:      Firebird SQL Database Server and Client tools
 Summary(pl):   Firebird - serwer baz danych SQL oraz narzêdzia klienckie
 Name:          Firebird
 # FirebirdCS/FirebirdSS (Classic Server/Super Server)?
 Summary(pl):   Firebird - serwer baz danych SQL oraz narzêdzia klienckie
 Name:          Firebird
 # FirebirdCS/FirebirdSS (Classic Server/Super Server)?

-Version:       1.0.2.908
-Release:       2
+Version:       1.5.0.4290
+Release:       0.1

 License:       Interbase Public License 1.0
 Group:         Applications/Databases
 License:       Interbase Public License 1.0
 Group:         Applications/Databases

-Source0:       http://dl.sourceforge.net/firebird/%{name}-%{version}.src.tar.gz
-# Source0-md5: 8ca9aac6cfe2670659d00bb2decb3456
-Source1:       http://dl.sourceforge.net/firebird/bootkit-%{version}.tar.gz
-# Source1-md5: 3ce1d058d568242843fa0f92d5ae7018
+Source0:       http://dl.sourceforge.net/firebird/firebird-%{version}.tar.bz2
+# Source0-md5: c088ccf4d149ecc1fa03ee27e9043701
+#Source1:      http://dl.sourceforge.net/firebird/bootkit-%{version}.tar.gz
+## Source1-md5: 3ce1d058d568242843fa0f92d5ae7018

 Source2:       http://www.ibphoenix.com/downloads/60All.zip
 # Source2-md5: f86a132012361cd4ae88563105741a4c
 Source3:       http://www.ibphoenix.com/downloads/ib_4_0_docs.tar.gz
 Source2:       http://www.ibphoenix.com/downloads/60All.zip
 # Source2-md5: f86a132012361cd4ae88563105741a4c
 Source3:       http://www.ibphoenix.com/downloads/ib_4_0_docs.tar.gz

-# Source3-md5: f4176d5dec952ee774bb8ee74c1f715d
+# Source3-md5: f4176d5dec952ee774bb8ee74c1f715d

 Source4:       http://www.ibphoenix.com/downloads/isc_docs.zip
 # Source4-md5: 66eef71c188215d10988788282c014a7
 Source4:       http://www.ibphoenix.com/downloads/isc_docs.zip
 # Source4-md5: 66eef71c188215d10988788282c014a7

-# dirty "fixes" for missing error contants and conflict with isql from unixODBC
-# (gds__bad_{limit,skip}_param are defined in supplied codes.h, but removed
-#  by codes.h regeneration from messages.gbak(?))
-Patch0:                %{name}-fix.patch
-Patch1:                %{name}-gcc33.patch
-Patch2:                %{name}-link.patch
-Patch3:                %{name}-chmod.patch
-Patch4:                %{name}-env-overflows.patch
+Patch0:                %{name}-chmod.patch
+Patch1:                %{name}-link.patch
+Patch2:                %{name}-env-overflows.patch
+Patch3:                %{name}-sparc.patch
+Patch4:                %{name}-va.patch
+Patch5:                %{name}-types.patch
+Patch6:                %{name}-morearchs.patch

 URL:           http://firebird.sourceforge.net/
 URL:           http://firebird.sourceforge.net/

+BuildRequires: libstdc++-devel
+BuildRequires: ncurses-devel

 BuildRequires: unzip
 Requires:      %{name}-lib = %{version}-%{release}
 BuildRequires: unzip
 Requires:      %{name}-lib = %{version}-%{release}

-# see firebird-*/jrd/{common.h,gds.h,ibase.h} if you want to add support for more
-ExclusiveArch: %{ix86}
+# official ports are x86 and sparc(32)
+# ppc added in morearchs patch
+# see morearchs patch if you want to add support for more 32-bit archs
+# (64-bit port is currently broken, types patch is not sufficient)
+ExclusiveArch: %{ix86} sparc sparcv9 ppc

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                ibdir   %{_libdir}/interbase
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                ibdir   %{_libdir}/interbase

+%define                specflags       -fno-strict-aliasing
+%define                debugcflags     -O1 -g -Wall -fno-strict-aliasing

 
 %description
 Firebird is a powerful, high-performance relational database designed
 
 %description
 Firebird is a powerful, high-performance relational database designed


@@ -58,6 +64,7 @@ Summary:      Header files for Firebird library
 Summary(pl):   Pliki nag³ówkowe biblioteki Firebird
 Group:         Development/Libraries
 Requires:      %{name}-lib = %{version}-%{release}
 Summary(pl):   Pliki nag³ówkowe biblioteki Firebird
 Group:         Development/Libraries
 Requires:      %{name}-lib = %{version}-%{release}

+Requires:      libstdc++-devel

 
 %description devel
 Header files for Firebird library.
 
 %description devel
 Header files for Firebird library.


@@ -89,12 +96,15 @@ Extensive InterBase and Firebird documentation.
 Obszerna dokumentacja do baz InterBase i Firebird.
 
 %prep
 Obszerna dokumentacja do baz InterBase i Firebird.
 
 %prep

-%setup -q -n firebird-%{version} -a1
+%setup -q -n firebird-%{version}

 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

+# incomplete, 64-bit port is broken
+#%patch5 -p1
+%patch6 -p1

 
 install -d docs/{IB3.0,IB4.0,IB6.0}
 unzip -q %{SOURCE2} -d docs/IB6.0
 
 install -d docs/{IB3.0,IB4.0,IB6.0}
 unzip -q %{SOURCE2} -d docs/IB6.0


@@ -104,65 +114,86 @@ unzip -q %{SOURCE4} -d docs/IB3.0
 mv -f docs/IB6.0/LANGREF.{PDF,pdf}
 
 %build
 mv -f docs/IB6.0/LANGREF.{PDF,pdf}
 
 %build

-INTERBASE=/usr/lib/interbase; export INTERBASE
-echo 'y' | ./Configure.sh PROD
-. ./Configure_SetupEnv.sh
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}

 
 

-%{__make} firebird \
-       CC="%{__cc}" \
-       PROD_CFLAGS="%{rpmcflags} -fpic -DFLINTSTONE"
+%configure \
+       --prefix=%{ibdir} \
+       %{?debug:--enable-debug}
+# --enable-superserver

 
 

-# classic/super - what's the difference?
-#%%{__make} super_firebird
-
-#-Isource/interbase/include"
+%{__make} -j1 \
+       PROD_FLAGS="%{rpmcflags} -DNDEBUG -DLINUX -pipe -MMD -fPIC" \
+       DEV_FLAGS="%{rpmcflags} -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -fPIC -Wall -Wno-switch" \
+       LIB_LINK_RPATH_LINE= \
+       LIB_CLIENT_LINK_OPTIONS="-lpthread"

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-INTERBASE=/usr/lib/interbase; export INTERBASE
-. ./Configure_SetupEnv.sh

 
 

-%{__make} buildclassicimage -f firebird/install/linux/Makefile
+%{__make} -C src -f ../gen/Makefile.install buildImageDir

 
 install -d $RPM_BUILD_ROOT{%{ibdir},%{_libdir},%{_includedir}} \
        $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install -d $RPM_BUILD_ROOT{%{ibdir},%{_libdir},%{_includedir}} \
        $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}

-cd buildroot/opt/interbase
-rm -f bin/isc4.gbak
-cp -af UDF bin help intl interbase.msg isc4.gdb isc_config \
+install gen/firebird/lib/libfb*.a $RPM_BUILD_ROOT%{_libdir}
+cd gen/buildroot/%{ibdir}
+
+cp -af UDF bin help intl aliases.conf firebird.conf firebird.msg security.fdb \

        $RPM_BUILD_ROOT%{ibdir}
 install include/* $RPM_BUILD_ROOT%{_includedir}
        $RPM_BUILD_ROOT%{ibdir}
 install include/* $RPM_BUILD_ROOT%{_includedir}

-install lib/* $RPM_BUILD_ROOT%{_libdir}
+cp -df lib/* $RPM_BUILD_ROOT%{_libdir}

 install examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 

+# or libfbembed?
+ln -sf libfbclient.so.1.5.0 $RPM_BUILD_ROOT%{_libdir}/libgds.so.0
+ln -sf libfbclient.so.1 $RPM_BUILD_ROOT%{_libdir}/libgds.so
+
+ln -sf libfbstatic.a $RPM_BUILD_ROOT%{_libdir}/libgds.a
+

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

+%post  lib -p /sbin/ldconfig
+%postun        lib -p /sbin/ldconfig
+

 %files
 %defattr(644,root,root,755)
 %files
 %defattr(644,root,root,755)

-%doc builds_win32/install/{*License,Readme}.txt
+%doc doc/{sql.extensions,Firebird_conf.txt,README.user*,WhatsNew,fb2-todo.txt}

 %attr(755,root,root) %{_libdir}/libib_util.so
 %dir %{ibdir}
 %attr(755,root,root) %{ibdir}/UDF
 %attr(755,root,root) %{ibdir}/bin
 %{ibdir}/help
 %{ibdir}/intl
 %attr(755,root,root) %{_libdir}/libib_util.so
 %dir %{ibdir}
 %attr(755,root,root) %{ibdir}/UDF
 %attr(755,root,root) %{ibdir}/bin
 %{ibdir}/help
 %{ibdir}/intl

-%{ibdir}/interbase.msg
-# following two files should be in /var and /etc resp.?
-%{ibdir}/isc4.gdb
-%{ibdir}/isc_config
+%{ibdir}/firebird.msg
+# following files should be in /var (*.fdb) and /etc (*.conf)?
+%{ibdir}/security.fdb
+%{ibdir}/aliases.conf
+%{ibdir}/firebird.conf

 
 %files lib
 %defattr(644,root,root,755)
 
 %files lib
 %defattr(644,root,root,755)

-# .so link needed here - library doesn't have SONAME
-%attr(755,root,root) %{_libdir}/libgds.so*
+%attr(755,root,root) %{_libdir}/libfbclient.so.*.*.*
+%attr(755,root,root) %{_libdir}/libfbembed.so.*.*.*
+# InterBase/old Firebird compatibility symlinks
+%attr(755,root,root) %{_libdir}/libgds.so.0
+# needed here - original libgds.so.0 didn't have soname, so some old
+# (possibly not open-source) apps may be linked with libgds.so
+%attr(755,root,root) %{_libdir}/libgds.so

 
 %files devel
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)

-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libfbclient.so
+%attr(755,root,root) %{_libdir}/libfbembed.so
+%{_includedir}/*.h

 %{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)

+%{_libdir}/libfbcommon.a
+%{_libdir}/libfbstatic.a
+# compat link

 %{_libdir}/libgds.a
 
 %files doc
 %{_libdir}/libgds.a
 
 %files doc