diff -u system-config-printer-1.3.1+20110222/debian/changelog system-config-printer-1.3.1+20110222/debian/changelog --- system-config-printer-1.3.1+20110222/debian/changelog +++ system-config-printer-1.3.1+20110222/debian/changelog @@ -1,3 +1,10 @@ +system-config-printer (1.3.1+20110222-0ubuntu16.2) natty-proposed; urgency=low + + * debian/patches/70_udev-configure-printer-dont-crash-on-bad-ipp-answer.patch: + Be more defensive when parsing CUPS responses (LP: #760661). + + -- Till Kamppeter Wed, 27 Apr 2011 10:35:00 +0200 + system-config-printer (1.3.1+20110222-0ubuntu16.1) natty; urgency=low * debian/rules: include langpacks.mk to update the translations template only in patch2: unchanged: --- system-config-printer-1.3.1+20110222.orig/debian/patches/70_udev-configure-printer-dont-crash-on-bad-ipp-answer.patch +++ system-config-printer-1.3.1+20110222/debian/patches/70_udev-configure-printer-dont-crash-on-bad-ipp-answer.patch @@ -0,0 +1,31 @@ +diff -Nur -x '*.orig' -x '*~' system-config-printer-1.3.1+20110222//udev/udev-configure-printer.c system-config-printer-1.3.1+20110222.new//udev/udev-configure-printer.c +--- system-config-printer-1.3.1+20110222//udev/udev-configure-printer.c 2011-02-16 23:25:01.000000000 +0100 ++++ system-config-printer-1.3.1+20110222.new//udev/udev-configure-printer.c 2011-04-27 10:34:23.890264949 +0200 +@@ -1,6 +1,6 @@ + /* -*- Mode: C; c-file-style: "gnu" -*- + * udev-configure-printer - a udev callout to configure print queues +- * Copyright (C) 2009, 2010 Red Hat, Inc. ++ * Copyright (C) 2009, 2010, 2011 Red Hat, Inc. + * Author: Tim Waugh + * + * This program is free software; you can redistribute it and/or modify +@@ -1238,6 +1238,11 @@ + state = attr->values[0].integer; + } + ++ if (!this_device_uri) ++ /* CUPS didn't include a device-uri attribute in the response ++ for this printer (shouldn't happen). */ ++ goto skip; ++ + this_device_uri_n = normalize_device_uri(this_device_uri); + syslog (LOG_DEBUG, "URI of print queue: %s, normalized: %s", + this_device_uri, this_device_uri_n); +@@ -1296,6 +1301,7 @@ + } + } + ++ skip: + if (!attr) + break; + }