Bug #308163: avoid sandbox more.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 124 insertions, 3 deletions

diff --git a/sys-libs/nss-db/ChangeLog b/sys-libs/nss-db/ChangeLog
index 3d7d6666b989..df2bccdcd303 100644
--- a/sys-libs/nss-db/ChangeLog
+++ b/sys-libs/nss-db/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/nss-db
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/ChangeLog,v 1.21 2009/12/08 19:03:52 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/ChangeLog,v 1.22 2010/06/18 06:23:55 robbat2 Exp $
+
+*nss-db-2.2.3_pre1-r3 (18 Jun 2010)
+
+  18 Jun 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +nss-db-2.2.3_pre1-r3.ebuild, +files/sandbox.d_50nss-db:
+  Bug #308163: avoid sandbox more.
 
   08 Dec 2009; nixnut <nixnut@gentoo.org> nss-db-2.2.3_pre1-r2.ebuild:
   ppc stable #291811
diff --git a/sys-libs/nss-db/Manifest b/sys-libs/nss-db/Manifest
index 076a3c308c30..12ae1bbdb565 100644
--- a/sys-libs/nss-db/Manifest
+++ b/sys-libs/nss-db/Manifest
@@ -1,6 +1,7 @@
 AUX db3.patch 1174 RMD160 eeac21cb96b84070ddd1cb4975e4c42793711f12 SHA1 1733d2d5ee9cd8e6075bcb2d37b40291985d8721 SHA256 2db3285c19657c9dfad4ced22e17d0bf19268c12779e781716cd87db6fac7bf0
 AUX nss-db-2.2.3_pre1-root-upgrade-only.patch 706 RMD160 e13940f6ff0dc48014a73a245b11ca9086de6a50 SHA1 cdc016300086dd18ad8ad916a37d6791425c9b83 SHA256 097bb136444f03aebd482a81c6039ef82c8cc3aeee80c6750f3165d7d9a2fef3
 AUX remake-all-db 233 RMD160 e1a896ad287edf451a68bcdfa4c68e4c0678556e SHA1 4122643ca4aaad940017fa0ca7371cbeb0c18fed SHA256 16ea89210a3e5d0249665b425ad191244d159639028b1f9cb534d7cc9aef4f7d
+AUX sandbox.d_50nss-db 284 RMD160 fa90f7db952beb897242446af39275ecc3b7cea2 SHA1 9d112daa3ac16d7c5bfdb4f3935bd8f6bfa21737 SHA256 a3dce2b52c9707a13166b7640854de966042d823e11f3277e357025a4771faf3
 DIST nss_db-2.2.3pre1-dbopen.patch.bz2 258 RMD160 2a7b96393cf3c338c8bc1041e26824dbca74aa57 SHA1 966c4baf1c23cc2fe3f5930e2d898659ed9ac391 SHA256 9d7bf1ef17ca91c59c234bfa96d4b9e3f866a792c609a02cc6d9daa601dee1d3
 DIST nss_db-2.2.3pre1-dbupgrade.patch.bz2 263 RMD160 90ad8e330a7677f8ebd4a2fd210d258d8ba1e496 SHA1 223701c38b1d1935bc9d0ce13d56ae4e7743927a SHA256 31052eb79cc4aa60f639a3a57d9225630327ee6c728d62eda1d9c91ea7d70dc3
 DIST nss_db-2.2.3pre1-external.patch.bz2 1870 RMD160 d85fdb31935c5ab75ed80b1159155f5fa5b8a2e5 SHA1 b736463196d2b2438f03a801579e51e529c6a152 SHA256 dbc45a4dc7c977fae2193e0a14fdb862a5f42479ac40da0d4772d5d66e95ade0
@@ -8,5 +9,6 @@ DIST nss_db-2.2.3pre1.tar.gz 235360 RMD160 a511fcc1dc7937e13e84ccd125d688463ac52
 DIST nss_db-2.2.tar.gz 128636 RMD160 c67db191c7ae720b39a5b45866b110bd20d45585 SHA1 5a4796ae61e6e7b679f6559f0094f6a999311661 SHA256 aa8f54138b8797a6eeaf0e30364f45ff4d7d1d7e2846d8495de946509fda56f0
 EBUILD nss-db-2.2-r1.ebuild 1012 RMD160 d7f5ff010159a1a8d14bc42e802d1bf49d98d0b9 SHA1 3389daab85b1ab3363813b347f993eacdd4d74af SHA256 bf4474cc88cc7909602229c1cf6a026fc48ad352d889209d00289d5a7204c4f4
 EBUILD nss-db-2.2.3_pre1-r2.ebuild 3213 RMD160 e61bf19e54021e48983d72d59d0b0131e6ce6d1a SHA1 62742c22a93cd5e1a564214eecc2e810133c36c6 SHA256 70889006893c923e7fef5729bc24d2dec35d388fb42f2a6cb9e4abb1a6fbd8f6
