[packages/Firebird] - started update to 3.0.0 (2.5.x left on Firebird-2.5 branch) - updated editline,va,chmod,FHS,opt,no
qboosh
qboosh at pld-linux.org
Sat Sep 3 07:49:17 CEST 2016
commit d8c389bc169fdc4de041c6cc74b3665e6960a0c7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Sep 3 07:50:34 2016 +0200
- started update to 3.0.0 (2.5.x left on Firebird-2.5 branch)
- updated editline,va,chmod,FHS,opt,noroot patches
- removed rpath patch (use configure option instead)
- added libadd patch (place Firebird runtime as first LD_LIBRARY_PATH component)
- adjusted init script and inetd config (not tested yet)
Firebird-FHS.patch | 51 +++-----------
Firebird-chmod.patch | 47 -------------
Firebird-editline.patch | 4 +-
Firebird-libpath.patch | 11 +++
Firebird-noroot.patch | 129 ++---------------------------------
Firebird-opt.patch | 174 ++++++++++++++++++++++++++++--------------------
Firebird-rpath.patch | 11 ---
Firebird-va.patch | 4 +-
Firebird.spec | 97 ++++++++++++---------------
firebird.inetd | 2 +-
firebird.init | 7 +-
11 files changed, 182 insertions(+), 355 deletions(-)
---
diff --git a/Firebird.spec b/Firebird.spec
index 9cea09e..eddf9b7 100644
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -1,4 +1,8 @@
# TODO:
+# - check running
+# - 2.5 -> 3.0 migration?
+# - systemd support (see builds/install/arch-specific/linux : gen/install/misc/*)
+# - more docs from http://www.firebirdsql.org/en/reference-manuals/ ?
# - kill unaligned accesses (create_db,gpre_current,gbak_static,isql_static) on alpha
# - check if it's fixed now (RISC_ALIGNMENT is defined)
# - create classic server/super server subpackages and drop bcond
@@ -13,14 +17,14 @@ Summary(de.UTF-8): Firebird - relationalen Open-Source- Datenbankmanagementsyste
Summary(pl.UTF-8): Firebird - serwer baz danych SQL oraz narzędzia klienckie
Name: Firebird
# FirebirdCS/FirebirdSS (Classic Server/Super Server)?
-Version: 2.5.6.27020
-Release: 1
+Version: 3.0.0.32483
+Release: 0.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: 5514798d5dca8c3525525c61cf35283e
-Source1: http://www.firebirdsql.org/pdfmanual/%{name}-2.5-QuickStart.pdf
-# Source1-md5: a7776f1eae45ba0b2543c203cd5271ae
+# Source0-md5: 821260b61dafc22899d1464d4e91ee6a
+Source1: http://www.firebirdsql.org/file/documentation/reference_manuals/user_manuals/Firebird-3-QuickStart.pdf
+# Source1-md5: 8e029d449e9cb3e1da8213ac6c11ad02
# distfiles refuses this, would require some audit to allow '('/')' chars
#Source2: http://www.firebirdsql.org/pdfmanual/Using-Firebird_(wip).pdf
## Source2-md5: 9eb90583c200bdd7292a80ecc1df1178
@@ -47,19 +51,21 @@ Patch2: %{name}-va.patch
Patch3: %{name}-FHS.patch
Patch4: %{name}-opt.patch
Patch5: %{name}-gcc-icu.patch
-Patch6: %{name}-rpath.patch
+Patch6: %{name}-libpath.patch
Patch7: %{name}-noroot.patch
URL: http://www.firebirdsql.org/
-BuildRequires: autoconf >= 2.56
+BuildRequires: autoconf >= 2.67
BuildRequires: automake
BuildRequires: bison
BuildRequires: libatomic_ops
BuildRequires: libedit-devel
BuildRequires: libicu-devel
BuildRequires: libstdc++-devel
-BuildRequires: libtool
+BuildRequires: libtommath-devel
+BuildRequires: libtool >= 2:2
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
+BuildRequires: zlib-devel
Requires: %{name}-dirs = %{version}-%{release}
Requires: %{name}-lib = %{version}-%{release}
%if %{with ss}
@@ -128,6 +134,7 @@ Group: Development/Libraries
Requires: %{name}-dirs = %{version}-%{release}
Requires: %{name}-lib = %{version}-%{release}
Requires: libstdc++-devel
+Obsoletes: Firebird-static
%description devel
Header files for Firebird library.
@@ -135,18 +142,6 @@ Header files for Firebird library.
%description devel -l pl.UTF-8
Pliki nagłówkowe biblioteki Firebird.
-%package static
-Summary: Static Firebird library
-Summary(pl.UTF-8): Statyczna biblioteka Firebird
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Static Firebird library (libgds).
-
-%description static -l pl.UTF-8
-Statyczna biblioteka Firebird (libgds).
-
%package doc
Summary: Extensive InterBase and Firebird documentation
Summary(pl.UTF-8): Obszerna dokumentacja do baz InterBase i Firebird
@@ -182,18 +177,20 @@ cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8}
%{__autoconf}
%configure \
+ --prefix=%{ibdir} \
--with-editline \
--with-fbconf=%{_sysconfdir}/firebird \
+ --with-fbinclude=%{_includedir} \
--with-fblib=%{_libdir} \
--with-fblog=/var/log \
--with-fbsecure-db=/var/lib/firebird \
+ --with-fbglock=/var/lib/firebird \
--with-gnu-ld \
--with-gpre-pascal \
--with-system-editline \
- --with-system-icu \
+ %{?debug:--enable-debug} \
+ --disable-rpath \
%{?with_ss:--enable-superserver} \
- --prefix=%{ibdir} \
- %{?debug:--enable-debug}
%{__make} -j1
@@ -207,33 +204,31 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{ibdir},%{_libdir},%{_includedir}} \
install -d $RPM_BUILD_ROOT/var/{log,lib/firebird} \
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-install gen/firebird/lib/libfb*.a $RPM_BUILD_ROOT%{_libdir}
touch $RPM_BUILD_ROOT/var/log/firebird.log
cd gen/buildroot
-install var/lib/firebird/security2.fdb $RPM_BUILD_ROOT/var/lib/firebird
+install var/lib/firebird/security3.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}
+chmod 755 usr/include/firebird/impl
+cp -pr usr/include/* $RPM_BUILD_ROOT%{_includedir}
+cp -dp usr/%{_lib}/*.so* $RPM_BUILD_ROOT%{_libdir}
cd .%{ibdir}
-install include/* $RPM_BUILD_ROOT%{_includedir}
-cp -af UDF bin help intl plugins firebird.msg de_DE.msg fr_FR.msg $RPM_BUILD_ROOT%{ibdir}
+cp -a UDF bin help intl plugins firebird.msg $RPM_BUILD_ROOT%{ibdir}
ln -s %{ibdir}/intl $RPM_BUILD_ROOT%{_sysconfdir}/firebird
-chmod 755 examples examples/{api,dyn,include,stat,udf} # allow further cleaning
+chmod u+w -R examples # allow further cleaning
cp -rf examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-# or libfbembed?
ln -sf libfbclient.so.2 $RPM_BUILD_ROOT%{_libdir}/libgds.so.0
ln -sf libfbclient.so.2 $RPM_BUILD_ROOT%{_libdir}/libgds.so
-ln -sf libfbstatic.a $RPM_BUILD_ROOT%{_libdir}/libgds.a
-
-for f in bin/{fb_lock_print,gbak,gdef,gfix,gpre,gsec,gsplit,gstat,nbackup}; do
+for f in bin/{fb_lock_print,gbak,gfix,gpre,gsec,gsplit,gstat,nbackup}; do
ln -sf %{ibdir}/$f $RPM_BUILD_ROOT%{_bindir}/${f#bin/}
done
%if %{with ss}
install %{SOURCE100} $RPM_BUILD_ROOT/etc/rc.d/init.d/firebird
install %{SOURCE101} $RPM_BUILD_ROOT/etc/sysconfig/firebird
+install -d $RPM_BUILD_ROOT/var/run/firebird
%else
sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE102} >$RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/firebird
%endif
@@ -267,27 +262,21 @@ fi
%postun lib -p /sbin/ldconfig
%triggerpostun -- %{name} < 2.1.1.17910-2
-if [ -f %{ibdir}/aliases.conf.rpmsave ]; then
- mv -f %{ibdir}/aliases.conf.rpmsave %{_sysconfdir}/firebird/aliases.conf
-fi
if [ -f %{ibdir}/firebird.conf.rpmsave ]; then
mv -f %{ibdir}/firebird.conf.rpmsave %{_sysconfdir}/firebird/firebird.conf
fi
-if [ -f %{ibdir}/security2.fdb.rpmsave ]; then
- mv -f %{ibdir}/security2.fdb.rpmsave /var/lib/firebird/security2.fdb
-fi
%files
%defattr(644,root,root,755)
%doc doc/{license,sql.extensions,Firebird_conf.txt,README.user*,WhatsNew,fb2-todo.txt}
%dir %{_sysconfdir}/firebird
-%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/aliases.conf
+%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/databases.conf
%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/fbtrace.conf
%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/firebird.conf
+%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/plugins.conf
%{_sysconfdir}/firebird/intl
%attr(755,root,root) %{_bindir}/fb_lock_print
%attr(755,root,root) %{_bindir}/gbak
-%attr(755,root,root) %{_bindir}/gdef
%attr(755,root,root) %{_bindir}/gfix
%attr(755,root,root) %{_bindir}/gpre
%attr(755,root,root) %{_bindir}/gsec
@@ -305,16 +294,26 @@ fi
%{ibdir}/intl/fbintl.conf
%dir %{ibdir}/plugins
%attr(755,root,root) %{ibdir}/plugins/libfbtrace.so
+%attr(755,root,root) %{ibdir}/plugins/libCryptKeyHolder_example.so
+%attr(755,root,root) %{ibdir}/plugins/libDbCrypt_example.so
+%attr(755,root,root) %{ibdir}/plugins/libEngine12.so
+%attr(755,root,root) %{ibdir}/plugins/libLegacy_Auth.so
+%attr(755,root,root) %{ibdir}/plugins/libLegacy_UserManager.so
+%attr(755,root,root) %{ibdir}/plugins/libSrp.so
+%attr(755,root,root) %{ibdir}/plugins/libudr_engine.so
+%dir %{ibdir}/plugins/udr
+%attr(755,root,root) %{ibdir}/plugins/udr/libudrcpp_example.so
+%{ibdir}/plugins/udr_engine.conf
+
%{ibdir}/firebird.msg
-%lang(de) %{ibdir}/de_DE.msg
-%lang(fr) %{ibdir}/fr_FR.msg
%dir %attr(770,root,firebird) /var/lib/firebird
-%attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/lib/firebird/security2.fdb
+%attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/lib/firebird/security3.fdb
%attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/log/firebird.log
%if %{with ss}
%attr(754,root,root) /etc/rc.d/init.d/firebird
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/firebird
+%attr(770,root,firebird) /var/run/firebird
%else
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/firebird
%endif
@@ -328,8 +327,6 @@ fi
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libfbclient.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libfbclient.so.2
-%attr(755,root,root) %{_libdir}/libfbembed.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfbembed.so.2.5
# InterBase/old Firebird compatibility symlinks
%attr(755,root,root) %{_libdir}/libgds.so.0
@@ -340,20 +337,14 @@ fi
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libfbclient.so
-%attr(755,root,root) %{_libdir}/libfbembed.so
%attr(755,root,root) %{ibdir}/bin/fb_config
+%{_includedir}/firebird
%{_includedir}/ib_util.h
%{_includedir}/ibase.h
%{_includedir}/iberror.h
%{_includedir}/perf.h
%{_examplesdir}/%{name}-%{version}
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libfbstatic.a
-# compat link
-%{_libdir}/libgds.a
-
%files doc
%defattr(644,root,root,755)
%doc docs/*
diff --git a/Firebird-FHS.patch b/Firebird-FHS.patch
index e00078c..7e7a938 100644
--- a/Firebird-FHS.patch
+++ b/Firebird-FHS.patch
@@ -1,40 +1,11 @@
---- Firebird-2.5.4.26856-0/src/jrd/gds.cpp.orig 2015-05-29 20:19:05.329013419 +0200
-+++ Firebird-2.5.4.26856-0/src/jrd/gds.cpp 2015-05-29 20:33:36.775643514 +0200
-@@ -1754,7 +1754,13 @@
-
- GDS_init_prefix();
-
-- 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)
-+ strcpy(string, lockdir);
-+ else
-+ strcpy(string, fb_prefix_lock); // safe - no BO
-+
- iscSafeConcatPath(string, root);
- }
-
---- 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();
-- config_file = root_dir + string(CONFIG_FILE);
-+ config_file = "/etc/firebird/" + string(CONFIG_FILE);
- }
-
- 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
-@@ -272,7 +272,7 @@
- rs = "can not quit now, use shut -ign";
- break;
- case MSG_STARTERR:
-- rs = "check $FIREBIRD/firebird.log file for errors";
-+ rs = "check /var/log/firebird.log file for errors";
- break;
- case MSG_STARTFAIL:
- rs = "can not start server";
+--- Firebird-3.0.0.32483-0/src/yvalve/gds.cpp.orig 2016-08-30 21:31:23.418702669 +0200
++++ Firebird-3.0.0.32483-0/src/yvalve/gds.cpp 2016-08-31 20:24:57.044428320 +0200
+@@ -3785,7 +3785,7 @@
+ if (!fb_utils::readenv(FB_LOCK_ENV, lockPrefix))
+ {
+ #ifndef WIN_NT
+- PathUtils::concatPath(lockPrefix, WORKFILE, LOCKDIR);
++ PathUtils::concatPath(lockPrefix, "/var/lib", LOCKDIR);
+ #else
+ #ifdef WIN9X_SUPPORT
+ // shell32.dll version 5.0 and later supports SHGetFolderPath entry point
diff --git a/Firebird-chmod.patch b/Firebird-chmod.patch
index 1cec1f6..5b6fb83 100644
--- a/Firebird-chmod.patch
+++ b/Firebird-chmod.patch
@@ -1,50 +1,3 @@
---- 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
-@@ -69,7 +69,7 @@
- -$(RM) $@
- $(BIN)/create_db $@
- $(TOUCH) $@
-- $(CHMOD) 444 $@
-+ $(CHMOD) 644 $@
-
- # Ok so Jim had/has a sailing theme, and the sample database that a lot
- # of .epp files require to compile is yachts.lnk. MOD 05-Aug-2002
-@@ -93,7 +93,7 @@
- $(RM) -f msg.fdb
- echo create database \'msg.fdb\'\; | $(ISQL_STATIC)
- for sn in $(MSG_FILES); do (echo $$sn; $(ISQL_STATIC) -i $$sn msg.fdb) || exit; done
--# $(CHMOD) 444 msg.fdb
-+# $(CHMOD) 644 msg.fdb
- $(TOUCH) $@
-
- help.fdb: $(FIREBIRD)/help/help.fdb
-@@ -103,7 +103,7 @@
- $(FIREBIRD)/help/help.fdb: $(BLD_ROOT)/misc/help.gbak
- $(BIN)/gbak_static -MODE read_only -R $< $@
- $(TOUCH) $@
-- $(CHMOD) 444 $@
-+ $(CHMOD) 644 $@
-
- $(FIREBIRD)/security2.fdb: security2.fdb
- $(RM) -f $@
-@@ -118,7 +118,7 @@
- metadata.fdb: $(BLD_ROOT)/misc/metadata.gbak
- $(BIN)/gbak_static -MODE read_only -R $< $@
- $(TOUCH) $@
-- $(CHMOD) 444 $@
-+ $(CHMOD) 644 $@
-
- # An alternative metadata creation method, this one is actually preferred
- # since it ensures the data is valid.
-@@ -126,7 +126,7 @@
- metadata.fdb.x: $(SRC_ROOT)/misc/metadata.sql
- $(BIN)/isql -i $<
- $(TOUCH) $@
-- $(CHMOD) 444 $@
-+ $(CHMOD) 644 $@
-
-
- FORCE:
--- 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 @@
diff --git a/Firebird-editline.patch b/Firebird-editline.patch
index 6078bb3..95906c3 100644
--- a/Firebird-editline.patch
+++ b/Firebird-editline.patch
@@ -1,5 +1,5 @@
---- 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
+--- Firebird-3.0.0.32483-0/configure.ac.orig 2010-09-08 10:44:05.000000000 +0200
++++ Firebird-3.0.0.32483-0/configure.ac 2010-10-27 22:32:38.567739367 +0200
@@ -652,10 +652,10 @@
AC_SEARCH_LIBS(dlopen, dl)
AC_CHECK_LIB(m, main)
diff --git a/Firebird-libpath.patch b/Firebird-libpath.patch
new file mode 100644
index 0000000..e2c6a61
--- /dev/null
+++ b/Firebird-libpath.patch
@@ -0,0 +1,11 @@
+--- Firebird-3.0.0.32483-0/builds/posix/Makefile.in.orig 2016-04-14 16:07:29.000000000 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/Makefile.in 2016-09-01 21:59:46.720043484 +0200
+@@ -315,7 +315,7 @@
+
+ databases: yachts.lnk msg.timestamp $(HELP_FDB) $(SECURITY_FDB)
+
+-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(FIREBIRD)/lib
++export LD_LIBRARY_PATH := $(FIREBIRD)/lib:$(LD_LIBRARY_PATH)
+
+ yachts.lnk: metadata.fdb
+ -$(RM) $@
diff --git a/Firebird-noroot.patch b/Firebird-noroot.patch
index e6e5e86..afbd4ad 100644
--- a/Firebird-noroot.patch
+++ b/Firebird-noroot.patch
@@ -1,7 +1,7 @@
---- Firebird-2.5.2.26540-0/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in.orig 2013-03-19 09:37:35.000000000 +0100
-+++ Firebird-2.5.2.26540-0/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in 2013-04-13 13:31:09.763259410 +0200
+--- Firebird-3.0.0.32483-0/builds/install/arch-specific/linux/makeInstallImage.sh.in.orig 2016-04-14 16:07:29.000000000 +0200
++++ Firebird-3.0.0.32483-0/builds/install/arch-specific/linux/makeInstallImage.sh.in 2016-08-31 21:15:58.897726690 +0200
@@ -28,11 +28,6 @@
- # This script builds an image of the installed system into
+ # This script builds an image of the installed system into
# the gen/buildroot directory.
-if [ "`whoami`" != "root" ]; then
@@ -11,125 +11,4 @@
-
# Making an assumption that this program is being run in the gen directory
BuildRootDir=..
- BuiltFBDir=./firebird # Where the just build fb exists.
-@@ -118,7 +113,6 @@
- for d in $Dirs; do
- Dir=${TargetDir}${d}
- mkdir -p $Dir
-- chown root:root $Dir
- chmod 0755 $Dir
- done
- }
-@@ -163,7 +157,6 @@
- cp $BuiltFBDir/bin/isql ${TargetDir}@FB_BINDIR@/isql
- cp $BuiltFBDir/bin/qli ${TargetDir}@FB_BINDIR@/qli
-
-- chown root:root ${TargetDir}@FB_BINDIR@/*
- chmod 0755 ${TargetDir}@FB_BINDIR@/*
-
- #sbin
-@@ -182,7 +175,6 @@
- cp $BuiltFBDir/bin/createAliasDB.sh ${TargetDir}@FB_SBINDIR@
- cp $BuiltFBDir/bin/fb_config ${TargetDir}@FB_SBINDIR@
-
-- chown root:root ${TargetDir}@FB_SBINDIR@/*
- chmod 0755 ${TargetDir}@FB_SBINDIR@/*
- chmod 0700 ${TargetDir}@FB_SBINDIR@/*.sh
-
-@@ -206,19 +198,16 @@
-
- for i in `find ${TargetDir}@FB_SAMPLEDIR@ -type d -print`
- do
-- chown root:root $i
- chmod 0555 $i
- done
- for i in `find ${TargetDir}@FB_SAMPLEDIR@ -type f -print`
- do
-- chown root:root $i
- chmod 0444 $i
- done
-
- makeDirs @FB_SAMPLEDBDIR@
- cp $BuiltFBDir/examples/empbuild/*.fdb ${TargetDir}@FB_SAMPLEDBDIR@
-
-- chown root:root ${TargetDir}@FB_SAMPLEDBDIR@/*.fdb
- chmod 0444 ${TargetDir}@FB_SAMPLEDBDIR@/*.fdb
- fi
-
-@@ -226,13 +215,11 @@
- copyIfExists $BuiltFBDir/help/help.gbak ${TargetDir}@FB_HELPDIR@
- cp $BuiltFBDir/help/help.fdb ${TargetDir}@FB_HELPDIR@
-
-- chown root:root ${TargetDir}@FB_HELPDIR@/*.fdb
- chmod 0444 ${TargetDir}@FB_HELPDIR@/*.fdb
-
- #message file
- cp $BuiltFBDir/*.msg ${TargetDir}@FB_MSGDIR@
-
-- chown root:root ${TargetDir}@FB_MSGDIR@/*.msg
- chmod 0444 ${TargetDir}@FB_MSGDIR@/*.msg
-
- #secureDB (access rights will be set at install time)
-@@ -241,7 +228,6 @@
- #.h files
- cp $BuiltFBDir/include/*.h ${TargetDir}@FB_INCDIR@
-
-- chown root:root ${TargetDir}@FB_INCDIR@/*.h
- chmod 0444 ${TargetDir}@FB_INCDIR@/*.h
-
- #lib
-@@ -250,20 +236,17 @@
- cp -f $BuiltFBDir/lib/libib_util.so ${TargetDir}@FB_LIBDIR@/libib_util.so
- copyIfExists $BuiltFBDir/lib/libicu*.so* ${TargetDir}@FB_LIBDIR@
-
-- chown root:root ${TargetDir}@FB_LIBDIR@/*.so*
- chmod 0755 ${TargetDir}@FB_LIBDIR@/*.so*
-
- #plugins
- cp -df $BuiltFBDir/plugins/* ${TargetDir}@FB_PLUGDIR@
-
-- chown root:root ${TargetDir}@FB_PLUGDIR@/*.so*
- chmod 0755 ${TargetDir}@FB_PLUGDIR@/*.so*
-
- #intl
- cp $BuiltFBDir/intl/libfbintl.so ${TargetDir}@FB_INTLDIR@/fbintl
- cp $BuildRootDir/gen/install/misc/fbintl.conf ${TargetDir}@FB_INTLDIR@
-
-- chown root:root ${TargetDir}@FB_INTLDIR@/fbintl*
- chmod 0755 ${TargetDir}@FB_INTLDIR@/fbintl
- chmod 0644 ${TargetDir}@FB_INTLDIR@/fbintl.conf
-
-@@ -276,7 +259,6 @@
- cp $BuildRootDir/src/extlib/ib_udf2.sql ${TargetDir}@FB_UDFDIR@
- cp $BuildRootDir/src/extlib/fbudf/fbudf.sql ${TargetDir}@FB_UDFDIR@
-
-- chown root:root ${TargetDir}@FB_UDFDIR@/*.so ${TargetDir}@FB_UDFDIR@/*.sql
- chmod 0755 ${TargetDir}@FB_UDFDIR@/*.so
- chmod 0644 ${TargetDir}@FB_UDFDIR@/*.sql
-
-@@ -287,9 +269,7 @@
- cp $BuildRootDir/doc/WhatsNew ${TargetDir}@FB_CONFDIR@/WhatsNew
- cp $BuildRootDir/doc/README.user ${TargetDir}@FB_CONFDIR@/README
-
-- chown -R root:root ${TargetDir}@FB_MISCDIR@
- for i in `find ${TargetDir}@FB_MISCDIR@ -print`; do
-- chown root:root $i
- if [ -d $i ]; then
- chmod 0755 $i
- else
-@@ -306,7 +286,6 @@
- cp $BuildRootDir/gen/install/misc/firebird.init.d.* ${TargetDir}@FB_MISCDIR@
- cp $BuildRootDir/gen/install/misc/rc.config.firebird ${TargetDir}@FB_MISCDIR@
-
-- chown -R root:root ${TargetDir}@FB_MISCDIR@
- chmod -R go-rwx ${TargetDir}@FB_MISCDIR@
-
- #conf
-@@ -314,7 +293,6 @@
- cp $BuildRootDir/gen/install/misc/aliases.conf ${TargetDir}@FB_CONFDIR@
- cp $BuildRootDir/gen/install/misc/fbtrace.conf ${TargetDir}@FB_CONFDIR@
-
-- chown root:root ${TargetDir}@FB_CONFDIR@/*.conf
- chmod 0644 ${TargetDir}@FB_CONFDIR@/*.conf
-
- #license
+ BuiltFBDir=Release/firebird # Where the just build fb exists.
diff --git a/Firebird-opt.patch b/Firebird-opt.patch
index 664329a..a68d955 100644
--- a/Firebird-opt.patch
+++ b/Firebird-opt.patch
@@ -1,5 +1,5 @@
---- Firebird-2.5.1.26351-0/builds/posix/prefix.linux.orig 2011-08-12 09:28:48.000000000 +0200
-+++ Firebird-2.5.1.26351-0/builds/posix/prefix.linux 2012-09-19 19:29:07.407450640 +0200
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux.orig 2016-08-31 20:27:07.834426824 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux 2016-08-31 20:30:34.847757793 +0200
@@ -18,8 +18,8 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
@@ -8,11 +8,11 @@
-OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
+COMMON_FLAGS=@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
+ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing
- PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
---- Firebird-2.5.1.26351-0/builds/posix/prefix.linux_amd64.orig 2011-08-12 09:28:48.000000000 +0200
-+++ Firebird-2.5.1.26351-0/builds/posix/prefix.linux_amd64 2012-09-19 19:29:42.140783248 +0200
+ PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_amd64.orig 2016-08-31 20:27:07.834426824 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_amd64 2016-08-31 20:38:55.474418743 +0200
@@ -18,8 +18,8 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
@@ -21,46 +21,56 @@
-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -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
- CXXFLAGS:= $(CXXFLAGS) -fno-rtti
+ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-invalid-offsetof -Wno-narrowing -Wno-unused-local-typedefs
---- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_arm.orig 2008-04-15 16:11:33.000000000 +0200
-+++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_arm 2010-08-29 10:50:20.766823295 +0200
-@@ -23,11 +23,11 @@
+ PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_arm.orig 2016-08-31 20:27:07.857760158 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_arm 2016-08-31 20:40:23.017751079 +0200
+@@ -20,8 +20,8 @@
#LD=@CXX@
--#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DNDEBUG -DLINUX -pipe -MMD -fPIC
+-#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
-#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
+-
+-PROD_FLAGS=-O3 -DLINUX -DARM -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
+-DEV_FLAGS=-ggdb -DLINUX -DARM -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
+COMMON_FLAGS=@CFLAGS@ -DLINUX -DARM -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
+OPTIMIZE_FLAGS=
++
++PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++DEV_FLAGS=$(COMMON_FLAGS) -Wno-non-virtual-dtor
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_arm64.orig 2016-04-14 16:07:29.000000000 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_arm64 2016-08-31 21:08:27.381065178 +0200
+@@ -20,8 +20,8 @@
--PROD_FLAGS=-O3 -DNDEBUG -DLINUX -DARM -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
--DEV_FLAGS=-ggdb -DLINUX -DARM -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0
-+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+DEV_FLAGS=$(COMMON_FLAGS) -Wall
+ #LD=@CXX@
- OS_ServerFiles=inet_server.cpp
+-#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
+-#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
++COMMON_FLAGS=@CFLAGS@ -DLINUX -DARM64 -pipe -MMD -fPIC -fsigned-char -fmessage-length=0
++OPTIMIZE_FLAGS=
---- Firebird-2.5.4.26856-0/builds/posix/prefix.linux_generic.orig 2015-05-29 20:34:21.678974963 +0200
-+++ Firebird-2.5.4.26856-0/builds/posix/prefix.linux_generic 2015-05-29 20:50:50.918933450 +0200
-@@ -18,10 +18,11 @@
+-PROD_FLAGS=-O3 -DLINUX -DARM64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
+-DEV_FLAGS=-ggdb -DLINUX -DARM64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
++PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++DEV_FLAGS=$(COMMON_FLAGS) -Wall -Wno-non-virtual-dtor
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_generic.orig 2016-08-31 20:27:07.857760158 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_generic 2016-08-31 20:52:54.584409169 +0200
+@@ -18,7 +18,8 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
--COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL -fsigned-char
-+COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL -fsigned-char
+-COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL
++COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL
+OPTIMIZE_FLAGS=
--PROD_FLAGS=-ggdb -O3 -DNDEBUG $(COMMON_FLAGS)
--DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS)
-+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+DEV_FLAGS=-Wall -Wno-switch $(COMMON_FLAGS)
- CXXFLAGS:= $(CXXFLAGS) -fno-rtti
-
- OS_ServerFiles=inet_server.cpp
---- Firebird-2.5.1.26351-0/builds/posix/prefix.linux_ia64.orig 2011-08-12 09:28:48.000000000 +0200
-+++ Firebird-2.5.1.26351-0/builds/posix/prefix.linux_ia64 2012-09-19 19:34:44.454110281 +0200
+-PROD_FLAGS=-ggdb -O3 $(COMMON_FLAGS)
+-DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
++PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++DEV_FLAGS=-Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_ia64.orig 2016-08-31 20:27:07.857760158 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_ia64 2016-08-31 20:55:10.367740946 +0200
@@ -18,8 +18,8 @@
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
# Adriano dos Santos Fernandes - IA-64 port
@@ -69,54 +79,79 @@
-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DIA64 -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
- CXXFLAGS:= $(CXXFLAGS) -fno-rtti
+ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor
---- Firebird-2.5.1.26351-0/builds/posix/prefix.linux_mips.orig 2012-09-19 19:35:09.124109765 +0200
-+++ Firebird-2.5.1.26351-0/builds/posix/prefix.linux_mips 2012-09-19 19:35:12.537443029 +0200
+ PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_mips.orig 2016-08-31 20:27:07.857760158 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_mips 2016-08-31 20:56:05.504406983 +0200
@@ -1,5 +1,5 @@
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer -fno-builtin
+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
+OPTIMIZE_FLAGS=-fno-omit-frame-pointer -fno-builtin
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
+ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor
- PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
---- Firebird-2.5.1.26351-0/builds/posix/prefix.linux_mipsel.orig 2011-08-12 09:28:48.000000000 +0200
-+++ Firebird-2.5.1.26351-0/builds/posix/prefix.linux_mipsel 2012-09-19 19:36:25.827441500 +0200
-@@ -19,10 +19,12 @@
+ PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_mipsel.orig 2016-08-31 20:27:07.857760158 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_mipsel 2016-08-31 21:01:06.977736874 +0200
+@@ -19,7 +19,9 @@
LD=@CXX@
+COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC
-+OPTIMIZE=-fno-omit-frame-pointer
++OPTIMIZE_FLAGS=-fno-omit-frame-pointer
# -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
--PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DNDEBUG -DLINUX -pipe -MMD -fPIC
--DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
-+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE)
-+DEV_FLAGS=-DDEBUG_GDS_ALLOC -Wall -Wno-switch $(COMMON_FLAGS)
-
- OS_ServerFiles=inet_server.cpp
-
---- Firebird-2.5.1.26351-0/builds/posix/prefix.linux_powerpc.orig 2011-08-12 09:28:48.000000000 +0200
-+++ Firebird-2.5.1.26351-0/builds/posix/prefix.linux_powerpc 2012-09-19 19:39:04.874104851 +0200
-@@ -18,8 +18,11 @@
+-PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
+-DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-non-virtual-dtor
++PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++DEV_FLAGS=$(COMMON_FLAGS) -DDEBUG_GDS_ALLOC -Wall -Wno-switch -Wno-non-virtual-dtor
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc.orig 2016-08-31 20:27:07.857760158 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc 2016-08-31 21:03:32.994401873 +0200
+@@ -18,6 +18,9 @@
#
# 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
--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
+-PROD_FLAGS=-ggdb -fno-omit-frame-pointer -fsigned-char -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3
+-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 -Wno-non-virtual-dtor
+COMMON_FLAGS=@CFLAGS@ -fsigned-char -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DPowerPC -DPPC
+OPTIMIZE_FLAGS=-fno-omit-frame-pointer
+
-+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+DEV_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable $(COMMON_FLAGS)
- #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
++PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++DEV_FLAGS=$(COMMON_FLAGS) -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor
+ #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 -Wno-non-virtual-dtor
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc64.orig 2016-08-31 21:09:42.987730985 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc64 2016-08-31 21:09:45.644397621 +0200
+@@ -20,8 +20,8 @@
+
+ #LD=@CXX@
- OS_ServerFiles=inet_server.cpp
---- Firebird-2.5.1.26351-0/builds/posix/prefix.linux_s390x.orig 2011-08-12 09:28:48.000000000 +0200
-+++ Firebird-2.5.1.26351-0/builds/posix/prefix.linux_s390x 2012-09-19 19:39:25.480771086 +0200
+-#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
+-#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
++COMMON_FLAGS=@CFLAGS@ -DLINUX -DPPC64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
++OPTIMIZE_FLAGS=
+
+-PROD_FLAGS=-O3 -DLINUX -DPPC64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
+-DEV_FLAGS=-ggdb -DLINUX -DPPC64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
++PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++DEV_FLAGS=$(COMON_FLAGS) -Wno-non-virtual-dtor
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc64el.orig 2016-04-14 16:07:29.000000000 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc64el 2016-08-31 21:10:53.874396836 +0200
+@@ -20,8 +20,8 @@
+
+ #LD=@CXX@
+
+-#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
+-#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
++COMMON_FLAGS=@CFLAGS@ -DLINUX -DPPC64EL -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
++OPTIMIZE_FLAGS=
+
+-PROD_FLAGS=-O3 -DLINUX -DPPC64EL -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
+-DEV_FLAGS=-ggdb -DLINUX -DPPC64EL -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
++PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++DEV_FLAGS=$(COMMON_FLAGS) -Wno-non-virtual-dtor
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_s390x.orig 2016-08-31 20:27:07.857760158 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_s390x 2016-08-31 21:05:39.261067098 +0200
@@ -18,8 +18,8 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
@@ -125,22 +160,19 @@
-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer -fno-builtin
+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -fsigned-char
+OPTIMIZE_FLAGS=-fno-omit-frame-pointer -fno-builtin
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
+ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor
- PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
---- Firebird-2.5.1.26351-0/builds/posix/prefix.linux_sparc32.orig 2011-08-12 09:28:48.000000000 +0200
-+++ Firebird-2.5.1.26351-0/builds/posix/prefix.linux_sparc32 2012-09-19 19:40:02.704103648 +0200
-@@ -18,9 +18,10 @@
+ PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
+--- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_sparc32.orig 2016-08-31 20:27:07.857760158 +0200
++++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_sparc32 2016-08-31 21:06:34.644399800 +0200
+@@ -18,6 +18,7 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
-COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL
--PROD_FLAGS=-ggdb -mcpu=ultrasparc -mtune=ultrasparc -O3 -DNDEBUG $(COMMON_FLAGS)
--DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS)
+-PROD_FLAGS=-ggdb -mcpu=ultrasparc -mtune=ultrasparc -O3 $(COMMON_FLAGS)
+-DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
+COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL
+OPTIMIZE_FLAGS=
-+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+DEV_FLAGS=-p -Wall -Wno-switch $(COMMON_FLAGS)
- CXXFLAGS:= $(CXXFLAGS) -fno-rtti
-
- OS_ServerFiles=inet_server.cpp
++PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++DEV_FLAGS=-p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
diff --git a/Firebird-rpath.patch b/Firebird-rpath.patch
deleted file mode 100644
index 8e13a04..0000000
--- a/Firebird-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
diff --git a/Firebird-va.patch b/Firebird-va.patch
index a4224e0..fe89d95 100644
--- a/Firebird-va.patch
+++ b/Firebird-va.patch
@@ -1,5 +1,5 @@
---- Firebird-2.1.1.17910-0/src/jrd/gds.cpp.orig 2008-01-11 13:56:56.000000000 +0100
-+++ Firebird-2.1.1.17910-0/src/jrd/gds.cpp 2008-07-18 22:34:52.502041412 +0200
+--- Firebird-3.0.0.32483/src/yvalve/gds.cpp.orig 2008-01-11 13:56:56.000000000 +0100
++++ Firebird-3.0.0.32483/src/yvalve/gds.cpp 2008-07-18 22:34:52.502041412 +0200
@@ -2816,7 +2816,9 @@
va_list args;
diff --git a/firebird.inetd b/firebird.inetd
index e6b8342..02d1282 100644
--- a/firebird.inetd
+++ b/firebird.inetd
@@ -7,5 +7,5 @@ FLAGS=nowait
USER=firebird
GROUP=firebird
SERVER=tcpd
-DAEMON=/usr/lib/interbase/bin/fb_inet_server
+DAEMON=/usr/lib/interbase/bin/firebird
DAEMONARGS="-el /var/lib/firebird"
diff --git a/firebird.init b/firebird.init
index 2702853..87b41ec 100644
--- a/firebird.init
+++ b/firebird.init
@@ -17,7 +17,8 @@ if [ -f /etc/sysconfig/firebird ]; then
. /etc/sysconfig/firebird
fi
-DAEMON=/usr/lib/interbase/bin/fbmgr.bin
+GUARDIAN=/usr/lib/interbase/bin/fbguard
+PIDFILE=/var/run/firebird/firebird.pid
# Check that networking is up.
if is_yes "${NETWORKING}"; then
@@ -32,7 +33,7 @@ fi
start() {
if [ ! -f /var/lock/subsys/firebird ]; then
msg_starting firebird
- daemon --user firebird $DAEMON -start -forever
+ daemon --user firebird $GUARDIAN -pidfile $PIDFILE -daemon -forever
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/firebird
else
@@ -43,7 +44,7 @@ start() {
stop() {
if [ -f /var/lock/subsys/firebird ]; then
msg_stopping firebird
- daemon --user firebird $DAEMON -shut
+ killproc --pidfile $PIDFILE $GUARDIAN
rm -f /var/lock/subsys/firebird >/dev/null 2>&1
else
msg_not_running firebird
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Firebird.git/commitdiff/d8c389bc169fdc4de041c6cc74b3665e6960a0c7
More information about the pld-cvs-commit
mailing list