summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2009-01-30 12:44:15 +0000
committergdt <gdt@pkgsrc.org>2009-01-30 12:44:15 +0000
commite4055fb67a772f3976767dd89092c1a6a9ab2dea (patch)
tree42a6bd0a80b88563f89546d2f70dde38b8c54ace /print
parentd9d80e21fb9fde358017e2fb2dd22895d24afbff (diff)
downloadpkgsrc-e4055fb67a772f3976767dd89092c1a6a9ab2dea.tar.gz
annotate patch file with comments from Yorick Hardy
&data issue filed as http://www.cups.org/str.php?L3079 and fixed in cups svn 28 minutes later. The deeper issue is that firefox3 defines SHA1_Update in nss and cups uses openssl and the nss symbol wins; hence any use of RAND_seed fails.
Diffstat (limited to 'print')
-rw-r--r--print/cups/distinfo4
-rw-r--r--print/cups/patches/patch-ae9
2 files changed, 9 insertions, 4 deletions
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 292310b340d..8183c83240a 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2009/01/29 15:28:31 gdt Exp $
+$NetBSD: distinfo,v 1.59 2009/01/30 12:44:15 gdt Exp $
SHA1 (cups-1.3.9-source.tar.bz2) = c1a596b355201320456b393446286fe3947bce16
RMD160 (cups-1.3.9-source.tar.bz2) = ec8bd9fc6ee45648b6eb22949f44fc4cf2defd4e
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 51ff6e66f881e445adca768d4cf2f6bd18fc36dd
SHA1 (patch-ab) = 11936b2512fc4480a45a8efb01de0c5a29a7a6e8
SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04
SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60
-SHA1 (patch-ae) = 87b19c14bb2365630d1857c32b71236f0aab787b
+SHA1 (patch-ae) = f35e4460bb0cb73b4760b024dc8dc62570770ee0
SHA1 (patch-an) = 5c12e6de5d83659011c6050786049756e4aa4b49
SHA1 (patch-ao) = 4fc204e312bf8752f3f3b4fd73ec1e4f166ae2d3
SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
index 40c2a57db52..d9b6e8d48dd 100644
--- a/print/cups/patches/patch-ae
+++ b/print/cups/patches/patch-ae
@@ -1,6 +1,11 @@
-$NetBSD: patch-ae,v 1.20 2009/01/29 15:28:31 gdt Exp $
+$NetBSD: patch-ae,v 1.21 2009/01/30 12:44:15 gdt Exp $
-Should be pushed upstream and the real problem identified.
+&data issue filed as http://www.cups.org/str.php?L3079 and fixed in
+cups svn 28 minutes later.
+
+The deeper issue is that firefox3 defines SHA1_Update in nss and cups
+uses openssl and the nss symbol wins; hence any use of RAND_seed
+fails.
--- cups/http.c.orig 2008-08-01 14:33:16.000000000 -0400
+++ cups/http.c