diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-26 17:02:33 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-26 17:02:33 +0000 |
| commit | 768980b603f23e9ec406123217ec45d182e9a8fa (patch) | |
| tree | 4ea08be0bce108264d2eac06820c96eb6b4e6f2a /dev-libs/nspr | |
| parent | sign manifest (diff) | |
| download | historical-768980b603f23e9ec406123217ec45d182e9a8fa.tar.gz historical-768980b603f23e9ec406123217ec45d182e9a8fa.tar.bz2 historical-768980b603f23e9ec406123217ec45d182e9a8fa.zip | |
Simplify patch as per upstrem bug #354305.
Package-Manager: portage-2.1.2_pre1-r1
Diffstat (limited to 'dev-libs/nspr')
| -rw-r--r-- | dev-libs/nspr/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/nspr/Manifest | 22 | ||||
| -rw-r--r-- | dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch | 5 |
3 files changed, 17 insertions, 16 deletions
diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 6b07fb5c4f3d..21873f752472 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.55 2006/09/26 11:29:29 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.56 2006/09/26 17:02:33 flameeyes Exp $ + + 26 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> + files/nspr-4.6.3-fbsd62.patch: + Simplify patch as per upstrem bug #354305. 26 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> +files/nspr-4.6.3-fbsd62.patch, nspr-4.6.3.ebuild: diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index 83c7b14066a1..9ec9fe6a070e 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -33,10 +33,10 @@ AUX nspr-4.6.1-prtime.patch 1003 RMD160 20a8efaffdaf51d55566c14ebac1f40d3f22303b MD5 427516bd171200f54d93738aa4c1ab28 files/nspr-4.6.1-prtime.patch 1003 RMD160 20a8efaffdaf51d55566c14ebac1f40d3f22303b files/nspr-4.6.1-prtime.patch 1003 SHA256 54ed12024f4fd65bb911279faab18665b00429c7d0811c7485d4ff5c2c436237 files/nspr-4.6.1-prtime.patch 1003 -AUX nspr-4.6.3-fbsd62.patch 618 RMD160 fe81ce994ed6489c61595f4ed3a93c9c59aa87d4 SHA1 17611ff996f1e8131521c87376892048a29a2de6 SHA256 202fd52c7433e05640717cbc03a7bd6d51b5ee816721d34b1f1fe29a0691a126 -MD5 1e0bbba4b11fba583f8defbf77aff7aa files/nspr-4.6.3-fbsd62.patch 618 -RMD160 fe81ce994ed6489c61595f4ed3a93c9c59aa87d4 files/nspr-4.6.3-fbsd62.patch 618 -SHA256 202fd52c7433e05640717cbc03a7bd6d51b5ee816721d34b1f1fe29a0691a126 files/nspr-4.6.3-fbsd62.patch 618 +AUX nspr-4.6.3-fbsd62.patch 560 RMD160 6bd439cb9b5d194d8e47b12aced23a7649468e72 SHA1 99c24ec9972e0f8712329b8569db7df3d3861925 SHA256 8ba1abac80e24a96650ef9d6e821b03d874a97f819c4e422cf1904331a28ef1d +MD5 03f3d90557cfc278618911d4741e79d8 files/nspr-4.6.3-fbsd62.patch 560 +RMD160 6bd439cb9b5d194d8e47b12aced23a7649468e72 files/nspr-4.6.3-fbsd62.patch 560 +SHA256 8ba1abac80e24a96650ef9d6e821b03d874a97f819c4e422cf1904331a28ef1d files/nspr-4.6.3-fbsd62.patch 560 AUX nspr.pc.in 250 RMD160 4b09e190d343398d26568ed0dce821f951128782 SHA1 edcc81bcdb0618418aaa0d3fb82a3d0475b9098a SHA256 af16b4d93fe4615572ea1af025ff7b56763c734a4d946bb20abd62b032e08639 MD5 215e4174aea8d00c45ee29f021a68a4e files/nspr.pc.in 250 RMD160 4b09e190d343398d26568ed0dce821f951128782 files/nspr.pc.in 250 @@ -80,10 +80,10 @@ EBUILD nspr-4.6.3.ebuild 2687 RMD160 27c1fc8bb40910cc2fad6914ac33ae8c23697371 SH MD5 f3ff85b86cb01f40e1db5ccb0d1d7b3f nspr-4.6.3.ebuild 2687 RMD160 27c1fc8bb40910cc2fad6914ac33ae8c23697371 nspr-4.6.3.ebuild 2687 SHA256 24718971f976b1000750f74ffddb5196f077a6a8df011e860f589128d91e5a2c nspr-4.6.3.ebuild 2687 -MISC ChangeLog 6577 RMD160 c2751c44ed781d528a393a6cd910f141e6dbf4d9 SHA1 7e45d45f91ce2baafa8567b7d50d11a04083c150 SHA256 42f00150ccf4ce42e1b580b9c9254220729515fd5faf9b114eb792ba003f29fe -MD5 a2ce0ed65cbe89e624ab89d45787f826 ChangeLog 6577 -RMD160 c2751c44ed781d528a393a6cd910f141e6dbf4d9 ChangeLog 6577 -SHA256 42f00150ccf4ce42e1b580b9c9254220729515fd5faf9b114eb792ba003f29fe ChangeLog 6577 +MISC ChangeLog 6709 RMD160 2c1e7e0cf4f5b4ee2000e524ecf242a09bea56a7 SHA1 f24346cfb5223a8e95611c6e505da72d5a396608 SHA256 d7e13aa92fe90dc1de279fbc1e47316eb5d3c0b417d3591322da951d1c3a71f4 +MD5 ef814b51719d251d8d3f50d5a9dbffd8 ChangeLog 6709 +RMD160 2c1e7e0cf4f5b4ee2000e524ecf242a09bea56a7 ChangeLog 6709 +SHA256 d7e13aa92fe90dc1de279fbc1e47316eb5d3c0b417d3591322da951d1c3a71f4 ChangeLog 6709 MISC metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 SHA1 09baadee9aeb270d0a7f31be07db9db5c105abbc SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 MD5 243e4cd9809545d12f991b2d417040e1 metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 metadata.xml 159 @@ -115,7 +115,7 @@ SHA256 82d736986dd37fa8bff6a9c087f916915aff244b64f3f85350be22f901034203 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFGQ8sAiZjviIA2XgRAtULAJ4gS7Qu+I0fw3lmDbGX29bpYK49dQCgwGPY -YaIxJQarN/70jxOw3ld8ko8= -=nfTQ +iD8DBQFFGV03AiZjviIA2XgRAtZNAKC3Vc0Ix5mgzMf8UjFLdOxPPM3JygCg02jE +9fEmfziYgh+VDrM2xm43Ceg= +=7nlD -----END PGP SIGNATURE----- diff --git a/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch b/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch index 3c76e94709db..525c44775d82 100644 --- a/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch +++ b/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch @@ -2,17 +2,14 @@ Index: nspr-4.6.3/mozilla/nsprpub/pr/src/misc/prnetdb.c =================================================================== --- nspr-4.6.3.orig/mozilla/nsprpub/pr/src/misc/prnetdb.c +++ nspr-4.6.3/mozilla/nsprpub/pr/src/misc/prnetdb.c -@@ -108,6 +108,14 @@ PRLock *_pr_dnsLock = NULL; +@@ -108,6 +108,11 @@ PRLock *_pr_dnsLock = NULL; #define _PR_HAVE_GETPROTO_R_INT #endif -+#if defined(__FreeBSD__) -+#include <sys/param.h> +#if __FreeBSD_version >= 602000 +#define _PR_HAVE_GETPROTO_R +#define _PR_HAVE_5_ARG_GETPROTO_R +#endif -+#endif + #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) #define _PR_HAVE_GETPROTO_R |