Fri May 24 00:06:06 PDT 2013

9 files changed, 116 insertions, 33 deletions

diff --git a/extra/f2fs-tools/PKGBUILD b/extra/f2fs-tools/PKGBUILD
new file mode 100644
index 000000000..d033c1e3b
--- /dev/null
+++ b/extra/f2fs-tools/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 186280 2013-05-23 15:59:36Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Christian Hesse <mail@eworm.de>
+
+pkgname=f2fs-tools
+pkgver=1.1.0_130404
+pkgrel=1
+pkgdesc="Tools for Flash-Friendly File System (F2FS)"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/f2fs-tools/"
+depends=('util-linux')
+license=('GPL')
+#source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz')
+source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2")
+md5sums=('0bb44c174a2da2a7dd1216cc46b4612c')
+options=(!libtool)
+
+build() {
+	cd "${pkgname}-${pkgver}"
+
+	autoreconf -fi
+	./configure --prefix=/usr --sbindir=/usr/bin
+	make
+}
+
+package() {
+	cd "${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}/" sbindir=/usr/bin install
+}
+
diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD
index 27bfde990..cfae85ce5 100644
--- a/extra/fping/PKGBUILD
+++ b/extra/fping/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 185814 2013-05-19 12:00:14Z giovanni $
+# $Id: PKGBUILD 186276 2013-05-23 15:38:45Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=fping
-pkgver=3.4
-pkgrel=2
+pkgver=3.5
+pkgrel=1
 pkgdesc="A utility to ping multiple hosts at once"
 arch=('i686' 'x86_64')
 url="http://www.fping.org/"
 license=('custom') 
 depends=('glibc')
 source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a4bc97804e630dbf26dfac8f28c78091')
+md5sums=('2e17cb655aa4eb59b5a4a38a89e746ed')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 96cdd4a34..19bf3313a 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183266 2013-04-20 05:39:22Z heftig $
+# $Id: PKGBUILD 186259 2013-05-23 03:23:21Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=harfbuzz
-pkgver=0.9.16
+pkgver=0.9.17
 pkgrel=1
 pkgdesc="OpenType text shaping engine."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2')
 optdepends=('cairo: hb-view program')
 options=(!libtool)
 source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6da7e032f705d8a5c91487cd296628d64975672a5b0c1704829cf2285072c92b')
+sha256sums=('a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 5ca488f69..5b889c9c0 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185764 2013-05-18 14:49:17Z andyrtr $
+# $Id: PKGBUILD 186270 2013-05-23 15:26:49Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.4.6
+pkgver=4.4.7
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
 source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('377cc2caa2fc92755160270768e51604')
+md5sums=('a4e7b88d6b7aca389010ce6d6dca8099')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index 573ac890a..39967d9d4 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180833 2013-03-26 15:59:12Z bpiotrowski $
+# $Id: PKGBUILD 186282 2013-05-23 19:15:33Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
-pkgver=5.5.30
-pkgrel=2
+pkgver=5.5.31
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
@@ -14,7 +14,7 @@ source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunt
         mariadb.service
         mariadb-post.sh
         mariadb-tmpfile.conf)
