Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=61c7262356c0d978e291c0c421e8d2b65df2756f
commit 61c7262356c0d978e291c0c421e8d2b65df2756f Author: Miklos Vajna <[email protected]> Date: Fri Nov 8 08:18:42 2013 +0100 firebird-2.5.2.26540.0-1-x86_64 - initial packaging - my initial interest is to have a working libfbembed package that can be used by the upcoming libreoffice-4.2 - but the packaging itself should be pretty complete, with little effort (missing post-install scriptlets) the real DB can be made usable out-of-the-box as well diff --git a/source/apps-extra/firebird/FrugalBuild b/source/apps-extra/firebird/FrugalBuild new file mode 100644 index 0000000..ab22f51 --- /dev/null +++ b/source/apps-extra/firebird/FrugalBuild @@ -0,0 +1,179 @@ +# Compiling Time: 19.80 SBU +# Maintainer: Miklos Vajna <[email protected]> + +pkgname=firebird +pkgver=2.5.2.26540.0 +srcver=2.5.2.26540-0 +majorver=2.5.2 +pkgrel=1 +pkgdesc="SQL relational database management system" +_F_sourceforge_name="Firebird" +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_rss_limit="200" +Finclude sourceforge +url="http://www.firebirdsql.org/" +rodepends=("libfbembed=$pkgver-$pkgrel") +groups=('apps-extra') +archs=('i686' 'x86_64') +up2date="$up2date |sed 's/-/./g'" +source=(http://downloads.sourceforge.net/firebird/Firebird-$srcver.tar.bz2 \ + firebird-logrotate \ + firebird.conf \ + [email protected] \ + firebird-classic.socket \ + firebird-superclassic.service \ + firebird-superserver.service \ + firebird-2.5.2-svn-CORE-3946.patch \ + firebird-btyacc-fpie.patch) +sha1sums=('1b91d3b01d27ea420d21daa025ded3dffa9b297a' \ + 'ca23a67741ebb8cb6c222c4422ab3eb1b4c7f52a' \ + '5ca4921375cdca2bbe3c553905a3e9c14a151af3' \ + 'cd60465a2d87247f367209bf4da1ce2ed9130156' \ + '3dc22b6b8979321406d6769356cef4341bb1ca15' \ + 'c0aa0e3a5fc13738493977cac1055da5f314d7a6' \ + '0f0565ba21bc815cfe03bbfe584683568722c8ff' \ + '2ab9120dbe705bc3d1adbf75e1b040eb9bd02a18' \ + '836a7999b7df814ece053ec52a0259ca7665a575') + +subpkgs=('libfbembed') +subdescs=('Multi-process, local client libraries for Firebird SQL RDBMS') +subdepends=('icu4c') +subgroups=('lib') +subarchs=('i686 x86_64') + +build() +{ + set -e + Fcd Firebird-$srcver + Fpatchall + + unset MAKEFLAGS + # classic + if [ ! -e gen/buildroot-classic ]; then + NOCONFIGURE=1 ./autogen.sh + ./configure --prefix=/usr/lib/firebird --with-system-icu --with-system-editline \ + --with-fbbin=/usr/lib/firebird/bin-classic --with-fbinclude=/usr/include/firebird \ + --with-fbsbin=/usr/sbin --with-fbconf=/etc/firebird --with-fblib=/usr/lib \ + --with-fbdoc=/usr/share/doc/firebird-$pkgver --with-fbudf=/usr/lib/firebird/UDF --with-fbsample=/usr/share/doc/firebird-$pkgver/examples \ + --with-fbsample-db=/var/lib/firebird/data/ \ + --with-fbhelp=/var/lib/firebird/system/ --with-fbintl=/usr/lib/firebird/intl \ + --with-fbmisc=/usr/lib/firebird/misc --with-fbsecure-db=/var/lib/firebird/system \ + --with-fbmsg=/var/lib/firebird/system --with-fblog=/var/log/firebird \ + --with-fbglock=/run/firebird --with-fbplugins=/usr/lib/firebird/plugins-classic + + make + + cd gen + sed "s@exit 1@# exit 1@" -i ./install/makeInstallImage.sh + sed "s@chown@echo ""# chown@g" -i ./install/makeInstallImage.sh + sed "s@chmod@echo ""# chmod@g" -i ./install/makeInstallImage.sh + ./install/makeInstallImage.sh + mv ./buildroot/ buildroot-classic + cd .. + fi + + # superserver + if [ ! -e src.built ]; then + ./configure --prefix=/usr/lib/firebird --with-system-icu --with-system-editline --enable-superserver \ + --with-fbbin=/usr/lib/firebird/bin-superserver --with-fbinclude=/usr/include/firebird \ + --with-fbsbin=/usr/sbin --with-fbconf=/etc/firebird --with-fblib=/usr/lib \ + --with-fbdoc=/usr/share/doc/firebird-$pkgver --with-fbudf=/usr/lib/firebird/UDF --with-fbsample=/usr/share/doc/firebird-$pkgver/examples \ + --with-fbsample-db=/var/lib/firebird/data/ \ + --with-fbhelp=/var/lib/firebird/system/ --with-fbintl=/usr/lib/firebird/intl \ + --with-fbmisc=/usr/lib/firebird/misc --with-fbsecure-db=/var/lib/firebird/system \ + --with-fbmsg=/var/lib/firebird/system --with-fblog=/var/log/firebird \ + --with-fbglock=/run/firebird --with-fbplugins=/usr/lib/firebird/plugins-superserver + + make clean + make + + cd gen + sed "s@exit 1@echo ""# exit 1@" -i ./install/makeInstallImage.sh + sed "s@chown@echo ""# chown@g" -i ./install/makeInstallImage.sh + sed "s@chmod@echo ""# chmod@g" -i ./install/makeInstallImage.sh + ./install/makeInstallImage.sh + cd .. + fi + touch src.built + + # And now install the beast. + Fmkdir /etc/firebird + Fmkdir /usr/lib/firebird/bin-superserver + Fmkdir /usr/lib/firebird/bin-classic + Fmkdir /usr/include/firebird + Fmkdir /etc/sysconfig/firebird + Fmkdir /usr/lib/firebird/UDF + Fmkdir /usr/lib/firebird/intl + Fmkdir /var/lib/firebird/data + Fmkdir /var/lib/firebird/system + Fmkdir /var/log/firebird + Fmkdir /usr/lib/firebird/plugins-superserver + Fmkdir /usr/lib/firebird/plugins-classic + Fmkdir /etc/logrotate.d + Ffile /etc/tmpfiles.d/firebird.conf + Fmkdir /usr/sbin + Fmkdir /usr/bin + + rm -f gen/buildroot/etc/firebird/I*.txt + cp -d gen/buildroot/etc/firebird/* $Fdestdir/etc/firebird/ + cp -d gen/buildroot-classic/usr/lib/firebird/bin-classic/* $Fdestdir/usr/lib/firebird/bin-classic + cp -d gen/buildroot-classic/usr/sbin/fb_config $Fdestdir/usr/lib/firebird/bin-classic/fb_config + sed "s@-classic@-superserver@" gen/buildroot-classic/usr/sbin/fb_config > $Fdestdir/usr/lib/firebird/bin-superserver/fb_config + sed "s@-classic@@" gen/buildroot-classic/usr/sbin/fb_config > $Fdestdir/usr/sbin/fb_config + sed -i '/plugins/d' $Fdestdir/usr/sbin/fb_config + cp -d gen/buildroot-classic/usr/sbin/fbguard $Fdestdir/usr/sbin/fbguard + cp -d gen/buildroot-classic/usr/sbin/fb_inet_server $Fdestdir/usr/sbin/fb_inet_server + cp -d gen/buildroot-classic/usr/sbin/fb_lock_print $Fdestdir/usr/sbin/fb_lock_print + cp -d gen/buildroot-classic/usr/sbin/fb_smp_server $Fdestdir/usr/sbin/fb_smp_server + cp -d gen/buildroot/usr/sbin/fbserver $Fdestdir/usr/sbin/fbserver + rm -f gen/buildroot/usr/lib/firebird/bin-superserver/fb_inet_server + rm -f gen/buildroot/usr/lib/firebird/bin-superserver/fb_smp_server + rm -f gen/buildroot/usr/lib/firebird/bin-superserver/changeMultiConnectMode.sh + cp -d gen/buildroot/usr/lib/firebird/bin-superserver/* $Fdestdir/usr/lib/firebird/bin-superserver + cp -d gen/buildroot/usr/include/*.h $Fdestdir/usr/include + cp -d gen/buildroot/usr/include/firebird/* $Fdestdir/usr/include/firebird + cp -d gen/buildroot/etc/firebird/* $Fdestdir/etc/firebird + rm -f $Fdestdir/etc/firebird/README + rm -f $Fdestdir/etc/firebird/WhatsNew + + cp -d gen/buildroot-classic/usr/lib/lib* $Fdestdir/usr/lib + cp -d gen/buildroot/usr/lib/firebird/UDF/* $Fdestdir/usr/lib/firebird/UDF + cp -d gen/buildroot/var/lib/firebird/data/* $Fdestdir/var/lib/firebird/data + cp -d gen/buildroot/var/lib/firebird/system/* $Fdestdir/var/lib/firebird/system + cp -d gen/buildroot/usr/lib/firebird/plugins-superserver/* $Fdestdir/usr/lib/firebird/plugins-superserver + cp -d gen/buildroot-classic/usr/lib/firebird/plugins-classic/* $Fdestdir/usr/lib/firebird/plugins-classic + cp -d gen/buildroot/usr/lib/firebird/intl/fbintl $Fdestdir/usr/lib/firebird/intl/fbintl + cp -d gen/buildroot/usr/lib/firebird/intl/fbintl.conf $Fdestdir/etc/firebird/fbintl.conf + ln -s /etc/firebird/fbintl.conf $Fdestdir/usr/lib/firebird/intl/fbintl.conf + + Fln libfbclient.so /usr/lib/libgds.so + Fln libfbclient.so.$majorver /usr/lib/libgds.so.0 + + echo 1 > $Fdestdir/var/log/firebird/firebird.log + sed "[email protected]@/var/log/firebird/firebird.log@g" $Fsrcdir/firebird-logrotate > $Fdestdir/etc/logrotate.d/firebird + + Ffile /lib/systemd/system/[email protected] + Ffile /lib/systemd/system/firebird-classic.socket + + Ffile /lib/systemd/system/firebird-superclassic.service + Ffile /lib/systemd/system/firebird-superserver.service + + Fln /usr/lib/firebird/bin/fbsvcmgr /usr/bin/fbsvcmgr + Fln /usr/lib/firebird/bin/fbtracemgr /usr/bin/fbtracemgr + Fln /usr/lib/firebird/bin/gbak /usr/bin/gbak + Fln /usr/lib/firebird/bin/gdef /usr/bin/gdef + Fln /usr/lib/firebird/bin/gfix /usr/bin/gfix + Fln /usr/lib/firebird/bin/gpre /usr/bin/gpre + Fln /usr/lib/firebird/bin/gsec /usr/bin/gsec + Fln /usr/lib/firebird/bin/gsplit /usr/bin/gsplit + Fln /usr/lib/firebird/bin/gstat /usr/bin/gstat-fb + Fln /usr/lib/firebird/bin/isql /usr/bin/isql-fb + Fln /usr/lib/firebird/bin/nbackup /usr/bin/nbackup + Fln /usr/lib/firebird/bin/qli /usr/bin/qli + Fln /usr/lib/firebird/bin/fb_config /usr/bin/fb_config + + Fsplit libfbembed usr/lib/libfbembed.so.* + set +e +} + +# optimization OK diff --git a/source/apps-extra/firebird/firebird-2.5.2-svn-CORE-3946.patch b/source/apps-extra/firebird/firebird-2.5.2-svn-CORE-3946.patch new file mode 100644 index 0000000..5fb9f304 --- /dev/null +++ b/source/apps-extra/firebird/firebird-2.5.2-svn-CORE-3946.patch @@ -0,0 +1,151 @@ +--- src/jrd/unicode_util.cpp 2012/10/12 09:56:14 57235 ++++ src/jrd/unicode_util.cpp 2012/10/12 21:20:30 57236 +@@ -42,6 +42,9 @@ + #include "unicode/ucnv.h" + #include "unicode/ucol.h" + ++// The next major ICU version after 4.8 is 49. ++#define ICU_NEW_VERSION_MEANING 49 ++ + + using namespace Firebird; + +@@ -49,8 +52,16 @@ + namespace Jrd { + + ++#if U_ICU_VERSION_MAJOR_NUM >= ICU_NEW_VERSION_MEANING ++const char* const UnicodeUtil::DEFAULT_ICU_VERSION = STRINGIZE(U_ICU_VERSION_MAJOR_NUM); ++#else + const char* const UnicodeUtil::DEFAULT_ICU_VERSION = + STRINGIZE(U_ICU_VERSION_MAJOR_NUM)"."STRINGIZE(U_ICU_VERSION_MINOR_NUM); ++#endif ++ ++ ++static void formatFilename(PathName& filename, const char* templateName, ++ int majorVersion, int minorVersion); + + + // encapsulate ICU collations libraries +@@ -79,6 +90,11 @@ + { + string symbol; + ++ symbol.printf("%s_%d", name, majorVersion); ++ module->findSymbol(symbol, ptr); ++ if (ptr) ++ return; ++ + symbol.printf("%s_%d_%d", name, majorVersion, minorVersion); + module->findSymbol(symbol, ptr); + if (ptr) +@@ -157,14 +173,25 @@ + RWLock lock; + }; + +-namespace { +- GlobalPtr<UnicodeUtil::ICUModules> icuModules; +-} ++static GlobalPtr<UnicodeUtil::ICUModules> icuModules; + + + static const char* const COLL_30_VERSION = "41.128.4.4"; // ICU 3.0 collator version + + ++static void formatFilename(PathName& filename, const char* templateName, ++ int majorVersion, int minorVersion) ++{ ++ string s; ++ if (majorVersion >= ICU_NEW_VERSION_MEANING) ++ s.printf("%d", majorVersion); ++ else ++ s.printf("%d%d", majorVersion, minorVersion); ++ ++ filename.printf(templateName, s.c_str()); ++} ++ ++ + static void getVersions(const string& configInfo, ObjectsArray<string>& versions) + { + charset cs; +@@ -758,17 +785,17 @@ + const Firebird::string& configInfo) + { + #if defined(WIN_NT) +- const char* const inTemplate = "icuin%d%d.dll"; +- const char* const ucTemplate = "icuuc%d%d.dll"; ++ const char* const inTemplate = "icuin%s.dll"; ++ const char* const ucTemplate = "icuuc%s.dll"; + #elif defined(DARWIN) + const char* const inTemplate = "/Library/Frameworks/Firebird.framework/Versions/A/Libraries/libicui18n.dylib"; + const char* const ucTemplate = "/Library/Frameworks/Firebird.framework/versions/A/Libraries/libicuuc.dylib"; + #elif defined(HPUX) +- const char* const inTemplate = "libicui18n.sl.%d%d"; +- const char* const ucTemplate = "libicuuc.sl.%d%d"; ++ const char* const inTemplate = "libicui18n.sl.%s"; ++ const char* const ucTemplate = "libicuuc.sl.%s"; + #else +- const char* const inTemplate = "libicui18n.so.%d%d"; +- const char* const ucTemplate = "libicuuc.so.%d%d"; ++ const char* const inTemplate = "libicui18n.so.%s"; ++ const char* const ucTemplate = "libicuuc.so.%s"; + #endif + + ObjectsArray<string> versions; +@@ -776,24 +803,28 @@ + + string version = icuVersion.isEmpty() ? versions[0] : icuVersion; + if (version == "default") +- { +- version.printf("%d.%d", U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM); +- } ++ version = DEFAULT_ICU_VERSION; + + for (ObjectsArray<string>::const_iterator i(versions.begin()); i != versions.end(); ++i) + { + int majorVersion, minorVersion; ++ int n = sscanf((*i == "default" ? version : *i).c_str(), "%d.%d", ++ &majorVersion, &minorVersion); + +- if (*i == "default") +- { +- majorVersion = U_ICU_VERSION_MAJOR_NUM; +- minorVersion = U_ICU_VERSION_MINOR_NUM; +- } +- else if (sscanf(i->c_str(), "%d.%d", &majorVersion, &minorVersion) != 2) ++ if (n == 1) ++ minorVersion = 0; ++ else if (n != 2) + continue; + + string configVersion; +- configVersion.printf("%d.%d", majorVersion, minorVersion); ++ ++ if (majorVersion >= ICU_NEW_VERSION_MEANING) ++ { ++ minorVersion = 0; ++ configVersion.printf("%d", majorVersion); ++ } ++ else ++ configVersion.printf("%d.%d", majorVersion, minorVersion); + + if (version != configVersion) + continue; +@@ -805,7 +836,7 @@ + return icu; + + PathName filename; +- filename.printf(ucTemplate, majorVersion, minorVersion); ++ formatFilename(filename, ucTemplate, majorVersion, minorVersion); + + icu = FB_NEW(*getDefaultMemoryPool()) ICU(majorVersion, minorVersion); + +@@ -822,7 +853,7 @@ + continue; + } + +- filename.printf(inTemplate, majorVersion, minorVersion); ++ formatFilename(filename, inTemplate, majorVersion, minorVersion); + + icu->inModule = ModuleLoader::loadModule(filename); + if (!icu->inModule) diff --git a/source/apps-extra/firebird/firebird-btyacc-fpie.patch b/source/apps-extra/firebird/firebird-btyacc-fpie.patch new file mode 100644 index 0000000..e276c31 --- /dev/null +++ b/source/apps-extra/firebird/firebird-btyacc-fpie.patch @@ -0,0 +1,11 @@ +--- extern/btyacc/Makefile.ori 2013-03-19 09:38:04.000000000 +0100 ++++ extern/btyacc/Makefile 2013-04-27 13:20:35.964379129 +0200 +@@ -12,7 +12,7 @@ HDRS = defs.h mstring.h + # across all of our supported compilers/platforms. + + # Vanilla CFLAGS +-CFLAGS= ++#CFLAGS= + + # No LDFLAGS + #LDFLAGS= diff --git a/source/apps-extra/firebird/firebird-classic.socket b/source/apps-extra/firebird/firebird-classic.socket new file mode 100644 index 0000000..66d2c71 --- /dev/null +++ b/source/apps-extra/firebird/firebird-classic.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Firebird Classic Activation Socket + +[Socket] +ListenStream=3050 +Accept=true + +[Install] +WantedBy=sockets.target + diff --git a/source/apps-extra/firebird/[email protected] b/source/apps-extra/firebird/[email protected] new file mode 100644 index 0000000..cd9543d --- /dev/null +++ b/source/apps-extra/firebird/[email protected] @@ -0,0 +1,10 @@ +[Unit] +Description=Firebird Classic server +After=local-fs.target + +[Service] +User=firebird +Group=firebird +ExecStart=/usr/sbin/fb_inet_server +StandardInput=socket +StandardError=syslog diff --git a/source/apps-extra/firebird/firebird-logrotate b/source/apps-extra/firebird/firebird-logrotate new file mode 100644 index 0000000..5da6610 --- /dev/null +++ b/source/apps-extra/firebird/firebird-logrotate @@ -0,0 +1,9 @@ +firebird.log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 firebird adm + } diff --git a/source/apps-extra/firebird/firebird-superclassic.service b/source/apps-extra/firebird/firebird-superclassic.service new file mode 100644 index 0000000..abb49e4 --- /dev/null +++ b/source/apps-extra/firebird/firebird-superclassic.service @@ -0,0 +1,15 @@ +[Unit] +Description=Firebird Database Server ( SuperClassic ) +After=syslog.target network.target + +[Service] +User=firebird +Group=firebird +Type=forking +PIDFile=/run/firebird/default.pid +ExecStart=/usr/sbin/fbguard -pidfile /run/firebird/default.pid -daemon -forever +StandardError=syslog + +[Install] +WantedBy=multi-user.target + diff --git a/source/apps-extra/firebird/firebird-superserver.service b/source/apps-extra/firebird/firebird-superserver.service new file mode 100644 index 0000000..3edc565 --- /dev/null +++ b/source/apps-extra/firebird/firebird-superserver.service @@ -0,0 +1,15 @@ +[Unit] +Description=Firebird Database Server ( SuperServer ) +After=syslog.target network.target + +[Service] +User=firebird +Group=firebird +Type=forking +PIDFile=/run/firebird/default.pid +ExecStart=/usr/sbin/fbguard -pidfile /run/firebird/default.pid -daemon -forever +StandardError=syslog + +[Install] +WantedBy=multi-user.target + diff --git a/source/apps-extra/firebird/firebird.conf b/source/apps-extra/firebird/firebird.conf new file mode 100644 index 0000000..fa7b34c --- /dev/null +++ b/source/apps-extra/firebird/firebird.conf @@ -0,0 +1 @@ +d /run/firebird 0775 firebird firebird - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
