From: Raúl Porcel Date: Wed, 7 Mar 2007 21:21:10 +0000 (+0000) Subject: Version bump wrt bug 165555 and cleanup old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4337069c464a6f65c0581d7b81947240a4b2a437;p=gentoo.git Version bump wrt bug 165555 and cleanup old Package-Manager: portage-2.1.2.1-r1 --- diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index 303b244d51ff..ce3d62c6fd92 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/nss # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.79 2007/03/07 16:40:50 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.80 2007/03/07 21:21:10 armin76 Exp $ + +*nss-3.11.5 (07 Mar 2007) + + 07 Mar 2007; Raúl Porcel + -files/nss-3.9.2-gcc4.patch, -files/nss-3.9.2-ppc64.patch, + -files/nss-3.11.1-perl.patch, +files/nss-3.11.5-config-1.patch, + -files/nss-3.11-zdefs.patch, +nss-3.11.5.ebuild: + Version bump wrt bug 165555 and cleanup old 07 Mar 2007; Raúl Porcel nss-3.11.4.ebuild: license change, bug 150118 diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index fbb59d595751..dab0d79d7e98 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -6,22 +6,10 @@ AUX nss-3.11-config.patch 3167 RMD160 e4b57c89a518b54070b884f40ca11224ccc60349 S MD5 23a5eb94e38f7dcf481a83bb81143788 files/nss-3.11-config.patch 3167 RMD160 e4b57c89a518b54070b884f40ca11224ccc60349 files/nss-3.11-config.patch 3167 SHA256 0947675d067f09dee55684e29dc7764834ad640b2adf52d9450fbb1b7f9b728c files/nss-3.11-config.patch 3167 -AUX nss-3.11-zdefs.patch 545 RMD160 77e0f5803d638f4e4c5565d32d184e4edbb45ad7 SHA1 a97aa2ed7293996f66b74d7b354e98091f830936 SHA256 f9283635903cf0c6cfda4b634263b9b02f64e65c00fa656d27592e5f2fc3458d -MD5 12bb7fc61eb53ac0d989dd31b1a5ce66 files/nss-3.11-zdefs.patch 545 -RMD160 77e0f5803d638f4e4c5565d32d184e4edbb45ad7 files/nss-3.11-zdefs.patch 545 -SHA256 f9283635903cf0c6cfda4b634263b9b02f64e65c00fa656d27592e5f2fc3458d files/nss-3.11-zdefs.patch 545 -AUX nss-3.11.1-perl.patch 2024 RMD160 c0319b9fc50d6cb7246f7268060863a477d9da5d SHA1 fbd56675b7584525cd2d588782e5c61dff8cb94e SHA256 a86fb5fe79ce158cba025a66af18405917847d85619e59edae949c24fe8672f8 -MD5 fcffdc0db377b01032220a594cc3039b files/nss-3.11.1-perl.patch 2024 -RMD160 c0319b9fc50d6cb7246f7268060863a477d9da5d files/nss-3.11.1-perl.patch 2024 -SHA256 a86fb5fe79ce158cba025a66af18405917847d85619e59edae949c24fe8672f8 files/nss-3.11.1-perl.patch 2024 -AUX nss-3.9.2-gcc4.patch 1818 RMD160 7be7c0f39933dcad5c45909ef6099ad3a170d40e SHA1 035334857928da20d70c8dbac7f667348f4080dd SHA256 09bf6b2d51c27eccbf3b6c21aafb7f6263b723b3e526419f81a90db7bc203046 -MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/nss-3.9.2-gcc4.patch 1818 -RMD160 7be7c0f39933dcad5c45909ef6099ad3a170d40e files/nss-3.9.2-gcc4.patch 1818 -SHA256 09bf6b2d51c27eccbf3b6c21aafb7f6263b723b3e526419f81a90db7bc203046 files/nss-3.9.2-gcc4.patch 1818 -AUX nss-3.9.2-ppc64.patch 526 RMD160 ba87b963b301cc0aaa3a19247ed14fc51794c790 SHA1 299c0a26ed39bd9d944d58e5e1a4a4c2c7a1d6f8 SHA256 0fcf66819d218ca2bd3c48ccfde0a6365cc70a68f9c6861b82f2176449775031 -MD5 31208c12f404d120fb880b0e8300c175 files/nss-3.9.2-ppc64.patch 526 -RMD160 ba87b963b301cc0aaa3a19247ed14fc51794c790 files/nss-3.9.2-ppc64.patch 526 -SHA256 0fcf66819d218ca2bd3c48ccfde0a6365cc70a68f9c6861b82f2176449775031 files/nss-3.9.2-ppc64.patch 526 +AUX nss-3.11.5-config-1.patch 1508 RMD160 2f71b5c38841c2c24cbea6ca0f206b3debfb4942 SHA1 7df5c48fc0ea49fee61e408f8b8c64a9eb01c995 SHA256 400bfe6e75ba628663819b833a04fd0037c575edc075a1e109665fe939670c74 +MD5 b3d1b99b538f1dd071a72a62fb40d149 files/nss-3.11.5-config-1.patch 1508 +RMD160 2f71b5c38841c2c24cbea6ca0f206b3debfb4942 files/nss-3.11.5-config-1.patch 1508 +SHA256 400bfe6e75ba628663819b833a04fd0037c575edc075a1e109665fe939670c74 files/nss-3.11.5-config-1.patch 1508 AUX nss-config.in 2238 RMD160 b9dfeeef5319bae20326454a67dc67316dcd04cd SHA1 535ea4869d0f5fdc4f14b723320ef7284c14190a SHA256 57fb0219482981c80d9a72d8a86dfcbe0e776e4e5609fad8965e651f79296fa7 MD5 99b1609eb56425f4ecafc6a0b457f83b files/nss-config.in 2238 RMD160 b9dfeeef5319bae20326454a67dc67316dcd04cd files/nss-config.in 2238 @@ -36,6 +24,7 @@ RMD160 8716eb83ecf554c5751b0a135adeaf0a3a4208b0 files/nss.pc.in 269 SHA256 cf659c5e72e560b79a928e7cdf5ed416b286f4eefa8d5b0cab50ee846b320e75 files/nss.pc.in 269 DIST nss-3.11.3.tar.gz 3684552 RMD160 da84f03f52453a307b27602e4a42205b20c02947 SHA1 842a153d110a1547d29f5b78326eee97819a4449 SHA256 41278699b80dc3767f3d505f3526e6acb2911fd75bf82167bb3b3753aa5f4c6f DIST nss-3.11.4.tar.gz 3713920 RMD160 5047c7f56444b22bc5f64dbaa02576e48ab5ef2a SHA1 fc032211f38bd3b688b75f3bdf36a32a23e4abd2 SHA256 c50062df123d733f25d4903f42e8855adf51b7324c786c714f7dd1ab9e328f06 +DIST nss-3.11.5.tar.gz 3696893 RMD160 fe49128857bbc645d6ee8824c96e9ff0461438c0 SHA1 2cde010908ab41777e43fda83be0a925010c4a09 SHA256 ea3876f5aea92231228130b451479a7fda94436d7c328f0fe1c07ea6f8fc9a40 EBUILD nss-3.11.3-r1.ebuild 3983 RMD160 59c63d92074bbf402f30d63a28063d2f663e2c86 SHA1 b7e5fe35622d633e46327cf38ab0261953947307 SHA256 886daa14be10351b828f3d5a508530eff60ff5c4b45fd5e720e545e118aa140c MD5 29d729ae3512321cd7f6f49bcf1a39d6 nss-3.11.3-r1.ebuild 3983 RMD160 59c63d92074bbf402f30d63a28063d2f663e2c86 nss-3.11.3-r1.ebuild 3983 @@ -48,10 +37,14 @@ EBUILD nss-3.11.4.ebuild 3996 RMD160 6c0d4abe452f69645627e22f57ca46307be6ed3c SH MD5 5144fb9f42e23b5f7d83616ac3ff06e4 nss-3.11.4.ebuild 3996 RMD160 6c0d4abe452f69645627e22f57ca46307be6ed3c nss-3.11.4.ebuild 3996 SHA256 5ec1ac5e173bd32ffbc3f05bff346eb93b51fd216b130d2447ea939c229466d9 nss-3.11.4.ebuild 3996 -MISC ChangeLog 9625 RMD160 a69cd9f11b6cd692c4424b1ac342926c5e24998f SHA1 a15b8b5cf8847535efd317cad04923fd8592ce20 SHA256 0feace5a07b8054cca0d9cb6429be60e90f8fb55e4fec219d64e6278110cc725 -MD5 9919670132bf08bb9d5a3b1d8dd03fcc ChangeLog 9625 -RMD160 a69cd9f11b6cd692c4424b1ac342926c5e24998f ChangeLog 9625 -SHA256 0feace5a07b8054cca0d9cb6429be60e90f8fb55e4fec219d64e6278110cc725 ChangeLog 9625 +EBUILD nss-3.11.5.ebuild 3983 RMD160 fd7a847e826536a428cf5aebf295ff6d251cc428 SHA1 4024b233a9212369b3bb2b412046722e4449da22 SHA256 aae455d3744a81b427c6a169dabdf8528e5d3c27f5d231336393b08095833b3f +MD5 37c9ed83a5ac2604e67cc35170beeefb nss-3.11.5.ebuild 3983 +RMD160 fd7a847e826536a428cf5aebf295ff6d251cc428 nss-3.11.5.ebuild 3983 +SHA256 aae455d3744a81b427c6a169dabdf8528e5d3c27f5d231336393b08095833b3f nss-3.11.5.ebuild 3983 +MISC ChangeLog 9926 RMD160 045d7ebff668efa9c88e3d150450b49f382f65f1 SHA1 a26865d3df5cd502ef2306cb78f5f33b4dda99d3 SHA256 e989c8a6e5a4e54969353d123b0d78512936c01aab016e0eb2c03121216d8942 +MD5 0f8a90a5cfdc1988d4eb860b77d91cd0 ChangeLog 9926 +RMD160 045d7ebff668efa9c88e3d150450b49f382f65f1 ChangeLog 9926 +SHA256 e989c8a6e5a4e54969353d123b0d78512936c01aab016e0eb2c03121216d8942 ChangeLog 9926 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160 @@ -65,3 +58,6 @@ SHA256 2d9a5ffde98268d6d3aee0a56354a526a61e58988a2fd5b3bcbf972a3b3ebbd5 files/di MD5 d0b7edd7e4851a040365059d059d9189 files/digest-nss-3.11.4 235 RMD160 ac0948f91465d2aca9d15ec2f776671c82b3e500 files/digest-nss-3.11.4 235 SHA256 efe4bf422ed887062809946056c7c0146806cfc630c817534ead7b0881202cae files/digest-nss-3.11.4 235 +MD5 9cad1572e7476c69874652009a0ca939 files/digest-nss-3.11.5 235 +RMD160 5b60d388fda9327971c41506adc1931b7aa8359f files/digest-nss-3.11.5 235 +SHA256 e9cfbe72168b75a9e6c008174e111a9ff4a7bd7ac953a37000881cc63d5f96b3 files/digest-nss-3.11.5 235 diff --git a/dev-libs/nss/files/digest-nss-3.11.5 b/dev-libs/nss/files/digest-nss-3.11.5 new file mode 100644 index 000000000000..17dd61bdf6dd --- /dev/null +++ b/dev-libs/nss/files/digest-nss-3.11.5 @@ -0,0 +1,3 @@ +MD5 1add44e6a41dbf5091cfd000f19ad6b9 nss-3.11.5.tar.gz 3696893 +RMD160 fe49128857bbc645d6ee8824c96e9ff0461438c0 nss-3.11.5.tar.gz 3696893 +SHA256 ea3876f5aea92231228130b451479a7fda94436d7c328f0fe1c07ea6f8fc9a40 nss-3.11.5.tar.gz 3696893 diff --git a/dev-libs/nss/files/nss-3.11-zdefs.patch b/dev-libs/nss/files/nss-3.11-zdefs.patch deleted file mode 100644 index 0e8128cbcaf1..000000000000 --- a/dev-libs/nss/files/nss-3.11-zdefs.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: mozilla/security/coreconf/Linux.mk -=================================================================== -RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v -retrieving revision 1.27 -diff -u -r1.27 Linux.mk ---- mozilla/security/coreconf/Linux.mk 16 Sep 2005 17:09:23 -0000 1.27 -+++ mozilla/security/coreconf/Linux.mk 15 Dec 2005 21:25:00 -0000 -@@ -165,7 +165,7 @@ - ARCH = linux - - DSO_CFLAGS = -fPIC --DSO_LDOPTS = -shared $(ARCHFLAG) -z defs -+DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,-z,defs - DSO_LDFLAGS = - LDFLAGS += $(ARCHFLAG) - diff --git a/dev-libs/nss/files/nss-3.11.1-perl.patch b/dev-libs/nss/files/nss-3.11.1-perl.patch deleted file mode 100644 index 194525095194..000000000000 --- a/dev-libs/nss/files/nss-3.11.1-perl.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- .pc/make-perl-problem-in-coreconf.diff/security/coreconf/rules.mk 2006-01-31 00:06:21.000000000 +0100 -+++ security/coreconf/rules.mk 2006-01-31 00:31:37.000000000 +0100 -@@ -865,18 +865,18 @@ endif - - - ################################################################################ - - -include $(DEPENDENCIES) - - ifneq (,$(filter-out OpenVMS OS2 WIN%,$(OS_TARGET))) - # Can't use sed because of its 4000-char line length limit, so resort to perl --.DEFAULT: -- @perl -e ' \ -+ -+PERL_DEPENDENCIES_PROGRAM=\ - open(MD, "< $(DEPENDENCIES)"); \ - while () { \ - if (m@ \.*/*$< @) { \ - $$found = 1; \ - last; \ - } \ - } \ - if ($$found) { \ -@@ -893,17 +893,20 @@ ifneq (,$(filter-out OpenVMS OS2 WIN%,$( - } \ - close(TMD); \ - if (!rename($$tmpname, "$(DEPENDENCIES)")) { \ - unlink(($$tmpname)); \ - } \ - } elsif ("$<" ne "$(DEPENDENCIES)") { \ - print "$(MAKE): *** No rule to make target $<. Stop.\n"; \ - exit(1); \ -- }' -+ } -+ -+.DEFAULT: -+ @perl -e '$(PERL_DEPENDENCIES_PROGRAM)' - endif - - ############################################################################# - # X dependency system - ############################################################################# - - ifdef MKDEPENDENCIES - diff --git a/dev-libs/nss/files/nss-3.11.5-config-1.patch b/dev-libs/nss/files/nss-3.11.5-config-1.patch new file mode 100644 index 000000000000..a39e30dddf17 --- /dev/null +++ b/dev-libs/nss/files/nss-3.11.5-config-1.patch @@ -0,0 +1,37 @@ +--- 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=11 ++ + # + # 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.9.2-gcc4.patch b/dev-libs/nss/files/nss-3.9.2-gcc4.patch deleted file mode 100644 index 2d0a04949072..000000000000 --- a/dev-libs/nss/files/nss-3.9.2-gcc4.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h ---- mozilla-orig/security/nss/lib/pki1/oiddata.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oiddata.h 2005-03-13 19:15:19.000000000 -0500 -@@ -43,12 +43,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - extern const NSSOID *NSS_OID_RFC1274_UID; - extern const NSSOID *NSS_OID_RFC1274_EMAIL; - extern const NSSOID *NSS_OID_RFC2247_DC; -diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl ---- mozilla-orig/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:15:19.000000000 -0500 -@@ -233,12 +233,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - EOD - ; - -diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h ---- mozilla-orig/security/nss/lib/pki1/pki1.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/pki1.h 2005-03-13 19:15:19.000000000 -0500 -@@ -55,7 +55,9 @@ - - PR_BEGIN_EXTERN_C - --/* fgmr 19990505 moved these here from oiddata.h */ -+extern const NSSOID nss_builtin_oids[]; -+extern const PRUint32 nss_builtin_oid_count; -+ - extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[]; - extern const PRUint32 nss_attribute_type_alias_count; - diff --git a/dev-libs/nss/files/nss-3.9.2-ppc64.patch b/dev-libs/nss/files/nss-3.9.2-ppc64.patch deleted file mode 100644 index 5c9c3181ca97..000000000000 --- a/dev-libs/nss/files/nss-3.9.2-ppc64.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.foo 2003-10-01 13:06:30.000000000 -0400 -+++ mozilla/security/coreconf/Linux.mk 2003-10-01 13:07:22.000000000 -0400 -@@ -53,7 +53,11 @@ - ifeq ($(OS_TEST),m68k) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = m68k --else -+else -+ifeq ($(OS_TEST),ppc64) -+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+ CPU_ARCH = ppc64 -+else - ifeq ($(OS_TEST),ppc) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = ppc -@@ -112,6 +116,7 @@ - endif - endif - endif -+endif - - - LIBC_TAG = _glibc diff --git a/dev-libs/nss/nss-3.11.5.ebuild b/dev-libs/nss/nss-3.11.5.ebuild new file mode 100644 index 000000000000..10481517ed4e --- /dev/null +++ b/dev-libs/nss/nss-3.11.5.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.5.ebuild,v 1.1 2007/03/07 21:21:10 armin76 Exp $ + +inherit eutils flag-o-matic + +NSPR_VER="4.6.3" +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.5-config-1.patch + epatch ${FILESDIR}/${PN}-mips64.patch +} + +src_compile() { + strip-flags + 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 XCFLAGS="${CFLAGS}" || die "coreconf make failed" + cd ${S}/mozilla/security/dbm + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "dbm make failed" + cd ${S}/mozilla/security/nss + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || 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 +}