diff options
27 files changed, 621 insertions, 86 deletions
diff --git a/community/grass/PKGBUILD b/community/grass/PKGBUILD index d96b4e57f..1a13057a9 100644 --- a/community/grass/PKGBUILD +++ b/community/grass/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=grass -pkgver=6.4.1RC2 -pkgrel=2 +pkgver=6.4.1 +pkgrel=1 pkgdesc='Geographic Information System (GIS) used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization.' arch=('i686' 'x86_64') url='http://grass.itc.it/index.php' @@ -22,7 +22,7 @@ install='grass.install' source=("http://grass.itc.it/grass64/source/grass-${pkgver}.tar.gz" "grass.sh" "grass.conf") -md5sums=('e994fab74279cf19a9d7cff6440535c3' +md5sums=('d8ca83d416b5b0cf2aa9d36c81a77b23' 'a0e0ac6275e09a272f8ec38d3c0b4b3a' '6103480c2a1adc19a50b9e925e5e6d4c') diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 0ff2783ad..d5728de32 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 32152 2010-11-11 01:53:51Z jconder $ +# $Id: PKGBUILD 45080 2011-04-16 01:55:08Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,18 +7,19 @@ pkgname=mythtv pkgver=0.24 -pkgrel=1 +pkgrel=2 +epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') url="http://www.mythtv.org/" license=('GPL') -depends=('lame' 'libavc1394' 'libiec61883' 'libvdpau' 'libxinerama' 'libxvmc' - 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' - 'perl-libwww' 'perl-net-upnp' 'python-lxml' 'qt' 'wget') +depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama' + 'libxvmc' 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python' + 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' 'python-lxml' 'qt' + 'udev' 'wget') makedepends=('yasm') optdepends=('xmltv: to download tv listings') backup=('etc/conf.d/mythbackend') -options=('force') install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'mythbackend.rc' @@ -37,7 +38,7 @@ build() { --enable-audio-oss \ --enable-audio-alsa \ --disable-audio-jack \ - --disable-audio-pulse \ + --enable-audio-pulse \ --disable-altivec \ --disable-distcc \ --disable-ccache \ diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD new file mode 100644 index 000000000..086d93d54 --- /dev/null +++ b/core/libpipeline/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 119506 2011-04-11 19:53:04Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=libpipeline +pkgver=1.2.0 +pkgrel=1 +pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" +arch=('i686' 'x86_64') +url="http://libpipeline.nongnu.org/" +license=('GPL') +groups=('base') +depends=('glibc') +options=('!libtool') +source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz) +md5sums=('dd3a987a0d2b594716baee2f73d61ae3') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD index 05265fdc1..0c4b05652 100644 --- a/core/man-db/PKGBUILD +++ b/core/man-db/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 99794 2010-11-17 19:07:22Z andyrtr $ +# $Id: PKGBUILD 119687 2011-04-13 16:45:31Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> pkgname=man-db -pkgver=2.5.9 +pkgver=2.6.0.2 pkgrel=1 pkgdesc="A utility for reading man pages" arch=('i686' 'x86_64') url="http://www.nongnu.org/man-db/" license=('GPL' 'LGPL') groups=('base') -depends=( 'bash' 'gdbm' 'zlib' 'groff') +depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline') optdepends=('less' 'gzip') backup=('etc/man_db.conf' 'etc/cron.daily/man-db') @@ -21,7 +21,7 @@ install=${pkgname}.install source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz #http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz convert-mans man-db.cron.daily) -md5sums=('9841394f5c5fe7e2dd2e0c5fb4766d0f' +md5sums=('2b41c96efec032d2b74ccbf2e401f93e' '2b7662a7d5b33fe91f9f3e034361a2f6' 'd30c39ae47560304471b5461719e0f03') options=('!libtool') @@ -35,9 +35,14 @@ build() { make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install # part of groff pkg rm -f ${pkgdir}/usr/bin/zsoelim diff --git a/core/man-db/man-db.install b/core/man-db/man-db.install index 6a0f36b67..f6f0f27a6 100644 --- a/core/man-db/man-db.install +++ b/core/man-db/man-db.install @@ -10,9 +10,13 @@ post_upgrade() { echo "run \"userdel man\". please also" echo "chown root:root /var/cache/man" fi + # force database rebuild to get rid off badly imported pages + if [ "`vercmp $2 2.6.0.2`" -lt 0 ]; then + echo "(re)building database..." + mandb -c --quiet + fi } post_remove() { rm -rf /var/cache/man } - diff --git a/extra/fvwm-devel/PKGBUILD b/extra/fvwm-devel/PKGBUILD index f5fd92bc6..66d4180dd 100644 --- a/extra/fvwm-devel/PKGBUILD +++ b/extra/fvwm-devel/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 87047 2010-08-10 02:32:22Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Tobias Kieslich <tobias@archlinux.org> +# $Id: PKGBUILD 119857 2011-04-16 04:00:46Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fvwm-devel -pkgver=2.5.31 +pkgver=2.7.0 pkgrel=1 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64') @@ -13,10 +12,11 @@ depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'readline' 'librsvg') makedepends=('pkg-config') conflicts=('fvwm') provides=("fvwm=${pkgver}") -changelog=ChangeLog source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-${pkgver}.tar.bz2 fvwm-devel.desktop) -md5sums=('bc0a64cee2b76a91b1b3f1aa716f564d' '3f5bcb246e035ff29aa5bf54487a3db4') -sha1sums=('0a59ac1c17f37dbfb1e042f4df3f86a5eb2d719c' '17db773870637b410ceb4f68743dbd517bc5c599') +md5sums=('c7dbb0c067f570e478005edb95dcccc3' + '3f5bcb246e035ff29aa5bf54487a3db4') +sha1sums=('bc8f84902b0926df171d059eff75780a25c8a97a' + '17db773870637b410ceb4f68743dbd517bc5c599') build() { cd "${srcdir}/fvwm-${pkgver}" @@ -31,6 +31,6 @@ package() { install -d "${pkgdir}/etc/fvwm" install -D -m644 sample.fvwmrc/* "${pkgdir}/etc/fvwm" rm -f "${pkgdir}"/etc/fvwm/Makefile* - install -D -m644 ../fvwm-devel.desktop "${pkgdir}/etc/X11/sessions/fvwm-devel.desktop" + install -D -m644 ../fvwm-devel.desktop "${pkgdir}/usr/share/xsessions/fvwm-devel.desktop" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index e32a5e22d..3dbdd37b3 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,25 +1,34 @@ -# $Id: PKGBUILD 42788 2009-06-18 20:20:03Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> +# $Id: PKGBUILD 119852 2011-04-16 03:57:41Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fvwm -pkgver=2.4.20 -pkgrel=4 +pkgver=2.6.0 +pkgrel=1 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64') url="http://www.fvwm.org" license=('GPL' 'custom') -depends=('readline>=6.0.00' 'libxpm' 'libxinerama' 'gtk' 'imlib' 'libstroke') +depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'readline' 'librsvg') conflicts=('fvwm-devel') -source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/${pkgname}-${pkgver}.tar.gz fvwm2.desktop) -md5sums=('3ac10558411c896f3afba285697cf42c' 'e52a6ef25a936dcf3ad0e58f2e9ed0ea') -sha1sums=('2130a16590462cbbf15f255a46abe8b8a6cb4401' 'e0924164329e7eb14e0d6137d8ff18cf6230191c') +source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/${pkgname}-${pkgver}.tar.bz2 fvwm2.desktop) +md5sums=('e4b4b065b2185be9071a9a55ac49b39a' + 'e52a6ef25a936dcf3ad0e58f2e9ed0ea') +sha1sums=('7c6ed1075c3faa1cd13c2ebc31f720d971564f5e' + 'e0924164329e7eb14e0d6137d8ff18cf6230191c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libexecdir=/usr/lib --with-stroke || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 ../fvwm2.desktop "${pkgdir}/etc/X11/sessions/fvwm2.desktop" || return 1 - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-stroke-library + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/etc/fvwm" + install -D -m644 sample.fvwmrc/* "${pkgdir}/etc/fvwm" + rm -f "${pkgdir}"/etc/fvwm/Makefile* + install -D -m644 ../fvwm2.desktop "${pkgdir}/usr/share/xsessions/fvwm2.desktop" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/python/CVE-2011-1521.patch b/extra/python/CVE-2011-1521.patch new file mode 100644 index 000000000..91f4946c4 --- /dev/null +++ b/extra/python/CVE-2011-1521.patch @@ -0,0 +1,134 @@ +diff -Naur Python-3.2.ori/Doc/library/urllib.request.rst Python-3.2/Doc/library/urllib.request.rst +--- Python-3.2.ori/Doc/library/urllib.request.rst 2011-02-11 03:25:47.000000000 -0800 ++++ Python-3.2/Doc/library/urllib.request.rst 2011-04-15 03:49:02.778745379 -0700 +@@ -650,6 +650,10 @@ + is the case, :exc:`HTTPError` is raised. See :rfc:`2616` for details of the + precise meanings of the various redirection codes. + ++ An :class:`HTTPError` exception raised as a security consideration if the ++ HTTPRedirectHandler is presented with a redirected url which is not an HTTP, ++ HTTPS or FTP url. ++ + + .. method:: HTTPRedirectHandler.redirect_request(req, fp, code, msg, hdrs, newurl) + +diff -Naur Python-3.2.ori/Lib/test/test_urllib2.py Python-3.2/Lib/test/test_urllib2.py +--- Python-3.2.ori/Lib/test/test_urllib2.py 2011-02-11 03:25:47.000000000 -0800 ++++ Python-3.2/Lib/test/test_urllib2.py 2011-04-15 03:50:29.705417290 -0700 +@@ -8,6 +8,7 @@ + + import urllib.request + from urllib.request import Request, OpenerDirector ++import urllib.error + + # XXX + # Request +@@ -1029,6 +1030,29 @@ + self.assertEqual(count, + urllib.request.HTTPRedirectHandler.max_redirections) + ++ ++ def test_invalid_redirect(self): ++ from_url = "http://example.com/a.html" ++ valid_schemes = ['http','https','ftp'] ++ invalid_schemes = ['file','imap','ldap'] ++ schemeless_url = "example.com/b.html" ++ h = urllib.request.HTTPRedirectHandler() ++ o = h.parent = MockOpener() ++ req = Request(from_url) ++ req.timeout = socket._GLOBAL_DEFAULT_TIMEOUT ++ ++ for scheme in invalid_schemes: ++ invalid_url = scheme + '://' + schemeless_url ++ self.assertRaises(urllib.error.HTTPError, h.http_error_302, ++ req, MockFile(), 302, "Security Loophole", ++ MockHeaders({"location": invalid_url})) ++ ++ for scheme in valid_schemes: ++ valid_url = scheme + '://' + schemeless_url ++ h.http_error_302(req, MockFile(), 302, "That's fine", ++ MockHeaders({"location": valid_url})) ++ self.assertEqual(o.req.get_full_url(), valid_url) ++ + def test_cookie_redirect(self): + # cookies shouldn't leak into redirected requests + from http.cookiejar import CookieJar +diff -Naur Python-3.2.ori/Lib/test/test_urllib.py Python-3.2/Lib/test/test_urllib.py +--- Python-3.2.ori/Lib/test/test_urllib.py 2010-12-17 09:35:56.000000000 -0800 ++++ Python-3.2/Lib/test/test_urllib.py 2011-04-15 03:49:02.778745379 -0700 +@@ -2,6 +2,7 @@ + + import urllib.parse + import urllib.request ++import urllib.error + import http.client + import email.message + import io +@@ -198,6 +199,21 @@ + finally: + self.unfakehttp() + ++ def test_invalid_redirect(self): ++ # urlopen() should raise IOError for many error codes. ++ self.fakehttp(b'''HTTP/1.1 302 Found ++Date: Wed, 02 Jan 2008 03:03:54 GMT ++Server: Apache/1.3.33 (Debian GNU/Linux) mod_ssl/2.8.22 OpenSSL/0.9.7e ++Location: file://guidocomputer.athome.com:/python/license ++Connection: close ++Content-Type: text/html; charset=iso-8859-1 ++''') ++ try: ++ self.assertRaises(urllib.error.HTTPError, urlopen, ++ "http://python.org/") ++ finally: ++ self.unfakehttp() ++ + def test_empty_socket(self): + # urlopen() raises IOError if the underlying socket does not send any + # data. (#1680230) +diff -Naur Python-3.2.ori/Lib/urllib/request.py Python-3.2/Lib/urllib/request.py +--- Python-3.2.ori/Lib/urllib/request.py 2011-02-11 03:25:47.000000000 -0800 ++++ Python-3.2/Lib/urllib/request.py 2011-04-15 03:49:02.778745379 -0700 +@@ -545,6 +545,17 @@ + + # fix a possible malformed URL + urlparts = urlparse(newurl) ++ ++ # For security reasons we don't allow redirection to anything other ++ # than http, https or ftp. ++ ++ if not urlparts.scheme in ('http', 'https', 'ftp'): ++ raise HTTPError(newurl, code, ++ msg + ++ " - Redirection to url '%s' is not allowed" % ++ newurl, ++ headers, fp) ++ + if not urlparts.path: + urlparts = list(urlparts) + urlparts[2] = "/" +@@ -1897,8 +1908,24 @@ + return + void = fp.read() + fp.close() ++ + # In case the server sent a relative URL, join with original: + newurl = urljoin(self.type + ":" + url, newurl) ++ ++ urlparts = urlparse(newurl) ++ ++ # For security reasons, we don't allow redirection to anything other ++ # than http, https and ftp. ++ ++ # We are using newer HTTPError with older redirect_internal method ++ # This older method will get deprecated in 3.3 ++ ++ if not urlparts.scheme in ('http', 'https', 'ftp'): ++ raise HTTPError(newurl, errcode, ++ errmsg + ++ " Redirection to url '%s' is not allowed." % newurl, ++ headers, fp) ++ + return self.open(newurl) + + def http_error_301(self, url, fp, errcode, errmsg, headers, data=None): diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index b8d376acc..fc8fce46d 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 110651 2011-02-21 01:21:12Z stephane $ +# $Id: PKGBUILD 119805 2011-04-15 11:51:39Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python pkgver=3.2 -pkgrel=1 +pkgrel=2 _pybasever=3.2 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64') @@ -17,9 +17,10 @@ optdepends=('tk: for tkinter') provides=('python3') replaces=('python3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${_pybasever}/Python-${pkgver}.tar.xz) -sha1sums=('55a3a9d39f31563370d0c494373bb6d38e4d1a00') - +source=(http://www.python.org/ftp/python/${_pybasever}/Python-${pkgver}.tar.xz + CVE-2011-1521.patch) +sha1sums=('55a3a9d39f31563370d0c494373bb6d38e4d1a00' + '561161ce5ae3a91254352c09a33e3e4434444e14') build() { cd "${srcdir}/Python-${pkgver}" @@ -29,6 +30,10 @@ build() { rm -r Modules/zlib rm -r Modules/_ctypes/{darwin,libffi}* + # urllib Security Vulnerability + # http://blog.python.org/2011/04/urllib-security-vulnerability-fixed.html + patch -Np1 -i ../CVE-2011-1521.patch + ./configure --prefix=/usr \ --enable-shared \ --with-threads \ @@ -40,10 +45,12 @@ build() { --with-system-ffi make +} - # Run the upstream test suite -# LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ -# "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils +check() { + cd "${srcdir}/Python-${pkgver}" + LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site } package() { diff --git a/extra/python2/CVE-2011-1521.patch b/extra/python2/CVE-2011-1521.patch new file mode 100644 index 000000000..d68ec3323 --- /dev/null +++ b/extra/python2/CVE-2011-1521.patch @@ -0,0 +1,98 @@ +diff -Naur Python-2.7.1.ori/Lib/test/test_urllib2.py Python-2.7.1/Lib/test/test_urllib2.py +--- Python-2.7.1.ori/Lib/test/test_urllib2.py 2010-11-21 21:04:33.000000000 -0800 ++++ Python-2.7.1/Lib/test/test_urllib2.py 2011-04-15 05:02:13.278853672 -0700 +@@ -969,6 +969,27 @@ + self.assertEqual(count, + urllib2.HTTPRedirectHandler.max_redirections) + ++ def test_invalid_redirect(self): ++ from_url = "http://example.com/a.html" ++ valid_schemes = ['http', 'https', 'ftp'] ++ invalid_schemes = ['file', 'imap', 'ldap'] ++ schemeless_url = "example.com/b.html" ++ h = urllib2.HTTPRedirectHandler() ++ o = h.parent = MockOpener() ++ req = Request(from_url) ++ ++ for scheme in invalid_schemes: ++ invalid_url = scheme + '://' + schemeless_url ++ self.assertRaises(urllib2.HTTPError, h.http_error_302, ++ req, MockFile(), 302, "Security Loophole", ++ MockHeaders({"location": invalid_url})) ++ ++ for scheme in valid_schemes: ++ valid_url = scheme + '://' + schemeless_url ++ h.http_error_302(req, MockFile(), 302, "That's fine", ++ MockHeaders({"location": valid_url})) ++ self.assertEqual(o.req.get_full_url(), valid_url) ++ + def test_cookie_redirect(self): + # cookies shouldn't leak into redirected requests + from cookielib import CookieJar +diff -Naur Python-2.7.1.ori/Lib/test/test_urllib.py Python-2.7.1/Lib/test/test_urllib.py +--- Python-2.7.1.ori/Lib/test/test_urllib.py 2010-11-21 05:34:58.000000000 -0800 ++++ Python-2.7.1/Lib/test/test_urllib.py 2011-04-15 05:02:13.278853672 -0700 +@@ -161,6 +161,20 @@ + finally: + self.unfakehttp() + ++ def test_invalid_redirect(self): ++ # urlopen() should raise IOError for many error codes. ++ self.fakehttp("""HTTP/1.1 302 Found ++Date: Wed, 02 Jan 2008 03:03:54 GMT ++Server: Apache/1.3.33 (Debian GNU/Linux) mod_ssl/2.8.22 OpenSSL/0.9.7e ++Location: file:README ++Connection: close ++Content-Type: text/html; charset=iso-8859-1 ++""") ++ try: ++ self.assertRaises(IOError, urllib.urlopen, "http://python.org/") ++ finally: ++ self.unfakehttp() ++ + def test_empty_socket(self): + # urlopen() raises IOError if the underlying socket does not send any + # data. (#1680230) +diff -Naur Python-2.7.1.ori/Lib/urllib2.py Python-2.7.1/Lib/urllib2.py +--- Python-2.7.1.ori/Lib/urllib2.py 2010-11-20 03:24:08.000000000 -0800 ++++ Python-2.7.1/Lib/urllib2.py 2011-04-15 05:02:13.278853672 -0700 +@@ -579,6 +579,17 @@ + + newurl = urlparse.urljoin(req.get_full_url(), newurl) + ++ # For security reasons we do not allow redirects to protocols ++ # other than HTTP, HTTPS or FTP. ++ newurl_lower = newurl.lower() ++ if not (newurl_lower.startswith('http://') or ++ newurl_lower.startswith('https://') or ++ newurl_lower.startswith('ftp://')): ++ raise HTTPError(newurl, code, ++ msg + " - Redirection to url '%s' is not allowed" % ++ newurl, ++ headers, fp) ++ + # XXX Probably want to forget about the state of the current + # request, although that might interact poorly with other + # handlers that also use handler-specific request attributes +diff -Naur Python-2.7.1.ori/Lib/urllib.py Python-2.7.1/Lib/urllib.py +--- Python-2.7.1.ori/Lib/urllib.py 2010-11-21 21:04:33.000000000 -0800 ++++ Python-2.7.1/Lib/urllib.py 2011-04-15 05:02:13.278853672 -0700 +@@ -644,6 +644,18 @@ + fp.close() + # In case the server sent a relative URL, join with original: + newurl = basejoin(self.type + ":" + url, newurl) ++ ++ # For security reasons we do not allow redirects to protocols ++ # other than HTTP, HTTPS or FTP. ++ newurl_lower = newurl.lower() ++ if not (newurl_lower.startswith('http://') or ++ newurl_lower.startswith('https://') or ++ newurl_lower.startswith('ftp://')): ++ raise IOError('redirect error', errcode, ++ errmsg + " - Redirection to url '%s' is not allowed" % ++ newurl, ++ headers) ++ + return self.open(newurl) + + def http_error_301(self, url, fp, errcode, errmsg, headers, data=None): diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 2dadb1ec3..af34f960a 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 119684 2011-04-13 16:35:24Z stephane $ +# $Id: PKGBUILD 119810 2011-04-15 12:17:53Z stephane $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 pkgver=2.7.1 -pkgrel=8 +pkgrel=9 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') @@ -17,16 +17,22 @@ optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2 - python-2.7-db51.diff - python-2.7.1-fix-decimal-in-turkish-locale.patch) -md5sums=('aa27bc25725137ba155910bd8e5ddc4f' - 'd9b8161568ce17a305c1b71e61ccd4b5' - '5032449f1ff2abfe18d14cc674165b23') + CVE-2011-1521.patch + python-2.7.1-fix-decimal-in-turkish-locale.patch + python-2.7-db51.patch) +sha1sums=('fbe1894322ff91b80726e269c97454f4129fc2a3' + '31cdc76092d0f598289aaeb18e492874c981904d' + 'baf470682ae7d2b55caaa173696d08d3f468a569' + '9667a2a2f8594902b352793e649f78696a77bd13') build() { cd "${srcdir}/Python-${pkgver}" - patch -Np1 -i ../python-2.7-db51.diff + patch -Np1 -i ../python-2.7-db51.patch + + # Fix urllib Security Vulnerability + # http://blog.python.org/2011/04/urllib-security-vulnerability-fixed.html + patch -Np1 -i ../CVE-2011-1521.patch # Fix "import decimal" in the Turkish locale # cf : https://bugzilla.redhat.com/show_bug.cgi?id=694928 diff --git a/extra/python2/python-2.7-db51.patch b/extra/python2/python-2.7-db51.patch new file mode 100644 index 000000000..2da95c375 --- /dev/null +++ b/extra/python2/python-2.7-db51.patch @@ -0,0 +1,42 @@ +diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c +--- Python-2.7-orig//Modules/_bsddb.c 2010-05-10 00:46:46.000000000 +1000 ++++ Python-2.7/Modules/_bsddb.c 2010-10-20 13:19:26.436669911 +1000 +@@ -9765,8 +9765,11 @@ + + ADD_INT(d, DB_REP_PERMANENT); + +-#if (DBVER >= 44) ++#if (DBVER >= 44) && (DBVER <= 48) + ADD_INT(d, DB_REP_CONF_NOAUTOINIT); ++#endif ++ ++#if (DBVER >= 44) + ADD_INT(d, DB_REP_CONF_DELAYCLIENT); + ADD_INT(d, DB_REP_CONF_BULK); + ADD_INT(d, DB_REP_CONF_NOWAIT); +diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py +--- Python-2.7-orig//setup.py 2010-06-27 22:36:16.000000000 +1000 ++++ Python-2.7/setup.py 2010-10-20 13:10:48.256670026 +1000 +@@ -765,7 +765,7 @@ + # a release. Most open source OSes come with one or more + # versions of BerkeleyDB already installed. + +- max_db_ver = (4, 8) ++ max_db_ver = (5, 1) + min_db_ver = (4, 1) + db_setup_debug = False # verbose debug prints from this script? + +@@ -787,8 +787,12 @@ + return True + + def gen_db_minor_ver_nums(major): +- if major == 4: ++ if major == 5: + for x in range(max_db_ver[1]+1): ++ if allow_db_ver((5, x)): ++ yield x ++ if major == 4: ++ for x in range(9): + if allow_db_ver((4, x)): + yield x + elif major == 3: diff --git a/multilib/lib32-gnutls/PKGBUILD b/multilib/lib32-gnutls/PKGBUILD index c9a313f09..50d5c8865 100644 --- a/multilib/lib32-gnutls/PKGBUILD +++ b/multilib/lib32-gnutls/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 35315 2010-12-18 20:32:19Z ibiru $ +# $Id: PKGBUILD 45059 2011-04-15 15:10:37Z ibiru $ # Maintainer: Biru Ionut <ionut@archlinux.ro # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> _pkgbasename=gnutls pkgname=lib32-$_pkgbasename -pkgver=2.10.4 +pkgver=2.12.2 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)" arch=('x86_64') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" -options=('libtool') +options=('!libtool') # uses built-in libtasn1 for the moment depends=(lib32-{gcc-libs,readline,libgcrypt,zlib}) makedepends=('gcc-multilib') source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('4e1517084018a8b1fdc96daabea40528') +md5sums=('ca6903d99b2aca2a6a326bc8df805b61') build() { export CC="gcc -m32" @@ -24,7 +24,10 @@ build() { cd ${srcdir}/${_pkgbasename}-${pkgver} ./configure --prefix=/usr --libdir=/usr/lib32 \ - --with-zlib --disable-guile + --with-zlib \ + --with-libgcrypt \ + --disable-static\ + --disable-guile make } diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index dcede47fb..8b7b2f8bf 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 44087 2011-04-02 07:03:36Z svenstaro $ +# $Id: PKGBUILD 45066 2011-04-15 20:30:34Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.3.17 +pkgver=1.3.18 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('f8d9d1d8cdab27ad311fa3743a1a0bc5') +md5sums=('17fb6334af12af17feb843f68272b070') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" diff --git a/testing/accountsservice/PKGBUILD b/testing/accountsservice/PKGBUILD index 237c3ca39..093803324 100644 --- a/testing/accountsservice/PKGBUILD +++ b/testing/accountsservice/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 118186 2011-04-05 19:20:06Z ibiru $ +# $Id: PKGBUILD 119834 2011-04-15 16:41:54Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.8 +pkgver=0.6.9 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64) @@ -11,7 +11,7 @@ depends=('dbus-glib' 'polkit') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2) -md5sums=('beeece0cb3a0eb88f551ad5e37accf8f') +md5sums=('e21a311d11089386eaf7d738f7bca222') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD index de443295d..5139ab408 100644 --- a/testing/evince/PKGBUILD +++ b/testing/evince/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 117852 2011-04-04 20:13:46Z heftig $ +# $Id: PKGBUILD 119825 2011-04-15 13:37:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64') license=('GPL') depends=('libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' - 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf') + 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') optdepends=('texlive-bin: DVI support') groups=('gnome-extra') diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD new file mode 100644 index 000000000..c7dd791be --- /dev/null +++ b/testing/file/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 119819 2011-04-15 12:49:27Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> + +pkgname=file +pkgver=5.06 +pkgrel=1 +pkgdesc="File type identification utility" +arch=('i686' 'x86_64') +license=('custom') +groups=('base') +url="http://www.darwinsys.com/file/" +depends=('glibc' 'zlib') +options=('!libtool') +source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz + file-5.05-zip64.patch) +md5sums=('deb12b0fb9d09e7681be72bad6eba4e0' + '385f020467debd98bd2d8df6143f93d0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's#\$(datadir)/misc#\$(datadir)#' configure + + # identify zip64 files + patch -Np1 -i ${srcdir}/file-5.05-zip64.patch + + ./configure --prefix=/usr --datadir=/usr/share/file + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR=${pkgdir} install + install -dm755 ${pkgdir}/usr/share/misc + ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc + + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} diff --git a/testing/file/file-5.05-zip64.patch b/testing/file/file-5.05-zip64.patch new file mode 100644 index 000000000..2c9aede5f --- /dev/null +++ b/testing/file/file-5.05-zip64.patch @@ -0,0 +1,11 @@ +diff -Naur file-5.05-old//magic/Magdir/archive file-5.05/magic/Magdir/archive +--- file-5.05-old//magic/Magdir/archive 2011-01-08 06:24:25.000000000 +1000 ++++ file-5.05/magic/Magdir/archive 2011-01-19 14:37:47.766673895 +1000 +@@ -688,6 +688,7 @@ + >>4 byte 0x0b \b, at least v1.1 to extract + >>0x161 string WINZIP \b, WinZIP self-extracting + >>4 byte 0x14 \b, at least v2.0 to extract ++>>4 byte 0x2d \b, at least v3.0 to extract + + # Zoo archiver + 20 lelong 0xfdc4a7dc Zoo archive data diff --git a/testing/gimp-devel/PKGBUILD b/testing/gimp-devel/PKGBUILD index 533100002..16ede8148 100644 --- a/testing/gimp-devel/PKGBUILD +++ b/testing/gimp-devel/PKGBUILD @@ -1,30 +1,29 @@ -# $Id: PKGBUILD 118821 2011-04-08 05:03:45Z eric $ +# $Id: PKGBUILD 119839 2011-04-15 18:55:33Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gimp-devel -pkgver=2.7.1 -pkgrel=5 +pkgver=2.7.2 +pkgrel=1 pkgdesc="GNU Image Manipulation Program (Development Version)" arch=('i686' 'x86_64') url="http://www.gimp.org/" license=('GPL') depends=('gtk2' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \ - 'libexif' 'pygtk' 'desktop-file-utils' 'gegl') + 'libexif' 'pygtk' 'desktop-file-utils' 'gegl' 'hicolor-icon-theme') makedepends=('gutenprint' 'intltool' 'libwebkit' 'gnome-python' 'poppler-glib' \ 'pkg-config' 'alsa-lib' 'iso-codes') optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' 'libwebkit: for the help browser' 'poppler-glib: for pdf support' - 'hal: for Linux input event controller module' 'alsa-lib: for MIDI event controller module') options=('!libtool' '!makeflags') conflicts=('gimp') provides=("gimp=${pkgver}") install=gimp-devel.install source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl) -md5sums=('4932a0a1645ecd5b23ea6155ddda013d' +md5sums=('6996138ab70b0bfebfe9f563284e5f78' 'bb27bc214261d36484093e857f015f38') -sha1sums=('3dcfc08ddccbdf541449e4ea6be252b449f6d872' +sha1sums=('4690420961d110f99448c32fe61aae7d4869a863' '110ce9798173b19a662d086ed7b882b4729f06cf') build() { @@ -32,7 +31,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --enable-mp --enable-gimp-console --enable-gimp-remote \ --enable-python --with-gif-compression=lzw \ - --without-aa + --without-aa --without-hal make } diff --git a/testing/gimp/PKGBUILD b/testing/gimp/PKGBUILD index c238765a7..c0bab91ef 100644 --- a/testing/gimp/PKGBUILD +++ b/testing/gimp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 118818 2011-04-08 04:09:10Z eric $ +# $Id: PKGBUILD 119782 2011-04-15 08:31:34Z jgc $ # Maintainer: tobias <tobias@archlinux.org> pkgname=gimp pkgver=2.6.11 -pkgrel=4 +pkgrel=5 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64') url="http://www.gimp.org/" @@ -15,7 +15,6 @@ makedepends=('gutenprint' 'intltool' 'libwebkit' 'gnome-python' 'poppler-glib' \ optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' 'libwebkit: for the help browser' 'poppler-glib: for pdf support' - 'hal: for Linux input event controller module' 'alsa-lib: for MIDI event controller module') options=('!libtool' '!makeflags') conflicts=('gimp-devel') @@ -31,7 +30,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --enable-mp --enable-gimp-console --enable-gimp-remote \ --enable-python --with-gif-compression=lzw \ - --without-aa + --without-aa --without-hal make } diff --git a/testing/gnome-vfs/PKGBUILD b/testing/gnome-vfs/PKGBUILD new file mode 100644 index 000000000..39abc3f5e --- /dev/null +++ b/testing/gnome-vfs/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 119776 2011-04-15 07:50:36Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-vfs +pkgver=2.24.4 +pkgrel=2 +pkgdesc="The GNOME Virtual File System" +arch=(i686 x86_64) +license=('LGPL') +depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'heimdal' 'gnutls') +makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common') +options=('!libtool' '!emptydirs' '!makeflags') +conflicts=(gnome-vfs-samba) +provides=(gnome-vfs-samba) +replaces=(gnome-vfs-samba gnome-vfs-extras) +url="http://www.gnome.org" +install=gnome-vfs.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2 + gnutls-config.patch) +sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa' + '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + #Fix build with new gnutls + patch -Np1 -i "${srcdir}/gnutls-config.patch" + libtoolize --force + gtkdocize + aclocal + autoconf + automake + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-vfs-2.0 \ + --enable-samba --disable-hal \ + --enable-avahi --disable-howl \ + --disable-openssl --enable-gnutls + make + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -d -m755 "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/gnome-vfs/gnome-vfs.install b/testing/gnome-vfs/gnome-vfs.install new file mode 100644 index 000000000..793a3e7ab --- /dev/null +++ b/testing/gnome-vfs/gnome-vfs.install @@ -0,0 +1,17 @@ +pkgname=gnome-vfs + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} diff --git a/testing/gnome-vfs/gnutls-config.patch b/testing/gnome-vfs/gnutls-config.patch new file mode 100644 index 000000000..f6fa18b17 --- /dev/null +++ b/testing/gnome-vfs/gnutls-config.patch @@ -0,0 +1,25 @@ +# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0 +# Use pkg-config in place of gnutls own macro since it's not present anymore. +--- a/configure.in 2009-03-07 19:59:53.805507753 +0100 ++++ b/configure.in 2009-03-07 18:34:36.928169018 +0100 +@@ -686,14 +686,14 @@ + AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***]) + else + AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***])) +- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) +- have_ssl=true]) ++ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) ++ have_ssl=true]) + + if test "x${LIBGNUTLS_LIBS}" = "x"; then +- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) +- AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) +- have_ssl=true], +- AC_MSG_ERROR([Unable to find GNUTLS])) ++ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) ++ AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) ++ have_ssl=true], ++ AC_MSG_ERROR([Unable to find GNUTLS])) + fi + fi + fi diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD index 64d2efb0c..7c3a55dba 100644 --- a/testing/gtk3/PKGBUILD +++ b/testing/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117508 2011-04-04 09:35:23Z ibiru $ +# $Id: PKGBUILD 119847 2011-04-15 22:42:57Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.0.8 +pkgver=3.0.9 pkgrel=1 pkgdesc="The GTK+ Toolkit (v3)" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2 settings.ini) -sha256sums=('42b2b1a400372fe0b3ef890162d1610422f7e787af0765b59f1b3352a4839308' +sha256sums=('88a9dda6f2a23155ac3d7aca6b414ca3b55e2817b46bcc87733f1a407e16678c' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { diff --git a/testing/libxml++/PKGBUILD b/testing/libxml++/PKGBUILD new file mode 100644 index 000000000..c4385a417 --- /dev/null +++ b/testing/libxml++/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 119822 2011-04-15 13:14:14Z ibiru $ +# Maintainer: damir <damir@archlinux.org> + +pkgbase=libxml++ +pkgname=('libxml++' 'libxml++-docs') +pkgver=2.34.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +url="http://libxmlplusplus.sourceforge.net/" +makedepends=('pkgconfig' 'glibmm-docs' 'libxml2' 'glibmm' 'mm-common') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.34/${pkgbase}-${pkgver}.tar.bz2) +sha256sums=('09bc0e20cdc729660ebb0429cdfc8202f3e48fd65f443a0a3cc1278a14ad7807') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure --prefix=/usr + make +} + +package_libxml++() { + pkgdesc="C++ bindings to libxml2" + depends=('libxml2' 'glibmm') + replaces=('libxml++2') + provides=("libxml++2=${pkgver}") + conflicts=('libxml++2') + + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -i -e 's/install-data-am: install-data-local install-dist_referenceDATA/install-data-am: /' Makefile + make DESTDIR="${pkgdir}" install +} + +package_libxml++-docs() { + pkgdesc="Developer documentation for libxml++" + depends=('glibmm-docs') + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install-data-local install-dist_referenceDATA +} diff --git a/testing/pmount/PKGBUILD b/testing/pmount/PKGBUILD new file mode 100644 index 000000000..bbdb957e7 --- /dev/null +++ b/testing/pmount/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 119797 2011-04-15 09:29:18Z jgc $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=pmount +pkgver=0.9.23 +pkgrel=2 +pkgdesc="mount removable devices as normal user" +arch=(i686 x86_64) +license=('GPL2') +url="http://pmount.alioth.debian.org/" +backup=('etc/pmount.allow') +depends=('sysfsutils>=2.0.0-1' 'bash') +makedepends=('intltool') +source=(https://alioth.debian.org/frs/download.php/3310/pmount-0.9.23.tar.bz2) +md5sums=('db19f5bf3151b1b41705ec7bafa439d3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-hal + make + make DESTDIR="${pkgdir}" install +} diff --git a/testing/telepathy-glib/PKGBUILD b/testing/telepathy-glib/PKGBUILD index 46c55b48d..07b7dd632 100644 --- a/testing/telepathy-glib/PKGBUILD +++ b/testing/telepathy-glib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117593 2011-04-04 12:26:48Z ibiru $ +# $Id: PKGBUILD 119800 2011-04-15 11:36:23Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.14.3 +pkgver=0.14.4 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('fe9a4f781651593fd4afddb343ff50bf') +md5sums=('011c7357c8d85bea8b1f402a4f5eb02a') build() { cd "${srcdir}/${pkgname}-${pkgver}" |