summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorjlam <jlam>2001-03-07 04:09:58 +0000
committerjlam <jlam>2001-03-07 04:09:58 +0000
commitd55ba59aad75637278c18104c2547932ad6ac4cc (patch)
tree653940e46103c6a4c4d4bc2576e20a045be71631 /print
parent038b0baed3aeb7b83971c93efd1ebb740f379f40 (diff)
downloadpkgsrc-d55ba59aad75637278c18104c2547932ad6ac4cc.tar.gz
Update cups to 1.1.6.3nb2. Changes from version 1.1.6.3nb1 include two fixes
from the mailing list: 1) Use /dev/urandom instead of /dev/random for random device. 2) Read configuration file before creating certificates as the conf file may redefine the location of the certs directory.
Diffstat (limited to 'print')
-rw-r--r--print/cups/Makefile4
-rw-r--r--print/cups/files/patch-sum4
-rw-r--r--print/cups/patches/patch-ai13
-rw-r--r--print/cups/patches/patch-aj21
4 files changed, 39 insertions, 3 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index cb6f5bf311f..177da84856b 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2001/03/04 09:06:17 tron Exp $
+# $NetBSD: Makefile,v 1.25 2001/03/07 04:09:58 jlam Exp $
#
DISTNAME= cups-${VERS}-3-source
-PKGNAME= cups-${VERS}.3nb1
+PKGNAME= cups-${VERS}.3nb2
VERS= 1.1.6
WRKSRC= ${WRKDIR}/cups-${VERS}
CATEGORIES= print
diff --git a/print/cups/files/patch-sum b/print/cups/files/patch-sum
index 392d48f15ff..0681bafca81 100644
--- a/print/cups/files/patch-sum
+++ b/print/cups/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.14 2001/02/27 17:37:53 jlam Exp $
+$NetBSD: patch-sum,v 1.15 2001/03/07 04:09:59 jlam Exp $
MD5 (patch-aa) = 9e634f9986e0cec53cb2c4fd673755e4
MD5 (patch-ab) = 4155498923feeee81ea9f8b99821fb82
@@ -6,3 +6,5 @@ MD5 (patch-ac) = 4ea2faaf4cf0ef1a75a3b35d964683e1
MD5 (patch-ad) = 250117284e59dba57f234ba941547f45
MD5 (patch-ag) = b8bc803ab02adcfe0cdb7cc11ea6ab44
MD5 (patch-ah) = c1db5a2db6340a836eba9f749cef3468
+MD5 (patch-ai) = fef832b4856e8cb55b32725a1c110ef8
+MD5 (patch-aj) = d0ca80366564f61e8dbb386204e0d1a1
diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai
new file mode 100644
index 00000000000..b97a4d3ffb2
--- /dev/null
+++ b/print/cups/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.7 2001/03/07 04:09:59 jlam Exp $
+
+--- scheduler/cert.c.orig Mon Jan 22 10:03:58 2001
++++ scheduler/cert.c
+@@ -235,7 +235,7 @@
+ * the current time, as available...
+ */
+
+- if ((fp = fopen("/dev/random", "rb")) == NULL)
++ if ((fp = fopen("/dev/urandom", "rb")) == NULL)
+ {
+ /*
+ * Get the time in usecs and use it as the initial seed...
diff --git a/print/cups/patches/patch-aj b/print/cups/patches/patch-aj
new file mode 100644
index 00000000000..61f4ac2cca8
--- /dev/null
+++ b/print/cups/patches/patch-aj
@@ -0,0 +1,21 @@
+$NetBSD: patch-aj,v 1.7 2001/03/07 04:09:59 jlam Exp $
+
+--- scheduler/main.c.orig Mon Jan 22 10:04:00 2001
++++ scheduler/main.c
+@@ -234,14 +234,14 @@
+ * Read configuration...
+ */
+
+- InitCerts();
+-
+ if (!ReadConfiguration())
+ {
+ syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!",
+ ConfigurationFile);
+ return (1);
+ }
++
++ InitCerts();
+
+ LoadAllJobs();
+