diff options
author | Steve Dibb <beandog@gentoo.org> | 2008-02-25 15:49:26 +0000 |
---|---|---|
committer | Steve Dibb <beandog@gentoo.org> | 2008-02-25 15:49:26 +0000 |
commit | cd8b34a47464289dd3a59cee0ae3788900fabf1d (patch) | |
tree | d7d06584000bdbfba92f245f1a90bddd5db274a5 /dev-db/firebird | |
parent | Masking xmlrpc use flag because xmlrpc-c does not compile bug 209138 for ppc64 (diff) | |
download | gentoo-2-cd8b34a47464289dd3a59cee0ae3788900fabf1d.tar.gz gentoo-2-cd8b34a47464289dd3a59cee0ae3788900fabf1d.tar.bz2 gentoo-2-cd8b34a47464289dd3a59cee0ae3788900fabf1d.zip |
Fix multilib issues, amd64 stable, security bug 208034
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-db/firebird')
-rw-r--r-- | dev-db/firebird/ChangeLog | 6 | ||||
-rw-r--r-- | dev-db/firebird/firebird-2.0.3.12981.0-r5.ebuild | 27 |
2 files changed, 19 insertions, 14 deletions
diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog index a3277a3b73e9..3014325d2aa6 100644 --- 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/firebird-2.0.3.12981.0-r5.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r5.ebuild index f4fd88dd1e8f..ea9d709a9457 100644 --- 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 |