[arch-commits] Commit in hplip/repos (14 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Sun Oct 13 20:06:09 UTC 2013
Date: Sunday, October 13, 2013 @ 22:06:09
Author: andyrtr
Revision: 196444
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
hplip/repos/extra-i686/PKGBUILD
(from rev 196443, hplip/trunk/PKGBUILD)
hplip/repos/extra-i686/hp-mkuri.patch
(from rev 196443, hplip/trunk/hp-mkuri.patch)
hplip/repos/extra-i686/hplip-CVE-2013-4325.patch
(from rev 196443, hplip/trunk/hplip-CVE-2013-4325.patch)
hplip/repos/extra-i686/hplip.install
(from rev 196443, hplip/trunk/hplip.install)
hplip/repos/extra-x86_64/PKGBUILD
(from rev 196443, hplip/trunk/PKGBUILD)
hplip/repos/extra-x86_64/hp-mkuri.patch
(from rev 196443, hplip/trunk/hp-mkuri.patch)
hplip/repos/extra-x86_64/hplip-CVE-2013-4325.patch
(from rev 196443, hplip/trunk/hplip-CVE-2013-4325.patch)
hplip/repos/extra-x86_64/hplip.install
(from rev 196443, hplip/trunk/hplip.install)
Deleted:
hplip/repos/extra-i686/PKGBUILD
hplip/repos/extra-i686/hp-mkuri.patch
hplip/repos/extra-i686/hplip.install
hplip/repos/extra-x86_64/PKGBUILD
hplip/repos/extra-x86_64/hp-mkuri.patch
hplip/repos/extra-x86_64/hplip.install
----------------------------------------+
/PKGBUILD | 210 +++++++++++++++++++++++++++++++
/hp-mkuri.patch | 22 +++
/hplip.install | 36 +++++
extra-i686/PKGBUILD | 93 -------------
extra-i686/hp-mkuri.patch | 11 -
extra-i686/hplip-CVE-2013-4325.patch | 22 +++
extra-i686/hplip.install | 18 --
extra-x86_64/PKGBUILD | 93 -------------
extra-x86_64/hp-mkuri.patch | 11 -
extra-x86_64/hplip-CVE-2013-4325.patch | 22 +++
extra-x86_64/hplip.install | 18 --
11 files changed, 312 insertions(+), 244 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-10-13 20:05:28 UTC (rev 196443)
+++ extra-i686/PKGBUILD 2013-10-13 20:06:09 UTC (rev 196444)
@@ -1,93 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor : Rémy Oudompheng <remy at archlinux.org>
-# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
-
-pkgname=hplip
-pkgver=3.13.9
-pkgrel=2
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com"
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
- 'net-snmp>=5.7.1' 'wget')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx')
-optdepends=('cups: for printing support'
- 'python2-dbus: for dbus support'
- 'sane: for scanner support'
- 'python2-pillow: for commandline scanning support'
- 'python2-notify: for Desktop notification support'
- 'rpcbind: for network support'
- 'python2-pyqt: for running hp-toolbox'
- 'python2-gobject2: for running hp-toolbox'
- 'hplip-plugin: binary blobs for specific devices'
- 'libusbx: for advanced usb support')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
- hp-mkuri.patch)
-md5sums=('8fcbbd0d3a0b76550f325bd6cf46d9d9'
- 'SKIP'
- '0bd7779fdbc4d7a9386df04dce2cb8d4')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # fix linking libnotify, FS#34283
- patch -Np0 -i ${srcdir}/hp-mkuri.patch
-
- export PYTHON=python2
-
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py makeuri.py logcapture.py base/magic.py
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
-
- # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
- # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
- # The hpcups driver does not use foomatic-rip
- local i
- for i in ppd/hpijs/*.ppd.gz ; do
- rm -f ${i}.temp
- gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
- gzip > ${i}.temp || return 1
- mv ${i}.temp ${i}
- done
-
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --disable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules #--help
-
- make
-}
-
-package() {
- #cd "$srcdir/$pkgname-$pkgver"
- cd "$srcdir/$pkgname-${pkgver/.a/a}"
- make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- # remove HAL .fdi file because HAL is no longer used
- rm -rf "$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
-}
Copied: hplip/repos/extra-i686/PKGBUILD (from rev 196443, hplip/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-10-13 20:06:09 UTC (rev 196444)
@@ -0,0 +1,105 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor : Rémy Oudompheng <remy at archlinux.org>
+# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
+
+pkgname=hplip
+pkgver=3.13.9
+pkgrel=3
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com"
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+ 'net-snmp>=5.7.1' 'wget')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx')
+optdepends=('cups: for printing support'
+ 'python2-dbus: for dbus support'
+ 'sane: for scanner support'
+ 'python2-pillow: for commandline scanning support'
+ 'python2-notify: for Desktop notification support'
+ 'rpcbind: for network support'
+ 'python2-pyqt: for running hp-toolbox'
+ 'python2-gobject2: for running hp-toolbox'
+ 'hplip-plugin: binary blobs for specific devices'
+ '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')
+
+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~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py makeuri.py logcapture.py base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
+ sed -i 's|python ./print.py|python2 ./print.py|' scan.py
+ sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
+ sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
+ sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+ local i
+ for i in ppd/hpijs/*.ppd.gz ; do
+ rm -f ${i}.temp
+ gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+ gzip > ${i}.temp || return 1
+ mv ${i}.temp ${i}
+ done
+
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --disable-foomatic-rip-hplip-install \
+ --enable-foomatic-ppd-install \
+ --enable-hpcups-install \
+ --enable-new-hpcups \
+ --enable-cups-ppd-install \
+ --enable-cups-drv-install \
+ --enable-hpijs-install \
+ --enable-foomatic-drv-install \
+ --enable-pp-build \
+ --enable-udev-acl-rules #--help
+
+ make
+}
+
+package() {
+ #cd $pkgname-$pkgver
+ cd $pkgname-${pkgver/.a/a}
+ make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+
+ # remove HAL .fdi file because HAL is no longer used
+ rm -rf "$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
+}
Deleted: extra-i686/hp-mkuri.patch
===================================================================
--- extra-i686/hp-mkuri.patch 2013-10-13 20:05:28 UTC (rev 196443)
+++ extra-i686/hp-mkuri.patch 2013-10-13 20:06:09 UTC (rev 196444)
@@ -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;
Copied: hplip/repos/extra-i686/hp-mkuri.patch (from rev 196443, hplip/trunk/hp-mkuri.patch)
===================================================================
--- extra-i686/hp-mkuri.patch (rev 0)
+++ extra-i686/hp-mkuri.patch 2013-10-13 20:06:09 UTC (rev 196444)
@@ -0,0 +1,11 @@
+--- 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;
Copied: hplip/repos/extra-i686/hplip-CVE-2013-4325.patch (from rev 196443, hplip/trunk/hplip-CVE-2013-4325.patch)
===================================================================
--- extra-i686/hplip-CVE-2013-4325.patch (rev 0)
+++ extra-i686/hplip-CVE-2013-4325.patch 2013-10-13 20:06:09 UTC (rev 196444)
@@ -0,0 +1,22 @@
+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
+
Deleted: extra-i686/hplip.install
===================================================================
--- extra-i686/hplip.install 2013-10-13 20:05:28 UTC (rev 196443)
+++ extra-i686/hplip.install 2013-10-13 20:06:09 UTC (rev 196444)
@@ -1,18 +0,0 @@
-post_install() {
- cat << EOF
-
-NOTE
-----
-# If you want to use this driver with sane:
-# echo "hpaio" >> /etc/sane.d/dll.conf
-
-EOF
-}
-
-post_upgrade() {
- if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then
- # important upgrade notice
- echo "> Please remove your printer in cups, then add it"
- echo "> back and reconfigure it to make it work again!"
- fi
-}
Copied: hplip/repos/extra-i686/hplip.install (from rev 196443, hplip/trunk/hplip.install)
===================================================================
--- extra-i686/hplip.install (rev 0)
+++ extra-i686/hplip.install 2013-10-13 20:06:09 UTC (rev 196444)
@@ -0,0 +1,18 @@
+post_install() {
+ cat << EOF
+
+NOTE
+----
+# If you want to use this driver with sane:
+# echo "hpaio" >> /etc/sane.d/dll.conf
+
+EOF
+}
+
+post_upgrade() {
+ if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then
+ # important upgrade notice
+ echo "> Please remove your printer in cups, then add it"
+ echo "> back and reconfigure it to make it work again!"
+ fi
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-10-13 20:05:28 UTC (rev 196443)
+++ extra-x86_64/PKGBUILD 2013-10-13 20:06:09 UTC (rev 196444)
@@ -1,93 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor : Rémy Oudompheng <remy at archlinux.org>
-# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
-
-pkgname=hplip
-pkgver=3.13.9
-pkgrel=2
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com"
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
- 'net-snmp>=5.7.1' 'wget')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx')
-optdepends=('cups: for printing support'
- 'python2-dbus: for dbus support'
- 'sane: for scanner support'
- 'python2-pillow: for commandline scanning support'
- 'python2-notify: for Desktop notification support'
- 'rpcbind: for network support'
- 'python2-pyqt: for running hp-toolbox'
- 'python2-gobject2: for running hp-toolbox'
- 'hplip-plugin: binary blobs for specific devices'
- 'libusbx: for advanced usb support')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
- hp-mkuri.patch)
-md5sums=('8fcbbd0d3a0b76550f325bd6cf46d9d9'
- 'SKIP'
- '0bd7779fdbc4d7a9386df04dce2cb8d4')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # fix linking libnotify, FS#34283
- patch -Np0 -i ${srcdir}/hp-mkuri.patch
-
- export PYTHON=python2
-
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py makeuri.py logcapture.py base/magic.py
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
-
- # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
- # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
- # The hpcups driver does not use foomatic-rip
- local i
- for i in ppd/hpijs/*.ppd.gz ; do
- rm -f ${i}.temp
- gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
- gzip > ${i}.temp || return 1
- mv ${i}.temp ${i}
- done
-
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --disable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules #--help
-
- make
-}
-
-package() {
- #cd "$srcdir/$pkgname-$pkgver"
- cd "$srcdir/$pkgname-${pkgver/.a/a}"
- make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- # remove HAL .fdi file because HAL is no longer used
- rm -rf "$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
-}
Copied: hplip/repos/extra-x86_64/PKGBUILD (from rev 196443, hplip/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-10-13 20:06:09 UTC (rev 196444)
@@ -0,0 +1,105 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor : Rémy Oudompheng <remy at archlinux.org>
+# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
+
+pkgname=hplip
+pkgver=3.13.9
+pkgrel=3
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com"
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+ 'net-snmp>=5.7.1' 'wget')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx')
+optdepends=('cups: for printing support'
+ 'python2-dbus: for dbus support'
+ 'sane: for scanner support'
+ 'python2-pillow: for commandline scanning support'
+ 'python2-notify: for Desktop notification support'
+ 'rpcbind: for network support'
+ 'python2-pyqt: for running hp-toolbox'
+ 'python2-gobject2: for running hp-toolbox'
+ 'hplip-plugin: binary blobs for specific devices'
+ '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')
+
+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~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py makeuri.py logcapture.py base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
+ sed -i 's|python ./print.py|python2 ./print.py|' scan.py
+ sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
+ sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
+ sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+ local i
+ for i in ppd/hpijs/*.ppd.gz ; do
+ rm -f ${i}.temp
+ gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+ gzip > ${i}.temp || return 1
+ mv ${i}.temp ${i}
+ done
+
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --disable-foomatic-rip-hplip-install \
+ --enable-foomatic-ppd-install \
+ --enable-hpcups-install \
+ --enable-new-hpcups \
+ --enable-cups-ppd-install \
+ --enable-cups-drv-install \
+ --enable-hpijs-install \
+ --enable-foomatic-drv-install \
+ --enable-pp-build \
+ --enable-udev-acl-rules #--help
+
+ make
+}
+
+package() {
+ #cd $pkgname-$pkgver
+ cd $pkgname-${pkgver/.a/a}
+ make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+
+ # remove HAL .fdi file because HAL is no longer used
+ rm -rf "$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
+}
Deleted: extra-x86_64/hp-mkuri.patch
===================================================================
--- extra-x86_64/hp-mkuri.patch 2013-10-13 20:05:28 UTC (rev 196443)
+++ extra-x86_64/hp-mkuri.patch 2013-10-13 20:06:09 UTC (rev 196444)
@@ -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;
Copied: hplip/repos/extra-x86_64/hp-mkuri.patch (from rev 196443, hplip/trunk/hp-mkuri.patch)
===================================================================
--- extra-x86_64/hp-mkuri.patch (rev 0)
+++ extra-x86_64/hp-mkuri.patch 2013-10-13 20:06:09 UTC (rev 196444)
@@ -0,0 +1,11 @@
+--- 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;
Copied: hplip/repos/extra-x86_64/hplip-CVE-2013-4325.patch (from rev 196443, hplip/trunk/hplip-CVE-2013-4325.patch)
===================================================================
--- extra-x86_64/hplip-CVE-2013-4325.patch (rev 0)
+++ extra-x86_64/hplip-CVE-2013-4325.patch 2013-10-13 20:06:09 UTC (rev 196444)
@@ -0,0 +1,22 @@
+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
+
Deleted: extra-x86_64/hplip.install
===================================================================
--- extra-x86_64/hplip.install 2013-10-13 20:05:28 UTC (rev 196443)
+++ extra-x86_64/hplip.install 2013-10-13 20:06:09 UTC (rev 196444)
@@ -1,18 +0,0 @@
-post_install() {
- cat << EOF
-
-NOTE
-----
-# If you want to use this driver with sane:
-# echo "hpaio" >> /etc/sane.d/dll.conf
-
-EOF
-}
-
-post_upgrade() {
- if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then
- # important upgrade notice
- echo "> Please remove your printer in cups, then add it"
- echo "> back and reconfigure it to make it work again!"
- fi
-}
Copied: hplip/repos/extra-x86_64/hplip.install (from rev 196443, hplip/trunk/hplip.install)
===================================================================
--- extra-x86_64/hplip.install (rev 0)
+++ extra-x86_64/hplip.install 2013-10-13 20:06:09 UTC (rev 196444)
@@ -0,0 +1,18 @@
+post_install() {
+ cat << EOF
+
+NOTE
+----
+# If you want to use this driver with sane:
+# echo "hpaio" >> /etc/sane.d/dll.conf
+
+EOF
+}
+
+post_upgrade() {
+ if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then
+ # important upgrade notice
+ echo "> Please remove your printer in cups, then add it"
+ echo "> back and reconfigure it to make it work again!"
+ fi
+}
More information about the arch-commits
mailing list