[arch-commits] Commit in hplip/trunk (3 files)

[Andreas Radke]

    Date: Tuesday, October 15, 2013 @ 17:40:43
  Author: andyrtr
Revision: 196599

upgpkg: hplip 3.13.10-1

upstream update 3.13.10

Modified:
  hplip/trunk/PKGBUILD
Deleted:
  hplip/trunk/hp-mkuri.patch
  hplip/trunk/hplip-CVE-2013-4325.patch

---------------------------+
 PKGBUILD                  |   27 +++++++--------------------
 hp-mkuri.patch            |   11 -----------
 hplip-CVE-2013-4325.patch |   22 ----------------------
 3 files changed, 7 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-15 15:35:39 UTC (rev 196598)
+++ PKGBUILD	2013-10-15 15:40:43 UTC (rev 196599)
@@ -4,8 +4,8 @@
 # Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
 
 pkgname=hplip
-pkgver=3.13.9
-pkgrel=3
+pkgver=3.13.10
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -25,23 +25,13 @@
             'libusbx: for advanced usb support')
 options=('!libtool')
 install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
-        hp-mkuri.patch
-        hplip-CVE-2013-4325.patch)
-md5sums=('8fcbbd0d3a0b76550f325bd6cf46d9d9'
-         'SKIP'
-         '0bd7779fdbc4d7a9386df04dce2cb8d4'
-         '947db41ee8556c78dd027a2f107957e6')
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('ba729c514a2dc95390b99e9a9d452999'
+         'SKIP')
 
 prepare() {
  cd $pkgname-$pkgver
-
- # fix linking libnotify, FS#34283
- patch -Np0 -i ${srcdir}/hp-mkuri.patch
  
- # https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2013-4325
- patch -Np1 -i ${srcdir}/hplip-CVE-2013-4325.patch
- 
  export PYTHON=python2
  
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
@@ -95,11 +85,8 @@
  rm -rf "$pkgdir"/etc/{sane.d,xdg}
  
  # remove HAL .fdi file because HAL is no longer used
- rm -rf "$pkgdir"/usr/share/hal
+ rm -vrf "$pkgdir"/usr/share/hal
  
- # log dir should not be world writeable
- chmod 775 "$pkgdir"/var/log/hp{,/tmp}
- 
  # remove rc script
- rm -rf "$pkgdir"/etc/init.d
+ rm -vrf "$pkgdir"/etc/init.d
 }

Deleted: hp-mkuri.patch
===================================================================
--- hp-mkuri.patch	2013-10-15 15:35:39 UTC (rev 196598)
+++ hp-mkuri.patch	2013-10-15 15:40:43 UTC (rev 196599)
@@ -1,11 +0,0 @@
---- io/hpmud/hp-mkuri.c.orig	2013-03-17 09:15:15.360624061 -0400
-+++ io/hpmud/hp-mkuri.c	2013-03-17 09:15:30.924316847 -0400
-@@ -266,7 +266,7 @@
- 
-     /* Bypass glib build dependencies by loading libnotify manually. */  
- 
--    if ((handle = load_library("libnotify.so.1")) == NULL)
-+    if ((handle = load_library("libnotify.so.4")) == NULL)
-     {
-        BUG("failed to open libnotify: %m\n");
-        goto bugout;

Deleted: hplip-CVE-2013-4325.patch
===================================================================
--- hplip-CVE-2013-4325.patch	2013-10-15 15:35:39 UTC (rev 196598)
+++ hplip-CVE-2013-4325.patch	2013-10-15 15:40:43 UTC (rev 196599)
@@ -1,22 +0,0 @@
-diff -up hplip-3.13.7/base/pkit.py.CVE-2013-4325 hplip-3.13.7/base/pkit.py
---- hplip-3.13.7/base/pkit.py.CVE-2013-4325	2013-07-23 06:18:29.000000000 +0100
-+++ hplip-3.13.7/base/pkit.py	2013-09-11 10:54:13.252419283 +0100
-@@ -176,15 +176,10 @@ class PolicyKitService(dbus.service.Obje
-                                     "/org/freedesktop/PolicyKit1/Authority",
-                                     "org.freedesktop.PolicyKit1.Authority")
-         policy_kit = dbus.Interface(obj, "org.freedesktop.PolicyKit1.Authority")
--        info = dbus.Interface(connection.get_object("org.freedesktop.DBus",
--                                                    "/org/freedesktop/DBus/Bus",
--                                                    False),
--                              "org.freedesktop.DBus")
--        pid = info.GetConnectionUnixProcessID(sender)
-         
-         subject = (
--            'unix-process',
--            { 'pid' : dbus.UInt32(pid, variant_level = 1) }
-+            'system-bus-name',
-+            { 'name' : dbus.String(sender, variant_level = 1) }
-         )
-         details = { '' : '' }
-         flags = dbus.UInt32(1)         # AllowUserInteraction = 0x00000001
-