From 81fbbf86edeb63cf5e75e32d2aadc604303cf62f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Wed, 11 Dec 2013 22:37:25 -0200
Subject: hplip-libre-3.13.11-2: disable internal upgrade; FS#38083 =>
 https://bugs.archlinux.org/task/38083

---
 libre/hplip-libre/PKGBUILD              | 13 +++++++++----
 libre/hplip-libre/disable_upgrade.patch | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 libre/hplip-libre/disable_upgrade.patch

(limited to 'libre')

diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 16137f33a..4dd135604 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 199297 2013-11-09 19:21:00Z andyrtr $
+# $Id: PKGBUILD 201437 2013-12-11 16:52:25Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -7,7 +7,7 @@
 _pkgname=hplip
 pkgname=hplip-libre
 pkgver=3.13.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -29,9 +29,11 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=hplip.install
-source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
+source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
+        disable_upgrade.patch)
 md5sums=('8ee362d9bc45fd4eddd3c9d9e583d728'
-         'SKIP')
+         'SKIP'
+         '257c8bfe675862d90f4ce07d3dff1d9f')
 
 prepare() {
  cd $_pkgname-$pkgver
@@ -47,6 +49,9 @@ prepare() {
  sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
  sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
  
+ # 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
diff --git a/libre/hplip-libre/disable_upgrade.patch b/libre/hplip-libre/disable_upgrade.patch
new file mode 100644
index 000000000..f7d8fb322
--- /dev/null
+++ b/libre/hplip-libre/disable_upgrade.patch
@@ -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()
-- 
cgit v1.2.2