Fix multilib issues, amd64 stable, security bug 208034

Package-Manager: portage-2.1.4.4

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index a3277a3b73e91cf645acfcd844c8de15ad6ed2e4..3014325d2aa6f5c3e41270e3accb17c4341646bd 100644 (file)
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/firebird
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.88 2008/02/21 08:20:59 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.89 2008/02/25 15:49:26 beandog Exp $
+
+  25 Feb 2008; Steve Dibb <beandog@gentoo.org>
+  firebird-2.0.3.12981.0-r5.ebuild:
+  Fix multilib issues, amd64 stable, security bug 208034
 
   21 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
   firebird-2.0.3.12981.0-r5.ebuild:

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index c8b16281404e8b0a27ec0ce0e8a3d382a67c407e..0e6102a7ceff2216e450d5474872a300357d7721 100644 (file)
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70firebird 50 RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 SHA1 71b414835ed7c66f94b2908b7793da817d3c4438 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03
 AUX firebird-2.0.3.12981.0-CVE-2008-0387.patch 3279 RMD160 462a32e8bc64c2ede4852901a9ff7036a7c3b52a SHA1 7c87e7f41e8c408b190d84e80f7c6aa1a5c0753c SHA256 62dd30ec1a785578a4686ba37e82fedbc0b00d0e95735b4aab9b056b5b82ad4b
 AUX firebird-2.0.3.12981.0-CVE-2008-0467.patch 16005 RMD160 2bfd332b7d551402a1c9bed8b4706fc57cc80ec0 SHA1 38bc58cec68a4b9b12315846c3eb5f8c967e83e3 SHA256 f4de4b4b988669378b09fcbba59dac96b22a3b4cfeb6bdf7db45c4a16f81fd05
@@ -17,14 +14,7 @@ DIST Firebird-2.0.3.12981-0.tar.bz2 12623689 RMD160 6a1139b30a77070e6e74bdaebc5d
 DIST Firebird-2.1.0.17735-ReleaseCandidate1.tar.bz2 13377514 RMD160 924014a93aa8b57152c6a7ffb5f41ca58fa9b9b9 SHA1 7585aa45baca20888bb56629bf74bff9c688f6e8 SHA256 b50888c43f0f44870d067eb4c3e68719238907f265daaaeb0251a3b4b5eae001
 DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d
 EBUILD firebird-2.0.3.12981.0-r2.ebuild 6072 RMD160 b8260dcae6e5cb40c4da7fccdaa97a1f4979d8f7 SHA1 8a441a71c3ec39189649cc92b03c24fe4176a3e0 SHA256 b5c63f2a462b911958cf5fb5ffca4e21c9eb174b08f3e8b4026d1e6328bc1540
-EBUILD firebird-2.0.3.12981.0-r5.ebuild 9903 RMD160 0887e3636b343127b41332018e2f8cbe5b14c951 SHA1 f74c3c08a74f339a654d5f5eb3b6af5bb7f087ab SHA256 b33afa041be75cea3d0cdc6f11aabc1c983c8f59a365437533ca24b1fd29bf22
+EBUILD firebird-2.0.3.12981.0-r5.ebuild 10017 RMD160 672703dff9874e80dcd25c748b5764aa0b63a33d SHA1 91c3e82435deeaad2873637ef32cf38ea3d6e659 SHA256 1011ac52c9b146363eb18c7ce1bbb61758ddfafc1c3f1a78e6e407e90363d980
 EBUILD firebird-2.1.0.17735_rc1.ebuild 10118 RMD160 340f8685d1adcd8d762397553d914bef005a1888 SHA1 278c4f825f5507036e556e48a370f3f923c2c90d SHA256 209913a166f4b087533813db04bd9707d8379b6e146edfb795eda7d1de590026
