Fri Jun 27 03:52:25 UTC 2014

13 files changed, 99 insertions, 46 deletions

diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD
index 71b5347df..7a5737e9b 100644
--- a/extra/flac/PKGBUILD
+++ b/extra/flac/PKGBUILD
@@ -1,18 +1,24 @@
-# $Id: PKGBUILD 213052 2014-05-18 04:34:11Z eric $
+# $Id: PKGBUILD 215465 2014-06-26 00:20:23Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=flac
 pkgname=('flac' 'flac-doc')
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://flac.sourceforge.net/"
 license=('BSD' 'GPL')
 depends=('gcc-libs' 'libogg')
 makedepends=('nasm' 'doxygen')
 options=('!makeflags')
-source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz)
-sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b')
+source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz flac-realloc.patch)
+sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b'
+          '22bf08219c289d747f399e351c701d0f195d3ce0')
+
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  patch -p1 -i "${srcdir}/flac-realloc.patch"
+}
 
 build() {
   cd ${pkgbase}-${pkgver}
diff --git a/extra/flac/flac-realloc.patch b/extra/flac/flac-realloc.patch
new file mode 100644
index 000000000..cf1a212cf
--- /dev/null
+++ b/extra/flac/flac-realloc.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.xiph.org/?p=flac.git;a=blobdiff_plain;f=src%2Fmetaflac%2Futils.c;h=8a31daaddd47f8ea2d7b1e66445d180b4151e0db;hp=097537b2d39ea302269a16e7da9bc413e02ffb6e;hb=606fdfcaece19d3e05434bde57c289102a369069;hpb=d42c04260bf9e27cbb8c61a5529ecab3b20e25ff
+
+diff --git a/src/metaflac/utils.c b/src/metaflac/utils.c
+index 097537b..8a31daa 100644
+--- a/src/metaflac/utils.c
++++ b/src/metaflac/utils.c
+@@ -75,7 +75,7 @@ void local_strcat(char **dest, const char *source)
+ 	*dest = safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1);
+ 	if(0 == *dest)
+ 		die("out of memory growing string");
+-	safe_strncpy((*dest)+ndest, source, ndest + nsource + 1);
++	safe_strncpy((*dest)+ndest, source, nsource + 1);
+ }
+ 
+ static inline int local_isprint(int c)
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index ab0506250..8b86188cb 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 214028 2014-06-01 21:43:54Z dan $
+# $Id: PKGBUILD 215496 2014-06-26 21:33:44Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=2.0.0
+pkgver=2.0.1
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -105,9 +105,6 @@ package() {
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('560200d1db05a2dd2b8a2b3718655463'
-         '042524f942785772d7bd52a1f02fe5ae'
-         'f67869315c2cc112e076f0c73f248002')
-md5sums=('0646202ae979e4339f3e47f2375b5773'
+md5sums=('6d28a5d112379c20c7f7df9e0ffb070c'
          '042524f942785772d7bd52a1f02fe5ae'
          'f67869315c2cc112e076f0c73f248002')
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index b632eab50..2f38334d0 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 215256 2014-06-17 19:24:42Z eric $
+# $Id: PKGBUILD 215482 2014-06-26 17:44:45Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.9.3
+pkgver=6.8.9.4
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
 #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
 source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
         perlmagick.rpath.patch)
-sha1sums=('6204ab02754c10220f2c7a5d0c61ab3b1172d40e'
+sha1sums=('b3aa7b95f8db8a863602fa4c205420ad1d5a69b7'
           'SKIP'
           'e143cf9d530fabf3b58023899b5cc544ba93daec')
 
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 837c2fbaa..3d1dbdd37 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 215399 2014-06-23 22:12:53Z bisson $
+# $Id: PKGBUILD 215483 2014-06-26 17:44:48Z eric $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD
index e79237c26..760a5d2a9 100644
--- a/extra/intel-tbb/PKGBUILD
+++ b/extra/intel-tbb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 210356 2014-04-14 16:42:11Z eric $
+# $Id: PKGBUILD 215494 2014-06-26 20:41:37Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Denis Martinez <deuns.martinez AT gmail.com>
 
 pkgname=intel-tbb
-pkgver=4.2_20140122
+pkgver=4.2_20140601
 pkgrel=1
 pkgdesc='High level abstract threading library'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url='http://www.threadingbuildingblocks.org/'
 license=('GPL')
 depends=('gcc-libs')
 source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz")
-sha1sums=('d897a6ced4f425c6608422a2e19218898e727260')
+sha1sums=('f50c04a27f5e37c920a03be134dc57ccf909515d')
 
 build() {
   cd tbb${pkgver/\./}oss
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 08ce53503..420114f99 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 215218 2014-06-16 18:52:23Z foutrelis $
+# $Id: PKGBUILD 215463 2014-06-25 23:03:43Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('opencl-mesa' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=10.2.1
-pkgrel=2
+pkgver=10.2.2
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd'
@@ -14,8 +14,8 @@ url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
         LICENSE)
-md5sums=('093f9b5d077e5f6061dcd7b01b7aa51a'
-         '5c65a0fe315dd347e09b1f2826a1df5a')
+sha256sums=('38c4a40364000f89cddaa1694f6f3cfb444981d1110238ce603093585477399c'
+            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
 
 build() {
   cd ${srcdir}/?esa-*
diff --git a/extra/nginx/PKGBUILD b/extra/nginx/PKGBUILD
index 510958dbb..299507196 100644
--- a/extra/nginx/PKGBUILD
+++ b/extra/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 213863 2014-05-30 16:37:11Z bpiotrowski $
+# $Id: PKGBUILD 215474 2014-06-26 09:27:07Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Maintainer: Sébastien Luttringer
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=nginx
 pkgver=1.6.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64')
 url='http://nginx.org'
@@ -95,6 +95,9 @@ package() {
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 
   rmdir "$pkgdir"/run
+
+  install -d "$pkgdir"/usr/share/man/man8/
+  gzip -9c man/nginx.8 > "$pkgdir"/usr/share/man/man8/nginx.8.gz
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 416a0ec8b..2103e51ae 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 213812 2014-05-29 11:04:10Z pierre $
+# $Id: PKGBUILD 215481 2014-06-26 16:14:41Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.5.13
+pkgver=5.5.14
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -34,7 +34,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz"
         "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('32d0fc26fccdb249a918c0e01ffb7b82'
+md5sums=('b34262d4ccbb6bef8d2cf83840625201'
          'SKIP'
          '510f9092ebfe6e378e12817e197a88b6'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
diff --git a/extra/pptpclient/PKGBUILD b/extra/pptpclient/PKGBUILD
new file mode 100644
index 000000000..e09245fec
--- /dev/null
+++ b/extra/pptpclient/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 215491 2014-06-26 20:19:29Z daniel $
+# Maintainer: Daniel Isenmann <daniel @ archlinux.org>
+# Contributor: Mark Nikkel <mnikkel@gmail.com>
+
+pkgname=pptpclient
+pkgver=1.8.0
+pkgrel=1
+pkgdesc="Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP."
+arch=('i686' 'x86_64')
+url="http://pptpclient.sourceforge.net/"
+license=('GPL')
+depends=('ppp' 'iproute2')
+backup=('etc/ppp/options.pptp')
+source=("http://downloads.sourceforge.net/sourceforge/pptpclient/pptp-$pkgver.tar.gz")
+md5sums=('4efce9f263e2c3f38d79d9df222476de')
+
+prepare() {
+  cd $srcdir/pptp-$pkgver
+
+  # use our CFLAGS and LDFLAGS
+  sed -i -e "/CFLAGS  =/ c\CFLAGS = ${CFLAGS}" Makefile
+  sed -i -e "/LDFLAGS =/ c\LDFLAGS = ${LDFLAGS}" Makefile
+
+  # adjust ip path
+  sed -i 's#/bin/ip#/usr/bin/ip#' routing.c
+
+  # put binaries in /usr/bin
+  sed -i "/BINDIR/s#/sbin#/bin#" Makefile
+}
+
+build() {
+  cd $srcdir/pptp-$pkgver
+  make 
+}
+
+package() {
+  cd $srcdir/pptp-$pkgver
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD
index 80c082155..98879ba77 100644
--- a/extra/pstoedit/PKGBUILD
+++ b/extra/pstoedit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 215258 2014-06-17 19:24:44Z eric $
+# $Id: PKGBUILD 215484 2014-06-26 17:44:52Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tobias Powalowski <t.powa@gmx.de>
 
 pkgname=pstoedit
 pkgver=3.62
-pkgrel=5
+pkgrel=6
 pkgdesc="Translates PostScript and PDF graphics into other vector formats"
 arch=('i686' 'x86_64')
 url="http://www.pstoedit.net/"
diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD
index 0d206267e..7a8221dd0 100644
--- a/extra/qtcreator/PKGBUILD
+++ b/extra/qtcreator/PKGBUILD
@@ -7,8 +7,8 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname=qtcreator
-pkgver=3.1.1
-_pkgver=v3.1.1
+pkgver=3.1.2
+_pkgver=v3.1.2
 pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index 75710119d..a33ccd01f 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,32 +1,25 @@
-# $Id: PKGBUILD 211621 2014-04-21 17:22:50Z jgc $
+# $Id: PKGBUILD 215468 2014-06-26 04:45:15Z pierre $
 
 pkgname=rsync
-pkgver=3.1.0
-pkgrel=2
+pkgver=3.1.1
+pkgrel=1
 pkgdesc="A file transfer program to keep remote files in sync"
 arch=('i686' 'x86_64')
 url="http://rsync.samba.org/"
 license=('GPL3')
-depends=('perl' 'popt')
+depends=('perl' 'popt' 'acl' 'zlib')
 backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
 source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz"
         "http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz.asc"
         'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service'
-        'rsyncd.socket' 'rsyncd@.service'
-        'CVE-2014-2855.patch')
-md5sums=('3be148772a33224771a8d4d2a028b132'
+        'rsyncd.socket' 'rsyncd@.service')
+md5sums=('43bd6676f0b404326eee2d63be3cdcfe'
          'SKIP'
          'bce64d122a8e0f86872a4a21a03bc7f3'
          'ea3e9277dc908bc51f9eddc0f6b935c1'
          '084140868d38cf3e937a2db716d47c0f'
          'ae4c381e0c02d6132c7f6ded3f473041'
-         '53f94e613e0bc502d38dd61bd2cd7636'
-         'dacfe77bd72fbf6b6ba65c741c57f74c')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../CVE-2014-2855.patch
-}
+         '53f94e613e0bc502d38dd61bd2cd7636')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"