summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/hplip-libre/PKGBUILD28
-rw-r--r--libre/hplip-libre/hplip-CVE-2013-4325.patch22
-rw-r--r--nonprism/claws-mail-nonprism/PKGBUILD (renamed from nonprism/claws-mail-libre-nonprism/PKGBUILD)22
-rw-r--r--nonprism/claws-mail-nonprism/claws-mail.install (renamed from nonprism/claws-mail-libre-nonprism/claws-mail.install)0
4 files changed, 53 insertions, 19 deletions
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index bd2820343..41ef21e4e 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194375 2013-09-15 08:00:33Z andyrtr $
+# $Id: PKGBUILD 196443 2013-10-13 20:05:28Z 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.9
-pkgrel=2
+pkgrel=3
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"
@@ -30,17 +30,22 @@ provides=$_pkgname=$pkgver
options=('!libtool')
install=hplip.install
source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
- hp-mkuri.patch)
+ hp-mkuri.patch
+ hplip-CVE-2013-4325.patch)
md5sums=('8fcbbd0d3a0b76550f325bd6cf46d9d9'
'SKIP'
- '0bd7779fdbc4d7a9386df04dce2cb8d4')
+ '0bd7779fdbc4d7a9386df04dce2cb8d4'
+ '947db41ee8556c78dd027a2f107957e6')
-build() {
- cd "$srcdir/$_pkgname-$pkgver"
+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~' {} +
@@ -65,7 +70,10 @@ build() {
export AUTOMAKE='automake --foreign'
autoreconf --force --install
+}
+build() {
+ cd $_pkgname-$pkgver
./configure --prefix=/usr \
--enable-qt4 \
--disable-foomatic-rip-hplip-install \
@@ -83,15 +91,19 @@ build() {
}
package() {
- #cd "$srcdir/$_pkgname-$pkgver"
- cd "$srcdir/$_pkgname-${pkgver/.a/a}"
+ #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
}
diff --git a/libre/hplip-libre/hplip-CVE-2013-4325.patch b/libre/hplip-libre/hplip-CVE-2013-4325.patch
new file mode 100644
index 000000000..85bff893b
--- /dev/null
+++ b/libre/hplip-libre/hplip-CVE-2013-4325.patch
@@ -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
+
diff --git a/nonprism/claws-mail-libre-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD
index 099b6e1a0..4df1a5e5f 100644
--- a/nonprism/claws-mail-libre-nonprism/PKGBUILD
+++ b/nonprism/claws-mail-nonprism/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id$
+# $Id: PKGBUILD 196415 2013-10-13 09:17:50Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=claws-mail
-pkgname=$_pkgname-libre-nonprism
+pkgname=$_pkgname-nonprism
pkgver=3.9.2
-pkgrel=3.1
-pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices and libgdata support'
+pkgrel=4
+pkgdesc="A GTK+ based e-mail client, without libgdata support"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
url="http://www.$_pkgname.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
- 'gpgme' 'libetpan>=1.1-4' 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4'
+ 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind'
# dependencies for plugins
'libsoup' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk')
@@ -31,7 +31,7 @@ optdepends=('python2: needed for some tools and python plugin'
'libsoup: for the fancy webkit html plugin'
'poppler-glib: for pdf viewer plugin'
'ghostscript: for pdf viewer plugin')
-replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libre")
+replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libre" "$_pkgname-libre-nonprism")
conflicts=("$_pkgname" "$_pkgname-extra-plugins")
provides=("$_pkgname=$pkgver" 'claws')
options=(!libtool)
@@ -41,7 +41,7 @@ md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
'SKIP')
build() {
- cd $srcdir/$_pkgname-$pkgver
+ cd $_pkgname-$pkgver
# fixes for python2
export PYTHON="/usr/bin/python2"
@@ -56,14 +56,13 @@ build() {
--enable-pgpmime-plugin \
--enable-spamassassin-plugin \
--enable-bogofilter-plugin \
- --disable-jpilot \
--disable-gdata-plugin
#--help
setarch $CARCH make
}
package() {
- cd $srcdir/$_pkgname-$pkgver
+ cd $_pkgname-$pkgver
setarch $CARCH make DESTDIR=$pkgdir install
# build and install extra tools
@@ -71,6 +70,7 @@ package() {
setarch $CARCH make
# all executables and .conf files ; only top directory
find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
- install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i
+ install -D -m755 $i \
+ $pkgdir/usr/lib/$_pkgname/tools/$i
done
}
diff --git a/nonprism/claws-mail-libre-nonprism/claws-mail.install b/nonprism/claws-mail-nonprism/claws-mail.install
index 4d2f155d4..4d2f155d4 100644
--- a/nonprism/claws-mail-libre-nonprism/claws-mail.install
+++ b/nonprism/claws-mail-nonprism/claws-mail.install
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 09:06:14 +0000