-MISC ChangeLog 18126 RMD160 dd813b1cbf4c7453ca37b7fe6d5afc88a0ab2810 SHA1 c811a05ba44f7c6eb09009798ac161dca427b376 SHA256 6a9e07e8414a46114b2fde13b63473b346dfdb4c609314d84a3d4183ea22c40e
+MISC ChangeLog 18269 RMD160 b3b23ff3607aae10a433f52d20ac37f10c0ce00b SHA1 276df73d537d32e2866e012666333a6559f0ad43 SHA256 c7969097dfb739495af474e742462ddc551be4e864494b8650972e0a6644d81c
 MISC metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 SHA1 ce284a4db1ea6aa20a3824fb0c5730385659f84c SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHvTTXNQqtfCuFneMRAuuoAJ9pLhkrN4Lvxv/pWe7+nfezJAJQ2ACff5PH
-aeO078k6G7aigjEKbJ7Lhqc=
-=D3f7
------END PGP SIGNATURE-----

diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r5.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r5.ebuild
index f4fd88dd1e8f4a8aa2e6ae928c2113be0496bc03..ea9d709a94572a77393321f1aaaa7b630325ad75 100644 (file)
--- a/dev-db/firebird/firebird-2.0.3.12981.0-r5.ebuild
+++ b/dev-db/firebird/firebird-2.0.3.12981.0-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r5.ebuild,v 1.2 2008/02/21 08:20:59 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r5.ebuild,v 1.3 2008/02/25 15:49:26 beandog Exp $
 
-inherit flag-o-matic eutils autotools versionator
+inherit flag-o-matic eutils autotools versionator multilib
 
 MY_P=Firebird-$(replace_version_separator 4 -)
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
 
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
-KEYWORDS="~amd64 -ia64 x86"
+KEYWORDS="amd64 -ia64 x86"
 IUSE="doc xinetd examples debug"
 RESTRICT="userpriv"
 
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
        enewgroup firebird 450
-       enewuser firebird 450 /bin/bash /usr/lib/firebird firebird
+       enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
 }
 
 function check_sed() {
@@ -123,7 +123,7 @@ src_compile() {
        filter-flags -fprefetch-loop-arrays
        filter-mfpmath sse
 
-       econf --prefix=/usr/lib/firebird --with-editline \
+       econf --prefix=/usr/$(get_libdir)/firebird --with-editline \
                $(use_enable !xinetd superserver) \
                $(use_enable debug) \
                ${myconf} || die "econf failed"
@@ -147,14 +147,14 @@ src_install() {
        insinto /usr/include
        doins include/*
 
-       insinto /usr/lib
+       insinto /usr/$(get_libdir)
        dolib.so lib/*.so*
        dolib.a lib/*.a*
 
-       insinto /usr/lib/firebird
+       insinto /usr/$(get_libdir)/firebird
        doins *.msg
 
-       insinto /usr/lib/firebird/help
+       insinto /usr/$(get_libdir)/firebird/help
        doins help/help.fdb
 
        insinto /usr/share/firebird/upgrade
@@ -167,13 +167,13 @@ src_install() {
        insopts -m0660 -o firebird -g firebird
        doins security2.fdb
 
-       exeinto /usr/lib/firebird/UDF
+       exeinto /usr/$(get_libdir)/firebird/UDF
        doexe UDF/*.so
 
-       exeinto /usr/lib/firebird/intl
+       exeinto /usr/$(get_libdir)/firebird/intl
        newexe intl/libfbintl.so fbintl.so
 
-       insinto /usr/lib/firebird/intl
+       insinto /usr/$(get_libdir)/firebird/intl
        doins ../install/misc/fbintl.conf
 
        diropts -m 755 -o firebird -g firebird
@@ -183,7 +183,7 @@ src_install() {
        keepdir /var/run/firebird
 
        # create links for backwards compatibility
-       cd "${D}/usr/lib"
+       cd "${D}/usr/$(get_libdir)"
        ln -s libfbclient.so libgds.so
        ln -s libfbclient.so libgds.so.0
        ln -s libfbclient.so libfbclient.so.1
@@ -209,7 +209,8 @@ src_install() {
 
 pkg_postinst() {
        # Hack to fix ownership/perms
-       chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/lib/firebird"
+       chown -fR firebird:firebird "${ROOT}/etc/firebird" \
+               "${ROOT}/usr/$(get_libdir)/firebird"
        chmod 750 "${ROOT}/etc/firebird"
 
        elog