Hello community, here is the log from the commit of package system-config-printer for openSUSE:Factory checked in at 2011-12-07 14:40:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/system-config-printer (Old) and /work/SRC/openSUSE:Factory/.system-config-printer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "system-config-printer", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/system-config-printer/system-config-printer.changes 2011-10-29 00:17:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.system-config-printer.new/system-config-printer.changes 2011-12-07 14:40:34.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Dec 6 16:42:31 UTC 2011 - [email protected] + +- Add system-config-printer-no-openprinting.patch: this disables + the feature where PPD drivers can be downloaded from + OpenPrinting.org. See discussion in bnc#733542. As a side-effect, + this fixes CVE-2011-4405. + +------------------------------------------------------------------- New: ---- system-config-printer-no-openprinting.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ system-config-printer.spec ++++++ --- /var/tmp/diff_new_pack.kob21k/_old 2011-12-07 14:40:35.000000000 +0100 +++ /var/tmp/diff_new_pack.kob21k/_new 2011-12-07 14:40:35.000000000 +0100 @@ -28,6 +28,8 @@ Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE system-config-printer-icon-brp-friendly.patch [email protected] -- brp checks don't like the printer icon name, so we have to use something else Patch13: system-config-printer-icon-brp-friendly.patch +# PATCH-FIX-OPENSUSE system-config-printer-no-openprinting.patch bnc#733542 [email protected] -- Disable feature that downloads ppd from openprinting.org +Patch19: system-config-printer-no-openprinting.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: gnome-cups-manager <= 0.33 BuildRequires: cups-devel @@ -146,6 +148,7 @@ %prep %setup -q %patch13 -p1 +%patch19 -p1 %build %configure \ ++++++ system-config-printer-no-openprinting.patch ++++++ Index: system-config-printer-1.3.7/cupshelpers/openprinting.py =================================================================== --- system-config-printer-1.3.7.orig/cupshelpers/openprinting.py +++ system-config-printer-1.3.7/cupshelpers/openprinting.py @@ -46,6 +46,11 @@ class _QueryThread (threading.Thread): self.setDaemon (True) def run (self): + ## Disabled on openSUSE, see discussion in https://bugzilla.novell.com/show_bug.cgi?id=733542 + if self.callback != None: + self.callback (403, self.user_data, None) + return + # CGI script to be executed query_command = "/query.cgi" # Headers for the post request @@ -70,6 +75,7 @@ class _QueryThread (threading.Thread): except: result = sys.exc_info () + ## openSUSE: just a guard to know if first part in patch should be updated if self.callback != None: self.callback (status, self.user_data, result) Index: system-config-printer-1.3.7/newprinter.py =================================================================== --- system-config-printer-1.3.7.orig/newprinter.py +++ system-config-printer-1.3.7/newprinter.py @@ -362,6 +362,8 @@ class NewPrinterGUI(GtkGUI): # Set up OpenPrinting widgets. self.openprinting = cupshelpers.openprinting.OpenPrinting () self.openprinting_query_handle = None + ## Disabled on openSUSE, see discussion in https://bugzilla.novell.com/show_bug.cgi?id=733542 + self.rbtnNPDownloadableDriverSearch.hide() combobox = self.cmbNPDownloadableDriverFoundPrinters cell = gtk.CellRendererText() combobox.pack_start (cell, True) @@ -1248,6 +1250,7 @@ class NewPrinterGUI(GtkGUI): self.btnNPBack.hide() self.btnNPForward.show() downloadable_selected = False + ## openSUSE: just a guard to know when the name of the widget to hide changes if self.rbtnNPDownloadableDriverSearch.get_active (): combobox = self.cmbNPDownloadableDriverFoundPrinters iter = combobox.get_active_iter () @@ -3336,6 +3339,8 @@ class NewPrinterGUI(GtkGUI): elif self.rbtnNPPPD.get_active(): ppd = cups.PPD(self.filechooserPPD.get_filename()) else: + ## Disabled on openSUSE, see discussion in https://bugzilla.novell.com/show_bug.cgi?id=733542 + return # PPD of the driver downloaded from OpenPrinting XXX treeview = self.tvNPDownloadableDrivers model, iter = treeview.get_selection ().get_selected () -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
