# ChangeLog for dev-libs/nss
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.175 2010/04/08 15:28:38 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.176 2010/04/10 04:00:45 anarchy Exp $
+
+ 10 Apr 2010; <anarchy@gentoo.org> -files/3.12-nss.pc.in,
+ -files/nss-3.11.5-config-1.patch, -nss-3.11.9-r1.ebuild,
+ -files/nss-3.11-config.patch, -nss-3.12.2.ebuild, -nss-3.12.3.ebuild,
+ -nss-3.12.3-r1.ebuild, -files/nss-3.12.3-executable-stacks.patch,
+ -files/nss-3.12-config-1.patch, -nss-3.12.4-r2.ebuild,
+ -files/nss-3.12.4-gentoo-fixups-1.diff, -files/3.12-nss-config.in,
+ -files/nss-3.11-config-1.patch, -files/nss-3.12-config.patch,
+ -files/nss.pc.in, -files/nss-config.in, -files/nss-fbsd7.patch,
+ -files/nss-mips64-2.patch, -files/nss-mips64.patch:
+ remove stable ebuilds/files
08 Apr 2010; <anarchy@gentoo.org> nss-3.12.6-r1.ebuild:
use nspr-config to determine includes/libdir
-AUX 3.12-nss-config.in 2400 RMD160 927a5573d72ad8c9d06a56fd094b7523d8cc0784 SHA1 0227f94c745519b67b1b530e6cc116e8069a6b43 SHA256 6d03d7c1ade80922831b90a4242bf57519d649c4ab47eaac0958ceee90c169b2
-AUX 3.12-nss.pc.in 280 RMD160 e6966434f42fdcdb71977ba80638c74ef4b2ae63 SHA1 2024da0f72759c87375459a4e521caaf97a7922c SHA256 c61ebe55abca04bf6b05024e6c160735f74fe83a1ba48b0314a4110b6828bbc9
-AUX nss-3.11-config-1.patch 1440 RMD160 052cc7d19eafaadec1cca6d9882f23265afdf8a7 SHA1 7a9153ec9bd099d2b1d42ab3de240201ae5d6004 SHA256 9a67bbbd9996535ac0aff115294c6537be5ba2efc99ae48c3bc92eb995e670bc
-AUX nss-3.11-config.patch 3167 RMD160 e4b57c89a518b54070b884f40ca11224ccc60349 SHA1 78acfa3c26bf5ca8f8d741f54c00bcf044d4c82b SHA256 0947675d067f09dee55684e29dc7764834ad640b2adf52d9450fbb1b7f9b728c
-AUX nss-3.11.5-config-1.patch 1508 RMD160 2f71b5c38841c2c24cbea6ca0f206b3debfb4942 SHA1 7df5c48fc0ea49fee61e408f8b8c64a9eb01c995 SHA256 400bfe6e75ba628663819b833a04fd0037c575edc075a1e109665fe939670c74
-AUX nss-3.12-config-1.patch 1508 RMD160 ea2f4e2f05cc865ef41af0c39e573b8eb8801f42 SHA1 4897595a91f331ce34155e9872ece3518acb1ac8 SHA256 22d72c155d7b6aa8f1dd797959d5ec3b0975cf9a1bf4607e6b0ee2207112c2b7
-AUX nss-3.12-config.patch 4192 RMD160 22955dd1a51b285748fff9f854946a461a9b43f2 SHA1 bcd834996c24c86e3af49e2b9c855925f80b055e SHA256 44acd5199ceed4a286b6526cb158db75e704fca34d6d3b2cddaaa99b9af7c926
-AUX nss-3.12.3-executable-stacks.patch 444 RMD160 ec9337fcfa7f666b9d58224a143811338b4afd7b SHA1 57f48fc04cd62789bb8a67d283c52d21eac50e36 SHA256 063958325f02090bd8221fd60b45031720c561cfeab683883ca082c217c9b173
-AUX nss-3.12.4-gentoo-fixups-1.diff 6669 RMD160 feb6d8e9bf6c51eea42d6eb2138bd420a5e42e38 SHA1 12ac4f92e77f9280626a22e5985996b25d5c58c7 SHA256 a4f4999065d8902f3c0c8bfec2f11992a79a91dd4a7e3dd4b8434f45baf9b3c1
AUX nss-3.12.5-gentoo-fixups.diff 6669 RMD160 af35db729406c62d0e8582e7db18f2f80a71c776 SHA1 e50b55be77f62516f735acfb41a1e47509572cd8 SHA256 24593640e682cb7a831cd8a0888397b7b20880c9cfabed76bb647cc12385aef6
AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f29b7c347a71c1717912234 SHA1 620bec7adc3c36c94075bffead0ce73cd8d3d7df SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329
-AUX nss-config.in 2238 RMD160 b9dfeeef5319bae20326454a67dc67316dcd04cd SHA1 535ea4869d0f5fdc4f14b723320ef7284c14190a SHA256 57fb0219482981c80d9a72d8a86dfcbe0e776e4e5609fad8965e651f79296fa7
-AUX nss-fbsd7.patch 638 RMD160 9c60b07a9f9b9a7482221f09042266c358d6cfcf SHA1 27036a161ff076fc8a9d459458d2a4adc38876ad SHA256 f471f04def6d4f1abd2062b582246a60a33b346576ad6e71c782fcfe317c8cc7
-AUX nss-mips64-2.patch 540 RMD160 16c461f453470238922065068dd6530b908bb64f SHA1 27062b98164c946d5116b64a49c7c164b261fdbd SHA256 06ad64812bd49382ff4165bfa452fd697a5ca2c03e8f3ffb9aa1bcfa14499b34
-AUX nss-mips64.patch 508 RMD160 17e750805ec8e3e6f5989810b43522bea344f133 SHA1 dd127c2365ea13f5f5c3ec3f9d6d1991225e3565 SHA256 e50a8fcd0521b7722448b480ff672d49d6ca0dc6134d8df25ac63da1a83ab07b
-AUX nss.pc.in 269 RMD160 8716eb83ecf554c5751b0a135adeaf0a3a4208b0 SHA1 1a33aeb4131333d4cf4ccef7118533d0e89d7267 SHA256 cf659c5e72e560b79a928e7cdf5ed416b286f4eefa8d5b0cab50ee846b320e75
-DIST nss-3.11.9.tar.gz 3760535 RMD160 f60eca812ace7dc57459a2ddbce12c2305540061 SHA1 96dc531d4ed518d4b4bf43932896cab276d6f3ed SHA256 fa55182f675d5c180eb928a17a9eec94cd317172ba4b070b628c52230b9a5028
-DIST nss-3.12.2.tar.bz2 3974864 RMD160 eebddb26f26268550d106301464e0f98944a5e04 SHA1 a668ddb8e80c90aaa6d958f85745c6595a493f38 SHA256 84fb75ded8db4a4a38cb12a7aeeeade4fed68ff0f5e9f069ffe021d3b36f94a4
-DIST nss-3.12.3.tar.bz2 4066954 RMD160 b5339eda9dfc87385b2c11e2ca53be249b75ed69 SHA1 eeca14a37629287baa10eb7562a5fb927e9dd171 SHA256 68152f9ad62b49c8860306a6056f5c42f1a66095749e97346a2c3001528075f4
-DIST nss-3.12.4.tar.gz 5412877 RMD160 4c451f5dd1c5205a6886a3c3abb014638f87395d SHA1 a152bf980f3a3dcf575c2d149fb279058ef2e757 SHA256 8202546524c69ce03e1c3ef5e2956b71b8fa0a5bffdf06568597e7c0d1f83bf0
DIST nss-3.12.5.tar.gz 5397000 RMD160 2592c4cf107d5de907c74b2e7ae260650be3c446 SHA1 ec12c6eddba5fb4609a174b079095b374935d37c SHA256 2980c292b8cb2248e3f29111bef9991ea2cf83b11f26635618b413f422af16b3
DIST nss-3.12.6.tar.gz 5947630 RMD160 cb11e154730a12c72f684c6036fa6f27d10d2b60 SHA1 461e81adbdef6c3f848fcfee0dc5ad8c2dbebd46 SHA256 8f9759be1ce928e82830923fde62a66e270c4645f10a4c176acfccb6021a9795
-EBUILD nss-3.11.9-r1.ebuild 4249 RMD160 b946376594976c29d73050af8bdb8887aa73b382 SHA1 17482607cc8b98e69ecff4735bbf276601f484ad SHA256 086b85d6e853f8cb058e3111a86f2de31525dad78df70a5e5143dd48cf786098
-EBUILD nss-3.12.2.ebuild 4598 RMD160 bfe76dcbb0bbc33aad9462384217cc8a3b0e2402 SHA1 6167d30a4d42d690af15960438e318687ab95f8c SHA256 3362b29bcd69d539dd8a15b46d4681c43d63de07cb628679a002bd317a2cd849
-EBUILD nss-3.12.3-r1.ebuild 4707 RMD160 a0152ef25c60c1a84f38c4d79589a007c9584a7e SHA1 0d705e3db8f9fea9b04fb912e8d6eded40496693 SHA256 577f4d89c6d0fc7c2ff9bacce97b4658e681ac3f7f269f4eed4a2a65e976e927
-EBUILD nss-3.12.3.ebuild 4613 RMD160 440ac301ddf48df2e715ea7c59d30b8f9cc658fc SHA1 88c7c9f9c821d9df2ae8ab0497adfa6f3c4b9195 SHA256 7e1430b5c050da8b83aad62209a5fc0a7262676f8adf38f00d8a92123cedb9ce
-EBUILD nss-3.12.4-r2.ebuild 3797 RMD160 f9cc7d27298f953b5d70551c199432e48d933e5d SHA1 418b773d837571db4918cbbba8b5f43216b8db3f SHA256 cddf7ceebbd2077a5e1245d23db28a92c8ff3e7cb17eb0e3f148e0ad03e2df12
EBUILD nss-3.12.5-r1.ebuild 3622 RMD160 07f36f9905c2114bf5a4c243131d7ded05b8f463 SHA1 a74cd74556ba145b0f596c52225eb8c47b2ab822 SHA256 289a533844552f8e3fc86fd8da60c20cef6b53cfc1bcf8c0ecc701c20a7e5a0e
EBUILD nss-3.12.5.ebuild 3904 RMD160 4a482069bf56b343cbf3d56d6189d7f8e25f3fff SHA1 c7f5cbdf09b52ce188e9a90bb39de6eee33b1fa5 SHA256 b395fde2231f7373e67c51c3cc87f2db4bac2ebf396b2c65dba42612233c4f9d
EBUILD nss-3.12.6-r1.ebuild 3489 RMD160 da8286ae4f780b6d3dfaa9081caddd255fe3e7d5 SHA1 19bf86d8c1a1b67ffcd9ff33442bfd784df6649b SHA256 c62d0ea49fa879ea223f1e7aa5df4e0aae05acae39a4f4214028a1786640a7bd
-MISC ChangeLog 21898 RMD160 5e419e70c3e5a84d357df7815dd6c434008fbb12 SHA1 88083ea9b666cfca7268d4291112bec6e3c3fd52 SHA256 c3ef6bc4c4d59337b5cd860a81c05be6bb21da521b873dfc830779bf19299aeb
+MISC ChangeLog 22497 RMD160 ba82d2eb4908a87a1311f9a6ecf07400b5c8ff21 SHA1 cbc48f93ff39eb3564a46bb82da0445740b3aab2 SHA256 16895c3f3b7d5b7948bfffb674792064dee819150e9fe44ebfc1588a7db08d70
MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
+++ /dev/null
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
- cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
- [--includedir[=DIR]]
- [--libdir[=DIR]]
- [--version]
- [--libs]
- [--cflags]
-Dynamic Libraries:
- nss
- ssl
- smime
- nssutil
-EOF
- exit $1
-}
-
-if test $# -eq 0; then
- usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case $1 in
- --prefix=*)
- prefix=$optarg
- ;;
- --prefix)
- echo_prefix=yes
- ;;
- --exec-prefix=*)
- exec_prefix=$optarg
- ;;
- --exec-prefix)
- echo_exec_prefix=yes
- ;;
- --includedir=*)
- includedir=$optarg
- ;;
- --includedir)
- echo_includedir=yes
- ;;
- --libdir=*)
- libdir=$optarg
- ;;
- --libdir)
- echo_libdir=yes
- ;;
- --version)
- echo ${major_version}.${minor_version}.${patch_version}
- ;;
- --cflags)
- echo_cflags=yes
- ;;
- --libs)
- echo_libs=yes
- ;;
- ssl)
- lib_ssl=yes
- ;;
- smime)
- lib_smime=yes
- ;;
- nss)
- lib_nss=yes
- ;;
- nssutil)
- lib_nssutil=yes
- ;;
- *)
- usage 1 1>&2
- ;;
- esac
- shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
- exec_prefix=@exec_prefix@
-fi
-if test -z "$includedir"; then
- includedir=@includedir@
-fi
-if test -z "$libdir"; then
- libdir=@libdir@
-fi
-
-if test "$echo_prefix" = "yes"; then
- echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
- echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
- echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
- echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
- echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
- libdirs="-Wl,-R$libdir -L$libdir"
- if test -n "$lib_ssl"; then
- libdirs="$libdirs -lssl${major_version}"
- fi
- if test -n "$lib_smime"; then
- libdirs="$libdirs -lsmime${major_version}"
- fi
- if test -n "$lib_nss"; then
- libdirs="$libdirs -lnss${major_version}"
- fi
- if test -n "$lib_nssutil"; then
- libdirs="$libdirs -lnssutil${major_version}"
- fi
- echo $libdirs
-fi
-
+++ /dev/null
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: NSS
-Description: Network Security Services
-Version: @NSS_VERSION@
-Requires: nspr >= @NSPR_VERSION@
-Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir}
-Cflags: -I${includedir}
+++ /dev/null
---- 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)
- endif
- ifdef IMPORT_LIBRARY
- $(INSTALL) -m 775 $(IMPORT_LIBRARY) $(SOURCE_LIB_DIR)
+++ /dev/null
---- 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
+++ /dev/null
---- 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)
-
+++ /dev/null
---- 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)
-
+++ /dev/null
-diff -ur mozilla.orig/security/nss/lib/ckfw/builtins/config.mk mozilla/security/nss/lib/ckfw/builtins/config.mk
---- mozilla.orig/security/nss/lib/ckfw/builtins/config.mk 2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/ckfw/builtins/config.mk 2009-04-15 15:31:02.000000000 +0000
-@@ -79,3 +79,10 @@
- endif
- 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
-+
-Only in mozilla/security/nss/lib/ckfw/builtins: config.mk.orig
-Only in mozilla/security/nss/lib/ckfw/builtins: config.mk.rej
-diff -ur mozilla.orig/security/nss/lib/ckfw/capi/config.mk mozilla/security/nss/lib/ckfw/capi/config.mk
---- mozilla.orig/security/nss/lib/ckfw/capi/config.mk 2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/ckfw/capi/config.mk 2009-04-15 15:29:42.000000000 +0000
-@@ -71,3 +71,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
-+
-Only in mozilla/security/nss/lib/ckfw/capi: config.mk.orig
-diff -ur mozilla.orig/security/nss/lib/freebl/Makefile mozilla/security/nss/lib/freebl/Makefile
---- mozilla.orig/security/nss/lib/freebl/Makefile 2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/freebl/Makefile 2009-04-15 15:29:42.000000000 +0000
-@@ -143,6 +143,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
-Only in mozilla/security/nss/lib/freebl: Makefile.orig
-diff -ur mozilla.orig/security/nss/lib/nss/config.mk mozilla/security/nss/lib/nss/config.mk
---- mozilla.orig/security/nss/lib/nss/config.mk 2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/nss/config.mk 2009-04-15 15:29:42.000000000 +0000
-@@ -83,6 +83,11 @@
-
- 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
-
- # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
- SHARED_LIBRARY_LIBS = \
-Only in mozilla/security/nss/lib/nss: config.mk.orig
-diff -ur mozilla.orig/security/nss/lib/smime/config.mk mozilla/security/nss/lib/smime/config.mk
---- mozilla.orig/security/nss/lib/smime/config.mk 2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/smime/config.mk 2009-04-15 15:31:30.000000000 +0000
-@@ -106,3 +106,8 @@
- 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
-Only in mozilla/security/nss/lib/smime: config.mk.orig
-Only in mozilla/security/nss/lib/smime: config.mk.rej
-diff -ur mozilla.orig/security/nss/lib/softoken/config.mk mozilla/security/nss/lib/softoken/config.mk
---- mozilla.orig/security/nss/lib/softoken/config.mk 2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/softoken/config.mk 2009-04-15 15:29:42.000000000 +0000
-@@ -114,6 +114,12 @@
- 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 ($(OS_TARGET),WINCE)
- DEFINES += -DDBM_USING_NSPR
- endif
-Only in mozilla/security/nss/lib/softoken: config.mk.orig
-diff -ur mozilla.orig/security/nss/lib/ssl/config.mk mozilla/security/nss/lib/ssl/config.mk
---- mozilla.orig/security/nss/lib/ssl/config.mk 2009-04-15 15:29:14.000000000 +0000
-+++ mozilla/security/nss/lib/ssl/config.mk 2009-04-15 15:29:42.000000000 +0000
-@@ -130,4 +130,10 @@
- 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
-+
- endif
-Only in mozilla/security/nss/lib/ssl: config.mk.orig
+++ /dev/null
---- mozilla/security/nss/lib/freebl/intel-aes.s-old 2009-06-21 14:20:10.491641710 -0500
-+++ mozilla/security/nss/lib/freebl/intel-aes.s 2009-06-21 14:21:33.846655888 -0500
-@@ -1633,4 +1633,10 @@
-
- xor %eax, %eax
- ret
-- .size intel_aes_decrypt_cbc_256, .-intel_aes_decrypt_cbc_256
-+ .size intel_aes_decrypt_cbc_256, .-intel_aes_decrypt_cbc_256
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-+
-
+++ /dev/null
-diff -urN nss-3.12.4-orig/mozilla/security/nss/config/Makefile nss-3.12.4/mozilla/security/nss/config/Makefile
---- nss-3.12.4-orig/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500
-@@ -0,0 +1,40 @@
-+CORE_DEPTH = ../..
-+DEPTH = ../..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: export libs
-+
-+export:
-+ # Create the nss.pc file
-+ mkdir -p $(DIST)/lib/pkgconfig
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@exec_prefix@,\$${prefix}," \
-+ -e "s,@libdir@,\$${prefix}/gentoo/nss," \
-+ -e "s,@includedir@,\$${prefix}/include/nss," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss.pc.in > nss.pc
-+ chmod 0644 nss.pc
-+ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
-+
-+ # Create the nss-config script
-+ mkdir -p $(DIST)/bin
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss-config.in > nss-config
-+ chmod 0755 nss-config
-+ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
-diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in nss-3.12.4/mozilla/security/nss/config/nss-config.in
---- nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+ [--prefix[=DIR]]
-+ [--exec-prefix[=DIR]]
-+ [--includedir[=DIR]]
-+ [--libdir[=DIR]]
-+ [--version]
-+ [--libs]
-+ [--cflags]
-+Dynamic Libraries:
-+ nss
-+ ssl
-+ smime
-+ nssutil
-+EOF
-+ exit $1
-+}
-+
-+if test $# -eq 0; then
-+ usage 1 1>&2
-+fi
-+
-+lib_ssl=yes
-+lib_smime=yes
-+lib_nss=yes
-+lib_nssutil=yes
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case $1 in
-+ --prefix=*)
-+ prefix=$optarg
-+ ;;
-+ --prefix)
-+ echo_prefix=yes
-+ ;;
-+ --exec-prefix=*)
-+ exec_prefix=$optarg
-+ ;;
-+ --exec-prefix)
-+ echo_exec_prefix=yes
-+ ;;
-+ --includedir=*)
-+ includedir=$optarg
-+ ;;
-+ --includedir)
-+ echo_includedir=yes
-+ ;;
-+ --libdir=*)
-+ libdir=$optarg
-+ ;;
-+ --libdir)
-+ echo_libdir=yes
-+ ;;
-+ --version)
-+ echo ${major_version}.${minor_version}.${patch_version}
-+ ;;
-+ --cflags)
-+ echo_cflags=yes
-+ ;;
-+ --libs)
-+ echo_libs=yes
-+ ;;
-+ ssl)
-+ lib_ssl=yes
-+ ;;
-+ smime)
-+ lib_smime=yes
-+ ;;
-+ nss)
-+ lib_nss=yes
-+ ;;
-+ nssutil)
-+ lib_nssutil=yes
-+ ;;
-+ *)
-+ usage 1 1>&2
-+ ;;
-+ esac
-+ shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+ exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+ includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+ libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+ echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+ echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+ echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+ echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+ echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+ libdirs="-Wl,-R$libdir -L$libdir"
-+ if test -n "$lib_ssl"; then
-+ libdirs="$libdirs -lssl${major_version}"
-+ fi
-+ if test -n "$lib_smime"; then
-+ libdirs="$libdirs -lsmime${major_version}"
-+ fi
-+ if test -n "$lib_nss"; then
-+ libdirs="$libdirs -lnss${major_version}"
-+ fi
-+ if test -n "$lib_nssutil"; then
-+ libdirs="$libdirs -lnssutil${major_version}"
-+ fi
-+ echo $libdirs
-+fi
-+
-diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in nss-3.12.4/mozilla/security/nss/config/nss.pc.in
---- nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.8
-+Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir}
-+Cflags: -I${includedir}
-+
-diff -urN nss-3.12.4-orig/mozilla/security/nss/Makefile nss-3.12.4/mozilla/security/nss/Makefile
---- nss-3.12.4-orig/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500
-@@ -78,7 +78,7 @@
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
-
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
-
-@@ -140,12 +140,6 @@
- --with-dist-prefix='$(NSPR_PREFIX)' \
- --with-dist-includedir='$(NSPR_PREFIX)/include'
-
--build_nspr: $(NSPR_CONFIG_STATUS)
-- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE)
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
-- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber
--
- build_dbm:
- ifndef NSS_DISABLE_DBM
- cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs
-diff -urN nss-3.12.4-orig/mozilla/security/nss/manifest.mn nss-3.12.4/mozilla/security/nss/manifest.mn
---- nss-3.12.4-orig/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500
-+++ nss-3.12.4/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500
-@@ -42,6 +42,6 @@
-
- RELEASE = nss
-
--DIRS = lib cmd
-+DIRS = lib cmd config
-
-
+++ /dev/null
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
- cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
- [--includedir[=DIR]]
- [--libdir[=DIR]]
- [--version]
- [--libs]
- [--cflags]
-Dynamic Libraries:
- nss
- ssl
- smime
-EOF
- exit $1
-}
-
-if test $# -eq 0; then
- usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case $1 in
- --prefix=*)
- prefix=$optarg
- ;;
- --prefix)
- echo_prefix=yes
- ;;
- --exec-prefix=*)
- exec_prefix=$optarg
- ;;
- --exec-prefix)
- echo_exec_prefix=yes
- ;;
- --includedir=*)
- includedir=$optarg
- ;;
- --includedir)
- echo_includedir=yes
- ;;
- --libdir=*)
- libdir=$optarg
- ;;
- --libdir)
- echo_libdir=yes
- ;;
- --version)
- echo ${major_version}.${minor_version}.${patch_version}
- ;;
- --cflags)
- echo_cflags=yes
- ;;
- --libs)
- echo_libs=yes
- ;;
- ssl)
- lib_ssl=yes
- ;;
- smime)
- lib_smime=yes
- ;;
- nss)
- lib_nss=yes
- ;;
- *)
- usage 1 1>&2
- ;;
- esac
- shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
- exec_prefix=@exec_prefix@
-fi
-if test -z "$includedir"; then
- includedir=@includedir@
-fi
-if test -z "$libdir"; then
- libdir=@libdir@
-fi
-
-if test "$echo_prefix" = "yes"; then
- echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
- echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
- echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
- echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
- echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
- libdirs="-Wl,-R$libdir -L$libdir"
- if test -n "$lib_ssl"; then
- libdirs="$libdirs -lssl${major_version}"
- fi
- if test -n "$lib_smime"; then
- libdirs="$libdirs -lsmime${major_version}"
- fi
- if test -n "$lib_nss"; then
- libdirs="$libdirs -lnss${major_version}"
- fi
- echo $libdirs
-fi
-
+++ /dev/null
-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
+++ /dev/null
---- mozilla/security/coreconf/Linux.mk.orig 2008-12-11 09:12:48.000000000 +0000
-+++ mozilla/security/coreconf/Linux.mk 2008-12-11 09:13:51.000000000 +0000
-@@ -119,6 +119,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
- ifeq (,$(filter-out i%86,$(OS_TEST)))
- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
- CPU_ARCH = x86
-@@ -140,6 +144,7 @@
- endif
- endif
- endif
-+endif
-
-
- LIBC_TAG = _glibc
+++ /dev/null
---- 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
+++ /dev/null
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: NSS
-Description: Network Security Services
-Version: @NSS_VERSION@
-Requires: nspr >= @NSPR_VERSION@
-Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -Wl,-R${libdir}
-Cflags: -I${includedir}
+++ /dev/null
-# 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.11.9-r1.ebuild,v 1.1 2008/11/25 14:50:17 armin76 Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.6.8"
-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}"
-
-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.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
- export NSS_ENABLE_ECC=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=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
-
- if use utils; then
- cd "${S}"/mozilla/security/dist/*/bin/
- for f in *; do
- newbin ${f} nss${f}
- done
- fi
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.2.ebuild,v 1.6 2009/04/12 14:56:16 bluebird Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.7.3"
-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"
-SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
- mirror://gentoo/${P}.tar.bz2"
-
-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"
-
-S="${WORKDIR}"
-
-DEPEND=">=dev-libs/nspr-${NSPR_VER}
- >=dev-db/sqlite-3.5"
-
-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-2.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 "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-
- export NSDISTMODE=copy
- export NSS_USE_SYSTEM_SQLITE=1
- export NSS_ENABLE_ECC=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
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.3-r1.ebuild,v 1.8 2009/09/05 20:39:37 keytoaster Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.7.4"
-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.bz2"
-#SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-# mirror://gentoo/${P}.tar.bz2"
-
-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"
-RDEPEND="${DEPEND}"
-
-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.12-config.patch
- epatch "${FILESDIR}"/${PN}-3.12-config-1.patch
- epatch "${FILESDIR}"/${PN}-mips64-2.patch
- epatch "${FILESDIR}"/${P}-executable-stacks.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 "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-
- export NSDISTMODE=copy
- export NSS_USE_SYSTEM_SQLITE=1
- export NSS_ENABLE_ECC=1
- export NSPR_LIB_DIR="/usr/$(get_libdir)/nspr"
- 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
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.3.ebuild,v 1.1 2009/04/15 13:37:53 armin76 Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.7.4"
-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.bz2"
-#SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-# mirror://gentoo/${P}.tar.bz2"
-
-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"
-
-S="${WORKDIR}/${P}"
-
-DEPEND=">=dev-libs/nspr-${NSPR_VER}
- >=dev-db/sqlite-3.5"
-
-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.12-config.patch
- epatch "${FILESDIR}"/${PN}-3.12-config-1.patch
- epatch "${FILESDIR}"/${PN}-mips64-2.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 "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-
- export NSDISTMODE=copy
- export NSS_USE_SYSTEM_SQLITE=1
- export NSS_ENABLE_ECC=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
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.4-r2.ebuild,v 1.2 2009/11/06 13:29:36 anarchy Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.7.4"
-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"
-#SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-# mirror://gentoo/${P}.tar.bz2"
-
-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-util/pkgconfig"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}
- >=dev-db/sqlite-3.5"
-
-src_unpack() {
- unpack ${A}
-
- # Custom changes for gentoo
- epatch "${FILESDIR}"/"${P}"-gentoo-fixups-1.diff
-
- cd "${S}"/mozilla/security/coreconf
-
- # 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
-
- # Ensure we stay multilib aware
- sed -i -e "s:gentoo:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile
-}
-
-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 "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-
- export BUILD_OPT=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
- export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L//'`
- export USE_SYSTEM_ZLIB=1
- export ZLIB_LIBS=-lz
- export NSDISTMODE=copy
- export NSS_ENABLE_ECC=1
- export XCFLAGS="${CFLAGS}"
- export FREEBL_NO_DEPEND=1
-
- cd "${S}"/mozilla/security/coreconf
- emake -j1 CC="$(tc-getCC)" || die "coreconf make failed"
- cd "${S}"/mozilla/security/dbm
- emake -j1 CC="$(tc-getCC)" || die "dbm make failed"
- cd "${S}"/mozilla/security/nss
- emake -j1 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"
-
- # Install nspr-config and pkgconfig file
- dodir /usr/bin
- cp -L */bin/nss-config "${D}"/usr/bin
- dodir /usr/$(get_libdir)/pkgconfig
- cp -L */lib/pkgconfig/nss.pc "${D}"/usr/$(get_libdir)/pkgconfig
-
- # 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
-
- if use utils; then
- cd "${S}"/mozilla/security/dist/*/bin/
- for f in *; do
- newbin ${f} nss${f}
- done
- fi
-}
-
-pkg_postinst() {
- elog "We have reverted back to using upstreams soname."
- elog "Please run revdep-rebuild --library libnss3.so.12 , this"
- elog "will correct most issues. If you find a binary that does"
- elog "not run please re-emerge package to ensure it properly"
- elog " links after upgrade."
- elog
-}
projects / gentoo.git / commitdiff