Thu Jan 29 15:28:31 2009 UTC ()
Add patch to not call RAND_seed.  Works around problem where firefox3
crashes when opening the printing dialog.  Fix based on concept from
Yorick Hardy, but bugs are my fault.


(gdt)
diff -r1.136 -r1.137 pkgsrc/print/cups/Makefile
diff -r1.57 -r1.58 pkgsrc/print/cups/distinfo
diff -r0 -r1.20 pkgsrc/print/cups/patches/patch-ae
cvs diff -r1.136 -r1.137 pkgsrc/print/cups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile 2008/10/22 21:48:15 1.136
+++ pkgsrc/print/cups/Makefile 2009/01/29 15:28:31 1.137
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.136 2008/10/22 21:48:15 tonnerre Exp $ 1# $NetBSD: Makefile,v 1.137 2009/01/29 15:28:31 gdt Exp $
2# 2#
3# The CUPS author is very good about taking back changes into the main 3# The CUPS author is very good about taking back changes into the main
4# CUPS distribution. The correct place to send patches or bug-fixes is: 4# CUPS distribution. The correct place to send patches or bug-fixes is:
5# cups-bugs@cups.org. 5# cups-bugs@cups.org.
6 6
7DISTNAME= cups-${DIST_VERS}-source 7DISTNAME= cups-${DIST_VERS}-source
8PKGNAME= cups-${VERS} 8PKGNAME= cups-${VERS}
9BASE_VERS= 1.3.9 9BASE_VERS= 1.3.9
10DIST_VERS= ${BASE_VERS} 10DIST_VERS= ${BASE_VERS}
11VERS= ${DIST_VERS:S/-/./g} 11VERS= ${DIST_VERS:S/-/./g}
 12PKGREVISION= 1
12CATEGORIES= print 13CATEGORIES= print
13MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ 14MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
14 ftp://ftp.ntua.gr/pub/gnu/cups/${BASE_VERS}/ \ 15 ftp://ftp.ntua.gr/pub/gnu/cups/${BASE_VERS}/ \
15 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${BASE_VERS}/ \ 16 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${BASE_VERS}/ \
16 ftp://ftp.fisek.com.tr/pub/cups/${BASE_VERS}/ 17 ftp://ftp.fisek.com.tr/pub/cups/${BASE_VERS}/
17EXTRACT_SUFX= .tar.bz2 18EXTRACT_SUFX= .tar.bz2
18 19
19MAINTAINER= jlam@pkgsrc.org 20MAINTAINER= jlam@pkgsrc.org
20HOMEPAGE= http://www.cups.org/ 21HOMEPAGE= http://www.cups.org/
21COMMENT= Common UNIX Printing System 22COMMENT= Common UNIX Printing System
22 23
23PKG_DESTDIR_SUPPORT= user-destdir 24PKG_DESTDIR_SUPPORT= user-destdir
24 25
cvs diff -r1.57 -r1.58 pkgsrc/print/cups/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/distinfo 2008/10/22 21:48:16 1.57
+++ pkgsrc/print/cups/Attic/distinfo 2009/01/29 15:28:31 1.58
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.57 2008/10/22 21:48:16 tonnerre Exp $ 1$NetBSD: distinfo,v 1.58 2009/01/29 15:28:31 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-an) = 5c12e6de5d83659011c6050786049756e4aa4b49 11SHA1 (patch-an) = 5c12e6de5d83659011c6050786049756e4aa4b49
11SHA1 (patch-ao) = 4fc204e312bf8752f3f3b4fd73ec1e4f166ae2d3 12SHA1 (patch-ao) = 4fc204e312bf8752f3f3b4fd73ec1e4f166ae2d3
12SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1 13SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1
13SHA1 (patch-au) = 0c32755a4979e5a44b1773c9fd1fb75bcf919cef 
File Added: pkgsrc/print/cups/patches/Attic/patch-ae
$NetBSD: patch-ae,v 1.20 2009/01/29 15:28:31 gdt Exp $

Should be pushed upstream and the real problem identified.

--- cups/http.c.orig	2008-08-01 14:33:16.000000000 -0400
+++ cups/http.c
@@ -1175,7 +1175,14 @@ httpInitialize(void)
   for (i = 0; i < sizeof(data); i ++)
     data[i] = rand(); /* Yes, this is a poor source of random data... */
 
-  RAND_seed(&data, sizeof(data));
+#if 0
+  /*
+   * For reasons not entirely clear, this call results in segfaults
+   * when firefox3 tries to print.  Upstream has a spurious & in front
+   * of data, but removing that is not enough to avoid the crash.
+   */
+  RAND_seed(data, sizeof(data));
+#endif
 #endif /* HAVE_LIBSSL */
 }