version bump, security bug 147652

Package-Manager: portage-2.1.2_pre1

6 files changed, 223 insertions, 2 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index d507e64c1f79..58a567cc3a64 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.47 2006/07/12 20:19:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.48 2006/09/16 08:22:36 genstef Exp $
+
+*nspr-4.6.3 (16 Sep 2006)
+
+  16 Sep 2006; Stefan Schweizer <genstef@gentoo.org> +nspr-4.6.3.ebuild:
+  version bump, security bug 147652
 
   12 Jul 2006; Aron Griffis <agriffis@gentoo.org> nspr-4.6.2.ebuild:
   Mark 4.6.2 stable on ia64. #134798
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.3 b/dev-libs/nspr/files/digest-nspr-4.6.3
new file mode 100644
index 000000000000..ea0a022c4dd6
--- /dev/null
+++ b/dev-libs/nspr/files/digest-nspr-4.6.3
@@ -0,0 +1,3 @@
+MD5 d529cf2d1676e4c38bf7d530098865e6 nspr-4.6.3.tar.gz 1301965
+RMD160 b9cdde13afabfc6af02817781b2ca274ce5588b6 nspr-4.6.3.tar.gz 1301965
+SHA256 69f323e359a4751c883fbfc3affe5ea255fc89e77107e97736d2440bc22010d1 nspr-4.6.3.tar.gz 1301965
diff --git a/dev-libs/nspr/nspr-4.6.3.ebuild b/dev-libs/nspr/nspr-4.6.3.ebuild
new file mode 100644
index 000000000000..917d5a5499ff
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.6.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.3.ebuild,v 1.1 2006/09/16 08:22:36 genstef Exp $
+
+inherit eutils gnuconfig
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mkdir build inst
+	epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-prtime.patch
+	gnuconfig_update
+}
+
+src_compile() {
+	cd build
+
+	if use amd64 || use ppc64 || use ia64 || use s390; then
+		myconf="${myconf} --enable-64bit"
+	else
+		myconf=""
+	fi
+
+	if use ipv6; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	../mozilla/nsprpub/configure \
+		--build=${CBUILD:-${CHOST}} \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir)/nspr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		${myconf} || die "./configure failed"
+	make || die
+}
+
+src_install () {
+	# Their build system is royally fucked, as usual
+	MINOR_VERSION=6
+	cd ${S}/build
+	make install
+	insinto /usr
+	doins -r dist/*
+	rm -rf ${D}/usr/bin/lib*.so
+
+	#removing includes/nspr/md as per fedora spec
+	# i.e a waste of space!
+	rm -rf ${D}/usr/include/nspr/md
+
+	# there have been /usr/lib/nspr changes (like the ldpath below), but never
+	# have I seen any libraries end up in this directory. lets fix that.
+	# note: I tried doing this fix via the build system. It wont work.
+	if [ ! -e ${D}/usr/lib/nspr ] ; then
+		mkdir -p ${D}/usr/lib/nspr
+		mv ${D}/usr/lib/*so* ${D}/usr/lib/nspr
+		mv ${D}/usr/lib/*\.a ${D}/usr/lib/nspr
+	fi
+	# and while we're at it, lets make it actually use the arch's libdir damnit
+	if [ "lib" != "$(get_libdir)" ] ; then
+		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+	fi
+	#and while at it move them to files with versions-ending
+	#and link them back :)
+	cd ${D}/usr/$(get_libdir)/nspr
+	for file in *.so; do
+	    mv ${file} ${file}.${MINOR_VERSION}
+	    ln -s ${file}.${MINOR_VERSION} ${file}
+	done
+	# cope with libraries being in /usr/lib/nspr
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/08nspr
+
+	# install nspr-config
+	insinto  /usr/bin
+	doins ${S}/build/config/nspr-config
+	chmod a+x ${D}/usr/bin/nspr-config
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins ${S}/build/config/nspr.pc
+}
diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 8830bb3352ee..0c2d1db660f1 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/nss
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.63 2006/07/23 22:18:56 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.64 2006/09/16 08:22:19 genstef Exp $
+
+*nss-3.11.3 (16 Sep 2006)
+
+  16 Sep 2006; Stefan Schweizer <genstef@gentoo.org> +nss-3.11.3.ebuild:
+  version bump, security bug 147652
 
 *nss-3.11.2 (23 Jul 2006)
 
diff --git a/dev-libs/nss/files/digest-nss-3.11.3 b/dev-libs/nss/files/digest-nss-3.11.3
new file mode 100644
index 000000000000..a6272bc9bb24
--- /dev/null
+++ b/dev-libs/nss/files/digest-nss-3.11.3
@@ -0,0 +1,3 @@
+MD5 196c8d2746bd75d3561d129f64bbf9cf nss-3.11.3.tar.gz 3684552
+RMD160 da84f03f52453a307b27602e4a42205b20c02947 nss-3.11.3.tar.gz 3684552
+SHA256 41278699b80dc3767f3d505f3526e6acb2911fd75bf82167bb3b3753aa5f4c6f nss-3.11.3.tar.gz 3684552
diff --git a/dev-libs/nss/nss-3.11.3.ebuild b/dev-libs/nss/nss-3.11.3.ebuild
new file mode 100644
index 000000000000..ce6315e0eced
--- /dev/null
+++ b/dev-libs/nss/nss-3.11.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.3.ebuild,v 1.1 2006/09/16 08:22:19 genstef Exp $
+
+inherit eutils
+
+NSPR_VER="4.6.2"
+RTM_NAME="NSS_${PV//./_}_RTM"
+DESCRIPTION="Mozilla's Netscape Security Services Library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="virtual/libc
+	app-arch/zip
+	>=dev-libs/nspr-${NSPR_VER}"
+
+src_unpack() {
+	unpack ${A}
+
+	# hack nspr paths
+	echo 'INCLUDES += -I${ROOT}/usr/include/nspr -I$(DIST)/include/dbm' \
+		>> ${S}/mozilla/security/coreconf/headers.mk || die "failed to append include"
+
+	# cope with nspr being in /usr/$(get_libdir)/nspr
+	sed -e 's:$(DIST)/lib:${ROOT}/usr/'"$(get_libdir)"/nspr':' \
+		-i ${S}/mozilla/security/coreconf/location.mk
+
+	# modify install path
+	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i ${S}/mozilla/security/coreconf/source.mk
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-3.11-config.patch
+	epatch ${FILESDIR}/${PN}-3.11-config-1.patch
+	epatch ${FILESDIR}/${PN}-mips64.patch
+}
+
+src_compile() {
+	if use amd64 || use ppc64 || use ia64 || use s390; then
+		export USE_64=1
+	fi
+	export NSDISTMODE=copy
+	cd ${S}/mozilla/security/coreconf
+	emake -j1 BUILD_OPT=1 || die "coreconf make failed"
+	cd ${S}/mozilla/security/dbm
+	emake -j1 BUILD_OPT=1 || die "dbm make failed"
+	cd ${S}/mozilla/security/nss
+	emake -j1 BUILD_OPT=1 || die "nss make failed"
+}
+
+src_install () {
+	MINOR_VERSION=11
+	cd ${S}/mozilla/security/dist
+
+	# put all *.a files in /usr/lib/nss (because some have conflicting names
+	# with existing libraries)
+	dodir /usr/$(get_libdir)/nss
+	cp -L */lib/*.so ${D}/usr/$(get_libdir)/nss || die "copying shared libs failed"
+	cp -L */lib/*.chk ${D}/usr/$(get_libdir)/nss || die "copying chk files failed"
+	cp -L */lib/*.a ${D}/usr/$(get_libdir)/nss || die "copying libs failed"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins private/nss/*.h
+	doins public/nss/*.h
+	cd ${D}/usr/$(get_libdir)/nss
+	for file in *.so; do
+		mv ${file} ${file}.${MINOR_VERSION}
+		ln -s ${file}.${MINOR_VERSION} ${file}
+	done
+
+	# coping with nss being in a different path. We move up priority to
+	# ensure that nss/nspr are used specifically before searching elsewhere.
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/nss" > ${D}/etc/env.d/08nss
+
+	dodir /usr/bin
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp ${FILESDIR}/nss-config.in ${D}/usr/bin/nss-config
+	cp ${FILESDIR}/nss.pc.in ${D}/usr/$(get_libdir)/pkgconfig/nss.pc
+	NSS_VMAJOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
+	NSS_VMINOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
+	NSS_VPATCH=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
+
+	sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \
+		-e "s,@prefix@,/usr,g" \
+		-e "s,@exec_prefix@,\$\{prefix},g" \
+		-e "s,@includedir@,\$\{prefix}/include/nss,g" \
+		-e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \
+		-e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \
+		-e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
+		-i ${D}/usr/bin/nss-config
+	chmod 755 ${D}/usr/bin/nss-config
+
+	sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \
+	      -e "s,@prefix@,/usr,g" \
+	      -e "s,@exec_prefix@,\$\{prefix},g" \
+	      -e "s,@includedir@,\$\{prefix}/include/nss," \
+	      -e "s,@NSPR_VERSION@,`nspr-config --version`,g" \
+	      -e "s,@NSS_VERSION@,$NSS_VMAJOR.$NSS_VMINOR.$NSS_VPATCH,g" \
+	      -i ${D}/usr/$(get_libdir)/pkgconfig/nss.pc
+	chmod 644 ${D}/usr/$(get_libdir)/pkgconfig/nss.pc
+}