# HG changeset patch # User Binki # Date 2009-08-20 14:37:22 # Node ID 6a91accf752d31e0db18e41d417ea6a228339180 # Parent cfe344101e3f78b5fb3eb16cdd7a002e8a0d874f dev-libs/nss: removed, fix fixed in nss-3.12.2 (in Portage) diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest deleted file mode 100644 --- a/dev-libs/nss/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX nss-3.11-config.patch 3167 RMD160 e4b57c89a518b54070b884f40ca11224ccc60349 SHA1 78acfa3c26bf5ca8f8d741f54c00bcf044d4c82b SHA256 0947675d067f09dee55684e29dc7764834ad640b2adf52d9450fbb1b7f9b728c -AUX nss-3.12-config-1.patch 1508 RMD160 ea2f4e2f05cc865ef41af0c39e573b8eb8801f42 SHA1 4897595a91f331ce34155e9872ece3518acb1ac8 SHA256 22d72c155d7b6aa8f1dd797959d5ec3b0975cf9a1bf4607e6b0ee2207112c2b7 -AUX nss-3.12-missingheader.patch 876 RMD160 4b1d2f888a6c243858ed48c157b7515fa5e66159 SHA1 5b9bd2b2170db9298667e937ff44c49e44d91b63 SHA256 e21218da77054614883cf23fb6b4dad53b7152aefe1ef8efbe5822d1828a6bc9 -AUX nss-fbsd7.patch 638 RMD160 9c60b07a9f9b9a7482221f09042266c358d6cfcf SHA1 27036a161ff076fc8a9d459458d2a4adc38876ad SHA256 f471f04def6d4f1abd2062b582246a60a33b346576ad6e71c782fcfe317c8cc7 -AUX nss-mips64.patch 508 RMD160 17e750805ec8e3e6f5989810b43522bea344f133 SHA1 dd127c2365ea13f5f5c3ec3f9d6d1991225e3565 SHA256 e50a8fcd0521b7722448b480ff672d49d6ca0dc6134d8df25ac63da1a83ab07b -DIST nss-3.12.tar.gz 5163155 RMD160 a84f9fa11e9fdb1c13f6d9b804b6f37dac4ee0af SHA1 6b8e83c0931cfad161aae993d344687b67f317aa SHA256 d30a7470b82a73ed442525b365afaf00427204e3771edfeab05743acca97122b -EBUILD nss-3.12.ebuild 4457 RMD160 4a10c8d39525708269a021df4f154383369e9616 SHA1 b5fd893171818b5e75d63a8dbc9b3f73d33125c7 SHA256 1a6df0c7bfd9856eedf697e14bc243bc2b54b1e6582e4c24964f06c3e0493b3b diff --git a/dev-libs/nss/files/nss-3.11-config.patch b/dev-libs/nss/files/nss-3.11-config.patch deleted file mode 100644 --- a/dev-libs/nss/files/nss-3.11-config.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- mozilla/security/nss/lib/ckfw/builtins/config.mk.orig 2005-01-20 02:25:46.000000000 +0000 -+++ mozilla/security/nss/lib/ckfw/builtins/config.mk 2006-01-15 05:13:08.000000000 +0000 -@@ -69,3 +69,9 @@ - MKSHLIB += -R '$$ORIGIN' - endif - -+ifeq ($(OS_TARGET),Linux) -+# The -R '$ORIGIN' linker option instructs this library to search for its -+# dependencies in the same directory where it resides. -+DSO_LDOPTS += -Wl,-R,'$$ORIGIN' -+endif -+ ---- mozilla/security/nss/lib/ckfw/capi/config.mk.orig 2005-11-04 02:05:04.000000000 +0000 -+++ mozilla/security/nss/lib/ckfw/capi/config.mk 2006-01-15 05:13:52.000000000 +0000 -@@ -69,3 +69,9 @@ - MKSHLIB += -R '$$ORIGIN' - endif - -+ifeq ($(OS_TARGET),Linux) -+# The -R '$ORIGIN' linker option instructs this library to search for its -+# dependencies in the same directory where it resides. -+DSO_LDOPTS += -Wl,-R,'$$ORIGIN' -+endif -+ ---- mozilla/security/nss/lib/freebl/Makefile.orig 2005-11-22 07:13:32.000000000 +0000 -+++ mozilla/security/nss/lib/freebl/Makefile 2006-01-15 05:16:05.000000000 +0000 -@@ -132,6 +132,7 @@ - endif - - ifeq ($(OS_TARGET),Linux) -+DSO_LDOPTS += -Wl,-R,'$$ORIGIN' - ifeq ($(CPU_ARCH),x86_64) - ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s - ASFLAGS += -march=opteron -m64 -fPIC ---- mozilla/security/nss/lib/nss/config.mk.orig 2005-07-21 23:48:28.000000000 +0000 -+++ mozilla/security/nss/lib/nss/config.mk 2006-01-15 05:11:58.000000000 +0000 -@@ -122,6 +122,11 @@ - endif - endif - -+ifeq ($(OS_TARGET),Linux) -+# The -R '$ORIGIN' linker option instructs this library to search for its -+# dependencies in the same directory where it resides. -+DSO_LDOPTS += -Wl,-R,'$$ORIGIN' -+endif - - ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET))) - ifndef NS_USE_GCC ---- mozilla/security/nss/lib/smime/config.mk.orig 2005-09-02 01:24:57.000000000 +0000 -+++ mozilla/security/nss/lib/smime/config.mk 2006-01-15 05:05:53.000000000 +0000 -@@ -97,3 +97,10 @@ - # dependencies in the same directory where it resides. - MKSHLIB += -R '$$ORIGIN' - endif -+ -+ifeq ($(OS_TARGET),Linux) -+# The -R '$ORIGIN' linker option instructs this library to search for its -+# dependencies in the same directory where it resides. -+DSO_LDOPTS += -Wl,-R,'$$ORIGIN' -+endif -+ ---- mozilla/security/nss/lib/softoken/config.mk.orig 2005-10-19 01:03:31.000000000 +0000 -+++ mozilla/security/nss/lib/softoken/config.mk 2006-01-15 05:07:15.000000000 +0000 -@@ -93,6 +93,12 @@ - MKSHLIB += -R '$$ORIGIN' - endif - -+ifeq ($(OS_TARGET),Linux) -+# The -R '$ORIGIN' linker option instructs this library to search for its -+# dependencies in the same directory where it resides. -+DSO_LDOPTS += -Wl,-R,'$$ORIGIN' -+endif -+ - ifeq ($(OS_TARGET),WINCE) - DEFINES += -DDBM_USING_NSPR - endif ---- mozilla/security/nss/lib/ssl/config.mk.orig 2005-10-19 01:04:16.000000000 +0000 -+++ mozilla/security/nss/lib/ssl/config.mk 2006-01-15 05:10:38.000000000 +0000 -@@ -119,6 +119,12 @@ - #EXTRA_SHARED_LIBS += -ldl -lrt -lc -z defs - endif - -+ifeq ($(OS_TARGET),Linux) -+# The -R '$ORIGIN' linker option instructs this library to search for its -+# dependencies in the same directory where it resides. -+DSO_LDOPTS += -Wl,-R,'$$ORIGIN' -+endif -+ - endif - - # indicates dependency on freebl static lib diff --git a/dev-libs/nss/files/nss-3.12-config-1.patch b/dev-libs/nss/files/nss-3.12-config-1.patch deleted file mode 100644 --- a/dev-libs/nss/files/nss-3.12-config-1.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2005-09-16 17:09:23.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-02-09 05:27:36.000000000 +0000 -@@ -37,6 +37,8 @@ - - include $(CORE_DEPTH)/coreconf/UNIX.mk - -+NSS_VERSION_MINOR=12 -+ - # - # The default implementation strategy for Linux is now pthreads - # ---- mozilla/security/coreconf/Linux2.6.mk.orig 2005-09-16 17:09:23.000000000 +0000 -+++ mozilla/security/coreconf/Linux2.6.mk 2006-02-09 05:38:16.000000000 +0000 -@@ -38,8 +38,7 @@ - include $(CORE_DEPTH)/coreconf/Linux.mk - - OS_REL_CFLAGS += -DLINUX2_1 --MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -- -+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so).$(NSS_VERSION_MINOR) - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif ---- mozilla/security/coreconf/rules.mk.orig 2005-10-10 23:46:12.000000000 +0000 -+++ mozilla/security/coreconf/rules.mk 2006-02-09 06:27:46.000000000 +0000 -@@ -113,7 +113,10 @@ - $(INSTALL) -m 664 $(LIBRARY) $(SOURCE_LIB_DIR) - endif - ifdef SHARED_LIBRARY -+ mv $(SHARED_LIBRARY) $(SHARED_LIBRARY).$(NSS_VERSION_MINOR) -+ ln -s $(shell pwd)/$(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(shell pwd)/$(SHARED_LIBRARY) - $(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR) -+ $(INSTALL) -m 775 $(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(SOURCE_LIB_DIR) - ifdef MOZ_DEBUG_SYMBOLS - ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) - $(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR) - diff --git a/dev-libs/nss/files/nss-3.12-missingheader.patch b/dev-libs/nss/files/nss-3.12-missingheader.patch deleted file mode 100644 --- a/dev-libs/nss/files/nss-3.12-missingheader.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -c /var/tmp/portage/dev-libs/nss-3.12/work/nss-3.12/mozilla/security/nss/lib/pk11wrap/pk11pub.h /tmp/buffer-content-25351CEc -This patch was made mirroring mozilla bug #129303, attachment #203479 -*** nss-3.12/mozilla/security/nss/lib/pk11wrap/pk11pub.h 2008-03-10 16:16:46.000000000 -0400 ---- /tmp/buffer-content-25351CEc 2008-11-09 22:43:34.000000000 -0500 -*************** -*** 628,633 **** ---- 628,634 ---- - CERTCertList * PK11_ListCertsInSlot(PK11SlotInfo *slot); - CERTSignedCrl* PK11_ImportCRL(PK11SlotInfo * slot, SECItem *derCRL, char *url, - int type, void *wincx, PRInt32 importOptions, PRArenaPool* arena, PRInt32 decodeOptions); -+ PK11SlotList * PK11_GetAllSlotsForCert(CERTCertificate *c, void *arg); - - /********************************************************************** - * Sign/Verify - -Diff finished. Sun Nov 9 22:43:34 2008 diff --git a/dev-libs/nss/files/nss-fbsd7.patch b/dev-libs/nss/files/nss-fbsd7.patch deleted file mode 100644 --- a/dev-libs/nss/files/nss-fbsd7.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=436806 - -objformat has been deprecated for a while. elf has been the default format for -FreeBSD for a while too. objformat is gone from FreeBSD 7, so we default to elf. - ---- nss-3.12/mozilla/security/coreconf/FreeBSD.mk.old 2008-09-05 11:38:11 +0200 -+++ nss-3.12/mozilla/security/coreconf/FreeBSD.mk 2008-09-05 11:38:28 +0200 -@@ -65,7 +65,7 @@ - - ARCH = freebsd - --MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) - - ifeq ($(MOZ_OBJFORMAT),elf) - DLL_SUFFIX = so diff --git a/dev-libs/nss/files/nss-mips64.patch b/dev-libs/nss/files/nss-mips64.patch deleted file mode 100644 --- a/dev-libs/nss/files/nss-mips64.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2004-08-21 00:07:08.000000000 -0400 -+++ mozilla/security/coreconf/Linux.mk 2004-08-20 23:28:52.000000000 -0400 -@@ -106,6 +106,10 @@ - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = mips - else -+ifeq ($(OS_TEST),mips64) -+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+ CPU_ARCH = mips64 -+else - OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE - CPU_ARCH = x86 - endif -@@ -122,6 +126,7 @@ - endif - endif - endif -+endif - - - LIBC_TAG = _glibc diff --git a/dev-libs/nss/nss-3.12.ebuild b/dev-libs/nss/nss-3.12.ebuild deleted file mode 100644 --- a/dev-libs/nss/nss-3.12.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.ebuild,v 1.3 2008/09/05 10:48:08 aballier Exp $ - -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.7.1" -RTM_NAME="NSS_${PV//./_}_RTM" -DESCRIPTION="Mozilla's Network 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 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="utils" - -DEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5.6" - -src_unpack() { - unpack ${A} - - cd "${S}"/mozilla/security/coreconf - # hack nspr paths - echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \ - >> headers.mk || die "failed to append include" - - # cope with nspr being in /usr/$(get_libdir)/nspr - sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \ - -i location.mk - - # modify install path - sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ - -i source.mk - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk - - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.11-config.patch - epatch "${FILESDIR}"/${PN}-3.12-config-1.patch - epatch "${FILESDIR}"/${PN}-mips64.patch - epatch "${FILESDIR}"/${PN}-fbsd7.patch - epatch "${FILESDIR}"/${PN}-${PV}-missingheader.patch -} - -src_compile() { - strip-flags - - echo > "${T}"/test.c - $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o - case $(file "${T}"/test.o) in - *64-bit*) export USE_64=1;; - *32-bit*) ;; - *) die "FAIL";; - esac - - export NSDISTMODE=copy - export NSS_USE_SYSTEM_SQLITE=1 - cd "${S}"/mozilla/security/coreconf - emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm - emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/security/nss - emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "nss make failed" -} - -src_install () { - MINOR_VERSION=12 - 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}"/3.12-nss-config.in "${D}"/usr/bin/nss-config - cp "${FILESDIR}"/3.12-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 - - if use utils; then - cd "${S}"/mozilla/security/dist/*/bin/ - for f in *; do - newbin ${f} nss${f} - done - fi -}