| 1 |
commit: 76eb52612f91e199f949ecec2a5fb379da1e36ee |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 6 12:43:33 2012 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 6 12:43:33 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=76eb5261 |
| 7 |
|
| 8 |
nss/nspr security update |
| 9 |
|
| 10 |
--- |
| 11 |
dev-libs/nspr/Manifest | 5 +- |
| 12 |
.../nspr/files/nspr-4.9-pkgconfig-gentoo.patch | 90 -------------------- |
| 13 |
.../nspr/{nspr-4.9.ebuild => nspr-4.9.1.ebuild} | 1 - |
| 14 |
dev-libs/nss/Manifest | 4 +- |
| 15 |
.../nss/{nss-3.13.4.ebuild => nss-3.13.5.ebuild} | 2 +- |
| 16 |
5 files changed, 5 insertions(+), 97 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest |
| 19 |
index 10e51bd..16ef6eb 100644 |
| 20 |
--- a/dev-libs/nspr/Manifest |
| 21 |
+++ b/dev-libs/nspr/Manifest |
| 22 |
@@ -8,6 +8,5 @@ AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb9c3cf9ef |
| 23 |
AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606a1e3 SHA1 7a919bf08fa9d7a68815cdceda9082f5db8be445 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa |
| 24 |
AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab |
| 25 |
AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610 |
| 26 |
-AUX nspr-4.9-pkgconfig-gentoo.patch 3710 RMD160 c25988e23698df566f69618989eb864dd8bd8848 SHA1 c10e52de61057047a53d8a45f56e7ad901014b57 SHA256 1483506296818ffffbb292d28d336d37147154e5e3db35e7e07d37bb728e2253 |
| 27 |
-DIST nspr-4.9.tar.gz 1218528 RMD160 35298a4752aa657196b9d2f41ad46f1bef7e22a2 SHA1 57a6bb09ccb90d14303c3d9a6ec2592d8a5c0752 SHA256 ecc632bc578c125650999776673eeff952096afa6d151f6d91f6c3a93e1e716a |
| 28 |
-EBUILD nspr-4.9.ebuild 3694 RMD160 e33e4c48a524edf92152725d5abaf11b28541956 SHA1 b2c8297ea444dad214ec6c2899b05601cda4d054 SHA256 239a4596442ec1767d8ce08db9949a7efba551036167191e5890d83b908789a3 |
| 29 |
+DIST nspr-4.9.1.tar.gz 1172951 RMD160 e541d6ead14dbf0145061c75d176f6391fc186cd SHA1 1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17 |
| 30 |
+EBUILD nspr-4.9.1.ebuild 3639 RMD160 476168270b833e5f28d1c1017d9ab39fcd942e33 SHA1 64d924c04cd3e67aef333684b9f733600b4f252a SHA256 5208b17ee8dd3c84f911a08de14aa49994f158ff0755f2aedb858412d82d0945 |
| 31 |
|
| 32 |
diff --git a/dev-libs/nspr/files/nspr-4.9-pkgconfig-gentoo.patch b/dev-libs/nspr/files/nspr-4.9-pkgconfig-gentoo.patch |
| 33 |
deleted file mode 100644 |
| 34 |
index 56d7bb8..0000000 |
| 35 |
--- a/dev-libs/nspr/files/nspr-4.9-pkgconfig-gentoo.patch |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,90 +0,0 @@ |
| 38 |
-diff -urN a/mozilla/nsprpub/config/config.mk b/mozilla/nsprpub/config/config.mk |
| 39 |
---- a/mozilla/nsprpub/config/config.mk 2011-10-13 09:00:06.000000000 -0500 |
| 40 |
-+++ b/mozilla/nsprpub/config/config.mk 2012-02-20 17:52:11.364823693 -0600 |
| 41 |
-@@ -183,6 +183,7 @@ |
| 42 |
- RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include |
| 43 |
- RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin |
| 44 |
- RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib |
| 45 |
-+RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig |
| 46 |
- |
| 47 |
- # autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including |
| 48 |
- # this file |
| 49 |
-diff -urN a/mozilla/nsprpub/config/Makefile.in b/mozilla/nsprpub/config/Makefile.in |
| 50 |
---- a/mozilla/nsprpub/config/Makefile.in 2009-03-03 16:04:23.000000000 -0600 |
| 51 |
-+++ b/mozilla/nsprpub/config/Makefile.in 2012-02-20 17:53:06.490819923 -0600 |
| 52 |
-@@ -52,9 +52,10 @@ |
| 53 |
- |
| 54 |
- # autoconf.mk must be deleted last (from the top-level directory) |
| 55 |
- # because it is included by every makefile. |
| 56 |
--DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config |
| 57 |
-+DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc |
| 58 |
- |
| 59 |
- RELEASE_BINS = nspr-config |
| 60 |
-+RELEASE_PC = nspr.pc |
| 61 |
- |
| 62 |
- include $(topsrcdir)/config/config.mk |
| 63 |
- |
| 64 |
-diff -urN a/mozilla/nsprpub/config/nspr-config.in b/mozilla/nsprpub/config/nspr-config.in |
| 65 |
---- a/mozilla/nsprpub/config/nspr-config.in 2005-05-10 19:53:41.000000000 -0500 |
| 66 |
-+++ b/mozilla/nsprpub/config/nspr-config.in 2012-02-20 17:55:10.947811413 -0600 |
| 67 |
-@@ -92,13 +92,13 @@ |
| 68 |
- |
| 69 |
- # Set variables that may be dependent upon other variables |
| 70 |
- if test -z "$exec_prefix"; then |
| 71 |
-- exec_prefix=@exec_prefix@ |
| 72 |
-+ exec_prefix=`pkg-config --variable=exec_prefix nspr` |
| 73 |
- fi |
| 74 |
- if test -z "$includedir"; then |
| 75 |
-- includedir=@includedir@ |
| 76 |
-+ includedir=`pkg-config --variable=includedir nspr` |
| 77 |
- fi |
| 78 |
- if test -z "$libdir"; then |
| 79 |
-- libdir=@libdir@ |
| 80 |
-+ libdir=`pkg-config --variable=libdir nspr` |
| 81 |
- fi |
| 82 |
- |
| 83 |
- if test "$echo_prefix" = "yes"; then |
| 84 |
-diff -urN a/mozilla/nsprpub/config/nspr.pc.in b/mozilla/nsprpub/config/nspr.pc.in |
| 85 |
---- a/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600 |
| 86 |
-+++ b/mozilla/nsprpub/config/nspr.pc.in 2012-02-20 18:00:14.609790649 -0600 |
| 87 |
-@@ -0,0 +1,10 @@ |
| 88 |
-+prefix=@prefix@ |
| 89 |
-+exec_prefix=@exec_prefix@ |
| 90 |
-+libdir=@libdir@ |
| 91 |
-+includedir=@includedir@ |
| 92 |
-+ |
| 93 |
-+Name: NSPR |
| 94 |
-+Description: The Netscape Portable Runtime |
| 95 |
-+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ |
| 96 |
-+Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ @OS_LIBS@ |
| 97 |
-+Cflags: -I@includedir@ |
| 98 |
-diff -urN a/mozilla/nsprpub/config/rules.mk b/mozilla/nsprpub/config/rules.mk |
| 99 |
---- a/mozilla/nsprpub/config/rules.mk 2011-08-29 12:02:51.000000000 -0500 |
| 100 |
-+++ b/mozilla/nsprpub/config/rules.mk 2012-02-20 18:11:56.112742680 -0600 |
| 101 |
-@@ -207,10 +207,14 @@ |
| 102 |
- rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE) |
| 103 |
- +$(LOOP_OVER_DIRS) |
| 104 |
- |
| 105 |
--install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) |
| 106 |
-+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC) |
| 107 |
- ifdef RELEASE_BINS |
| 108 |
- $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir) |
| 109 |
- endif |
| 110 |
-+ifdef RELEASE_PC |
| 111 |
-+ $(NSINSTALL) -D $(DESTDIR)$(libdir)/pkgconfig |
| 112 |
-+ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/ |
| 113 |
-+endif |
| 114 |
- ifdef RELEASE_HEADERS |
| 115 |
- $(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir) |
| 116 |
- endif |
| 117 |
-diff -urN a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in |
| 118 |
---- a/mozilla/nsprpub/configure.in 2012-02-14 13:06:00.000000000 -0600 |
| 119 |
-+++ b/mozilla/nsprpub/configure.in 2012-02-20 18:09:55.776750908 -0600 |
| 120 |
-@@ -3357,6 +3357,7 @@ |
| 121 |
- config/nsprincl.mk |
| 122 |
- config/nsprincl.sh |
| 123 |
- config/nspr-config |
| 124 |
-+ config/nspr.pc |
| 125 |
- lib/Makefile |
| 126 |
- lib/ds/Makefile |
| 127 |
- lib/libc/Makefile |
| 128 |
|
| 129 |
diff --git a/dev-libs/nspr/nspr-4.9.ebuild b/dev-libs/nspr/nspr-4.9.1.ebuild |
| 130 |
similarity index 98% |
| 131 |
rename from dev-libs/nspr/nspr-4.9.ebuild |
| 132 |
rename to dev-libs/nspr/nspr-4.9.1.ebuild |
| 133 |
index d4a9533..3f7426a 100644 |
| 134 |
--- a/dev-libs/nspr/nspr-4.9.ebuild |
| 135 |
+++ b/dev-libs/nspr/nspr-4.9.1.ebuild |
| 136 |
@@ -24,7 +24,6 @@ src_prepare() { |
| 137 |
epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch |
| 138 |
epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch |
| 139 |
epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch |
| 140 |
- epatch "${FILESDIR}"/${PN}-4.9-pkgconfig-gentoo.patch |
| 141 |
epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch |
| 142 |
epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch |
| 143 |
epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch |
| 144 |
|
| 145 |
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest |
| 146 |
index e3ac453..e4f7f09 100644 |
| 147 |
--- a/dev-libs/nss/Manifest |
| 148 |
+++ b/dev-libs/nss/Manifest |
| 149 |
@@ -3,5 +3,5 @@ AUX nss-3.13-gentoo-fixup.patch 6423 RMD160 335aaab44d35539ec6ae46cb00cc6e7fbb32 |
| 150 |
AUX nss-3.13.1-solaris-gcc.patch 994 RMD160 f6bfc9b34aebf2fd4b47187884fe572e446aa2c0 SHA1 37ad83887a91073c94bbed698677b82160392771 SHA256 2633e73f8bba27fb34b5872464946b1abe03a7e73e544be4f751655c6276487b |
| 151 |
DIST nss-3.13.3-add_spi+cacerts_ca_certs.patch 69983 RMD160 be90a26851b8b431ddfcb42718917bebadaad21f SHA1 02d33b60aecc2e2cc85db1737eb17981bf50eb21 SHA256 aa3e4ac057865b6c90718d1c815686867ff96540bb500b9191a632c029d2ad9e |
| 152 |
DIST nss-3.13.3_pem.support 191571 RMD160 875a6ca4328f582cfb42ca8427144f9c4f7f185a SHA1 17701871db5ce22edd64f9f7076a51f2b64f9d11 SHA256 cb6cf7955203514b3c1210c9b32504b0d2f1c158fa9b5d2509ef0bb34b68374c |
| 153 |
-DIST nss-3.13.4.tar.gz 6087584 RMD160 52c2984b3678af34da55c2b4dc50a1274afa7c59 SHA1 c5a829c3bd56aa743457faf21469065f87c2db75 SHA256 a552f56b03c0c716ba950c7eef971d87f717c02a4d9a75ee2fe84bd036830de5 |
| 154 |
-EBUILD nss-3.13.4.ebuild 6806 RMD160 bd8dab0c901cf755cdd3af6e5d0ab7767b254699 SHA1 6c79f87ff8b027c96f4048b0c7bef7598e0fdc0d SHA256 05bb2f571a1fbbffa6e7ffe208fcd866a5f854d37267ea44e20b9edd0adbac03 |
| 155 |
+DIST nss-3.13.5.tar.gz 6087983 RMD160 208ef2bda665946f921d7907b1ff606131b9a9d4 SHA1 22cfe2cbccc93189699e6eed283eca288b45f6cb SHA256 ee8b995ebc971308a5bc8b50eb391cd925d6ee7c5e139d25018ee993e71b012a |
| 156 |
+EBUILD nss-3.13.5.ebuild 6808 RMD160 fe9c266908d8af2096f8612297c4c060f713ae8a SHA1 5965e1f44a56ec563876b1272b3b29135024d0aa SHA256 d92f341a73b8015967c9d91967815c1154b1cf7d794fbd9562ba31b4d293e558 |
| 157 |
|
| 158 |
diff --git a/dev-libs/nss/nss-3.13.4.ebuild b/dev-libs/nss/nss-3.13.5.ebuild |
| 159 |
similarity index 99% |
| 160 |
rename from dev-libs/nss/nss-3.13.4.ebuild |
| 161 |
rename to dev-libs/nss/nss-3.13.5.ebuild |
| 162 |
index dcf2e24..cf5a9e4 100644 |
| 163 |
--- a/dev-libs/nss/nss-3.13.4.ebuild |
| 164 |
+++ b/dev-libs/nss/nss-3.13.5.ebuild |
| 165 |
@@ -5,7 +5,7 @@ |
| 166 |
EAPI=3 |
| 167 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 168 |
|
| 169 |
-NSPR_VER="4.9" |
| 170 |
+NSPR_VER="4.9.1" |
| 171 |
RTM_NAME="NSS_${PV//./_}_RTM" |
| 172 |
|
| 173 |
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" |
Archives