r37557 - in /attic/system-config-printer/debian: ./ patches/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Apr 16 15:31:56 UTC 2013
Author: pochu
Date: Tue Apr 16 15:31:55 2013
New Revision: 37557
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37557
Log:
* New upstream version 1.3.7 (Closes: #642211)
* Update watch file.
Upstream uses xz now (Closes: #646320)
* Drop superfluous patches.
0003-Adjust-package-names.patch
0004-Fix-blacklist-name.patch
0005-Revert-to-the-correct-menu-category.patch
0006-Don-t-blindly-listen-to-any-signal.patch
* configure: Enable installation of udev rule
* Fix MITM via unencrypted metadata download (CVE-2011-4405).
Patch taken from Ubuntu. Thanks to Till Kamppeter
Added:
attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch
attic/system-config-printer/debian/patches/0004-Fix-MITM-via-unencrypted-metadata-download.patch
Removed:
attic/system-config-printer/debian/patches/0003-Adjust-package-names.patch
attic/system-config-printer/debian/patches/0004-Fix-blacklist-name.patch
attic/system-config-printer/debian/patches/0005-Revert-to-the-correct-menu-category.patch
attic/system-config-printer/debian/patches/0006-Don-t-blindly-listen-to-any-signal.patch
attic/system-config-printer/debian/patches/0007-Use-our-custom-cpk-install-package-name.patch
Modified:
attic/system-config-printer/debian/changelog
attic/system-config-printer/debian/patches/0001-Adjust-python-paths.patch
attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch
attic/system-config-printer/debian/patches/series
attic/system-config-printer/debian/rules
attic/system-config-printer/debian/watch
Modified: attic/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/changelog?rev=37557&op=diff
==============================================================================
--- attic/system-config-printer/debian/changelog [utf-8] (original)
+++ attic/system-config-printer/debian/changelog [utf-8] Tue Apr 16 15:31:55 2013
@@ -1,3 +1,19 @@
+system-config-printer (1.3.7-1) experimental; urgency=low
+
+ * New upstream version 1.3.7 (Closes: #642211)
+ * Update watch file.
+ Upstream uses xz now (Closes: #646320)
+ * Drop superfluous patches.
+ 0003-Adjust-package-names.patch
+ 0004-Fix-blacklist-name.patch
+ 0005-Revert-to-the-correct-menu-category.patch
+ 0006-Don-t-blindly-listen-to-any-signal.patch
+ * configure: Enable installation of udev rule
+ * Fix MITM via unencrypted metadata download (CVE-2011-4405).
+ Patch taken from Ubuntu. Thanks to Till Kamppeter
+
+ -- Guido Günther <agx at sigxcpu.org> Tue, 13 Dec 2011 20:57:36 +0100
+
system-config-printer (1.2.3-3) unstable; urgency=high
* Depend on libxml2 (Closes: #597723)
Modified: attic/system-config-printer/debian/patches/0001-Adjust-python-paths.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0001-Adjust-python-paths.patch?rev=37557&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/0001-Adjust-python-paths.patch [utf-8] (original)
+++ attic/system-config-printer/debian/patches/0001-Adjust-python-paths.patch [utf-8] Tue Apr 16 15:31:55 2013
@@ -1,6 +1,6 @@
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 26 Jul 2010 16:20:26 +0200
-Subject: [PATCH] Adjust python paths
+Date: Tue, 13 Dec 2011 20:23:42 +0100
+Subject: Adjust python paths
---
applet.py | 1 +
@@ -8,7 +8,7 @@
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/applet.py b/applet.py
-index 09732d7..491ddb1 100644
+index 221291a..61b3a97 100644
--- a/applet.py
+++ b/applet.py
@@ -20,6 +20,7 @@
@@ -17,19 +17,18 @@
import sys
+sys.path.append("/usr/share/system-config-printer")
from debug import *
-
+
import dbus
diff --git a/system-config-printer.py b/system-config-printer.py
-index 96f1dad..6d6b08c 100755
+index 4b26c07..45fdeb3 100755
--- a/system-config-printer.py
+++ b/system-config-printer.py
-@@ -21,6 +21,8 @@
- ## along with this program; if not, write to the Free Software
- ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+@@ -22,6 +22,8 @@
+ ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ # config is generated from config.py.in by configure
+import sys
+sys.path.append("/usr/share/system-config-printer")
- # config is generated from config.py.in by configure
import config
-
---
+
+ import sys, os, time, re
Modified: attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch?rev=37557&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch [utf-8] (original)
+++ attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch [utf-8] Tue Apr 16 15:31:55 2013
@@ -1,38 +1,35 @@
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 26 Jul 2010 17:02:20 +0200
-Subject: [PATCH] Disable firewall checks
+Date: Tue, 13 Dec 2011 20:25:07 +0100
+Subject: Disable firewall checks
---
- firewall.py | 14 +++-----------
- 1 files changed, 3 insertions(+), 11 deletions(-)
+ firewall.py | 14 ++------------
+ 1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/firewall.py b/firewall.py
-index 512a83d..0466c12 100644
+index 94c1fa6..942e225 100644
--- a/firewall.py
+++ b/firewall.py
-@@ -48,21 +48,13 @@ class Firewall:
- return self._fw_data
-
- def write (self):
-- self._firewall.write (pickle.dumps (self._fw_data[0]))
-+ pass
-
+@@ -94,20 +94,10 @@ class Firewall:
+ pass
+
def _check_any_allowed (self, search):
- (args, filename) = self._get_fw_data ()
+- if filename == None: return True
- isect = set (search).intersection (set (args))
- return len (isect) != 0
+ return True
-
+
def add_rule (self, rule):
- try:
- (args, filename) = self._fw_data
- except AttributeError:
- (args, filename) = self._get_fw_data ()
+- if filename == None: return
-
- args.append (rule)
- self._fw_data = (args, filename)
+ pass
-
+
def check_ipp_client_allowed (self):
return self._check_any_allowed (set(["--port=631:udp",
---
Added: attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch?rev=37557&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch (added)
+++ attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch [utf-8] Tue Apr 16 15:31:55 2013
@@ -1,0 +1,31 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 28 Jul 2010 17:29:05 +0200
+Subject: Use our custom cpk-install-package-name
+
+---
+ installpackage.py | 10 +++-------
+ 1 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/installpackage.py b/installpackage.py
+index 288610a..e415bcc 100644
+--- a/installpackage.py
++++ b/installpackage.py
+@@ -22,15 +22,11 @@
+ import os
+ import glib
+
++GPK_INSTALL_PACKAGE_NAME='/usr/share/system-config-printer/gpk-install-package-name'
++
+ class PackageKit:
+ def __init__ (self):
+- for dir in os.environ.get ("PATH", "").split (":"):
+- path = dir + os.path.sep + "gpk-install-package-name"
+- if os.access (path, os.X_OK):
+- self.gpk_install_package_name = path
+- return
+-
+- raise RuntimeError, "No gpk-install-package-name program available"
++ self.gpk_install_package_name = GPK_INSTALL_PACKAGE_NAME
+
+ def InstallPackageName (self, xid, timestamp, name):
+ glib.spawn_async ([self.gpk_install_package_name, name])
Added: attic/system-config-printer/debian/patches/0004-Fix-MITM-via-unencrypted-metadata-download.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0004-Fix-MITM-via-unencrypted-metadata-download.patch?rev=37557&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0004-Fix-MITM-via-unencrypted-metadata-download.patch (added)
+++ attic/system-config-printer/debian/patches/0004-Fix-MITM-via-unencrypted-metadata-download.patch [utf-8] Tue Apr 16 15:31:55 2013
@@ -1,0 +1,79 @@
+From: Till Kamppeter <till.kamppeter at gmail.com>
+Date: Tue, 13 Dec 2011 20:54:26 +0100
+Subject: Fix MITM via unencrypted metadata download
+
+Closes: #651204
+---
+ cupshelpers/openprinting.py | 35 +++++++++++++++++++++++------------
+ 1 files changed, 23 insertions(+), 12 deletions(-)
+
+diff --git a/cupshelpers/openprinting.py b/cupshelpers/openprinting.py
+index 52faded..82b640f 100755
+--- a/cupshelpers/openprinting.py
++++ b/cupshelpers/openprinting.py
+@@ -19,7 +19,7 @@
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+-import urllib, platform, threading, tempfile, traceback
++import pycurl, urllib, platform, threading, tempfile, traceback
+ import os, sys
+ from xml.etree.ElementTree import XML
+ from . import Device
+@@ -42,10 +42,18 @@ class _QueryThread (threading.Thread):
+ self.parameters = parameters
+ self.callback = callback
+ self.user_data = user_data
++ self.result = ""
+
+ self.setDaemon (True)
+
+ def run (self):
++
++ # Callback function for pycURL collecting the data coming from
++ # the web server
++ def collect_data(result):
++ self.result += result;
++ return len(result)
++
+ # CGI script to be executed
+ query_command = "/query.cgi"
+ # Headers for the post request
+@@ -55,23 +63,26 @@ class _QueryThread (threading.Thread):
+ (urllib.urlencode (self.parameters),
+ self.parent.language[0],
+ self.parent.language[0]))
+- self.url = "http://%s%s?%s" % (self.parent.base_url, query_command, params)
++ self.url = "https://%s%s?%s" % (self.parent.base_url, query_command, params)
+ # Send request
+- result = None
++ self.result = ""
+ status = 1
+ try:
+- conn = urllib.urlopen(self.url);
+- status = conn.getcode();
+- if (status == 200):
+- result = conn.read()
+- status = 0;
+- else:
+- result = sys.exc_info ()
++ curl = pycurl.Curl()
++ curl.setopt(pycurl.SSL_VERIFYPEER, 1)
++ curl.setopt(pycurl.SSL_VERIFYHOST, 2)
++ curl.setopt(pycurl.WRITEFUNCTION, collect_data)
++ curl.setopt(pycurl.URL, self.url)
++ status = curl.perform()
++ if status == None: status = 0
++ if (status != 0):
++ self.result = sys.exc_info ()
+ except:
+- result = sys.exc_info ()
++ self.result = sys.exc_info ()
++ if status == None: status = 0
+
+ if self.callback != None:
+- self.callback (status, self.user_data, result)
++ self.callback (status, self.user_data, self.result)
+
+ class OpenPrinting:
+ def __init__(self, language=None):
Modified: attic/system-config-printer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/series?rev=37557&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/series [utf-8] (original)
+++ attic/system-config-printer/debian/patches/series [utf-8] Tue Apr 16 15:31:55 2013
@@ -1,7 +1,4 @@
0001-Adjust-python-paths.patch
0002-Disable-firewall-checks.patch
-0003-Adjust-package-names.patch
-0004-Fix-blacklist-name.patch
-0005-Revert-to-the-correct-menu-category.patch
-0006-Don-t-blindly-listen-to-any-signal.patch
-0007-Use-our-custom-cpk-install-package-name.patch
+0003-Use-our-custom-cpk-install-package-name.patch
+0004-Fix-MITM-via-unencrypted-metadata-download.patch
Modified: attic/system-config-printer/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/rules?rev=37557&op=diff
==============================================================================
--- attic/system-config-printer/debian/rules [utf-8] (original)
+++ attic/system-config-printer/debian/rules [utf-8] Tue Apr 16 15:31:55 2013
@@ -9,7 +9,9 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --sbindir=/usr/bin
+DEB_CONFIGURE_EXTRA_FLAGS := \
+ --sbindir=/usr/bin \
+ --with-udev-rules
configure/python-cupshelpers::
cp debug.py smburi.py cupshelpers/
Modified: attic/system-config-printer/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/watch?rev=37557&op=diff
==============================================================================
--- attic/system-config-printer/debian/watch [utf-8] (original)
+++ attic/system-config-printer/debian/watch [utf-8] Tue Apr 16 15:31:55 2013
@@ -1,3 +1,2 @@
version=3
-http://cyberelk.net/tim/data/system-config-printer/([\d\.]+)x?/system-config-printer-(.*).tar.bz2
-debian git-import-orig
+http://cyberelk.net/tim/data/system-config-printer/([\d\.]+)x?/system-config-printer-(.*)\.tar\.(?:bz2|xz)
More information about the pkg-gnome-commits
mailing list