| 1 |
commit: 2ec671376b065f993ee2d2551e70fdaf8a41088e |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 30 01:49:37 2013 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 30 01:49:37 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=2ec67137 |
| 7 |
|
| 8 |
Address bug #454576,454578 |
| 9 |
|
| 10 |
--- |
| 11 |
dev-libs/nspr/Manifest | 3 +- |
| 12 |
dev-libs/nspr/files/nspr-4.8-config.patch | 47 -------------------- |
| 13 |
.../{nspr-4.9.4.ebuild => nspr-4.9.4-r1.ebuild} | 1 - |
| 14 |
dev-libs/nss/Manifest | 4 +- |
| 15 |
...ups.patch => nss-3.14.1-gentoo-fixups-r1.patch} | 4 +- |
| 16 |
.../{nss-3.14.1.ebuild => nss-3.14.1-r1.ebuild} | 2 +- |
| 17 |
6 files changed, 6 insertions(+), 55 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest |
| 20 |
index 1980e86..17547b9 100644 |
| 21 |
--- a/dev-libs/nspr/Manifest |
| 22 |
+++ b/dev-libs/nspr/Manifest |
| 23 |
@@ -3,10 +3,9 @@ AUX nspr-4.6.1-lang.patch 1718 SHA256 326f5f9d020e73a6ed8e949124eb075f21d856d0b0 |
| 24 |
AUX nspr-4.7.0-prtime.patch 964 SHA256 3fd4f3c68257dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7 SHA512 f8e09dda87e1d4a226fcf48ebc2cdfb20e67c351ffd227603b150636b19df49471ca0c617005e515ccee715df248363ed2e2162563ea6bce978e8607b6aba001 WHIRLPOOL 0090d17ebc287a39d18dbe531dc31522601ce4fc32ddd9a45bd9024987c328aa9fab7c7606673a1220c9b8602ee76c7f58bd7c4d3d639e8edb356d4d0efbd32e |
| 25 |
AUX nspr-4.7.1-solaris.patch 516 SHA256 e47a0abb5b106af38fdfab2ca8661b4a1596d48ff7ca988280728dc6b8a49447 SHA512 864b842e77353b29f7d0b44cdd64d1a0f613fafa2d074f10adc30a1f1c2b69c5270646c25faa64a7b072e3f7d0f68134fe23eeaafd7bdf46d12f889074a8ef78 WHIRLPOOL b2caa24d39bb372a184a60f1a775d6787b6d6aec65db5d32772de5c70953b4a53ab6244b569bd5c1da63f5a6e00a7a50da6bd7e807085e3f3483aa90810ffe64 |
| 26 |
AUX nspr-4.7.4-solaris.patch 2011 SHA256 9e72078c941229e7112b4bc184e195821c9243bfb9411e9eeefcdb889866ff9f SHA512 ff8b6403470e9eec401eafb33b109a850ca72e3b6e05e31514e68e9b0ca77aaf7dc0e8062f45406f5abd96671d3c352d9690b8da09454555929422a86d9c4fd4 WHIRLPOOL ea7a6543f474ccd45cfd6448d75ebf17057d9952fdb6d7610ad33603e94bcce0fe1c60b07d80570e49d35c0828748f239aacdce588514aeae472927fecaa8490 |
| 27 |
-AUX nspr-4.8-config.patch 1429 SHA256 7cb63ea677ad9c92dde4513b16258f092b463738cb145edd95dd671bcfaa2150 SHA512 0180b026a89080c557ff39496f015195127343319d054904274fa118c4394b567b1e79bf72ddffe4d6ce821b831a72926fc40a55897976a6cdaee0cea52d070b WHIRLPOOL 1f31f98e552a771a77acd731b4e071386aad4a94c71d638f6074224f0f79eb8f4f49763ded4282d910f2a7fea8c05000c1428b7d895c8204a2982775022b42d3 |
| 28 |
AUX nspr-4.8.3-aix-gcc.patch 3673 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f344e830929e0a2c4046930a17f SHA512 08a1625bb4ca7263e9f98289355e6def516e4b31a4bc856e75686a808575f2603056490b6b5dd6f33e616923c6e035cafec89ff86bcc4b9ceb0b9a5c10334f48 WHIRLPOOL f42200ebdd0ac5b6739c61a2673345a63a33eb1b9d0c471d6700c5b9f7a305a3a518d0d0715041e3aedb80a923e6ff183d035da151c0c51457a2e628317887ea |
| 29 |
AUX nspr-4.8.3-aix-soname.patch 1164 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa SHA512 8c82c281ebc3ffade81445bef28323a89199e47a95b7ec8351cf14dc441f71d1126f112d564431e6c73657ae2de0c7cbdc701ff133d7086fd970e6c61cd58add WHIRLPOOL 90dca0ac6ae7931468d5b3835e786a817deaae1c4021fb033f127dd9aabae42975bcc8c4ccb3ea7db713b3224ec90669179cbb71a8492910a5aa75e0f8d1beac |
| 30 |
AUX nspr-4.8.4-darwin-install_name.patch 1102 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab SHA512 1c62eaea00c4eebe6885bfffca41131cfd5cd1c848d7564ccae32a39f012834684b2d3113dcb1a3d4607629dbec9909d6754491dc7caa977203e6010623fef4d WHIRLPOOL 1f5674fe691d75dbf7b9549d58700fef973a8fd6f805a389727843ffb336392587833bbb19af9c22b1388b3d3dcd2c760978676c9a55d894b646e029f8ba7280 |
| 31 |
AUX nspr-4.8.9-link-flags.patch 995 SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610 SHA512 3c20019b5a378bc0cec1925c2324fc1b72bd1427e9262065952632c406bc6a8f9303fc55aabad472713f5e8656973db5c503dd9072ea01283a6f671dcd26b049 WHIRLPOOL 695310cfd54140b2c333f0b6556d8c049441b246a006cc885d2149a6d73d8d6223964d47d5af87c949ab2693fd320c4ecf67fd120b09862972a39df0cc00c7ca |
| 32 |
DIST nspr-4.9.4.tar.gz 1160641 SHA256 749046c75be17f2f8b3874d288873d3355cedcb37abe7b6eb7b3bc374440d4a4 SHA512 5c1caf290bbe6cec7fddd40ae1eefbe54608a0f6fce908b1680513c50661dde40f4c1638ddca56b8a7125b20be6945aa2b4507fa0dde09e3e9eb0b08e90cfe2b WHIRLPOOL a9fd7a0c4b17240c746312cdab1495a5d5ebcabcc945a7c2f1a3df435db2d4e5e80e3086d20bd658a94c573abb916611327ad877430c9cd0282e8d192217d707 |
| 33 |
-EBUILD nspr-4.9.4.ebuild 4020 SHA256 986dce490c4d52eea53bbd0350e9416a28cf60225f0317ed9bcc1b08f9aae150 SHA512 ce8356d7855e25027cb001bb19f7730c5b37305fc7d6620b21cd83fe1df9d9f2801826bc24c3875374dc2a6e3e775218cf235a8360b9ce4d301845dc8c34bea2 WHIRLPOOL a4fe3006f826e8ba0cc98fabde2ae67124c3f1d27e98c5aa17ad3197ec753d69035551ea70edd9feb2ac031f1fe34eaddc763bba0e716165fc1852d026fe5906 |
| 34 |
+EBUILD nspr-4.9.4-r1.ebuild 3975 SHA256 70c73749c64340dcb75c8915486cceb682a6d84fd5f7c86861da9ae952b7d252 SHA512 558689f724284f1fcfc135ca443257f2a50fd4ddfa6ca4c0a777e11846b21d1b96d71a20e51a860fc6065e2501a84f4ff079369ddc7c95859630236607095fe0 WHIRLPOOL 27408c962e1355219838c4c3dfb9e3f2c32f3e4bde70ec83351e4fcdfbf5da25e85a812565d4978f60a4d0da9f6e8f4361e511b8ae25a6f1dabfa6f026be057b |
| 35 |
|
| 36 |
diff --git a/dev-libs/nspr/files/nspr-4.8-config.patch b/dev-libs/nspr/files/nspr-4.8-config.patch |
| 37 |
deleted file mode 100644 |
| 38 |
index e8fc6c1..0000000 |
| 39 |
--- a/dev-libs/nspr/files/nspr-4.8-config.patch |
| 40 |
+++ /dev/null |
| 41 |
@@ -1,47 +0,0 @@ |
| 42 |
---- mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000 |
| 43 |
-+++ mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000 |
| 44 |
-@@ -112,6 +112,10 @@ |
| 45 |
- MKSHLIB += -R '$$ORIGIN' |
| 46 |
- endif |
| 47 |
- |
| 48 |
-+ifeq ($(OS_ARCH), Linux) |
| 49 |
-+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' |
| 50 |
-+endif |
| 51 |
-+ |
| 52 |
- ifeq ($(OS_ARCH),OS2) |
| 53 |
- MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def |
| 54 |
- GARBAGE += $(MAPFILE) |
| 55 |
---- mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000 |
| 56 |
-+++ mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000 |
| 57 |
-@@ -102,6 +102,10 @@ |
| 58 |
- MKSHLIB += -R '$$ORIGIN' |
| 59 |
- endif |
| 60 |
- |
| 61 |
-+ifeq ($(OS_ARCH), Linux) |
| 62 |
-+DSO_LDOPTS += -Wl,-R,'$$ORIGIN' |
| 63 |
-+endif |
| 64 |
-+ |
| 65 |
- ifeq ($(OS_ARCH),OS2) |
| 66 |
- MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def |
| 67 |
- GARBAGE += $(MAPFILE) |
| 68 |
---- mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000 |
| 69 |
-+++ mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000 |
| 70 |
-@@ -168,6 +168,7 @@ |
| 71 |
- else |
| 72 |
- OS_LIBS = -ldl |
| 73 |
- endif |
| 74 |
-+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' |
| 75 |
- endif |
| 76 |
- |
| 77 |
- ifeq ($(OS_ARCH),HP-UX) |
| 78 |
---- mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000 |
| 79 |
-+++ mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000 |
| 80 |
-@@ -122,7 +122,7 @@ |
| 81 |
- fi |
| 82 |
- |
| 83 |
- if test "$echo_libs" = "yes"; then |
| 84 |
-- libdirs=-L$libdir |
| 85 |
-+ libdirs="-Wl,-R$libdir -L$libdir" |
| 86 |
- if test -n "$lib_plds"; then |
| 87 |
- libdirs="$libdirs -lplds${major_version}" |
| 88 |
- fi |
| 89 |
|
| 90 |
diff --git a/dev-libs/nspr/nspr-4.9.4.ebuild b/dev-libs/nspr/nspr-4.9.4-r1.ebuild |
| 91 |
similarity index 98% |
| 92 |
rename from dev-libs/nspr/nspr-4.9.4.ebuild |
| 93 |
rename to dev-libs/nspr/nspr-4.9.4-r1.ebuild |
| 94 |
index 5c82efc..233b0b1 100644 |
| 95 |
--- a/dev-libs/nspr/nspr-4.9.4.ebuild |
| 96 |
+++ b/dev-libs/nspr/nspr-4.9.4-r1.ebuild |
| 97 |
@@ -20,7 +20,6 @@ IUSE="debug" |
| 98 |
|
| 99 |
src_prepare() { |
| 100 |
mkdir build inst |
| 101 |
- epatch "${FILESDIR}"/${PN}-4.8-config.patch |
| 102 |
epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch |
| 103 |
epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch |
| 104 |
epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch |
| 105 |
|
| 106 |
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest |
| 107 |
index f0bbb54..a223e9e 100644 |
| 108 |
--- a/dev-libs/nss/Manifest |
| 109 |
+++ b/dev-libs/nss/Manifest |
| 110 |
@@ -1,8 +1,8 @@ |
| 111 |
AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329 SHA512 fcb47b120860436987858be53971f020db2d7c2f1bef1300bdca6dcf45d76a9b595c545112c1e7553ac29c412f72eafe3d29cd91ed1ab196b03146a7d8bc1870 WHIRLPOOL 1f59af79d4d7565185a3b841b3e936f7d3dddc642630d261be22c04d04cb0f8dfdd13ddacaa0fe8d69256fcffaee5fc273dfe73fc72f539abb5ed501dd1439c2 |
| 112 |
AUX nss-3.13.1-solaris-gcc.patch 994 SHA256 2633e73f8bba27fb34b5872464946b1abe03a7e73e544be4f751655c6276487b SHA512 6e06499d39c89fa60b9efac8dc5b38296d9e26003fc7fc9165434e5a545a50845ca920611cd722c9599b3c2652169ea9f0820a327dab74761e3db2dfab22cf0c WHIRLPOOL d1e3822e279361fd2b96c3e1fbac445aeddde0eca53371c0335c054d644f74de07c883466c20c0ab8d1d34f1bc3f8f4f10ff2111d2b4a1fef769bb74081063c7 |
| 113 |
AUX nss-3.13.5-x32.patch 2304 SHA256 ae402bef2c97cdeac3a00430729d3668167af5f957b1c217e3a79a3d54a3d206 SHA512 c9c4aeca3b7cc62037534b8b6dea04088e07f6d817a4f8a9f3af0de1e494119f140b67b1ed79c8c8af670cd6f86faa5366ae34afe4dda353d5e310c68a8122ee WHIRLPOOL a1507439d64dae60c237c105c3e47d5e20ff80451f97bedfa71b693aa99e9590dfb63f7fdb1bad057a6256159e3efa0a58a5941a9fb4f2d9de7aba3ca7b08102 |
| 114 |
-AUX nss-3.14.1-gentoo-fixups.patch 6405 SHA256 f0e6348d757fa1a0840b2fdae7ca53dbf8fd02846cd47026c4c815b929141df5 SHA512 8be37bd621fc8101928b8782910f41df4ba9e47d26937aa3c95f9da646c14daad1d6ac9acd2e856a159efcb7fe661c96fcaf23511dc917ce8a9db40e09b75e29 WHIRLPOOL 8b32fbb736c5ca43d8bf9b99eb51c1fabeb8f6a011cb920708f65271c3a056aa7ca37d18a6f6d39a04257af57458b9c029b6cda5d090ff478fb10b38385dc47f |
| 115 |
+AUX nss-3.14.1-gentoo-fixups-r1.patch 6370 SHA256 68a7e9f3f05d247825abe364e12289b7924e5e6f079d309b18aa7ef0be90d002 SHA512 8ac25987f330a34dd364ba4ea1eb9378813268d0a47dc6f287ece66184d88d2eb32fb80f8c6ea46815161ef54f6dac2960c8024ef443545d8ffdba43c10405e1 WHIRLPOOL fa45342b098c62daa6b8b798f8bcfec894743b264d50bd0c025f0395b91bd3c354547f4282fa8d9afcb5dd844f9f2590014657d881ab606cc71c2d84ba9ed7ce |
| 116 |
DIST nss-3.13.3_pem.support 191571 SHA256 cb6cf7955203514b3c1210c9b32504b0d2f1c158fa9b5d2509ef0bb34b68374c SHA512 223026adbacf2f325f808210cc050f95cb65cb0fe8c6022109a42bd991fd576e2e96beb5ec8e185dbbd649f4bd4516bc0f7fc10401f47eda806ab2d63f0c23a3 WHIRLPOOL 78345665e54fe67f57bc09311567ad525f9a8dae7d17e600a9639fac820fcf9c64e9f4bacc5df3f90b90a224e374ac44e938962c5248189fe76dad7143bf3476 |
| 117 |
DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43 |
| 118 |
DIST nss-3.14.1.tar.gz 5814063 SHA256 80a5d4872da13d0272636ad04e1beddcf8d4572bcc0d47dbea1d12fb592fb7e5 SHA512 f62a7ebcdade8815379f80929c63de1284c3ca3f5c87214cb5b327f6689635118d301969d4ef0e1940c7a426253b13ce54acd68a91abc23ab32626341217580e WHIRLPOOL 8b292433ec764cfe857bd7cb25c216905b785c536176ece14571c9e7017a93c7a8562502645d71eed7da9f5cc52c65564c294a8a2b75ea43bda19049d6c393bb |
| 119 |
-EBUILD nss-3.14.1.ebuild 8033 SHA256 89c058fdef433cbbd13d2a30c0d0fea6be19acbd7e0a0aefa334abafbeebd2cd SHA512 affde3740a81cbf01d0ab8ab72fc1a704eeba2cd86fc3d0c88619479690627b1fe4dc53d7176bd0f6e1af9fcbf056ca5871dd556c8b959bd1143de76c009563c WHIRLPOOL abc5b055ad6ec3e8fc5b35b42945fe45ab88732a392b731184bfc68a152640bb3d865b14b5fa0f704a0a2016f2de75fabb982c0e121d9643ed9c9a378a0b9067 |
| 120 |
+EBUILD nss-3.14.1-r1.ebuild 8036 SHA256 3623df7d0a49c990a5180e6c964e2bc0c325dcab0ed157a5dfc662cdb2d641c1 SHA512 66472b0d4106b80af2455d97edf403be7722324b63cdf90e699b0a2067e8a9127548f5503d0ae413d69bae763c3f2a39210fbf1a46a7e14f8e60864846e87869 WHIRLPOOL 32f07ec3cc57c79508d74a9391fc9ac920255f6c51b1cd71f0d4e2984b954f98e348eaf68464c892c082e7238fc4928c5fd90f422d9b62ac6637c1c125752bdb |
| 121 |
|
| 122 |
diff --git a/dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.14.1-gentoo-fixups-r1.patch |
| 123 |
similarity index 98% |
| 124 |
rename from dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch |
| 125 |
rename to dev-libs/nss/files/nss-3.14.1-gentoo-fixups-r1.patch |
| 126 |
index 300da5d..bc3a98e 100644 |
| 127 |
--- a/dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch |
| 128 |
+++ b/dev-libs/nss/files/nss-3.14.1-gentoo-fixups-r1.patch |
| 129 |
@@ -175,7 +175,7 @@ diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/con |
| 130 |
+fi |
| 131 |
+ |
| 132 |
+if test "$echo_libs" = "yes"; then |
| 133 |
-+ libdirs="-Wl,-R$libdir -L$libdir" |
| 134 |
++ libdirs="" |
| 135 |
+ if test -n "$lib_ssl"; then |
| 136 |
+ libdirs="$libdirs -lssl${major_version}" |
| 137 |
+ fi |
| 138 |
@@ -204,7 +204,7 @@ diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/ |
| 139 |
+Description: Network Security Services |
| 140 |
+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ |
| 141 |
+Requires: nspr >= 4.8 |
| 142 |
-+Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 |
| 143 |
++Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 |
| 144 |
+Cflags: -I${includedir} |
| 145 |
+ |
| 146 |
diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile |
| 147 |
|
| 148 |
diff --git a/dev-libs/nss/nss-3.14.1.ebuild b/dev-libs/nss/nss-3.14.1-r1.ebuild |
| 149 |
similarity index 99% |
| 150 |
rename from dev-libs/nss/nss-3.14.1.ebuild |
| 151 |
rename to dev-libs/nss/nss-3.14.1-r1.ebuild |
| 152 |
index bdc1f66..25a32d3 100644 |
| 153 |
--- a/dev-libs/nss/nss-3.14.1.ebuild |
| 154 |
+++ b/dev-libs/nss/nss-3.14.1-r1.ebuild |
| 155 |
@@ -32,7 +32,7 @@ src_setup() { |
| 156 |
|
| 157 |
src_prepare() { |
| 158 |
# Custom changes for gentoo |
| 159 |
- epatch "${FILESDIR}/${PN}-3.14.1-gentoo-fixups.patch" |
| 160 |
+ epatch "${FILESDIR}/${PN}-3.14.1-gentoo-fixups-r1.patch" |
| 161 |
epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" |
| 162 |
epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch" |
| 163 |
epatch "${DISTDIR}/${PN}-3.13.3_pem.support" |
Archives