rpms/cups
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Removed obsolete browsing directives from cupsd.conf (bug #880826, STR #4157).

Browse Source
This commit is contained in:
Jiri Popelka 2013-02-27 16:35:55 +01:00
parent c3bf1232c5
commit 8d6f914086
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cups-directives.patch Normal file
View File

@ -0,0 +1,27 @@
From 3f4855845fc8c3c41c3564bd91add767d35841e1 Mon Sep 17 00:00:00 2001
From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Tue, 28 Aug 2012 22:03:51 +0000
Subject: [PATCH] The cupsd.conf file included obsolete browsing directives
(STR #4157)
git-svn-id: http://svn.easysw.com/public/cups/trunk@10575 7a7537e8-13f0-0310-91df-b6672ffda945
---
conf/cupsd.conf.in | 2 --
1 file changed, 2 deletions(-)
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index 2ce33e3..8ed157e 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -19,8 +19,6 @@ Listen localhost:@DEFAULT_IPP_PORT@
# Show shared printers on the local network.
Browsing On
-BrowseOrder allow,deny
-BrowseAllow all
BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
# Default authentication type, when authentication is required...
--
1.8.1.4

4
cups.spec
View File

@ -49,6 +49,7 @@ Patch17: cups-usb-paperout.patch
Patch19: cups-res_init.patch Patch19: cups-res_init.patch
Patch20: cups-filter-debug.patch Patch20: cups-filter-debug.patch
Patch21: cups-uri-compat.patch Patch21: cups-uri-compat.patch
Patch22: cups-directives.patch
Patch23: cups-str3382.patch Patch23: cups-str3382.patch
Patch24: cups-usblp-quirks.patch Patch24: cups-usblp-quirks.patch
Patch25: cups-0755.patch Patch25: cups-0755.patch
@ -216,6 +217,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch20 -p1 -b .filter-debug %patch20 -p1 -b .filter-debug
# Allow the usb backend to understand old-style URI formats. # Allow the usb backend to understand old-style URI formats.
%patch21 -p1 -b .uri-compat %patch21 -p1 -b .uri-compat
# Remove obsolete browsing directives from cupsd.conf (bug #880826, STR #4157).
%patch22 -p1 -b .directives
# Fix temporary filename creation. # Fix temporary filename creation.
%patch23 -p1 -b .str3382 %patch23 -p1 -b .str3382
# Problem is a port reset which is done by the new USB backend of CUPS 1.5.4 and 1.6.x to clean up after the job. # Problem is a port reset which is done by the new USB backend of CUPS 1.5.4 and 1.6.x to clean up after the job.
@ -625,6 +628,7 @@ rm -f %{cups_serverbin}/backend/smb
%changelog %changelog
* Wed Feb 27 2013 Jiri Popelka <jpopelka@redhat.com> - 1:1.6.1-23 * Wed Feb 27 2013 Jiri Popelka <jpopelka@redhat.com> - 1:1.6.1-23
- Removed obsolete browsing directives from cupsd.conf (bug #880826, STR #4157).
- Updated summary and descriptions (#882982). - Updated summary and descriptions (#882982).
- Fixed bogus dates in changelog. - Fixed bogus dates in changelog.