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

- Avoid empty BrowseLocalProtocols setting (bug #516460, STR #3287).

Browse Source
This commit is contained in:
Tim Waugh 2009-08-11 08:12:19 +00:00
parent 3f6ad2bd25
commit 53ec61b826
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cups-str3287.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up cups-1.4rc1/cups/adminutil.c.str3287 cups-1.4rc1/cups/adminutil.c
--- cups-1.4rc1/cups/adminutil.c.str3287 2009-06-05 22:38:52.000000000 +0100
+++ cups-1.4rc1/cups/adminutil.c 2009-08-11 09:02:12.677703681 +0100
@@ -1594,7 +1594,7 @@ _cupsAdminSetServerSettings(
{
cupsFilePuts(temp, "BrowseAddress @LOCAL\n");
- if (!localp)
+ if (!localp || localp[0] == '\0')
localp = CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS;
cupsFilePrintf(temp, "BrowseLocalProtocols %s\n", localp);

7
cups.spec
View File

@ -10,7 +10,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4 Version: 1.4
Release: 0.%{pre}.14%{?dist} Release: 0.%{pre}.15%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@ -66,6 +66,7 @@ Patch38: cups-str3277.patch
Patch39: cups-str3284.patch Patch39: cups-str3284.patch
Patch40: cups-str3285.patch Patch40: cups-str3285.patch
Patch41: cups-str3279.patch Patch41: cups-str3279.patch
Patch42: cups-str3287.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
Epoch: 1 Epoch: 1
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -232,6 +233,7 @@ module.
%patch39 -p1 -b .str3284 %patch39 -p1 -b .str3284
%patch40 -p1 -b .str3285 %patch40 -p1 -b .str3285
%patch41 -p1 -b .str3279 %patch41 -p1 -b .str3279
%patch42 -p1 -b .str3287
%if %lspp %if %lspp
%patch100 -p1 -b .lspp %patch100 -p1 -b .lspp
@ -526,6 +528,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Tue Aug 11 2009 Tim Waugh <twaugh@redhat.com> 1:1.4-0.rc1.15
- Avoid empty BrowseLocalProtocols setting (bug #516460, STR #3287).
* Mon Aug 10 2009 Tim Waugh <twaugh@redhat.com> 1:1.4-0.rc1.14 * Mon Aug 10 2009 Tim Waugh <twaugh@redhat.com> 1:1.4-0.rc1.14
- Fixed ppds.dat handling of drv files (bug #515027, STR #3279). - Fixed ppds.dat handling of drv files (bug #515027, STR #3279).
- Fixed udev rules file to avoid DEVTYPE warning messages. - Fixed udev rules file to avoid DEVTYPE warning messages.