summaryrefslogtreecommitdiff
path: root/print/cups/patches
diff options
context:
space:
mode:
authorjlam <jlam>2001-03-07 04:09:58 +0000
committerjlam <jlam>2001-03-07 04:09:58 +0000
commit06bb8cab2088e556adb5f1a4f99c83f9b2787702 (patch)
tree653940e46103c6a4c4d4bc2576e20a045be71631 /print/cups/patches
parent42a1b8563f31d70d109b69219ad7f149c1863885 (diff)
downloadpkgsrc-06bb8cab2088e556adb5f1a4f99c83f9b2787702.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/cups/patches')
-rw-r--r--print/cups/patches/patch-ai13
-rw-r--r--print/cups/patches/patch-aj21
2 files changed, 34 insertions, 0 deletions
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();
+