Hello community, here is the log from the commit of package cups checked in at Thu Sep 13 18:40:35 CEST 2007. -------- --- cups/cups.changes 2007-08-06 17:47:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/cups/cups.changes 2007-09-10 17:18:49.025564000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 10 15:16:15 CEST 2007 - kssingvo@suse.de + +- patch: "None" needs to be valid value for cupstestppd (bugzilla#309219) + +------------------------------------------------------------------- New: ---- cups-1.2.12-testppd_none.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.D13889/_old 2007-09-13 18:40:08.000000000 +0200 +++ /var/tmp/diff_new_pack.D13889/_new 2007-09-13 18:40:08.000000000 +0200 @@ -17,7 +17,7 @@ Group: Hardware/Printing Summary: The Common UNIX Printing System Version: 1.2.12 -Release: 6 +Release: 17 Requires: cups-libs = %{version}, cups-client = %{version} Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters Requires: util-linux @@ -53,6 +53,7 @@ Patch16: cups-1.2.5-desktop_file.patch Patch17: cups-1.2.6-lppasswd_permission.patch Patch18: cups-1.2.7-xpdf_CVE_2007_3387.patch +Patch19: cups-1.2.12-testppd_none.patch Patch100: cups-1.1.23-testpage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version >= 801 @@ -146,6 +147,7 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 if [ -f /.buildenv ]; then . /.buildenv else @@ -383,6 +385,8 @@ %{_datadir}/locale/*/cups_* %changelog +* Mon Sep 10 2007 - kssingvo@suse.de +- patch: "None" needs to be valid value for cupstestppd (bugzilla#309219) * Mon Aug 06 2007 - kssingvo@suse.de - fix for xpdf bugzilla#291690, CVE-2007-3387, swamp-11865 * Mon Jul 30 2007 - kssingvo@suse.de ++++++ cups-1.2.12-testppd_none.patch ++++++ --- cups-1.2.12/systemv/cupstestppd.c.orig 2007-09-10 14:41:05.000000000 +0200 +++ cups-1.2.12/systemv/cupstestppd.c 2007-09-10 15:10:03.000000000 +0200 @@ -958,7 +958,8 @@ else ydpi = xdpi; - if (xdpi <= 0 || ydpi <= 0 || strcmp(ptr, "dpi")) + if ((xdpi <= 0 || ydpi <= 0 || strcmp(ptr, "dpi")) && + (strcmp(ptr, "None"))) { if (verbose >= 0) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org