Author: qboosh Date: Fri Oct 29 17:21:12 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.5.0
- updated editline,morearchs,FHS,64bit,gcc-icu,opt,rpath patches
- added noroot patch (allow non-root make install)
---- Files affected:
packages/Firebird:
Firebird-64bit.patch (1.3 -> 1.4) , Firebird-FHS.patch (1.2 -> 1.3) ,
Firebird-editline.patch (1.2 -> 1.3) , Firebird-gcc-icu.patch (1.1 -> 1.2) ,
Firebird-morearchs.patch (1.10 -> 1.11) , Firebird-opt.patch (1.1 -> 1.2) ,
Firebird-rpath.patch (1.1 -> 1.2) , Firebird.spec (1.77 -> 1.78) ,
Firebird-noroot.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/Firebird/Firebird-64bit.patch
diff -u packages/Firebird/Firebird-64bit.patch:1.3
packages/Firebird/Firebird-64bit.patch:1.4
--- packages/Firebird/Firebird-64bit.patch:1.3 Thu Jul 2 23:12:55 2009
+++ packages/Firebird/Firebird-64bit.patch Fri Oct 29 19:21:07 2010
@@ -1,20 +1,20 @@
---- Firebird-2.1.2.18118-0/src/gpre/pas.cpp~ 2007-02-11 10:31:45.000000000
+0100
-+++ Firebird-2.1.2.18118-0/src/gpre/pas.cpp 2009-07-02 23:08:50.683040590
+0200
-@@ -1931,7 +1931,7 @@
-
- args.pat_database = (DBB) init->nod_arg[3];
+--- Firebird-2.5.0.26074-0/src/gpre/pas.cpp.orig 2010-09-08
10:43:39.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/gpre/pas.cpp 2010-10-28 08:44:04.123740205
+0200
+@@ -1800,7 +1800,7 @@
+ PAT args;
+ args.pat_database = (gpre_dbb*) init->nod_arg[3];
args.pat_vector1 = status_vector(action);
- args.pat_value1 = (int) init->nod_arg[2];
+ args.pat_value1 = (int) (IPTR)init->nod_arg[2];
args.pat_value2 = (int) event_list->nod_count;
args.pat_string1 = GDS_EVENT_WAIT;
args.pat_string2 = GDS_EVENT_COUNTS;
-@@ -2007,7 +2007,7 @@
- event_init = (GPRE_NOD) event_action->act_object;
- stack_name = (gpre_sym*) event_init->nod_arg[0];
- if (!strcmp(event_name->sym_string, stack_name->sym_string)) {
+@@ -1872,7 +1872,7 @@
+ gpre_sym* stack_name = (gpre_sym*) event_init->nod_arg[0];
+ if (!strcmp(event_name->sym_string, stack_name->sym_string))
+ {
- ident = (int) event_init->nod_arg[2];
+ ident = (int) (IPTR)event_init->nod_arg[2];
- database = (DBB) event_init->nod_arg[3];
+ database = (gpre_dbb*) event_init->nod_arg[3];
}
}
================================================================
Index: packages/Firebird/Firebird-FHS.patch
diff -u packages/Firebird/Firebird-FHS.patch:1.2
packages/Firebird/Firebird-FHS.patch:1.3
--- packages/Firebird/Firebird-FHS.patch:1.2 Sat Sep 19 13:06:48 2009
+++ packages/Firebird/Firebird-FHS.patch Fri Oct 29 19:21:07 2010
@@ -1,71 +1,10 @@
-diff -U 3 -H -d -r -N --
Firebird-2.1.1.17910-0~/builds/install/misc/createAliasDB.sh.in
Firebird-2.1.1.17910-0/builds/install/misc/createAliasDB.sh.in
---- Firebird-2.1.1.17910-0~/builds/install/misc/createAliasDB.sh.in
2005-08-16 12:03:22.000000000 +0200
-+++ Firebird-2.1.1.17910-0/builds/install/misc/createAliasDB.sh.in
2008-08-23 15:52:25.000000000 +0200
-@@ -125,7 +125,7 @@
- aliasName=$1
- newDB=$2
+--- Firebird-2.5.0.26074-0/src/jrd/gds.cpp.orig 2010-10-28
08:01:51.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/gds.cpp 2010-10-28 08:33:54.483737691
+0200
+@@ -1751,7 +1751,12 @@
-- AliasFile=$FBRootDir/aliases.conf
-+ AliasFile=/etc/firebird/aliases.conf
+ GDS_init_prefix();
-
- checkNameStartsWithSlash $newDB
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/db_alias.cpp
Firebird-2.1.1.17910-0/src/jrd/db_alias.cpp
---- Firebird-2.1.1.17910-0~/src/jrd/db_alias.cpp 2006-05-19
17:16:45.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/db_alias.cpp 2008-08-23
17:58:51.000000000 +0200
-@@ -45,8 +45,7 @@
-
- bool ResolveDatabaseAlias(const string& alias, string& database)
- {
-- string alias_filename;
-- Firebird::Prefix(alias_filename, ALIAS_FILE);
-+ string alias_filename = "/etc/firebird/aliases.conf";
- ConfigFile aliasConfig(false);
- aliasConfig.setConfigFilePath(alias_filename);
-
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/gds.cpp
Firebird-2.1.1.17910-0/src/jrd/gds.cpp
---- Firebird-2.1.1.17910-0~/src/jrd/gds.cpp 2008-08-23 13:50:58.000000000
+0200
-+++ Firebird-2.1.1.17910-0/src/jrd/gds.cpp 2008-08-23 18:02:40.000000000
+0200
-@@ -1090,7 +1090,7 @@
- while (true) {
- if (trace_file_handle == INVALID_HANDLE_VALUE) {
- TEXT name[MAXPATHLEN];
-- gds__prefix(name, LOGFILE);
-+ sprintf(name, "/var/log/%s", LOGFILE);
- // We do not care to close this file.
- // It will be closed automatically when our process
terminates.
- trace_file_handle = CreateFile(name, GENERIC_WRITE,
-@@ -1116,7 +1116,7 @@
- TEXT name[MAXPATHLEN];
-
- // Note: signal-safe code
-- gds__prefix(name, LOGFILE);
-+ sprintf(name, "/var/log/%s", LOGFILE);
- int file = open(name, O_CREAT | O_APPEND | O_WRONLY, 0660);
- if (file == -1)
- return;
-@@ -1227,7 +1227,7 @@
- now = time((time_t *)0);
- #endif
-
-- gds__prefix(name, LOGFILE);
-+ sprintf(name, "/var/log/%s", LOGFILE);
-
- #ifdef WIN_NT
- WaitForSingleObject(trace_mutex_handle, INFINITE);
-@@ -1283,7 +1283,7 @@
- now = time((time_t *)0);
- #endif
-
-- gds__prefix(name, LOGFILE);
-+ sprintf(name, "/var/log/%s", LOGFILE);
-
- const int oldmask = umask(0111);
- #ifdef WIN_NT
-@@ -1844,8 +1844,13 @@
- fb_utils::snprintf(buf, MAXPATHLEN, root, fbEmbeddedRoot);
- root = buf;
- #endif
+- strcpy(string, fb_prefix_lock); // safe - no BO
+ const char *lockdir = "/var/lib/firebird";
+ struct stat sb;
+ if (stat(lockdir, &sb) == 0 && (sb.st_mode & S_IFMT) == S_IFDIR)
@@ -73,45 +12,19 @@
+ else
+ strcpy(string, fb_prefix_lock); // safe - no BO
-- strcpy(string, fb_prefix_lock); // safe - no BO
- safe_concat_path(string, root);
- }
- #endif
---- Firebird-2.1.3.18185-0/src/jrd/jrd_pwd.h.orig 2008-04-03
19:00:51.000000000 +0200
-+++ Firebird-2.1.3.18185-0/src/jrd/jrd_pwd.h 2009-09-19 05:52:40.000000000
+0200
-@@ -60,7 +60,7 @@
- "security2.fdb";
- #endif
-
-- gds__prefix(path_buffer, USER_INFO_NAME);
-+ gds__prefix_lock(path_buffer, USER_INFO_NAME);
- }
-
- static void initialize();
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/os/config_root.h
Firebird-2.1.1.17910-0/src/jrd/os/config_root.h
---- Firebird-2.1.1.17910-0~/src/jrd/os/config_root.h 2007-04-05
14:47:15.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/os/config_root.h 2008-08-23
16:09:04.000000000 +0200
-@@ -83,7 +83,7 @@
+ // if someone wants to know prefix for lock files,
+ // sooner of all he wants that directory to exist
+--- Firebird-2.5.0.26074-0/src/jrd/os/config_root.h.orig 2010-09-08
10:43:20.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/os/config_root.h 2010-10-28
08:36:33.139734339 +0200
+@@ -91,7 +91,7 @@
{
+ GetInstallDir();
GetRoot();
- install_dir = root_dir;
- config_file = root_dir + string(CONFIG_FILE);
+ config_file = "/etc/firebird/" + string(CONFIG_FILE);
}
-
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/svc.cpp
Firebird-2.1.1.17910-0/src/jrd/svc.cpp
---- Firebird-2.1.1.17910-0~/src/jrd/svc.cpp 2008-05-27 11:27:40.000000000
+0200
-+++ Firebird-2.1.1.17910-0/src/jrd/svc.cpp 2008-08-23 18:01:19.000000000
+0200
-@@ -2037,7 +2037,7 @@
- #endif
-
- TEXT name[MAXPATHLEN];
-- gds__prefix(name, LOGFILE);
-+ sprintf(name, "/var/log/%s", LOGFILE);
- FILE* file = fopen(name, "r");
- if (file != NULL) {
- #ifdef SERVICE_THREAD
+ virtual ~ConfigRoot() {}
diff -U 3 -H -d -r -N --
Firebird-2.1.1.17910-0~/src/utilities/ibmgr/srvrmgr.cpp
Firebird-2.1.1.17910-0/src/utilities/ibmgr/srvrmgr.cpp
--- Firebird-2.1.1.17910-0~/src/utilities/ibmgr/srvrmgr.cpp 2007-03-28
06:20:36.000000000 +0200
+++ Firebird-2.1.1.17910-0/src/utilities/ibmgr/srvrmgr.cpp 2008-08-23
16:16:02.000000000 +0200
================================================================
Index: packages/Firebird/Firebird-editline.patch
diff -u packages/Firebird/Firebird-editline.patch:1.2
packages/Firebird/Firebird-editline.patch:1.3
--- packages/Firebird/Firebird-editline.patch:1.2 Fri Jul 18 22:55:04 2008
+++ packages/Firebird/Firebird-editline.patch Fri Oct 29 19:21:07 2010
@@ -1,16 +1,7 @@
---- Firebird-2.1.1.17910-0/configure.in.orig 2008-05-27 11:26:28.000000000
+0200
-+++ Firebird-2.1.1.17910-0/configure.in 2008-07-18 22:28:11.790034707
+0200
-@@ -399,7 +399,7 @@
- # not need editline in default libs, but need to test for its presence
- saveLIBS=$LIBS
- if test "$STD_EDITLINE" = "true"; then
-- AC_CHECK_LIB(editline, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)
-+ AC_CHECK_LIB(edit, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)
- fi
- LIBS=$saveLIBS
-
-@@ -566,10 +566,10 @@
- dnl AC_CHECK_LIB(c, main)
+--- Firebird-2.5.0.26074-0/configure.in.orig 2010-09-08 10:44:05.000000000
+0200
++++ Firebird-2.5.0.26074-0/configure.in 2010-10-27 22:32:38.567739367
+0200
+@@ -652,10 +652,10 @@
+ AC_SEARCH_LIBS(dlopen, dl)
AC_CHECK_LIB(m, main)
if test "$EDITLINE_FLG" = "Y"; then
+ AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
@@ -18,17 +9,6 @@
AC_CHECK_LIB(ncurses, tgetent, TERMLIB=ncurses, \
AC_CHECK_LIB(termcap, tgetent, TERMLIB=termcap, \
- AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
- AC_MSG_ERROR(termcap support not
found)))))
+ AC_MSG_ERROR(termcap support not
found)))))
AC_SUBST(TERMLIB)
XE_APPEND(-l$TERMLIB, LIBS)
---- Firebird-2.1.1.17910-0/builds/posix/make.defaults.orig 2008-07-18
21:24:32.538046000 +0200
-+++ Firebird-2.1.1.17910-0/builds/posix/make.defaults 2008-07-18
22:29:07.222040573 +0200
-@@ -230,7 +230,7 @@
-
- ifeq ($(EDITLINE_FLG),Y)
- ifeq ($(STD_EDITLINE), true)
-- LIBEDITLINE := -leditline
-+ LIBEDITLINE := -ledit
- else
- LIBEDITLINE := $(LIB)/libeditline.a
- endif
================================================================
Index: packages/Firebird/Firebird-gcc-icu.patch
diff -u packages/Firebird/Firebird-gcc-icu.patch:1.1
packages/Firebird/Firebird-gcc-icu.patch:1.2
--- packages/Firebird/Firebird-gcc-icu.patch:1.1 Sun Sep 27 20:34:13 2009
+++ packages/Firebird/Firebird-gcc-icu.patch Fri Oct 29 19:21:07 2010
@@ -14,19 +14,3 @@
#ifdef _MSC_VER
#define THROW_BAD_ALLOC
-@@ -448,15 +449,6 @@ inline void* operator new[](size_t s) TH
- );
- }
-
--inline void* operator new(size_t, void* ptr) throw()
--{
-- return ptr;
--}
--inline void* operator new[](size_t, void* ptr) throw()
--{
-- return ptr;
--}
--
- inline void operator delete(void* mem) throw()
- {
- Firebird::MemoryPool::globalFree(mem);
================================================================
Index: packages/Firebird/Firebird-morearchs.patch
diff -u packages/Firebird/Firebird-morearchs.patch:1.10
packages/Firebird/Firebird-morearchs.patch:1.11
--- packages/Firebird/Firebird-morearchs.patch:1.10 Thu Jul 2 23:14:38 2009
+++ packages/Firebird/Firebird-morearchs.patch Fri Oct 29 19:21:07 2010
@@ -1,80 +1,69 @@
---- Firebird-2.1.1.17910-0/src/jrd/common.h.orig 2008-05-27
11:27:23.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/common.h 2008-07-18 22:37:29.266040573
+0200
-@@ -151,6 +151,11 @@
+--- Firebird-2.5.0.26074-0/src/jrd/common.h.orig 2010-09-08
10:43:27.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/common.h 2010-10-28 07:51:57.395734339
+0200
+@@ -158,6 +158,11 @@
#define RISC_ALIGNMENT
#endif // IA64
+#ifdef __alpha__
-+#define IMPLEMENTATION isc_info_db_impl_linux_alpha /* 77 */
++#define IMPLEMENTATION isc_info_db_impl_linux_alpha /* 82 */
+#define RISC_ALIGNMENT
+#endif
+
- #define MEMMOVE(from, to, length) memmove ((void *)to, (void
*)from, (size_t) length)
- #define MOVE_FAST(from, to, length) memcpy (to, from, (int) (length))
- #define MOVE_FASTER(from, to, length) memcpy (to, from, (int) (length))
---- Firebird-2.1.1.17910-0/src/jrd/inf_pub.h.orig 2008-05-27
11:27:30.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/inf_pub.h 2008-07-18 22:40:03.810034707
+0200
-@@ -205,6 +205,7 @@ enum info_db_implementations
-
- isc_info_db_impl_linux_arm = 75,
- isc_info_db_impl_linux_ia64 = 76,
-+ isc_info_db_impl_linux_alpha = 77,
+ #ifndef USE_POSIX_THREADS
+ // force pthread detection on Linux for distros that do not provide
+ // POSIX thread compatability
+--- Firebird-2.5.0.26074-0/src/jrd/inf_pub.h.orig 2010-09-08
10:43:27.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/inf_pub.h 2010-10-28 07:52:00.183734339
+0200
+@@ -213,6 +213,7 @@
+
+ isc_info_db_impl_linux_sh = 80,
+ isc_info_db_impl_linux_sheb = 81,
++ isc_info_db_impl_linux_alpha = 82,
isc_info_db_impl_last_value // Leave this LAST!
};
---- Firebird-2.1.1.17910-0/src/jrd/pag.cpp.orig 2008-05-27
11:27:37.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/pag.cpp 2008-07-18 22:42:52.586039735
+0200
-@@ -158,9 +158,10 @@ static const int CLASS_DARWIN_X64 = 31;
- static const int CLASS_LINUX_ARM = 33; // LINUX/ARM
- static const int CLASS_LINUX_IA64 = 34; // LINUX/IA64
- static const int CLASS_DARWIN_PPC64 = 35; // Darwin/PowerPC64
-+static const int CLASS_LINUX_ALPHA = 36; // LINUX/ALPHA
+--- Firebird-2.5.0.26074-0/src/jrd/pag.cpp.orig 2010-09-08
10:43:27.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/pag.cpp 2010-10-28 07:58:22.771734339
+0200
+@@ -160,9 +160,10 @@
+ static const int CLASS_LINUX_S390 = 37; // LINUX/s390
+ static const int CLASS_LINUX_SH = 38; // LINUX/SH (little-endian)
+ static const int CLASS_LINUX_SHEB = 39; // LINUX/SH (big-endian)
++static const int CLASS_LINUX_ALPHA = 40; // LINUX/Alpha
static const int CLASS_MAX10 = CLASS_LINUX_AMD64; // This should not be
changed, no new ports with ODS10
--static const int CLASS_MAX = CLASS_DARWIN_PPC64;
+-static const int CLASS_MAX = CLASS_LINUX_SHEB;
+static const int CLASS_MAX = CLASS_LINUX_ALPHA;
// ARCHITECTURE COMPATIBILITY CLASSES
-@@ -250,7 +251,8 @@ static ArchitectureType archMatrix[CLASS
- archLittleEndian, // CLASS_SOLARIS_AMD64
- archLittleEndian, // CLASS_LINUX_ARM
- archLittleEndian, // CLASS_LINUX_IA64
-- archBigEndian // CLASS_DARWIN_PPC64
-+ archBigEndian, // CLASS_DARWIN_PPC64
+@@ -259,7 +260,8 @@
+ archBigEndian, // CLASS_LINUX_S390X
+ archBigEndian, // CLASS_LINUX_S390
+ archLittleEndian, // CLASS_LINUX_SH
+- archBigEndian // CLASS_LINUX_SHEB
++ archBigEndian, // CLASS_LINUX_SHEB
+ archLittleEndian // CLASS_LINUX_ALPHA
};
- #ifdef sun
-@@ -308,6 +310,8 @@ const SSHORT CLASS = CLASS_LINUX_MIPSEL
- const SSHORT CLASS = CLASS_LINUX_MIPS;
- #elif defined(IA64)
- const SSHORT CLASS = CLASS_LINUX_IA64;
+ #ifdef __sun
+@@ -319,6 +321,8 @@
+ const SSHORT CLASS = CLASS_LINUX_SH;
+ #elif defined(SHEB)
+ const SSHORT CLASS = CLASS_LINUX_SHEB;
+#elif defined(__alpha__)
+const SSHORT CLASS = CLASS_LINUX_ALPHA;
#else
#error no support on other hardware for Linux
#endif
---- Firebird-2.1.1.17910-0/src/remote/xdr.cpp.orig 2008-05-27
11:27:51.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/remote/xdr.cpp 2008-07-18 22:43:33.910037221
+0200
-@@ -42,7 +42,7 @@
- // select abs2(2.0 / 3.0) from rdb$database;
- // It will return big strange value in case of invalid define
- // ASF: Currently, all little-endian are SWAP_DOUBLE and big-endian aren't.
--#if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) ||
defined(ARM) || defined(MIPSEL) || defined(DARWIN64) || defined(IA64)
-+#if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) ||
defined(ARM) || defined(MIPSEL) || defined(DARWIN64) || defined(IA64) ||
defined(__alpha__)
- #define SWAP_DOUBLE
- #elif defined(sparc) || defined(PowerPC) || defined(PPC) || defined(__ppc__)
|| defined(HPUX) || defined(MIPS) || defined(__ppc64__)
- #undef SWAP_DOUBLE
---- Firebird-2.1.1.17910-0/src/jrd/utl.cpp.orig 2008-05-27
11:27:40.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/utl.cpp 2008-07-18 22:44:17.890038059
+0200
-@@ -243,7 +243,8 @@ static const TEXT* const impl_implementa
- "Firebird/sun/amd64", /* 74 */
- "Firebird/linux ARM", /* 75 */
- "Firebird/linux IA64", /* 76 */
-- "Firebird/Darwin/PowerPC64" /* 77 */
-+ "Firebird/Darwin/PowerPC64", /* 77 */
-+ "Firebird/linux ALPHA" /* 78 */
+--- Firebird-2.5.0.26074-0/src/jrd/utl.cpp.orig 2010-09-08
10:43:27.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/utl.cpp 2010-10-28 07:57:59.231736853
+0200
+@@ -225,7 +225,8 @@
+ "Firebird/linux s390x", // 78
+ "Firebird/linux s390", // 79
+ "Firebird/linux SH", // 80
+- "Firebird/linux SHEB" // 81
++ "Firebird/linux SHEB", // 81
++ "Firebird/linux Alpha" // 82
};
================================================================
Index: packages/Firebird/Firebird-opt.patch
diff -u packages/Firebird/Firebird-opt.patch:1.1
packages/Firebird/Firebird-opt.patch:1.2
--- packages/Firebird/Firebird-opt.patch:1.1 Sun Aug 29 12:21:07 2010
+++ packages/Firebird/Firebird-opt.patch Fri Oct 29 19:21:07 2010
@@ -1,11 +1,11 @@
---- Firebird-2.1.3.18185-0/builds/posix/prefix.linux.orig 2007-05-03
13:24:50.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux 2010-08-29
10:48:00.738823295 +0200
-@@ -21,8 +21,8 @@
- # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
- # you may remove it if engine is getting compiled with any other GCC version
+--- Firebird-2.5.0.26074-0/builds/posix/prefix.linux.orig 2010-09-08
10:41:23.000000000 +0200
++++ Firebird-2.5.0.26074-0/builds/posix/prefix.linux 2010-10-28
08:55:49.323734339 +0200
+@@ -18,8 +18,8 @@
+ #
+ # 2 Oct 2002, Nickolay Samofatov - Major cleanup
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC
-fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin
+-OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
+common_fla...@cflags@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC
-fmessage-length=0
+OPTIMIZE_FLAGS=-fno-omit-frame-pointer
WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas
-Wno-unused-variable
@@ -101,21 +101,21 @@
OS_ServerFiles=inet_server.cpp
---- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_powerpc.orig
2007-05-03 13:24:50.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_powerpc 2010-08-29
11:01:16.790816591 +0200
+--- Firebird-2.5.0.26074-0/builds/posix/prefix.linux_powerpc.orig
2010-09-08 10:41:23.000000000 +0200
++++ Firebird-2.5.0.26074-0/builds/posix/prefix.linux_powerpc 2010-10-28
09:02:24.423734339 +0200
@@ -18,9 +18,12 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
-PROD_FLAGS=-ggdb -fno-omit-frame-pointer -fsigned-char -DNDEBUG -DLINUX -pipe
-MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3 -mcpu=powerpc
--DEV_FLAGS=-ggdb -O0 -DVIO_DEBUG -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch
-Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
-fsigned-char -DLINUX -DPowerPC -DPPC
+-DEV_FLAGS=-ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch
-Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
-fsigned-char -DLINUX -DPowerPC -DPPC
-#DEV_FLAGS=-DUSE_VALGRIND -ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall
-Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
-fmessage-length=0 -DLINUX -DPowerPC -DPPC
+common_fla...@cflags@ -DLINUX -DPowerPC -DPPC -fsigned-char -pipe -MMD -fPIC
-fmessage-length=0
+OPTIMIZE_FLAGS=-fno-omit-frame-pointer
+WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas
-Wno-unused-variable
+
+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+DEV_FLAGS=-DVIO_DEBUG -p $(COMMON_FLAGS) $(WARN_FLAGS)
++DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
OS_ServerFiles=inet_server.cpp
================================================================
Index: packages/Firebird/Firebird-rpath.patch
diff -u packages/Firebird/Firebird-rpath.patch:1.1
packages/Firebird/Firebird-rpath.patch:1.2
--- packages/Firebird/Firebird-rpath.patch:1.1 Sun Aug 29 20:16:59 2010
+++ packages/Firebird/Firebird-rpath.patch Fri Oct 29 19:21:07 2010
@@ -1,86 +1,11 @@
---- Firebird-2.1.3.18185-0/builds/posix/make.defaults.orig 2010-08-29
11:10:54.542824134 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/make.defaults 2010-08-29
12:30:20.570823295 +0200
-@@ -254,7 +254,7 @@
- ifneq ($(IsProdTypeBuild),Y)
- UNDEF_FLAGS = $(UNDEF_PLATFORM)
- endif
--LINK_OPTS = $(LDFLAGS) $(UNDEF_FLAGS)
$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib
$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/intl
-+LINK_OPTS = $(LDFLAGS) $(UNDEF_FLAGS)
- LIB_LINK_OPTIONS = $(LDFLAGS) $(UNDEF_FLAGS) -shared
-
- LIB_LINK_RPATH = -Wl,-rpath,
---- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.extlib.orig
2007-08-14 13:06:35.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.extlib 2010-08-29
13:57:29.034820781 +0200
-@@ -82,7 +82,7 @@ ifeq ($(PLATFORM),DARWIN)
- -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- else
- $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)ib_udf.$(SHRLIB_EXT) \
--$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ @PTHREAD_CFLAGS@
@PTHREAD_LIBS@
-+ -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- endif
- # ib_util
- # this is plain-C library, therefore CLIENTLIB_LINK
-@@ -96,7 +96,7 @@ ifeq ($(PLATFORM),DARWIN)
- -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- else
- $(CLIENTLIB_LINK) $(LIB_LINK_OPTIONS)
$(LIB_LINK_SONAME)$(IbUtilLibraryName) \
--$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ @PTHREAD_CFLAGS@
@PTHREAD_LIBS@
-+ -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- endif
-
- include $(ROOT)/gen/make.shared.targets
---- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbclient.orig
2007-08-14 13:06:35.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbclient
2010-08-29 13:58:09.594823295 +0200
-@@ -116,7 +116,7 @@ $(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SO
- -o $@ $^ $(SO_LINK_LIBS) $(STATIC_CXXSUPPORT_LIB) @PTHREAD_CFLAGS@
@PTHREAD_LIBS@
- else
- $(CLIENTLIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS)
$(LIB_LINK_IMPLIB) \
--$(LIB_LINK_SONAME)$(ClientLibraryNameMajor)
$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib \
-+ $(LIB_LINK_SONAME)$(ClientLibraryNameMajor) \
- -o $@ $^ $(SO_LINK_LIBS) $(STATIC_CXXSUPPORT_LIB) @PTHREAD_CFLAGS@
@PTHREAD_LIBS@
- endif
-
---- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbembed.orig
2007-06-11 16:21:17.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.libfbembed 2010-08-29
13:58:32.394816591 +0200
-@@ -68,7 +68,7 @@ $(LIB_EMBED_LINK_OPTIONS) $(LIB_LINK_SON
- -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
- else
- $(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS)
$(LIB_LINK_SONAME)$(SharedLibrarySoName) \
--$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ -L$(LIB) $(LIB_GUI)
$(SO_LINK_LIBS) $(ICU_LIBS)
-+ -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
- endif
- $(LIBFBEMBED_SOBASENAME): $(LIBFBEMBED_SO)
- (cd $(LIB) && $(LN) -f $(SharedLibraryName) $(SharedLibrarySoName) )
---- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.embed.fbudf.orig
2007-03-11 04:52:15.000000000 +0100
-+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.embed.fbudf
2010-08-29 19:06:58.122816591 +0200
-@@ -74,7 +74,7 @@
- -lm -o $@ $^
- else
- $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) \
--$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -lm -o $@ $^
-+ -lm -o $@ $^
- endif
-
-
---- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.client.fbudf.orig
2007-03-09 11:32:47.000000000 +0100
-+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.client.fbudf
2010-08-29 19:06:42.678823295 +0200
-@@ -88,7 +88,7 @@
- -L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- else
- $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) \
--$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -L$(LIB) -lm -o $@ $^
@PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-+ -L$(LIB) -lm -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- endif
-
-
---- Firebird-2.1.3.18185-0/builds/posix/Makefile.in.intl.orig 2007-05-11
08:40:19.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/Makefile.in.intl 2010-08-29
19:04:33.874816591 +0200
-@@ -89,7 +89,7 @@
- -o $@ $^ $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- else
- $(LIB_LINK) $(LINK_FBINTL_SYMBOLS) $(LIB_LINK_OPTIONS)
$(LIB_LINK_SONAME)libintl.$(SHRLIB_EXT).1 \
--$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ -L$(LIB) $(ICU_LIBS)
$(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-+ -o $@ $^ -L$(LIB) $(ICU_LIBS) $(SO_LINK_LIBS) @PTHREAD_CFLAGS@
@PTHREAD_LIBS@
- endif
-
- include $(ROOT)/gen/make.shared.targets
+--- Firebird-2.5.0.26074-0/builds/posix/make.defaults.orig 2010-10-28
09:05:38.000000000 +0200
++++ Firebird-2.5.0.26074-0/builds/posix/make.defaults 2010-10-28
09:17:10.475739367 +0200
+@@ -259,7 +259,7 @@
+ else
+ LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$$$ORIGIN/../$(1)')
+ endif
+-LIB_PATH_OPTS = $(call LIB_LINK_RPATH,lib) $(call LIB_LINK_RPATH,intl)
++LIB_PATH_OPTS =
+ LIB_LINK_SONAME= -Wl,-soname,$(1)
+ LIB_LINK_MAPFILE= -Wl,--version-script,
+ FBEMBED_LINK= -L$(LIB) -lfbembed
================================================================
Index: packages/Firebird/Firebird.spec
diff -u packages/Firebird/Firebird.spec:1.77
packages/Firebird/Firebird.spec:1.78
--- packages/Firebird/Firebird.spec:1.77 Sun Aug 29 20:16:59 2010
+++ packages/Firebird/Firebird.spec Fri Oct 29 19:21:07 2010
@@ -14,14 +14,14 @@
Summary(pl.UTF-8): Firebird - serwer baz danych SQL oraz narzędzia
klienckie
Name: Firebird
# FirebirdCS/FirebirdSS (Classic Server/Super Server)?
-Version: 2.1.3.18185
-Release: 3
+Version: 2.5.0.26074
+Release: 1
License: Interbase Public License 1.0, Initial Developer's Public
License 1.0
Group: Applications/Databases
Source0:
http://downloads.sourceforge.net/firebird/%{name}-%{version}-0.tar.bz2
-# Source0-md5: ec42bd5c85dc2f65baef185228bcc5ca
-Source1: http://www.firebirdsql.org/pdfmanual/%{name}-2.1-QuickStart.pdf
-# Source1-md5: 46bb1af4b94e8c8acee1d6ef2055b2d3
+# Source0-md5: 780f162ee71f087fc277adf09f966529
+Source1: http://www.firebirdsql.org/pdfmanual/%{name}-2.5-QuickStart.pdf
+# Source1-md5: a7776f1eae45ba0b2543c203cd5271ae
# distfiles refuses this, would require some audit to allow '('/')' chars
#Source2: http://www.firebirdsql.org/pdfmanual/Using-Firebird_(wip).pdf
## Source2-md5: 9eb90583c200bdd7292a80ecc1df1178
@@ -52,10 +52,12 @@
Patch7: %{name}-btyacc-segv.patch
Patch8: %{name}-opt.patch
Patch9: %{name}-rpath.patch
+Patch10: %{name}-noroot.patch
URL: http://www.firebirdsql.org/
BuildRequires: autoconf >= 2.56
BuildRequires: automake
BuildRequires: bison
+BuildRequires: libatomic_ops
BuildRequires: libedit-devel
BuildRequires: libicu-devel
BuildRequires: libstdc++-devel
@@ -172,11 +174,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-
-%{__sed} -i 's,@prefix@,%{_prefix},' builds/install/misc/fb_config.in
-
-# force rebuild
-rm -f src/dsql/parse.cpp
+%patch10 -p1
mkdir docs
cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
%{SOURCE8} %{SOURCE9} docs
@@ -192,6 +190,10 @@
%configure \
--with-editline \
+ --with-fbconf=%{_sysconfdir}/firebird \
+ --with-fblib=%{_libdir} \
+ --with-fblog=/var/log \
+ --with-fbsecure-db=/var/lib/firebird \
--with-gnu-ld \
--with-gpre-pascal \
--with-system-editline \
@@ -216,15 +218,16 @@
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
install gen/firebird/lib/libfb*.a $RPM_BUILD_ROOT%{_libdir}
-install gen/firebird/lib/libfbembed.so* $RPM_BUILD_ROOT%{_libdir}
touch $RPM_BUILD_ROOT/var/log/firebird.log
-cd gen/buildroot/%{ibdir}
-install security2.fdb $RPM_BUILD_ROOT/var/lib/firebird
-install *.conf $RPM_BUILD_ROOT%{_sysconfdir}/firebird
+cd gen/buildroot
+install var/lib/firebird/security2.fdb $RPM_BUILD_ROOT/var/lib/firebird
+install etc/firebird/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/firebird
+cp -df usr/lib/*.so* $RPM_BUILD_ROOT%{_libdir}
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Firebird/Firebird-64bit.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Firebird/Firebird-FHS.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Firebird/Firebird-editline.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Firebird/Firebird-gcc-icu.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Firebird/Firebird-morearchs.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Firebird/Firebird-opt.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Firebird/Firebird-rpath.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Firebird/Firebird.spec?r1=1.77&r2=1.78&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
