diff --git a/cups-str3287.patch b/cups-str3287.patch new file mode 100644 index 0000000..6d8118d --- /dev/null +++ b/cups-str3287.patch @@ -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); diff --git a/cups.spec b/cups.spec index 4ccbacf..3edb655 100644 --- a/cups.spec +++ b/cups.spec @@ -66,6 +66,7 @@ Patch38: cups-str3277.patch Patch39: cups-str3284.patch Patch40: cups-str3285.patch Patch41: cups-str3279.patch +Patch42: cups-str3287.patch Patch100: cups-lspp.patch Epoch: 1 Url: http://www.cups.org/ @@ -232,6 +233,7 @@ module. %patch39 -p1 -b .str3284 %patch40 -p1 -b .str3285 %patch41 -p1 -b .str3279 +%patch42 -p1 -b .str3287 %if %lspp %patch100 -p1 -b .lspp @@ -526,7 +528,8 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog -* Mon Aug 10 2009 Tim Waugh 1:1.4-0.rc1.15 +* Tue Aug 11 2009 Tim Waugh 1:1.4-0.rc1.15 +- Avoid empty BrowseLocalProtocols setting (bug #516460, STR #3287). - Fixed ppds.dat handling of drv files (bug #515027, STR #3279). - Fixed udev rules file to avoid DEVTYPE warning messages. - Fixed cupsGetNamedDest() so it does not fall back to the default