Fri Jan 30 12:44:15 2009 UTC ()
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.


(gdt)
diff -r1.58 -r1.59 pkgsrc/print/cups/distinfo
diff -r1.20 -r1.21 pkgsrc/print/cups/patches/patch-ae
cvs diff -r1.58 -r1.59 pkgsrc/print/cups/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/distinfo 2009/01/29 15:28:31 1.58
+++ pkgsrc/print/cups/Attic/distinfo 2009/01/30 12:44:15 1.59
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.58 2009/01/29 15:28:31 gdt Exp $ 1$NetBSD: distinfo,v 1.59 2009/01/30 12:44:15 gdt Exp $
2 2
3SHA1 (cups-1.3.9-source.tar.bz2) = c1a596b355201320456b393446286fe3947bce16 3SHA1 (cups-1.3.9-source.tar.bz2) = c1a596b355201320456b393446286fe3947bce16
4RMD160 (cups-1.3.9-source.tar.bz2) = ec8bd9fc6ee45648b6eb22949f44fc4cf2defd4e 4RMD160 (cups-1.3.9-source.tar.bz2) = ec8bd9fc6ee45648b6eb22949f44fc4cf2defd4e
5Size (cups-1.3.9-source.tar.bz2) = 3993875 bytes 5Size (cups-1.3.9-source.tar.bz2) = 3993875 bytes
6SHA1 (patch-aa) = 51ff6e66f881e445adca768d4cf2f6bd18fc36dd 6SHA1 (patch-aa) = 51ff6e66f881e445adca768d4cf2f6bd18fc36dd
7SHA1 (patch-ab) = 11936b2512fc4480a45a8efb01de0c5a29a7a6e8 7SHA1 (patch-ab) = 11936b2512fc4480a45a8efb01de0c5a29a7a6e8
8SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04 8SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04
9SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60 9SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60
10SHA1 (patch-ae) = 87b19c14bb2365630d1857c32b71236f0aab787b 10SHA1 (patch-ae) = f35e4460bb0cb73b4760b024dc8dc62570770ee0
11SHA1 (patch-an) = 5c12e6de5d83659011c6050786049756e4aa4b49 11SHA1 (patch-an) = 5c12e6de5d83659011c6050786049756e4aa4b49
12SHA1 (patch-ao) = 4fc204e312bf8752f3f3b4fd73ec1e4f166ae2d3 12SHA1 (patch-ao) = 4fc204e312bf8752f3f3b4fd73ec1e4f166ae2d3
13SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1 13SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1
cvs diff -r1.20 -r1.21 pkgsrc/print/cups/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/print/cups/patches/Attic/patch-ae 2009/01/29 15:28:31 1.20
+++ pkgsrc/print/cups/patches/Attic/patch-ae 2009/01/30 12:44:15 1.21
@@ -1,16 +1,21 @@ @@ -1,16 +1,21 @@
1$NetBSD: patch-ae,v 1.20 2009/01/29 15:28:31 gdt Exp $ 1$NetBSD: patch-ae,v 1.21 2009/01/30 12:44:15 gdt Exp $
2 2
3Should be pushed upstream and the real problem identified. 3&data issue filed as http://www.cups.org/str.php?L3079 and fixed in
 4cups svn 28 minutes later.
 5
 6The deeper issue is that firefox3 defines SHA1_Update in nss and cups
 7uses openssl and the nss symbol wins; hence any use of RAND_seed
 8fails.
4 9
5--- cups/http.c.orig 2008-08-01 14:33:16.000000000 -0400 10--- cups/http.c.orig 2008-08-01 14:33:16.000000000 -0400
6+++ cups/http.c 11+++ cups/http.c
7@@ -1175,7 +1175,14 @@ httpInitialize(void) 12@@ -1175,7 +1175,14 @@ httpInitialize(void)
8 for (i = 0; i < sizeof(data); i ++) 13 for (i = 0; i < sizeof(data); i ++)
9 data[i] = rand(); /* Yes, this is a poor source of random data... */ 14 data[i] = rand(); /* Yes, this is a poor source of random data... */
10  15
11- RAND_seed(&data, sizeof(data)); 16- RAND_seed(&data, sizeof(data));
12+#if 0 17+#if 0
13+ /* 18+ /*
14+ * For reasons not entirely clear, this call results in segfaults 19+ * For reasons not entirely clear, this call results in segfaults
15+ * when firefox3 tries to print. Upstream has a spurious & in front 20+ * when firefox3 tries to print. Upstream has a spurious & in front
16+ * of data, but removing that is not enough to avoid the crash. 21+ * of data, but removing that is not enough to avoid the crash.