-MISC ChangeLog 3010 RMD160 7e67bf1091f2cf5cfd2397dc26762234214cd42d SHA1 7b1a1911104898fc688fbe1efef5c8c9dcb6239b SHA256 7520202acca2a6451d23001009f3d0a5c7ee7ff6313bd2a0fff5bc2d5e7db65d
+EBUILD nss-db-2.2.3_pre1-r3.ebuild 3295 RMD160 a4beae4a0e7525f2e1b81810a8d9ba5505f26f67 SHA1 f7b867d9dd7456fa8789683970b302ac56ad7a99 SHA256 890aa76ffffe17eb08c753ae4bcb80c616d033960d1dd24944bfdd2f227193fc
+MISC ChangeLog 3196 RMD160 6c17e3ab7cbf1f8798fd1b3e1b9ec0c153925983 SHA1 ed07dd4292ca3c5ccb112e84ff6cab2af831aea5 SHA256 7955d54762c492aab9bc03dc31ee9be3eaa065fbdd48bfe847ce9942a79e1b01
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-libs/nss-db/files/sandbox.d_50nss-db b/sys-libs/nss-db/files/sandbox.d_50nss-db
new file mode 100644
index 000000000000..f8cfba24dd74
--- /dev/null
+++ b/sys-libs/nss-db/files/sandbox.d_50nss-db
@@ -0,0 +1 @@
+SANDBOX_PREDICT="/var/db/aliases.db:/var/db/automount.db:/var/db/bootparams.db:/var/db/ethers.db:/var/db/group.db:/var/db/hosts.db:/var/db/netgroup.db:/var/db/netmasks.db:/var/db/networks.db:/var/db/passwd.db:/var/db/protocols.db:/var/db/rpc.db:/var/db/services.db:/var/db/shadow.db"
diff --git a/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild b/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild
new file mode 100644
index 000000000000..5af04ae64ed7
--- /dev/null
+++ b/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild,v 1.1 2010/06/18 06:23:55 robbat2 Exp $
+
+inherit eutils versionator multilib autotools
+
+MY_PN="${PN/-/_}"
+MY_PV="${PV/_}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Allows important system files to be stored in a fast database file rather than plain text"
+HOMEPAGE="http://sources.redhat.com/glibc/"
+SRC_URI="ftp://sources.redhat.com/pub/glibc/old-releases/${MY_P}.tar.gz
+		 mirror://gentoo/${MY_P}-external.patch.bz2
+		 mirror://gentoo/${MY_P}-dbupgrade.patch.bz2
+		 mirror://gentoo/${MY_P}-dbopen.patch.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+# awk and make ARE needed at runtime!
+# and this didn't compile on BSD libc either
+RDEPEND=">=sys-libs/db-4
+		 sys-apps/gawk
+		 sys-devel/make
+		 >=sys-libs/glibc-2.3"
+# We really do need gettext to compile always :-(
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+S="${WORKDIR}/${MY_P}"
+
+db_getver() {
+	local DBPKG
+	DBPKG="$(best_version '>=sys-libs/db-4')"
+	echo "${DBPKG//sys-libs\/db-}"
+}
+
+db_getversym() {
+	local DBVER DBSYMSUFFIX
+	[ -n "${1}" ] && DBVER="${1}" || DBVER="$(db_getver)"
+	DBVER=($(get_version_components "${DBVER}"))
+	if has_version '>=sys-libs/db-4.3'; then
+		DBSYMSUFFIX=""
+	else
+		let DBSYMSUFFIX=(${DBVER[0]}*1000)+${DBVER[1]}
+		DBSYMSUFFIX=_${DBSYMSUFFIX}
+	fi
+	echo "${DBSYMSUFFIX}"
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${MY_P}-external.patch.bz2
+	EPATCH_OPTS="-p0 -d ${S}" epatch ${DISTDIR}/${MY_P}-dbupgrade.patch.bz2
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${MY_P}-dbopen.patch.bz2
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-root-upgrade-only.patch
+
+	# make sure we use the correct version of DB
+	cd "${S}"
+	DB_PV="$(db_getver)"
+	DB_SYM="$(db_getversym ${DB_PV})"
+	DB_PV_MAJORMINOR="$(get_version_component_range 1-2 ${DB_PV})"
+	sed -i configure.in \
+		-e "s!db.h!db${DB_PV_MAJORMINOR}/db.h!g" \
+		-e "s!db, db_version!db-${DB_PV_MAJORMINOR}, db_version${DB_SYM}!g"
+
+	# fix ancient broken-ness
+	for f in po/Makefile.in.in ./intl/Makefile.in; do
+		egrep -q '^mkinstalldirs = .*case.*esac' ${f} && \
+		sed -i ${f} \
+			-e '/^mkinstalldirs = /s,\(mkinstalldirs =\).*,\1 $(top_builddir)/./mkinstalldirs,'
+	done
+
+	# Fixes thanks to Flameeyes
+	# missing
+	cp /usr/share/gettext/config.rpath . 
+	sed -i -e '/makedb_LDADD/i makedb_CFLAGS=$(AM_CFLAGS)' src/Makefile.am
+	sed -i -e '/AC_PROG_CC/a AC_PROG_CC_C_O' configure.in
+	eautoreconf
+
+	# This is an evil target and we don't like it
+	sed -i -e '/^install-data-am:.*install-data-local/s,install-data-local,,g' "${S}"/src/Makefile.in
+}
+
+src_compile() {
+	econf -C --libdir=/$(get_libdir) `use_enable nls` || die
+	emake || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" slibdir="/$(get_libdir)" install || \
+		die "failed emake install"
+
+	into /usr
+	insinto /usr/share/${PN}
+	doins db-Makefile
+
+	exeinto /usr/sbin
+	doexe "${FILESDIR}"/remake-all-db
+
+	dodoc AUTHORS COPYING* ChangeLog INSTALL NEWS README THANKS
+
+	dodir /usr/$(get_libdir)/
+	mv "${D}"/$(get_libdir)/*.la "${D}"/usr/$(get_libdir)/ || \
+		die "failed to set up .la"
+
+	insinto /etc/sandbox.d/
+	newins "${FILESDIR}"/sandbox.d_50nss-db 50nss-db
+}