diff options
-rw-r--r-- | libre/epiphany-libre/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/hplip-libre/PKGBUILD | 13 | ||||
-rw-r--r-- | libre/hplip-libre/disable_upgrade.patch | 14 |
3 files changed, 26 insertions, 7 deletions
diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD index 0ad703fc2..8f1c2a8b6 100644 --- a/libre/epiphany-libre/PKGBUILD +++ b/libre/epiphany-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 199742 2013-11-15 12:42:25Z heftig $ +# $Id: PKGBUILD 201443 2013-12-11 19:00:11Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> # Contributor (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=epiphany pkgname=epiphany-libre -pkgver=3.10.2 +pkgver=3.10.3 pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support" @@ -20,7 +20,7 @@ options=('!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) -sha256sums=('7788221f775605ab29b26b92f4907ca9d5e8cf7999d103697a5979228d5fdd47') +sha256sums=('c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7') prepare() { cd $_pkgname-$pkgver 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() |