From 92bafb5f0efc526b1f83cd5fb9460443c4b13dca Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 Aug 2012 00:01:47 +0000 Subject: Fri Aug 3 00:01:47 UTC 2012 --- extra/anjuta/PKGBUILD | 40 ++-- extra/cfitsio/PKGBUILD | 11 +- extra/dovecot/PKGBUILD | 10 +- extra/gnome-keyring/PKGBUILD | 11 +- extra/gnome-keyring/gpg-agent-fix-encoding.patch | 86 +++++++++ extra/gtkpod/PKGBUILD | 6 +- extra/icedtea-web-java7/PKGBUILD | 4 +- extra/icedtea-web/PKGBUILD | 6 +- extra/libthai/PKGBUILD | 6 +- extra/nspr/PKGBUILD | 6 +- extra/obexd/PKGBUILD | 15 +- extra/postfix/PKGBUILD | 8 +- extra/pycups/PKGBUILD | 10 +- extra/rssh/PKGBUILD | 11 +- extra/rssh/env-breach.patch | 228 +++++++++++++++++++++++ extra/rssh/rsync.patch | 33 ++-- extra/scribus/PKGBUILD | 20 +- extra/system-config-printer/PKGBUILD | 10 +- extra/xf86-input-mouse/PKGBUILD | 6 +- 19 files changed, 431 insertions(+), 96 deletions(-) create mode 100644 extra/gnome-keyring/gpg-agent-fix-encoding.patch create mode 100644 extra/rssh/env-breach.patch (limited to 'extra') diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index 60c007667..e93128147 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,34 +1,50 @@ -# $Id: PKGBUILD 158006 2012-04-30 22:55:59Z ibiru $ +# $Id: PKGBUILD 164512 2012-08-01 11:18:32Z jgc $ # Maintainer: Andreas Radke # Contributor: Harley Laue -pkgname=anjuta -pkgver=3.4.1 +pkgbase=anjuta +pkgname=('libanjuta' 'anjuta') +pkgver=3.4.4 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64') license=('GPL') -depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') -url="http://anjuta.sourceforge.net/" -install=anjuta.install -source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +makedepends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf' 'gnome-doc-utils' 'intltool' 'gobject-introspection') +url="http://www.anjuta.org/" +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('92edd96d7b7df178405cd229ff72d284c5499ad4496702f4efac7178e2d84369') +sha256sums=('e97199a6b59bb25f0908018b141b3d6b2dbc23804b84b4be34be669f8556ef7a') build() { - cd "$pkgname-$pkgver" + cd "$pkgbase-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper make } -package(){ - cd "$pkgname-$pkgver" +package_libanjuta(){ + pkgdesc="Anjuta runtime library" + depends=('gdl') + conflicts=('anjuta<3.4.4') + + cd "$pkgbase-$pkgver/libanjuta" # j1: Race during linking make -j1 DESTDIR="$pkgdir" install +} + +package_anjuta(){ + pkgdesc="GNOME Integrated Development Environment (IDE)" + depends=('libanjuta' 'vte3' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf') + + install=anjuta.install + + cd "$pkgbase-$pkgver" + make -j1 DESTDIR="$pkgdir" install + cd libanjuta + make -j1 DESTDIR="$pkgdir" uninstall + sed -i "1s|#!/usr/bin/python$|&2|" \ $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py } diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD index fbf039583..36f354027 100644 --- a/extra/cfitsio/PKGBUILD +++ b/extra/cfitsio/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 157946 2012-04-30 07:18:29Z andrea $ -# Maintainer: Andrea Scarpino +# $Id: PKGBUILD 164645 2012-08-01 17:50:06Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=cfitsio -pkgver=3.300 +pkgver=3.310 pkgrel=1 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format" arch=('i686' 'x86_64') @@ -12,12 +13,12 @@ license=('custom') depends=('glibc') options=('!libtool') source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz") -md5sums=('5045e82a30495ce23fd4be2c67b987f8') +md5sums=('75b6411751c7f308d45b281b7beb92d6') build() { cd "${srcdir}"/${pkgname} ./configure --prefix=/usr - make shared + make shared } check() { diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index b5102b5b6..f4f418727 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 163971 2012-07-23 03:03:28Z allan $ +# $Id: PKGBUILD 164655 2012-08-01 19:38:29Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Paul Mattal # Contributor: Federico Quagliata (quaqo) # Contributor: GARETTE Emmanuel pkgname=dovecot -pkgver=2.1.8 -pkgrel=2 +pkgver=2.1.9 +pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') url="http://dovecot.org/" @@ -22,8 +22,8 @@ install=$pkgname.install source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh dovecot.tmpfilesd) -md5sums=('c6d962653b0a7f2ab8d892b53ddf0101' - '99118d4accb282d70242e813975d86b5' +md5sums=('3cb45a55c011a2f8599ad70ccfaaf8f5' + '4ad189a6203aa1b2a595e7587908364a' '587159e84e2da6f83d70b3c706ba87cc' '342a28251d40f983c98c0d1f1bf3d07d') diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 71d8e4ebd..273af7d06 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 158564 2012-05-04 23:57:06Z allan $ +#$Id: PKGBUILD 164501 2012-08-01 09:36:07Z jgc $ # Maintainer: Jan De Groot pkgname=gnome-keyring pkgver=3.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) license=('GPL' 'LGPL') @@ -13,11 +13,14 @@ groups=('gnome') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9e90267721198cbe6ebc08f6390d24901d9c0de39b180cd2ad1bbcdd7b30b249') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + gpg-agent-fix-encoding.patch) +sha256sums=('9e90267721198cbe6ebc08f6390d24901d9c0de39b180cd2ad1bbcdd7b30b249' + '05ae4ec8db316b1b7552099721226e3a211bcf3d2445f1ea464d26bf31590760') build() { cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/gpg-agent-fix-encoding.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring \ diff --git a/extra/gnome-keyring/gpg-agent-fix-encoding.patch b/extra/gnome-keyring/gpg-agent-fix-encoding.patch new file mode 100644 index 000000000..e6a7412b3 --- /dev/null +++ b/extra/gnome-keyring/gpg-agent-fix-encoding.patch @@ -0,0 +1,86 @@ +From d31a26df7ce8d9c084b9c66fe00458683dde9864 Mon Sep 17 00:00:00 2001 +From: Stef Walter +Date: Thu, 28 Jun 2012 15:51:54 +0200 +Subject: [PATCH] gpg-agent: Encode passwords when --data was requested + + * Use URI encoding to return passwords when gnupg calls us with + a --data argument. + +https://bugzilla.gnome.org/show_bug.cgi?id=678771 +--- + daemon/gpg-agent/gkd-gpg-agent-ops.c | 41 ++++++++++++++++++++++++++++++---- + 1 file changed, 37 insertions(+), 4 deletions(-) + +diff --git a/daemon/gpg-agent/gkd-gpg-agent-ops.c b/daemon/gpg-agent/gkd-gpg-agent-ops.c +index be6c4d3..a1a21ff 100644 +--- a/daemon/gpg-agent/gkd-gpg-agent-ops.c ++++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c +@@ -632,11 +632,12 @@ command_has_option (gchar *command, gchar *option) + return has_option; + } + ++static const char HEXC[] = "0123456789abcdef"; ++ + /* Encode a password in hex */ + static gchar* +-encode_password (const gchar *pass) ++hex_encode_password (const gchar *pass) + { +- static const char HEXC[] = "0123456789abcdef"; + int j, c; + gchar *enc, *k; + +@@ -656,6 +657,36 @@ encode_password (const gchar *pass) + return enc; + } + ++static gchar* ++uri_encode_password (const gchar *value) ++{ ++ gchar *p; ++ gchar *result; ++ ++ /* Just allocate for worst case */ ++ result = egg_secure_alloc ((strlen (value) * 3) + 1); ++ ++ /* Now loop through looking for escapes */ ++ p = result; ++ while (*value) { ++ ++ /* These characters we let through verbatim */ ++ if (*value && (g_ascii_isalnum (*value) || strchr ("_-.", *value) != NULL)) { ++ *(p++) = *(value++); ++ ++ /* All others get encoded */ ++ } else { ++ *(p++) = '%'; ++ *(p++) = HEXC[((unsigned char)*value) >> 4]; ++ *(p++) = HEXC[((unsigned char)*value) & 0x0F]; ++ ++value; ++ } ++ } ++ ++ *p = 0; ++ return result; ++} ++ + /* ---------------------------------------------------------------------------------- + * OPERATIONS + */ +@@ -737,10 +768,12 @@ gkd_gpg_agent_ops_getpass (GkdGpgAgentCall *call, gchar *args) + if (password == NULL) { + gkd_gpg_agent_send_reply (call, FALSE, "111 cancelled"); + } else if (flags & GKD_GPG_AGENT_PASS_AS_DATA) { +- gkd_gpg_agent_send_data (call, password); ++ encoded = uri_encode_password (password); ++ gkd_gpg_agent_send_data (call, encoded); + gkd_gpg_agent_send_reply (call, TRUE, NULL); ++ egg_secure_strfree (encoded); + } else { +- encoded = encode_password (password); ++ encoded = hex_encode_password (password); + gkd_gpg_agent_send_reply (call, TRUE, encoded); + egg_secure_strfree (encoded); + } +-- +1.7.10.2 \ No newline at end of file diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index 59721e0fb..caee54895 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 164364 2012-07-31 19:42:49Z eric $ +# $Id: PKGBUILD 164515 2012-08-01 13:53:49Z jgc $ # Contributor: Kevin Piche # Contributor: Aaron Griffin pkgname=gtkpod pkgver=2.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net" license=('GPL') -depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk') +depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'dconf' 'libwebkit3') makedepends=('flex' 'intltool' 'libvorbis' 'faad2') optdepends=('libmp4v2: MP4/h264 support' 'vorbis-tools: OGG support' diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index b12233bbb..7c1de7797 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -3,14 +3,14 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.2 +pkgver=1.2.1 pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit') source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) -sha256sums=('3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d') +sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index b9884b410..5ae3498ad 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 153280 2012-03-12 20:33:58Z andyrtr $ +# $Id: PKGBUILD 164517 2012-08-01 14:21:31Z andyrtr $ # Maintainer: Andreas Radke pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.2 +pkgver=1.2.1 pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit') source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) -sha256sums=('3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d') +sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6') _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk diff --git a/extra/libthai/PKGBUILD b/extra/libthai/PKGBUILD index 8b2db3e86..1a5df7ff1 100644 --- a/extra/libthai/PKGBUILD +++ b/extra/libthai/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156262 2012-04-16 13:46:17Z jgc $ +# $Id: PKGBUILD 164508 2012-08-01 10:14:01Z jgc $ # Maintainer: Jan de Groot # Contributor: Chaiwat Suttipongsakul pkgname=libthai -pkgver=0.1.17 +pkgver=0.1.18 pkgrel=1 pkgdesc="Thai language support routines" url="http://linux.thai.net/projects/libthai" @@ -13,7 +13,7 @@ depends=('libdatrie') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('d94ddbf5e5a09a911c459f0a4ad1c041') +md5sums=('0250fc5255c1e62b23f88c2d6b1d6262') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index 3b1ad5813..d152cbde5 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162022 2012-06-18 22:10:00Z ibiru $ +# $Id: PKGBUILD 164506 2012-08-01 10:09:37Z jgc $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=nspr -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('zip') options=(!emptydirs) source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz nspr.pc.in) -md5sums=('d36d7b65a38f5b43ebd50ad3ad227120' +md5sums=('1a8cad110e0ae94f538610a00f595b33' 'bce1611f3117b53fc904cab549c09967') build() { diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD index c9c8d6a08..d798a12e1 100644 --- a/extra/obexd/PKGBUILD +++ b/extra/obexd/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 162046 2012-06-19 06:07:57Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino +# $Id: PKGBUILD 164647 2012-08-01 18:37:45Z andrea $ +# Maintainer: Andrea Scarpino # Contributor: Geoffroy Carrier pkgbase=obexd pkgname=('obexd-client' 'obexd-server') -pkgver=0.46 +pkgver=0.47 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64') license=('GPL2') -makedepends=('glib2' 'bluez' 'libical') +makedepends=('bluez' 'libical') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('625f0417d119437429c9cce29479cfa4') +md5sums=('af721152055c40a226e374c2dd989901') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -23,7 +22,7 @@ build() { package_obexd-client() { pkgdesc="D-Bus service providing high-level OBEX client side functionality" - depends=('bluez' 'glib2') + depends=('bluez') provides=("obexd=${pkgver}") replaces=('obexd') conflicts=('obexd') @@ -37,7 +36,7 @@ package_obexd-client() { package_obexd-server() { pkgdesc="D-Bus service providing high-level OBEX server side functionality" - depends=('bluez' 'glib2' 'libical') + depends=('bluez' 'libical') conflicts=('obex-data-server') cd "${srcdir}/${pkgbase}-${pkgver}/src" diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index fce4af222..5f8e21a53 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163624 2012-07-17 12:46:32Z bisson $ +# $Id: PKGBUILD 164657 2012-08-02 00:26:06Z bisson $ # Contributor: Jeff Brodnax # Contributor: Paul Mattal # Maintainer: Gaetan Bisson pkgname=postfix -pkgver=2.9.3 -pkgrel=3 +pkgver=2.9.4 +pkgrel=1 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') @@ -17,7 +17,7 @@ source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${p 'aliases.patch' 'service' 'rc.d') -sha1sums=('fd6c1ba3bbceb1a29b95655a742a2c547e11ca1d' +sha1sums=('ac53c2c6e15b642d5d06eb0fc092d6a35ab7eec7' '5fc3de6c7df1e5851a0a379e825148868808318b' 'af621cf064813d9ddb13ffd579fee33e6b82d4be' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD index 3f006e6db..1400f73d6 100644 --- a/extra/pycups/PKGBUILD +++ b/extra/pycups/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 154446 2012-03-28 18:30:40Z andrea $ +# $Id: PKGBUILD 164649 2012-08-01 18:38:32Z andrea $ # Maintainer: Andrea Scarpino # Contributor: nesl247 pkgname=pycups -pkgver=1.9.61 +pkgver=1.9.62 pkgrel=1 pkgdesc="Python CUPS Bindings" url="http://cyberelk.net/tim/software/pycups/" arch=('i686' 'x86_64') license=('GPL') depends=('libcups' 'python2') -source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.asc}) -md5sums=('7464093b349b907dcdefb913674e959b' - 'cb780142a614300792a08d462e198589') +source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('b62fb397c0997dc4adf44487f4bdf5ae' + 'ced304a64389f2a0cf4178acc002562d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/rssh/PKGBUILD b/extra/rssh/PKGBUILD index c1d9e08f7..477c6fcdf 100644 --- a/extra/rssh/PKGBUILD +++ b/extra/rssh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149042 2012-02-05 15:15:17Z bisson $ +# $Id: PKGBUILD 164390 2012-08-01 04:02:33Z bisson $ # Contributor: Judd Vinet # Maintainer: Gaetan Bisson pkgname=rssh pkgver=2.3.3 -pkgrel=3 +pkgrel=4 pkgdesc='Restricted shell for use with OpenSSH, allowing only scp and/or sftp' url='http://www.pizzashack.org/rssh/' license=('custom:rssh') @@ -12,17 +12,20 @@ arch=('i686' 'x86_64') backup=('etc/rssh.conf') depends=('openssh') source=("http://downloads.sourceforge.net/sourceforge/rssh/rssh-${pkgver}.tar.gz" + 'env-breach.patch' 'destdir.patch' 'rsync.patch') sha1sums=('0a6dd80b5e6059e0db12c9f1276121dd966b610a' + '434712f82f24c60834a10142ca5c49b8a57555a7' '85bd1694decae5872cbeeafd578b147eb13313c6' - '41f32f8a77b3a2b924ede6044ab67846e06b5d20') + '86564eab4493f4b4502a022e5938babb31450a00') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../env-breach.patch # FS#30950 + patch -p1 -i ../rsync.patch # FS#21783 patch -p1 -i ../destdir.patch - patch -p1 -i ../rsync.patch # FS#21783, debian patch ./configure \ --prefix=/usr \ diff --git a/extra/rssh/env-breach.patch b/extra/rssh/env-breach.patch new file mode 100644 index 000000000..e9193c7bd --- /dev/null +++ b/extra/rssh/env-breach.patch @@ -0,0 +1,228 @@ +--- rssh-2.3.3/main.c.in 2010-08-01 15:43:30.000000000 -0400 ++++ rssh-2.3.3/main.c.in 2012-05-11 16:44:39.000000000 -0400 +@@ -184,7 +184,7 @@ + * determine if the command in cmdline is acceptable to run, and store + * name of program to exec in cmd + */ +- if ( !(*cmd = check_command_line(cmdline, opts)) ) return NULL; ++ if ( !(*cmd = get_command(cmdline, opts)) ) return NULL; + + /* if we need to do chroot processing, do it */ + if ( opts->shell_flags & RSSH_USE_CHROOT ){ +@@ -252,7 +252,9 @@ + } + + /* return vector of pointers to command line arguments */ +- return build_arg_vector(cmdline, 0); ++ argvec = build_arg_vector(cmdline, 0); ++ if (check_command_line(argvec, opts)) return argvec; ++ else return NULL; + } + + void vers_info( void ) +--- rssh-2.3.3/util.c 2010-08-01 09:07:00.000000000 -0400 ++++ rssh-2.3.3/util.c 2012-05-11 16:43:10.000000000 -0400 +@@ -106,7 +106,7 @@ + /* print error message to user and log attempt */ + fprintf(stderr, "\nThis account is restricted by rssh.\n" + "%s\n\nIf you believe this is in error, please contact " +- "your system administrator.\n\n", cmd); ++ "your system administrator.\n\n", cmd); + if ( argc < 3 ) + log_msg("user %s attempted to log in with a shell", + username); +@@ -132,31 +132,35 @@ + */ + bool opt_exist(char *cl, char opt) + { +- int i = 0; ++ int i = 1; + int len; +- char *token; +- bool optstring = FALSE; +- + + len = strlen(cl); + + /* process command line character by character */ +- while ( i < (len - 2) ){ +- if ( cl[i] == ' ' || cl[i] == '\t' ){ +- if ( cl[i+1] == '-' ){ +- optstring = TRUE; +- i+=2; +- } +- } +- if ( cl[i] == opt && optstring ) return TRUE; +- if ( cl[i] == ' ' || cl[i] == '\t' || cl[i] == '-' ) +- optstring = FALSE; ++ if (!(cl[0] == '-')) return FALSE; ++ while ( i < (len) ){ ++ if ( cl[i] == opt ) return TRUE; + i++; + } + return FALSE; + } + + ++bool opt_filter(char **vec, const char opt) ++{ ++ while (vec && *vec){ ++ if (opt_exist(*vec, opt)){ ++ fprintf(stderr, "\nillegal insecure %c option", opt); ++ log_msg("insecure %c option in scp command line!", opt); ++ return TRUE; ++ } ++ vec++; ++ } ++ return FALSE; ++} ++ ++ + bool check_command( char *cl, ShellOptions_t *opts, char *cmd, int cmdflag ) + { + int cl_len; /* length of command line */ +@@ -186,69 +190,78 @@ + return FALSE; + } + ++ + /* + * check_command_line() - take the command line passed to rssh, and verify +- * that the specified command is one the user is +- * allowed to run. Return the path of the command +- * which will be run if it is ok, or return NULL if it +- * is not. ++ * that the specified command is one the user is ++ * allowed to run and validate the arguments. Return the ++ * path of the command which will be run if it is ok, or ++ * return NULL if it is not. + */ +-char *check_command_line( char *cl, ShellOptions_t *opts ) ++char *check_command_line( char **cl, ShellOptions_t *opts ) + { + +- if ( check_command(cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) ) ++ if ( check_command(*cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) ) + return PATH_SFTP_SERVER; + +- if ( check_command(cl, opts, PATH_SCP, RSSH_ALLOW_SCP) ){ ++ if ( check_command(*cl, opts, PATH_SCP, RSSH_ALLOW_SCP) ){ + /* filter -S option */ +- if ( opt_exist(cl, 'S') ){ +- fprintf(stderr, "\ninsecure -S option not allowed."); +- log_msg("insecure -S option in scp command line!"); +- return NULL; +- } ++ if ( opt_filter(cl, 'S') ) return NULL; + return PATH_SCP; + } + +- if ( check_command(cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){ +- if ( opt_exist(cl, 'e') ){ +- fprintf(stderr, "\ninsecure -e option not allowed."); +- log_msg("insecure -e option in cvs command line!"); +- return NULL; +- } ++ if ( check_command(*cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){ ++ if ( opt_filter(cl, 'e') ) return NULL; + return PATH_CVS; + } + +- if ( check_command(cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) ){ ++ if ( check_command(*cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) ){ + /* filter -P option */ +- if ( opt_exist(cl, 'P') ){ +- fprintf(stderr, "\ninsecure -P option not allowed."); +- log_msg("insecure -P option in rdist command line!"); +- return NULL; +- } ++ if ( opt_filter(cl, 'P') ) return NULL; + return PATH_RDIST; + } + +- if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){ ++ if ( check_command(*cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){ + /* filter -e option */ +- if ( opt_exist(cl, 'e') ){ +- fprintf(stderr, "\ninsecure -e option not allowed."); +- log_msg("insecure -e option in rdist command line!"); +- return NULL; +- } +- +- if ( strstr(cl, "--rsh=" ) ){ +- fprintf(stderr, "\ninsecure --rsh= not allowed."); +- log_msg("insecure --rsh option in rsync command line!"); +- return NULL; ++ if ( opt_filter(cl, 'e') ) return NULL; ++ while (cl && *cl){ ++ if ( strstr(*cl, "--rsh=" ) ){ ++ fprintf(stderr, "\ninsecure --rsh= not allowed."); ++ log_msg("insecure --rsh option in rsync command line!"); ++ return NULL; ++ } + } +- + return PATH_RSYNC; + } ++ /* No match, return NULL */ ++ return NULL; ++} ++ ++ ++/* ++ * get_command() - take the command line passed to rssh, and verify ++ * that the specified command is one the user is allowed to run. ++ * Return the path of the command which will be run if it is ok, ++ * or return NULL if it is not. ++ */ ++char *get_command( char *cl, ShellOptions_t *opts ) ++{ + ++ if ( check_command(cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) ) ++ return PATH_SFTP_SERVER; ++ if ( check_command(cl, opts, PATH_SCP, RSSH_ALLOW_SCP) ) ++ return PATH_SCP; ++ if ( check_command(cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ) ++ return PATH_CVS; ++ if ( check_command(cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) ) ++ return PATH_RDIST; ++ if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ) ++ return PATH_RSYNC; + return NULL; + } + + ++ + /* + * extract_root() - takes a root directory and the full path to some other + * directory, and returns a pointer to a string which +@@ -264,7 +277,7 @@ + len = strlen(root); + /* get rid of a trailing / from the root path */ + if ( root[len - 1] == '/' ){ +- root[len - 1] = '\0'; ++ root[len - 1] = '\0'; + len--; + } + if ( (strncmp(root, path, len)) ) return NULL; +@@ -309,7 +322,7 @@ + * same name, and returns FALSE if the bits are not valid + */ + int validate_access( const char *temp, bool *allow_sftp, bool *allow_scp, +- bool *allow_cvs, bool *allow_rdist, bool *allow_rsync ) ++ bool *allow_cvs, bool *allow_rdist, bool *allow_rsync ) + { + int i; + +--- rssh-2.3.3/util.h 2006-12-21 17:22:38.000000000 -0500 ++++ rssh-2.3.3/util.h 2012-05-11 16:21:12.000000000 -0400 +@@ -33,7 +33,8 @@ + #include "rsshconf.h" + + void fail( int flags, int argc, char **argv ); +-char *check_command_line( char *cl, ShellOptions_t *opts ); ++char *check_command_line( char **cl, ShellOptions_t *opts ); ++char *get_command( char *cl, ShellOptions_t *opts); + char *extract_root( char *root, char *path ); + int validate_umask( const char *temp, int *mask ); + int validate_access( const char *temp, bool *allow_sftp, bool *allow_scp, diff --git a/extra/rssh/rsync.patch b/extra/rssh/rsync.patch index cafd6c54b..7d0a51195 100644 --- a/extra/rssh/rsync.patch +++ b/extra/rssh/rsync.patch @@ -1,6 +1,6 @@ -diff -aur old//util.c new//util.c ---- old//util.c 2010-08-01 15:07:00.000000000 +0200 -+++ new//util.c 2010-11-25 18:16:24.086709600 +0100 +diff -Naur old/util.c new/util.c +--- old/util.c 2012-08-01 13:48:47.803620731 +1000 ++++ new/util.c 2012-08-01 13:55:13.622614598 +1000 @@ -56,6 +56,7 @@ #ifdef HAVE_LIBGEN_H #include @@ -9,8 +9,8 @@ diff -aur old//util.c new//util.c /* LOCAL INCLUDES */ #include "pathnames.h" -@@ -187,6 +188,33 @@ - } +@@ -192,6 +193,33 @@ + /* + * check_rsync_e() - take the command line passed to rssh and look for a -e @@ -41,17 +41,14 @@ diff -aur old//util.c new//util.c + +/* * check_command_line() - take the command line passed to rssh, and verify - * that the specified command is one the user is - * allowed to run. Return the path of the command -@@ -230,9 +258,9 @@ + * that the specified command is one the user is + * allowed to run and validate the arguments. Return the +@@ -211,7 +239,7 @@ + } + + if ( check_command(*cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){ +- if ( opt_filter(cl, 'e') ) return NULL; ++ if ( opt_filter(cl, 'e') && !check_rsync_e(cl) ) return NULL; + return PATH_CVS; + } - if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){ - /* filter -e option */ -- if ( opt_exist(cl, 'e') ){ -+ if ( opt_exist(cl, 'e') && !check_rsync_e(cl) ){ - fprintf(stderr, "\ninsecure -e option not allowed."); -- log_msg("insecure -e option in rdist command line!"); -+ log_msg("insecure -e option in rsync command line!"); - return NULL; - } - diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD index 3ad378912..50e733eb0 100644 --- a/extra/scribus/PKGBUILD +++ b/extra/scribus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 148922 2012-02-05 11:56:01Z ibiru $ +# $Id: PKGBUILD 164496 2012-08-01 06:55:11Z remy $ # Contributor: Ronald van Haren # Contributor: tobias # Contributor: Ben # Maintainer: Daniel J Griffiths pkgname=scribus -pkgver=1.4.0 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc="A desktop publishing program" arch=('i686' 'x86_64') url="http://www.scribus.net" @@ -18,17 +18,19 @@ depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \ makedepends=('cmake') options=(!libtool) source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('ae19e62399941fb8e868d8e762caf494') -sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809') +md5sums=('c79593dc61bc137d9e7968b37d070993') +sha1sums=('fb48bc492d79abc2275b1903692defe9b3931adf') build() { cd "${srcdir}" + sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - ${pkgname}-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/* + Scribus/scribus/plugins/scriptplugin/{samples,scripts}/* + mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../Scribus \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ @@ -43,8 +45,8 @@ package() { # fix icon path in .desktop file sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \ - "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" + "${srcdir}/Scribus/scribus.desktop" - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" \ + install -Dm644 "${srcdir}/Scribus/scribus.desktop" \ "${pkgdir}/usr/share/applications/scribus.desktop" } diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 4393e612a..ce55b407c 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160371 2012-06-01 12:58:45Z dreisner $ +# $Id: PKGBUILD 164651 2012-08-01 18:41:16Z andrea $ # Maintainer: Andrea Scarpino pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') -pkgver=1.3.9 -pkgrel=3 +pkgver=1.3.10 +pkgrel=1 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ license=('GPL') makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'libusb-compat' 'desktop-file-utils') source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig}) -md5sums=('df424f127eede63965608e5ec5e27519' - 'd105b7f7725c1ec538b6e6adb10667f3') +md5sums=('9de9df07c4c97afa2cea3be2f05d6c18' + '8ef4287a04761bd0b96e8ec44a92c92c') build() { cd "${srcdir}"/${pkgbase}-${pkgver} diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD index ecac89959..06dedce66 100644 --- a/extra/xf86-input-mouse/PKGBUILD +++ b/extra/xf86-input-mouse/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164195 2012-07-27 14:22:36Z andyrtr $ +# $Id: PKGBUILD 164523 2012-08-01 14:34:46Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-input-mouse -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="X.org mouse input driver" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('075fdc392e69b7aefae9f032785bb28e74fa45e865d2cfd67cdd6482580e3fdf') +sha256sums=('f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8') build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v1.2.3-54-g00ecf