Date: Monday, August 29, 2016 @ 19:22:56
Author: andyrtr
Revision: 274826
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
hplip/repos/extra-i686/PKGBUILD
(from rev 274825, hplip/trunk/PKGBUILD)
hplip/repos/extra-i686/disable_upgrade.patch
(from rev 274825, hplip/trunk/disable_upgrade.patch)
hplip/repos/extra-x86_64/PKGBUILD
(from rev 274825, hplip/trunk/PKGBUILD)
hplip/repos/extra-x86_64/disable_upgrade.patch
(from rev 274825, hplip/trunk/disable_upgrade.patch)
Deleted:
hplip/repos/extra-i686/PKGBUILD
hplip/repos/extra-i686/disable_upgrade.patch
hplip/repos/extra-x86_64/PKGBUILD
hplip/repos/extra-x86_64/disable_upgrade.patch
------------------------------------+
/PKGBUILD | 172 +++++++++++++++++++++++++++++++++++
/disable_upgrade.patch | 28 +++++
extra-i686/PKGBUILD | 86 -----------------
extra-i686/disable_upgrade.patch | 14 --
extra-x86_64/PKGBUILD | 86 -----------------
extra-x86_64/disable_upgrade.patch | 14 --
6 files changed, 200 insertions(+), 200 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-08-29 19:22:46 UTC (rev 274825)
+++ extra-i686/PKGBUILD 2016-08-29 19:22:56 UTC (rev 274826)
@@ -1,86 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andy...@archlinux.org>
-# Maintainer: Tom Gundersen <t...@jklm.no>
-# Contributor : Rémy Oudompheng <r...@archlinux.org>
-# Contributor: Morgan LEFIEUX <com...@archlinuxfr.org>
-
-pkgname=hplip
-pkgver=3.16.7
-pkgrel=1
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python-dbus' 'ghostscript' 'net-snmp' 'wget' 'foomatic-db-engine')
-makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
-optdepends=('cups: for printing support'
- 'sane: for scanner support'
- 'xsane: sane scanner frontend'
- 'python-pillow: for commandline scanning support'
- 'python-reportlab: for pdf output in hp-scan'
- 'rpcbind: for network support'
- 'python-pyqt5: for running GUI and hp-toolbox'
- 'python-gobject: for running hp-toolbox'
- 'hplip-plugin: binary blobs for specific devices (AUR) or run
hp-setup to download the plugin'
- 'libusb: for advanced usb support')
-backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
- disable_upgrade.patch)
-sha1sums=('9d2efbdf80c9df96a7933efca95fd9fa3778d4f2'
- 'SKIP'
- '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
-validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux
Imaging and Printing) <hp...@hp.com>
-
-prepare() {
- cd $pkgname-$pkgver
-
- # disable insecure update - https://bugs.archlinux.org/task/38083
- patch -Np0 -i ${srcdir}/disable_upgrade.patch
-
- # 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-qt5 \
- --disable-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 #--help
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make -j1 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}
- install -dm755 ${pkgdir}/etc/sane.d/dll.d
- echo hpaio > ${pkgdir}/etc/sane.d/dll.d/hpaio
-
- # remove HAL .fdi file because HAL is no longer used
- rm -vrf "$pkgdir"/usr/share/hal
-
- # remove rc script
- rm -vrf "$pkgdir"/etc/init.d
-}
Copied: hplip/repos/extra-i686/PKGBUILD (from rev 274825, hplip/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-08-29 19:22:56 UTC (rev 274826)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Andreas Radke <andy...@archlinux.org>
+# Maintainer: Tom Gundersen <t...@jklm.no>
+# Contributor : Rémy Oudompheng <r...@archlinux.org>
+# Contributor: Morgan LEFIEUX <com...@archlinuxfr.org>
+
+pkgname=hplip
+pkgver=3.16.8
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python-dbus' 'ghostscript' 'net-snmp' 'wget' 'foomatic-db-engine')
+makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+ 'sane: for scanner support'
+ 'xsane: sane scanner frontend'
+ 'python-pillow: for commandline scanning support'
+ 'python-reportlab: for pdf output in hp-scan'
+ 'rpcbind: for network support'
+ 'python-pyqt5: for running GUI and hp-toolbox'
+ 'python-gobject: for running hp-toolbox'
+ 'hplip-plugin: binary blobs for specific devices (AUR) or run
hp-setup to download the plugin'
+ 'libusb: for advanced usb support')
+backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+ disable_upgrade.patch)
+sha1sums=('0331d810702983e15c3a3b8cfe48d262fa23aac5'
+ 'SKIP'
+ '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
+validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux
Imaging and Printing) <hp...@hp.com>
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # disable insecure update - https://bugs.archlinux.org/task/38083
+ patch -Np0 -i ${srcdir}/disable_upgrade.patch
+
+ # 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-qt5 \
+ --disable-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 #--help
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make -j1 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}
+ install -dm755 ${pkgdir}/etc/sane.d/dll.d
+ echo hpaio > ${pkgdir}/etc/sane.d/dll.d/hpaio
+
+ # remove HAL .fdi file because HAL is no longer used
+ rm -vrf "$pkgdir"/usr/share/hal
+
+ # remove rc script
+ rm -vrf "$pkgdir"/etc/init.d
+}
Deleted: extra-i686/disable_upgrade.patch
===================================================================
--- extra-i686/disable_upgrade.patch 2016-08-29 19:22:46 UTC (rev 274825)
+++ extra-i686/disable_upgrade.patch 2016-08-29 19:22:56 UTC (rev 274826)
@@ -1,14 +0,0 @@
---- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100
-+++ upgrade.py 2013-12-04 14:58:03.000000000 +0100
-@@ -134,6 +134,11 @@ except getopt.GetoptError, e:
- if os.getenv("HPLIP_DEBUG"):
- log.set_level('debug')
-
-+
-+log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see
https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the
Archlinux software package manager pacman.")
-+clean_exit(1)
-+
-+
- for o, a in opts:
- if o in ('-h', '--help'):
- usage()
Copied: hplip/repos/extra-i686/disable_upgrade.patch (from rev 274825,
hplip/trunk/disable_upgrade.patch)
===================================================================
--- extra-i686/disable_upgrade.patch (rev 0)
+++ extra-i686/disable_upgrade.patch 2016-08-29 19:22:56 UTC (rev 274826)
@@ -0,0 +1,14 @@
+--- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100
++++ upgrade.py 2013-12-04 14:58:03.000000000 +0100
+@@ -134,6 +134,11 @@ except getopt.GetoptError, e:
+ if os.getenv("HPLIP_DEBUG"):
+ log.set_level('debug')
+
++
++log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see
https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the
Archlinux software package manager pacman.")
++clean_exit(1)
++
++
+ for o, a in opts:
+ if o in ('-h', '--help'):
+ usage()
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-08-29 19:22:46 UTC (rev 274825)
+++ extra-x86_64/PKGBUILD 2016-08-29 19:22:56 UTC (rev 274826)
@@ -1,86 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andy...@archlinux.org>
-# Maintainer: Tom Gundersen <t...@jklm.no>
-# Contributor : Rémy Oudompheng <r...@archlinux.org>
-# Contributor: Morgan LEFIEUX <com...@archlinuxfr.org>
-
-pkgname=hplip
-pkgver=3.16.7
-pkgrel=1
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python-dbus' 'ghostscript' 'net-snmp' 'wget' 'foomatic-db-engine')
-makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
-optdepends=('cups: for printing support'
- 'sane: for scanner support'
- 'xsane: sane scanner frontend'
- 'python-pillow: for commandline scanning support'
- 'python-reportlab: for pdf output in hp-scan'
- 'rpcbind: for network support'
- 'python-pyqt5: for running GUI and hp-toolbox'
- 'python-gobject: for running hp-toolbox'
- 'hplip-plugin: binary blobs for specific devices (AUR) or run
hp-setup to download the plugin'
- 'libusb: for advanced usb support')
-backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
- disable_upgrade.patch)
-sha1sums=('9d2efbdf80c9df96a7933efca95fd9fa3778d4f2'
- 'SKIP'
- '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
-validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux
Imaging and Printing) <hp...@hp.com>
-
-prepare() {
- cd $pkgname-$pkgver
-
- # disable insecure update - https://bugs.archlinux.org/task/38083
- patch -Np0 -i ${srcdir}/disable_upgrade.patch
-
- # 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-qt5 \
- --disable-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 #--help
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make -j1 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}
- install -dm755 ${pkgdir}/etc/sane.d/dll.d
- echo hpaio > ${pkgdir}/etc/sane.d/dll.d/hpaio
-
- # remove HAL .fdi file because HAL is no longer used
- rm -vrf "$pkgdir"/usr/share/hal
-
- # remove rc script
- rm -vrf "$pkgdir"/etc/init.d
-}
Copied: hplip/repos/extra-x86_64/PKGBUILD (from rev 274825,
hplip/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-08-29 19:22:56 UTC (rev 274826)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Andreas Radke <andy...@archlinux.org>
+# Maintainer: Tom Gundersen <t...@jklm.no>
+# Contributor : Rémy Oudompheng <r...@archlinux.org>
+# Contributor: Morgan LEFIEUX <com...@archlinuxfr.org>
+
+pkgname=hplip
+pkgver=3.16.8
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python-dbus' 'ghostscript' 'net-snmp' 'wget' 'foomatic-db-engine')
+makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+ 'sane: for scanner support'
+ 'xsane: sane scanner frontend'
+ 'python-pillow: for commandline scanning support'
+ 'python-reportlab: for pdf output in hp-scan'
+ 'rpcbind: for network support'
+ 'python-pyqt5: for running GUI and hp-toolbox'
+ 'python-gobject: for running hp-toolbox'
+ 'hplip-plugin: binary blobs for specific devices (AUR) or run
hp-setup to download the plugin'
+ 'libusb: for advanced usb support')
+backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+ disable_upgrade.patch)
+sha1sums=('0331d810702983e15c3a3b8cfe48d262fa23aac5'
+ 'SKIP'
+ '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
+validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux
Imaging and Printing) <hp...@hp.com>
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # disable insecure update - https://bugs.archlinux.org/task/38083
+ patch -Np0 -i ${srcdir}/disable_upgrade.patch
+
+ # 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-qt5 \
+ --disable-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 #--help
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make -j1 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}
+ install -dm755 ${pkgdir}/etc/sane.d/dll.d
+ echo hpaio > ${pkgdir}/etc/sane.d/dll.d/hpaio
+
+ # remove HAL .fdi file because HAL is no longer used
+ rm -vrf "$pkgdir"/usr/share/hal
+
+ # remove rc script
+ rm -vrf "$pkgdir"/etc/init.d
+}
Deleted: extra-x86_64/disable_upgrade.patch
===================================================================
--- extra-x86_64/disable_upgrade.patch 2016-08-29 19:22:46 UTC (rev 274825)
+++ extra-x86_64/disable_upgrade.patch 2016-08-29 19:22:56 UTC (rev 274826)
@@ -1,14 +0,0 @@
---- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100
-+++ upgrade.py 2013-12-04 14:58:03.000000000 +0100
-@@ -134,6 +134,11 @@ except getopt.GetoptError, e:
- if os.getenv("HPLIP_DEBUG"):
- log.set_level('debug')
-
-+
-+log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see
https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the
Archlinux software package manager pacman.")
-+clean_exit(1)
-+
-+
- for o, a in opts:
- if o in ('-h', '--help'):
- usage()
Copied: hplip/repos/extra-x86_64/disable_upgrade.patch (from rev 274825,
hplip/trunk/disable_upgrade.patch)
===================================================================
--- extra-x86_64/disable_upgrade.patch (rev 0)
+++ extra-x86_64/disable_upgrade.patch 2016-08-29 19:22:56 UTC (rev 274826)
@@ -0,0 +1,14 @@
+--- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100
++++ upgrade.py 2013-12-04 14:58:03.000000000 +0100
+@@ -134,6 +134,11 @@ except getopt.GetoptError, e:
+ if os.getenv("HPLIP_DEBUG"):
+ log.set_level('debug')
+
++
++log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see
https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the
Archlinux software package manager pacman.")
++clean_exit(1)
++
++
+ for o, a in opts:
+ if o in ('-h', '--help'):
+ usage()
