diff options
| author | jlam <jlam> | 2002-06-09 20:59:34 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-06-09 20:59:34 +0000 |
| commit | 377a32ab41571568d6e2aef1f9c9bec9535b9402 (patch) | |
| tree | 06b1f112f36d86360a0002ae9f4bca54de958173 /print | |
| parent | 8bff3eca0e18367df6e3d310d4ba29da11282d72 (diff) | |
| download | pkgsrc-377a32ab41571568d6e2aef1f9c9bec9535b9402.tar.gz | |
Apply patch from pkg/16643 submitted by Tero Kivinen <kivinen@ssh.fi> to
fix the problem where cupsd dumps core if BrowseProtocols is empty in the
config file. The fix was taken from the CUPS CVS.
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups/distinfo | 3 | ||||
| -rw-r--r-- | print/cups/patches/patch-aa | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/print/cups/distinfo b/print/cups/distinfo index cbd75712e56..dcc32e8bb93 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.13 2002/02/18 11:26:15 martti Exp $ +$NetBSD: distinfo,v 1.14 2002/06/09 20:59:34 jlam Exp $ SHA1 (cups-1.1.14-source.tar.bz2) = b1a940af5f27cebb8bef340aa6a3552c887ad67d Size (cups-1.1.14-source.tar.bz2) = 5408714 bytes +SHA1 (patch-aa) = e740b0ed9292f72c1161de8b3e98cf7ae260f916 SHA1 (patch-ab) = 72eca08a8198cc94f817bdb4435e43e637886587 SHA1 (patch-ag) = df2c471d9dd013017afdef80a41ea2b2e5bdca27 SHA1 (patch-ah) = a7cdf225c7256c3277559d5bd2923df74ee3d26e diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa new file mode 100644 index 00000000000..51d6dc7a737 --- /dev/null +++ b/print/cups/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.12 2002/06/09 20:59:35 jlam Exp $ + +--- scheduler/main.c.orig Wed Feb 13 12:21:36 2002 ++++ scheduler/main.c +@@ -476,9 +476,9 @@ + * Update the browse list as needed... + */ + +- if (Browsing) ++ if (Browsing && BrowseProtocols) + { +- if (FD_ISSET(BrowseSocket, &input)) ++ if (BrowseSocket >= 0 && FD_ISSET(BrowseSocket, &input)) + UpdateCUPSBrowse(); + + if (PollPipe >= 0 && FD_ISSET(PollPipe, &input)) |