[arch-commits] Commit in hplip/repos (14 files)
Andreas Radke
andyrtr at archlinux.org
Fri Sep 4 19:06:30 UTC 2015
Date: Friday, September 4, 2015 @ 21:06:30
Author: andyrtr
Revision: 245310
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
hplip/repos/extra-i686/CommonDefinations.patch
(from rev 245309, hplip/trunk/CommonDefinations.patch)
hplip/repos/extra-i686/PKGBUILD
(from rev 245309, hplip/trunk/PKGBUILD)
hplip/repos/extra-i686/disable_upgrade.patch
(from rev 245309, hplip/trunk/disable_upgrade.patch)
hplip/repos/extra-i686/hplip.install
(from rev 245309, hplip/trunk/hplip.install)
hplip/repos/extra-x86_64/CommonDefinations.patch
(from rev 245309, hplip/trunk/CommonDefinations.patch)
hplip/repos/extra-x86_64/PKGBUILD
(from rev 245309, hplip/trunk/PKGBUILD)
hplip/repos/extra-x86_64/disable_upgrade.patch
(from rev 245309, hplip/trunk/disable_upgrade.patch)
hplip/repos/extra-x86_64/hplip.install
(from rev 245309, hplip/trunk/hplip.install)
Deleted:
hplip/repos/extra-i686/PKGBUILD
hplip/repos/extra-i686/disable_upgrade.patch
hplip/repos/extra-i686/hplip.install
hplip/repos/extra-x86_64/PKGBUILD
hplip/repos/extra-x86_64/disable_upgrade.patch
hplip/repos/extra-x86_64/hplip.install
--------------------------------------+
/PKGBUILD | 178 +++++++++++++++++++++++++++++++++
/disable_upgrade.patch | 28 +++++
/hplip.install | 36 ++++++
extra-i686/CommonDefinations.patch | 22 ++++
extra-i686/PKGBUILD | 83 ---------------
extra-i686/disable_upgrade.patch | 14 --
extra-i686/hplip.install | 18 ---
extra-x86_64/CommonDefinations.patch | 22 ++++
extra-x86_64/PKGBUILD | 83 ---------------
extra-x86_64/disable_upgrade.patch | 14 --
extra-x86_64/hplip.install | 18 ---
11 files changed, 286 insertions(+), 230 deletions(-)
Copied: hplip/repos/extra-i686/CommonDefinations.patch (from rev 245309, hplip/trunk/CommonDefinations.patch)
===================================================================
--- extra-i686/CommonDefinations.patch (rev 0)
+++ extra-i686/CommonDefinations.patch 2015-09-04 19:06:30 UTC (rev 245310)
@@ -0,0 +1,22 @@
+*** hplip-3.15.7_original/prnt/hpcups/CommonDefinitions.h 2015-07-13 13:18:53.000000000 +0530
+--- hplip-3.15.7_latest/prnt/hpcups/CommonDefinitions.h 2015-07-28 20:07:24.018247373 +0530
+***************
+*** 441,447 ****
+ {
+ int media_source;
+ int color_mode;
+- int HPSPDClass;
+ DUPLEXMODE e_duplex_mode;
+ int print_borderless;
+ int krgb_mode;
+--- 441,446 ----
+***************
+*** 466,471 ****
+--- 465,471 ----
+ int integer_values[16];
+ int printer_platform_version;
+ int pre_process_raster;
++ int HPSPDClass;
+ } JobAttributes;
+
+ #endif // COMMON_DEFINITIONS_H
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-09-04 19:05:40 UTC (rev 245309)
+++ extra-i686/PKGBUILD 2015-09-04 19:06:30 UTC (rev 245310)
@@ -1,83 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# 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.15.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' 'ghostscript>=8.64-6' 'net-snmp>=5.7.1' 'wget' 'foomatic-db-engine')
-makedepends=('python-pyqt4' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
-optdepends=('cups: for printing support'
- 'python-dbus: for dbus support'
- 'sane: for scanner support'
- 'python-pillow: for commandline scanning support'
- 'python-reportlab: for pdf output in hp-scan'
- 'rpcbind: for network support'
- 'python-pyqt4: 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')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
- disable_upgrade.patch)
-sha1sums=('f84e33b749ef34939c11b253767686c00ca2c30c'
- 'SKIP'
- '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
-validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at 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-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}
-
- # 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 245309, hplip/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-09-04 19:06:30 UTC (rev 245310)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# 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.15.7
+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=('python' 'ghostscript>=8.64-6' 'net-snmp>=5.7.1' 'wget' 'foomatic-db-engine')
+makedepends=('python-pyqt4' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+ 'python-dbus: for dbus support'
+ 'sane: for scanner support'
+ 'python-pillow: for commandline scanning support'
+ 'python-reportlab: for pdf output in hp-scan'
+ 'rpcbind: for network support'
+ 'python-pyqt4: 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')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+ CommonDefinations.patch
+ disable_upgrade.patch)
+sha1sums=('f84e33b749ef34939c11b253767686c00ca2c30c'
+ 'SKIP'
+ 'a0131125ce82308db5127505a4c4e5fd89fcf189'
+ '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
+validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # fix crash with HP MFP M127fw
+ # https://bugs.archlinux.org/task/46110
+ patch -Np1 -i $srcdir/CommonDefinations.patch
+
+ # 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-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}
+
+ # 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 2015-09-04 19:05:40 UTC (rev 245309)
+++ extra-i686/disable_upgrade.patch 2015-09-04 19:06:30 UTC (rev 245310)
@@ -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 245309, hplip/trunk/disable_upgrade.patch)
===================================================================
--- extra-i686/disable_upgrade.patch (rev 0)
+++ extra-i686/disable_upgrade.patch 2015-09-04 19:06:30 UTC (rev 245310)
@@ -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-i686/hplip.install
===================================================================
--- extra-i686/hplip.install 2015-09-04 19:05:40 UTC (rev 245309)
+++ extra-i686/hplip.install 2015-09-04 19:06:30 UTC (rev 245310)
@@ -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 245309, hplip/trunk/hplip.install)
===================================================================
--- extra-i686/hplip.install (rev 0)
+++ extra-i686/hplip.install 2015-09-04 19:06:30 UTC (rev 245310)
@@ -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
+}
Copied: hplip/repos/extra-x86_64/CommonDefinations.patch (from rev 245309, hplip/trunk/CommonDefinations.patch)
===================================================================
--- extra-x86_64/CommonDefinations.patch (rev 0)
+++ extra-x86_64/CommonDefinations.patch 2015-09-04 19:06:30 UTC (rev 245310)
@@ -0,0 +1,22 @@
+*** hplip-3.15.7_original/prnt/hpcups/CommonDefinitions.h 2015-07-13 13:18:53.000000000 +0530
+--- hplip-3.15.7_latest/prnt/hpcups/CommonDefinitions.h 2015-07-28 20:07:24.018247373 +0530
+***************
+*** 441,447 ****
+ {
+ int media_source;
+ int color_mode;
+- int HPSPDClass;
+ DUPLEXMODE e_duplex_mode;
+ int print_borderless;
+ int krgb_mode;
+--- 441,446 ----
+***************
+*** 466,471 ****
+--- 465,471 ----
+ int integer_values[16];
+ int printer_platform_version;
+ int pre_process_raster;
++ int HPSPDClass;
+ } JobAttributes;
+
+ #endif // COMMON_DEFINITIONS_H
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-09-04 19:05:40 UTC (rev 245309)
+++ extra-x86_64/PKGBUILD 2015-09-04 19:06:30 UTC (rev 245310)
@@ -1,83 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# 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.15.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' 'ghostscript>=8.64-6' 'net-snmp>=5.7.1' 'wget' 'foomatic-db-engine')
-makedepends=('python-pyqt4' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
-optdepends=('cups: for printing support'
- 'python-dbus: for dbus support'
- 'sane: for scanner support'
- 'python-pillow: for commandline scanning support'
- 'python-reportlab: for pdf output in hp-scan'
- 'rpcbind: for network support'
- 'python-pyqt4: 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')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
- disable_upgrade.patch)
-sha1sums=('f84e33b749ef34939c11b253767686c00ca2c30c'
- 'SKIP'
- '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
-validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at 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-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}
-
- # 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 245309, hplip/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-09-04 19:06:30 UTC (rev 245310)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# 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.15.7
+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=('python' 'ghostscript>=8.64-6' 'net-snmp>=5.7.1' 'wget' 'foomatic-db-engine')
+makedepends=('python-pyqt4' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+ 'python-dbus: for dbus support'
+ 'sane: for scanner support'
+ 'python-pillow: for commandline scanning support'
+ 'python-reportlab: for pdf output in hp-scan'
+ 'rpcbind: for network support'
+ 'python-pyqt4: 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')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+ CommonDefinations.patch
+ disable_upgrade.patch)
+sha1sums=('f84e33b749ef34939c11b253767686c00ca2c30c'
+ 'SKIP'
+ 'a0131125ce82308db5127505a4c4e5fd89fcf189'
+ '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
+validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # fix crash with HP MFP M127fw
+ # https://bugs.archlinux.org/task/46110
+ patch -Np1 -i $srcdir/CommonDefinations.patch
+
+ # 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-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}
+
+ # 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 2015-09-04 19:05:40 UTC (rev 245309)
+++ extra-x86_64/disable_upgrade.patch 2015-09-04 19:06:30 UTC (rev 245310)
@@ -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 245309, hplip/trunk/disable_upgrade.patch)
===================================================================
--- extra-x86_64/disable_upgrade.patch (rev 0)
+++ extra-x86_64/disable_upgrade.patch 2015-09-04 19:06:30 UTC (rev 245310)
@@ -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/hplip.install
===================================================================
--- extra-x86_64/hplip.install 2015-09-04 19:05:40 UTC (rev 245309)
+++ extra-x86_64/hplip.install 2015-09-04 19:06:30 UTC (rev 245310)
@@ -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 245309, hplip/trunk/hplip.install)
===================================================================
--- extra-x86_64/hplip.install (rev 0)
+++ extra-x86_64/hplip.install 2015-09-04 19:06:30 UTC (rev 245310)
@@ -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