diff options
| author | markd <markd@pkgsrc.org> | 2009-02-11 10:21:33 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2009-02-11 10:21:33 +0000 |
| commit | 40e28b7235cf334b73984db7385ebda8353185ef (patch) | |
| tree | d4563b9767eaf2b7b6399cda8ff909e305f9ee24 /print/cups | |
| parent | ca28982c9289879c235554de8f3bb826f0c9521f (diff) | |
| download | pkgsrc-40e28b7235cf334b73984db7385ebda8353185ef.tar.gz | |
firefox3 issue is now dealt with by a patch to firefox3 so revert
this to the patch as per cups svn.
Diffstat (limited to 'print/cups')
| -rw-r--r-- | print/cups/Makefile | 4 | ||||
| -rw-r--r-- | print/cups/distinfo | 4 | ||||
| -rw-r--r-- | print/cups/patches/patch-ae | 15 |
3 files changed, 6 insertions, 17 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 735dd36d97e..c925d2eba1d 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.137 2009/01/29 15:28:31 gdt Exp $ +# $NetBSD: Makefile,v 1.138 2009/02/11 10:21:33 markd Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -9,7 +9,7 @@ PKGNAME= cups-${VERS} BASE_VERS= 1.3.9 DIST_VERS= ${BASE_VERS} VERS= ${DIST_VERS:S/-/./g} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ ftp://ftp.ntua.gr/pub/gnu/cups/${BASE_VERS}/ \ diff --git a/print/cups/distinfo b/print/cups/distinfo index 8183c83240a..5bc32ebe32d 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.59 2009/01/30 12:44:15 gdt Exp $ +$NetBSD: distinfo,v 1.60 2009/02/11 10:21:33 markd 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) = f35e4460bb0cb73b4760b024dc8dc62570770ee0 +SHA1 (patch-ae) = 02f29abd78536fd2177042a0d7e308d418045448 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 d9b6e8d48dd..dd996e8f284 100644 --- a/print/cups/patches/patch-ae +++ b/print/cups/patches/patch-ae @@ -1,27 +1,16 @@ -$NetBSD: patch-ae,v 1.21 2009/01/30 12:44:15 gdt Exp $ +$NetBSD: patch-ae,v 1.22 2009/02/11 10:21:33 markd Exp $ &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 -@@ -1175,7 +1175,14 @@ httpInitialize(void) +@@ -1175,7 +1175,7 @@ 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 */ } |