-sha256sums=('64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f'
+sha256sums=('70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28'
             'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
             '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
@@ -106,7 +106,7 @@ package_mariadb() {
   pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
   backup=('etc/mysql/my.cnf')
   install=mariadb.install
-  depends=('mariadb-clients')
+  depends=('mariadb-clients' 'inetutils')
   conflicts=('mysql' 'mytop')
   provides=("mysql=$pkgver" 'mytop')
   optdepends=('perl-dbd-mysql: mytop dependency'
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index b7052f01b..14ce5932b 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 181379 2013-04-04 01:34:05Z eric $
+# $Id: PKGBUILD 186257 2013-05-23 01:22:39Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=mpg123
-pkgver=1.15.3
+pkgver=1.15.4
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64')
@@ -13,22 +13,20 @@ makedepends=('sdl' 'jack' 'libpulse')
 optdepends=('sdl: for sdl audio support'
             'jack: for jack audio support'
             'libpulse: for pulse audio support')
-conflicts=('mpg321')
-provides=('mpg321')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('915eb8782106a62b103a1171364571d69cb64e25'
-          '90614c85da88f965d9aa3165c111b6eeba711903')
+sha1sums=('f39d927bcf7abf4f9d857f10cd97c8ceccaffbfa'
+          'SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-int-quality --with-module-suffix=.so \
     --with-audio="alsa oss sdl jack pulse"
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m755 scripts/conplay "${pkgdir}/usr/bin/conplay"
 }
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 0d2f87b48..d295893d5 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 182150 2013-04-08 10:27:25Z stephane $
+# $Id: PKGBUILD 186286 2013-05-23 20:40:14Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
-pkgver=3.3.1
+pkgver=3.3.2
 pkgrel=1
 _pybasever=3.3
 pkgdesc="Next generation of the python high-level scripting language"
@@ -17,8 +17,10 @@ optdepends=('tk: for tkinter' 'sqlite')
 provides=('python3')
 replaces=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('393d7302c48bc911cd7faa7fa9b5fbcb9919bddc')
+source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
+        python-3.3.2-CVE-2013-2099.patch)
+sha1sums=('87009d0c156c6e1354dfec5c98c328cae93950ad'
+          'b7a386b2e2f0811b344898500860ec31ba81ed4d')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
@@ -32,6 +34,8 @@ build() {
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
 
+  patch -Np1 -i ../python-3.3.2-CVE-2013-2099.patch
+
   ./configure --prefix=/usr \
               --enable-shared \
               --with-threads \
@@ -48,8 +52,7 @@ build() {
 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 \
-     test_urllib test_uuid test_pydoc test_logging
+     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_posixpath test_logging
 }
 
 package() {
diff --git a/extra/python/python-3.3.2-CVE-2013-2099.patch b/extra/python/python-3.3.2-CVE-2013-2099.patch
new file mode 100644
index 000000000..8162d8e54
--- /dev/null
+++ b/extra/python/python-3.3.2-CVE-2013-2099.patch
@@ -0,0 +1,50 @@
+
+# HG changeset patch
+# User Antoine Pitrou <solipsis@pitrou.net>
+# Date 1368892602 -7200
+# Node ID c627638753e2d25a98950585b259104a025937a9
+# Parent  9682241dc8fcb4b1aef083bd30860efa070c3d6d
+Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099).
+
+diff --git a/Lib/ssl.py b/Lib/ssl.py
+--- a/Lib/ssl.py
++++ b/Lib/ssl.py
+@@ -129,9 +129,16 @@ class CertificateError(ValueError):
+     pass
+ 
+ 
+-def _dnsname_to_pat(dn):
++def _dnsname_to_pat(dn, max_wildcards=1):
+     pats = []
+     for frag in dn.split(r'.'):
++        if frag.count('*') > max_wildcards:
++            # Issue #17980: avoid denials of service by refusing more
++            # than one wildcard per fragment.  A survery of established
++            # policy among SSL implementations showed it to be a
++            # reasonable choice.
++            raise CertificateError(
++                "too many wildcards in certificate DNS name: " + repr(dn))
+         if frag == '*':
+             # When '*' is a fragment by itself, it matches a non-empty dotless
+             # fragment.
+diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
+--- a/Lib/test/test_ssl.py
++++ b/Lib/test/test_ssl.py
+@@ -349,6 +349,17 @@ class BasicSocketTests(unittest.TestCase
+         self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com')
+         self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com')
+ 
++        # Issue #17980: avoid denials of service by refusing more than one
++        # wildcard per fragment.
++        cert = {'subject': ((('commonName', 'a*b.com'),),)}
++        ok(cert, 'axxb.com')
++        cert = {'subject': ((('commonName', 'a*b.co*'),),)}
++        ok(cert, 'axxb.com')
++        cert = {'subject': ((('commonName', 'a*b*.com'),),)}
++        with self.assertRaises(ssl.CertificateError) as cm:
++            ssl.match_hostname(cert, 'axxbxxc.com')
++        self.assertIn("too many wildcards", str(cm.exception))
++
+     def test_server_side(self):
+         # server_hostname doesn't work for server sockets
+         ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD
index d808390a3..6072f73e0 100644
--- a/extra/xorg-xdpyinfo/PKGBUILD
+++ b/extra/xorg-xdpyinfo/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 176903 2013-02-02 07:12:27Z andyrtr $
+# $Id: PKGBUILD 186272 2013-05-23 15:31:13Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xdpyinfo
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="Display information utility for X"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,7 +13,7 @@ depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 'l
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2)
-sha256sums=('23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f')
+sha256sums=('aef9285069a517ed870e5d8a02d13f7d8a953d7f7220146da563e04c7f128b94')
 
 build() {
   cd "${srcdir}/xdpyinfo-${pkgver}"