From 5652af3ff1460a502ac3cbad9d6c87e6a7593a5e Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Tue, 16 Dec 2014 10:14:15 +0000 Subject: [PATCH] Patch should not remove MSG_NOSIGNAL flag on x86 (#424161 by Maciej Szmigiero) Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- dev-db/firebird/ChangeLog | 9 +- dev-db/firebird/Manifest | 10 +- .../firebird-2.5.3.26780.0-deps-flags.patch | 59 ++++ .../firebird/firebird-2.5.3.26780.0-r1.ebuild | 290 ++++++++++++++++++ 4 files changed, 363 insertions(+), 5 deletions(-) create mode 100644 dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch create mode 100644 dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog index 8a71c40dd7ca..a02532150431 100644 --- a/dev-db/firebird/ChangeLog +++ b/dev-db/firebird/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/firebird # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.117 2014/12/11 11:51:32 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.118 2014/12/16 10:14:12 pacho Exp $ + +*firebird-2.5.3.26780.0-r1 (16 Dec 2014) + + 16 Dec 2014; Pacho Ramos + +files/firebird-2.5.3.26780.0-deps-flags.patch, + +firebird-2.5.3.26780.0-r1.ebuild: + Patch should not remove MSG_NOSIGNAL flag on x86 (#424161 by Maciej Szmigiero) *firebird-2.5.3.26780.0 (11 Dec 2014) diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest index f522d6e6ff81..9f159ed8ce53 100644 --- a/dev-db/firebird/Manifest +++ b/dev-db/firebird/Manifest @@ -4,19 +4,21 @@ Hash: SHA256 AUX firebird-2.5.1.26351.0-client.patch 554 SHA256 afc61661c47dbedaac6b4d2582990712c8fbfe907340359c4eae12c4a66d1408 SHA512 dd1a62995b09f56db09b41b3a94bfb476b10018992b24e4cd19fb2ae95b557acb00b6a22c5bb28c4d2364aa424aca3ed717b9e9943e55fe8ef5412037b94c8f1 WHIRLPOOL fbe1281c31cace1cde2aad55f22203940e7c6703d68fee62f256dc7b4d5af54d5d2ec70d53b1c0a2d1584f7fcea05d59da2415160b8ef0fada86f8e21cce6be2 AUX firebird-2.5.1.26351.0-deps-flags.patch 3025 SHA256 ff6d2c832b9b1705e14ba8f083a65a774742375c9d4588c3a921cb5806d72be2 SHA512 269d44934e0477283190802e887b6ddfe4eaaf44f878ae19ba1e473804163cfb55593cca9a6dc4ef8f86e25a6557383e13939907fdd3406d8469822a4586cb7a WHIRLPOOL 004c905e0029adaec69ae5bed4f6abec17adb616b4bf725f1635f1f13487acea933a8db2777cef46ccf94a4bda3af7c26cc2c3b96568626f2727049ce0abc204 AUX firebird-2.5.1.26351.0-superclassic.patch 713 SHA256 dbf9b28a50772ec5c158ab8dfc6a06da5c72b179117ef5b6c6e1645d796f13bf SHA512 b1c0e253f25616ae6522f693e4a1202bcf290eab3d3cfc06f29e6822f8e55d1d316f0e45b89ebca2b4cd5c97bba07997a7e3aa7e5870ffaca28295d1f3d449cb WHIRLPOOL eef1837adac86b7bc21f8e240b753398a787e4e108243004ca34b6015c842e7ca91ce584ffa4e85e1f2e908b5b2d5a3af5fa04125c110b13ffe43b5dca63c5d6 +AUX firebird-2.5.3.26780.0-deps-flags.patch 3054 SHA256 cfc32092e041dc8fd0997ca40332c21d1e05e847467ccb39bb389d328117f47e SHA512 c786daaec706223c67c74448a317b5dcebcabeba17c244ebbf474763fd3d61e9ee5613241b94194a14816c2bd90dfff8a649bee9ab59eb78e085cb9f812ec9e8 WHIRLPOOL e2a39f825cd6b5ba5f4123243daa48cc703ceddb7a48baa5a6594f24ba5148a2ed38561427acc8a6b6e61b1c5dc7b0cc517c4378b1575f3dc3d0196b96606a8a AUX firebird.conf.d.2.5 270 SHA256 c95575949a2509f61dfdad0b311319c15bc4fcf98397dbf86849a208e8e49cea SHA512 ac1410f45accae1beb845eb895592524be22fd0afb457aac4146dc6dc0a79c74c7e62eb814477797a10661a57bb731ade02a2a3b3fd8f5c5ef0c3b80e809bb64 WHIRLPOOL 3a842eb9ea3ab4c97e01eb24fc04f3f46ec4f60ceeda7b6e23d27b59cfde092ae5795790c3687aa41940837b215a358943c39e616804a3529e8f48014a560920 AUX firebird.init.d.2.5 634 SHA256 6f542ea7a8067a101b1baae0d8b1b61d3bff65966a822e8c746838abb0890f6e SHA512 fc89029480bda6240befc4957e308656d0b13a8d840e30ce6d63953da40426b942896869ad3932ef72b9da568c95f6cebddba97f8d7d367ce8100257a1ee899d WHIRLPOOL 1afa1ae113d960557c1909cab1aa2ca18bba3860aea95bda752f3d9deef7f7bc3d5f639937886ef62c028bdb03f879d6221b97eab06803c3198c16c0372fdb90 AUX firebird.logrotate 169 SHA256 462a7273c4881b66d31fe44349aae45d1f7085ff4db848eebc5e50b2bcb7f6da SHA512 f99edc010272af28f18e2b89e420aabc204feda918a1181e477edb56612b6af97ca6bab2e39989db401eb8296e3233a64853f824af437329e117f09aa9868823 WHIRLPOOL 0bbfe1cd410c42b137f11d3fb3b8c976c3fc89990650275dab135c66dcd78b35b6d4f73a2a767a56338a519393a33be6f64887f293528878ebe139896e3da49d AUX firebird.xinetd 199 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb WHIRLPOOL 4ac8ee679d07329143d9a98fb1acf432876c65695cd188748b3d4a2e4d693817fa6ea759f0e58ca7e75aa6cee8e902b097bcfe4a66715f825bb5379492fa8ad9 DIST Firebird-2.5.3.26780-0.tar.bz2 13798872 SHA256 0c4b500d189aa9b4c12a7d2cf310a0b770118967c37ebe0edf8581cbcdad7aad SHA512 b8a0bef492d15739ea9a156225ac738687241a11571ce52ee6c644e5017dcff03007945aeb19b0537aadd1de01b339645871ff1905edf41c65679db377c69e98 WHIRLPOOL 0321763e79882dcdd2175191e1cbf6c82d656bb16e5ebd4a3bf0f08c77ee0494f06ffb08205b583c4a9990c33d652ac2fa73683e4c7ccebe900236975c8d60a5 DIST ib_b60_doc.zip 10530848 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a WHIRLPOOL 5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f +EBUILD firebird-2.5.3.26780.0-r1.ebuild 8383 SHA256 ad2d0504a4e0dc679e04cf7fb28cfdf7e64dd4510b117123cfe09fef5003f610 SHA512 9d1a038646d651af9f22cc33808e36e7763fa8328fadb09495ef7c575d34473795b575fd3901f65dc63482c9f76ec29a31c77c8dc2a29abcdc01a849747257b7 WHIRLPOOL ba1e969479d43eb8986990e373482f2543dda9932a6121bc515493fec3a92233e8aed9b042c7cf4afb2168b26a7c8d185e844bd7fcfba7ca972d3fe3bb91e847 EBUILD firebird-2.5.3.26780.0.ebuild 8380 SHA256 4dbbd68dc4482dda58d647899353cd284267c58b0caea47c3d5ec589ed47f7ce SHA512 f68902ef814cc4a24b8f6cd4e1a5eb00f989ded1799937542787ed39874b69f3009c2c5f7ab32e508a08ab05459bd2d891303a1e384ee091c2dae41d21f5de8b WHIRLPOOL 7e8f8e3ea9745723922fbad9dc4dcd861335459591cfff074777568c2fd4e1963ddd56aff56a03f30015794ed710ebb683f38f3005a4204caa3078afcca52ae9 -MISC ChangeLog 27132 SHA256 ab03666ece04d969e57210484cf2d7a237ca09e5401ba5bc66ac69518015060e SHA512 eb06d7307c9fa4cb7f82f0c4f5077e8347778bc89a7ace6cebc2d8acf853f316fb0aaa13e8be18151095a8501d061c127e59fc22e0a19efddb395a4de252ea1e WHIRLPOOL 7fce1d89f73faf6b72e48b70c172cd352e6be3699f363b97c3dd226b06bfd74f784c4f3e3f38c936d56ca42016c996035591813634222b5e16174cf005c1a2b9 +MISC ChangeLog 27389 SHA256 65259b897ce1c1edd6a9c01ffa6e9058766cfcf031d3c555c45aea0e048e9171 SHA512 4cb67d17f090dd78924f833329cca438235df21fdf4947852f4ba7838fb671b3873649d6998554fd15fbd8292281c0c135f7694ca592d5cb343ca4dd12076ec0 WHIRLPOOL 601194c0927e6467cfa9a4db4fe0f319151ec655b4874eff6426f69db918efe9adf1516ca290e1f0a1576263a320731489acafeec2cda0431c94d9974dee28f0 MISC metadata.xml 787 SHA256 6f5285eb2893a24ee779d1b1cf1840d0e34e38d152e65fdcb0244bfa5e6eceaa SHA512 2924fa1236aa39e737fce9d3c937bc8fc78ceaec165f45799bb07851c702a8f7be794907b2b7601abf3cd1a52db841c92403c03ba69626348f6c3bee7cc47a66 WHIRLPOOL 8d7dd3e4c7e4944458bdd5c7dd874d674ba12cb3dc868d0e451c29d1621a311a65519fae725f907060a88ecf792ccef44ec49df10d76d664a490e28cf78edaf0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSJhUUACgkQCaWpQKGI+9SP8gCfcHZMkKKYFDuOlwLuGy8UeAi2 -ypIAn3cSofl53qNsVv9EyoXsZF6G6vd2 -=WbgV +iEYEAREIAAYFAlSQBfcACgkQCaWpQKGI+9TftACfTdYggT/CPJ305MtHZ+203e2X +N/YAn1aGABxW38o//NxNqbvOziSkbXzS +=VRvk -----END PGP SIGNATURE----- diff --git a/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch b/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch new file mode 100644 index 000000000000..506a6c07a79c --- /dev/null +++ b/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch @@ -0,0 +1,59 @@ +diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird +--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500 ++++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird 2011-03-28 15:10:09.814370706 -0400 +@@ -158,7 +158,7 @@ + # some complications particularly for super in needing to start the server + # that you are currently building. MOD 28-July-2002 + +-firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets ++firebird_basic: firebird_boot basic_targets + + firebird_boot: updateBuildNum boot_phase1 boot_phase2 + +diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults +--- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults 2010-11-09 12:42:45.000000000 -0500 ++++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults 2011-03-28 15:21:26.904370708 -0400 +@@ -138,7 +138,7 @@ + AR= ar @AR_OPTIONS@ crsu + LN= @LN_S@ + RANLIB= @RANLIB@ +-BTYACC=$(ROOT)/extern/btyacc/btyacc ++BTYACC=/usr/bin/btyacc + + CC = @CC@ + CXX = @CXX@ +diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux +--- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux 2010-11-09 12:42:45.000000000 -0500 ++++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux 2011-03-25 21:38:29.031037374 -0400 +@@ -18,11 +18,10 @@ + # + # 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 -mtune=i686 -fno-omit-frame-pointer ++COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -MMD -fPIC -fmessage-length=0 + WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable + +-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) ++PROD_FLAGS=$(COMMON_FLAGS) + #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS) + DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS) + +diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64 +--- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 2010-11-09 12:42:45.000000000 -0500 ++++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64 2011-03-25 21:39:15.134370707 -0400 +@@ -18,12 +18,11 @@ + # + # 2 Oct 2002, Nickolay Samofatov - Major cleanup + +-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 +-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer ++COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0 + WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable + CXXFLAGS:= $(CXXFLAGS) -fno-rtti + +-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) ++PROD_FLAGS=$(COMMON_FLAGS) + #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS) + DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS) + diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild b/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild new file mode 100644 index 000000000000..487da35a9a88 --- /dev/null +++ b/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild @@ -0,0 +1,290 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild,v 1.1 2014/12/16 10:14:12 pacho Exp $ + +EAPI=5 +inherit flag-o-matic eutils autotools multilib user readme.gentoo versionator + +MY_P=${PN/f/F}-$(replace_version_separator 4 -) +#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate} + +DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features" +HOMEPAGE="http://www.firebirdsql.org/" +SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2 + doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )" + +LICENSE="IDPL Interbase-1.0" +SLOT="0" +KEYWORDS="~amd64 -ia64 ~x86" + +IUSE="doc client superserver xinetd examples debug" +REQUIRED_USE=" + client? ( !superserver ) + client? ( !xinetd ) + superserver? ( !xinetd ) +" + +RESTRICT="userpriv" + +RDEPEND=" + dev-libs/libedit + dev-libs/icu:= +" +DEPEND="${RDEPEND} + >=dev-util/btyacc-3.0-r2 + doc? ( app-arch/unzip ) +" +RDEPEND="${RDEPEND} + xinetd? ( virtual/inetd ) + !sys-cluster/ganglia +" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup firebird 450 + enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird +} + +function check_sed() { + MSG="sed of $3, required $2 lines modified $1" + einfo "${MSG}" + [[ $1 -ge $2 ]] || die "${MSG}" +} + +src_unpack() { + if use doc; then + # Unpack docs + mkdir "${WORKDIR}/manuals" + cd "${WORKDIR}/manuals" + unpack ib_b60_doc.zip + cd "${WORKDIR}" + fi + unpack "${MY_P}.tar.bz2" + cd "${S}" +} + +src_prepare() { + # This patch might be portable, and not need to be duplicated per version + # also might no longer be necessary to patch deps or libs, just flags + epatch "${FILESDIR}/${PN}-2.5.3.26780.0-deps-flags.patch" + + use client && epatch "${FILESDIR}/${PN}-2.5.1.26351.0-client.patch" + if ! use superserver ; then + epatch "${FILESDIR}/${PN}-2.5.1.26351.0-superclassic.patch" + fi + + # Rename references to isql to fbsql + # sed vs patch for portability and addtional location changes + check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \ + src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line + check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \ + src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines + check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \ + -e 's:isql :fbsql :w /dev/stdout' \ + -e 's:ISQL :FBSQL :w /dev/stdout' \ + src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines + + find "${S}" -name \*.sh -print0 | xargs -0 chmod +x + rm -rf "${S}"/extern/{btyacc,editline,icu} + + eautoreconf +} + +src_configure() { + filter-flags -fprefetch-loop-arrays + filter-mfpmath sse + + econf \ + --prefix=/usr/$(get_libdir)/firebird \ + $(use_enable superserver superserver) \ + $(use_enable debug) \ + --with-editline \ + --with-system-editline \ + --with-system-icu \ + --with-fbbin=/usr/bin \ + --with-fbsbin=/usr/sbin \ + --with-fbconf=/etc/${PN} \ + --with-fblib=/usr/$(get_libdir) \ + --with-fbinclude=/usr/include \ + --with-fbdoc=/usr/share/doc/${P} \ + --with-fbudf=/usr/$(get_libdir)/${PN}/UDF \ + --with-fbsample=/usr/share/doc/${P}/examples \ + --with-fbsample-db=/usr/share/doc/${P}/examples/db \ + --with-fbhelp=/usr/$(get_libdir)/${PN}/help \ + --with-fbintl=/usr/$(get_libdir)/${PN}/intl \ + --with-fbmisc=/usr/share/${PN} \ + --with-fbsecure-db=/etc/${PN} \ + --with-fbmsg=/usr/$(get_libdir)/${PN} \ + --with-fblog=/var/log/${PN}/ \ + --with-fbglock=/var/run/${PN} \ + --with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \ + --with-gnu-ld \ + ${myconf} +} + +src_compile() { + MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}" + emake +} + +src_install() { + cd "${S}/gen/${PN}" + + if use doc; then + dodoc "${S}"/doc/*.pdf + find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die + fi + + insinto /usr/include + doins include/* + + rm lib/libfbstatic.a + + insinto /usr/$(get_libdir) + dolib.so lib/*.so* + + # links for backwards compatibility + dosym libfbclient.so /usr/$(get_libdir)/libgds.so + dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0 + dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1 + + insinto /usr/$(get_libdir)/${PN} + doins *.msg + + use client && return + + einfo "Renaming isql -> fbsql" + mv bin/isql bin/fbsql + + local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli" + for bin in ${bins[@]}; do + dobin bin/${bin} + done + + dosbin bin/fb_lock_print + # SuperServer + if use superserver ; then + dosbin bin/{fbguard,fbserver} + # ClassicServer + elif use xinetd ; then + dosbin bin/fb_inet_server + # SuperClassic + else + dosbin bin/{fbguard,fb_smp_server} + + #Temp should not be necessary, need to patch/fix + dosym "${D}"/usr/$(get_libdir)/libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so + fi + + exeinto /usr/bin/${PN} + exeopts -m0755 + doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh + + insinto /usr/$(get_libdir)/${PN}/help + doins help/help.fdb + + exeinto /usr/$(get_libdir)/firebird/intl + dolib.so intl/libfbintl.so + dosym "${D}"/usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl + dosym "${D}"/etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf + + exeinto /usr/$(get_libdir)/${PN}/plugins + dolib.so plugins/libfbtrace.so + dosym "${D}"/usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so + + exeinto /usr/$(get_libdir)/${PN}/UDF + doexe UDF/*.so + + insinto /usr/share/${PN}/upgrade + doins "${S}"/src/misc/upgrade/v2/* + + insinto /etc/${PN} + insopts -m0644 -o firebird -g firebird + doins ../install/misc/*.conf + insopts -m0660 -o firebird -g firebird + doins security2.fdb + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}/${PN}.xinetd" ${PN} + else + newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN} + newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN} + fperms 640 /etc/conf.d/${PN} + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotate" ${PN} + + diropts -m 755 -o firebird -g firebird + dodir /var/log/${PN} + dodir /var/run/${PN} + keepdir /var/log/${PN} + keepdir /var/run/${PN} + + use examples && docinto examples +} + +pkg_postinst() { + use client && return + + # Hack to fix ownership/perms + chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}" + chmod 750 "${ROOT}/etc/${PN}" +} + +pkg_config() { + use client && return + + # if found /etc/security.gdb from previous install, backup, and restore as + # /etc/security2.fdb + if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then + # if we have scurity2.fdb already, back it 1st + if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then + cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old" + fi + gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk" + gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb" + mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old" + rm "${ROOT}/etc/firebird/security.gbk" + + # make sure they are readable only to firebird + chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}" + chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}" + + einfo + einfo "Converted old security.gdb to security2.fdb, security.gdb has been " + einfo "renamed to security.gdb.old. if you had previous security2.fdb, " + einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)." + einfo + fi + + # we need to enable local access to the server + if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then + touch "${ROOT}/etc/hosts.equiv" + chown root:0 "${ROOT}/etc/hosts.equiv" + chmod u=rw,go=r "${ROOT}/etc/hosts.equiv" + fi + + # add 'localhost.localdomain' to the hosts.equiv file... + if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then + echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv" + einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv" + fi + + # add 'localhost' to the hosts.equiv file... + if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then + echo "localhost" >> "${ROOT}/etc/hosts.equiv" + einfo "Added localhost to ${ROOT}/etc/hosts.equiv" + fi + + HS_NAME=`hostname` + if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then + echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv" + einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv" + fi + + einfo "If you're using UDFs, please remember to move them" + einfo "to /usr/lib/firebird/UDF" +} -- 2.26.2