diff -u cupsys-1.3.7/debian/changelog cupsys-1.3.7/debian/changelog --- cupsys-1.3.7/debian/changelog +++ cupsys-1.3.7/debian/changelog @@ -1,3 +1,10 @@ +cupsys (1.3.7-1ubuntu3.7) hardy-proposed; urgency=low + + * debian/patches/fix-lpstat.dpatch: Fix lpstat to work correctly against + CUPS 1.4 servers. (LP: #497606) + + -- Evan Broder Wed, 16 Dec 2009 17:41:23 -0500 + cupsys (1.3.7-1ubuntu3.6) hardy-security; urgency=low * SECURITY UPDATE: XSS and CRLF injection in headers diff -u cupsys-1.3.7/debian/patches/00list cupsys-1.3.7/debian/patches/00list --- cupsys-1.3.7/debian/patches/00list +++ cupsys-1.3.7/debian/patches/00list @@ -28,0 +29 @@ +fix-lpstat.dpatch only in patch2: unchanged: --- cupsys-1.3.7.orig/debian/patches/fix-lpstat.dpatch +++ cupsys-1.3.7/debian/patches/fix-lpstat.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-lpstat.dpatch by Evan Broder +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix a bug in CUPS 1.3's lpstat talking to 1.4 servers. +## + +@DPATCH@ +diff -urNad cupsys-1.3.7~/systemv/lpstat.c cupsys-1.3.7/systemv/lpstat.c +--- cupsys-1.3.7~/systemv/lpstat.c 2007-07-11 17:46:42.000000000 -0400 ++++ cupsys-1.3.7/systemv/lpstat.c 2009-12-16 15:12:09.000000000 -0500 +@@ -1433,11 +1433,15 @@ + * attributes-charset + * attributes-natural-language + * job-uri ++ * printer-uri + * requested-attributes + */ + + request = ippNewRequest(IPP_GET_JOBS); + ++ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", ++ NULL, "ipp://localhost/"); ++ + ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, + "requested-attributes", sizeof(jattrs) / sizeof(jattrs[0]), + NULL, jattrs);