Sat Jan 11 03:21:10 UTC 2014

11 files changed, 129 insertions, 58 deletions

diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index a1bcfbf96..e9c29232e 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197896 2013-10-30 11:32:22Z allan $
+# $Id: PKGBUILD 203440 2014-01-10 21:09:04Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=clutter-gst
-pkgver=2.0.8
+pkgver=2.0.10
 pkgrel=1
 pkgdesc="GStreamer bindings for clutter"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ license=(LGPL)
 depends=(clutter gst-plugins-base-libs libxdamage gst-plugins-bad)
 makedepends=(gobject-introspection)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('cee6b0667c74a54fdf43f0ec7c1dc8ff0ffd1c594e0d43529de45048f8080a4d')
+sha256sums=('f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 4c9de3f79..089ba8f7d 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 197898 2013-10-30 11:33:08Z allan $
+# $Id: PKGBUILD 203439 2014-01-10 21:08:52Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
 pkgver=1.16.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=('i686' 'x86_64')
 url="http://www.clutter-project.org/"
 license=('GPL2')
-depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
-makedepends=('mesa' 'gobject-introspection')
+depends=('mesa' 'libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango' 'libxrandr')
+makedepends=('gobject-introspection')
 options=(!emptydirs)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094')
diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index 6c0973b0c..f7a1916c4 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -1,37 +1,25 @@
-# $Id: PKGBUILD 178421 2013-02-21 20:49:20Z guillaume $
+# $Id: PKGBUILD 203446 2014-01-10 22:37:23Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=easytag
-pkgver=2.1.8
-pkgrel=2
+pkgver=2.1.9
+pkgrel=1
 pkgdesc='Utility for viewing and editing tags for most audio formats'
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://easytag.sourceforge.net/'
-makedepends=('intltool')
+makedepends=('intltool' 'itstool')
 depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'taglib'
          'desktop-file-utils' 'hicolor-icon-theme')
 install=${pkgname}.install
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz
-        easytag-2.1.8-fix_mixed_declarations_and_code.patch
-        easytag-2.1.8-fix_mime_directory_association.patch)
-sha256sums=('1a2f75c9a70aeb7a404dfaa96e0df0eaaa325df301c58f0f708d0da4c08e65a9'
-            '453d2a102cf482d6d1586b11e531bf267f302aab3ee6b8c43b6bcc61cfa2ede5'
-            '693da67f0c96d51ad363bb9e70a22b402bc7c5058d648981919a115381700cd3')
+source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('f5a6e742a458ef6f48f2d5e98a24182a9c87a213e847fcce75c757ac90273501')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Already fixed upstream
-  # http://git.gnome.org/browse/easytag/commit/src/wavpack_tag.c?id=17a33964c32035f6b9986e13726ae3582a126244
-  patch -p0 -i ${srcdir}/easytag-2.1.8-fix_mixed_declarations_and_code.patch
-
-  # Bad Easytag! Bad! You don't know your place!
-  patch -p0 -i ${srcdir}/easytag-2.1.8-fix_mime_directory_association.patch
-
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 16c4030c7..884b8cec1 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198050 2013-10-30 12:29:51Z allan $
+# $Id: PKGBUILD 203404 2014-01-10 04:16:47Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.34.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('CPL')
@@ -23,14 +23,20 @@ optdepends=('mono: sharp bindings'
             'tcl: tcl bindings'
             'qt4: gvedit')
 source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
+        'yyerror0.patch'
+        'yyerror1.patch'
         'dotty.patch')
 sha1sums=('5a0c00bebe7f4c7a04523db21f40966dc9f0d441'
+          '7a6fe4f532974d9ca173b1aba9927bdeb5f80be9'
+          '6d76a230ee6c11bcd610ebe56f98e96ecef6217d'
           '31bc9f505c8b6470289a0d6ec31c237765cba239')
 
 install=install
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../yyerror0.patch
+	patch -p1 -i ../yyerror1.patch
 	patch -p1 -i ../dotty.patch
 	sed \
 		-e '/LIBPOSTFIX="64"/d' \
diff --git a/extra/graphviz/yyerror0.patch b/extra/graphviz/yyerror0.patch
new file mode 100644
index 000000000..f8bb98373
--- /dev/null
+++ b/extra/graphviz/yyerror0.patch
@@ -0,0 +1,53 @@
+From 7aaddf52cd98589fb0c3ab72a393f8411838438a Mon Sep 17 00:00:00 2001
+From: "Emden R. Gansner" <erg@alum.mit.edu>
+Date: Fri, 4 Oct 2013 09:06:39 -0400
+Subject: [PATCH] Fix buffer overflow problem when reporting a syntax error
+ with a very long input line
+
+---
+ lib/cgraph/scan.l | 21 +++++++++++++++------
+ 1 file changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l
+index 3cfde0f..2efd203 100644
+--- a/lib/cgraph/scan.l
++++ b/lib/cgraph/scan.l
+@@ -16,6 +16,7 @@
+ %{
+ #include <grammar.h>
+ #include <cghdr.h>
++#include <agxbuf.h>
+ #include <ctype.h>
+ #define GRAPH_EOF_TOKEN		'@'		/* lex class must be defined below */
+ 	/* this is a workaround for linux flex */
+@@ -191,13 +192,21 @@ ID		({NAME}|{NUMBER})
+ %%
+ void yyerror(char *str)
+ {
++	unsigned char	xbuf[BUFSIZ];
+ 	char	buf[BUFSIZ];
+-	if (InputFile)
+-		sprintf(buf,"%s:%d: %s in line %d near '%s'\n",InputFile, line_num,
+-			str,line_num,yytext);
+-	else
+-		sprintf(buf," %s in line %d near '%s'\n", str,line_num,yytext);
+-	agerr(AGWARN,buf);
++	agxbuf  xb;
++
++	agxbinit(&xb, BUFSIZ, xbuf);
++	if (InputFile) {
++		agxbput (&xb, InputFile);
++		agxbput (&xb, ": ");
++	}
++	sprintf(buf," %s in line %d near '", str,line_num);
++	agxbput (&xb, buf);
++	agxbput (&xb, yytext);
++	agxbput (&xb,"'\n");
++	agerr(AGWARN,agxbuse(&xb));
++	agxbfree(&xb);
+ }
+ /* must be here to see flex's macro defns */
+ void aglexeof() { unput(GRAPH_EOF_TOKEN); }
+-- 
+1.8.5.1
+
diff --git a/extra/graphviz/yyerror1.patch b/extra/graphviz/yyerror1.patch
new file mode 100644
index 000000000..4f1faf4df
--- /dev/null
+++ b/extra/graphviz/yyerror1.patch
@@ -0,0 +1,26 @@
+From d266bb2b4154d11c27252b56d86963aef4434750 Mon Sep 17 00:00:00 2001
+From: "Emden R. Gansner" <erg@alum.mit.edu>
+Date: Tue, 7 Jan 2014 10:45:36 -0500
+Subject: [PATCH] Prevent possible buffer overflow in yyerror()
+
+---
+ lib/cgraph/scan.l | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l
+index 3efe1d5..212967c 100644
+--- a/lib/cgraph/scan.l
++++ b/lib/cgraph/scan.l
+@@ -201,7 +201,8 @@ void yyerror(char *str)
+ 		agxbput (&xb, InputFile);
+ 		agxbput (&xb, ": ");
+ 	}
+-	sprintf(buf," %s in line %d near '", str,line_num);
++	agxbput (&xb, str);
++	sprintf(buf," in line %d near '", line_num);
+ 	agxbput (&xb, buf);
+ 	agxbput (&xb, yytext);
+ 	agxbput (&xb,"'\n");
+-- 
+1.8.5.1
+
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index 9082549fe..59f3d12a0 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 203288 2014-01-07 13:06:50Z heftig $
+# $Id: PKGBUILD 203416 2014-01-10 14:44:32Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-good
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer Multimedia Framework Good Plugins"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo')
-makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python')
+makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python' 'gtk-doc')
 options=(!emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
 sha256sums=('6c090f00e8e4588f12807bd9fbb06a03b84a512c93e84d928123ee4a42228a81')
@@ -18,7 +18,7 @@ build() {
   cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
+    --disable-static --enable-experimental --enable-gtk-doc \
     --with-package-name="GStreamer Good Plugins (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/"
 
@@ -28,7 +28,7 @@ build() {
   make
 }
 
-# Disable for now: fails with soup timeout
+# Disabled for now: souphttpsrc times out, and takes a damn long time to do so
 #check() {
 #  cd $pkgname-$pkgver
 #  make check
@@ -36,5 +36,5 @@ build() {
 
 package() {
   cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD
index 1308e3cb7..44a286808 100644
--- a/extra/gst-plugins-ugly/PKGBUILD
+++ b/extra/gst-plugins-ugly/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 203290 2014-01-07 13:07:17Z heftig $
+# $Id: PKGBUILD 203422 2014-01-10 16:45:43Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-ugly
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-makedepends=('python')
+makedepends=('python' 'gtk-doc')
 options=(!emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
 sha256sums=('4b6aac272a5be0d68f365ef6fba0f829fc5c1d1d601bb4dd9e85f5289b2b56c3')
@@ -18,7 +18,7 @@ build() {
   cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
+    --disable-static --enable-experimental --enable-gtk-doc \
     --with-package-name="GStreamer Ugly Plugins (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/"
 
diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD
index c671c7dde..526bad1d2 100644
--- a/extra/libmikmod/PKGBUILD
+++ b/extra/libmikmod/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 201341 2013-12-09 07:42:41Z heftig $
+# $Id: PKGBUILD 203444 2014-01-10 21:24:03Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libmikmod
-pkgver=3.3.4
+pkgver=3.3.5
 pkgrel=1
 pkgdesc="A portable sound library"
 license=(GPL LGPL)
 url="http://mikmod.sourceforge.net"
 arch=(i686 x86_64)
-depends=(openal sh)
+depends=(libpulse sh)
 makedepends=(alsa-lib)
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/mikmod/$pkgname-$pkgver.tar.gz)
-sha256sums=('2e8ca1d945ff7330741d085548a6d4e8b2f6a9d41edda773607905d8905683ae')
+sha256sums=('b714ee340a04e6867f60246f679e0f40063b92f99269b6b715c8bf19ad469fb6')
 
 prepare() {
   mkdir build
@@ -24,7 +24,6 @@ build() {
   cd build
   ../$pkgname-$pkgver/configure \
     --prefix=/usr \
-    --enable-openal \
     --disable-static
   make
 }
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index e4d2e892c..93f94a870 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 201484 2013-12-12 18:14:36Z pierre $
+# $Id: PKGBUILD 203430 2014-01-10 20:36:02Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.5.7
+pkgver=5.5.8
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -30,10 +30,12 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
              'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
              'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
              'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd')
-source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz"
+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=('0c02437f661105221e99a301a5275a41'
+md5sums=('1ed2b0193ecaca8b980a9b6a90357f1c'
+         'SKIP'
          '799cd5f91f5253f4b47ec4fd7fccf4f1'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          '9f8263996836e27f5be1483e86ac2e33'
@@ -46,9 +48,6 @@ prepare() {
 
 	patch -p0 -i ${srcdir}/php.ini.patch
 	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
-	# freetype2 headers moved
-	# see README at http://sourceforge.net/projects/freetype/files/freetype2/2.5.1/
-	sed 's#/include/freetype2/freetype/freetype.h#/include/freetype2/freetype.h#g' -i configure
 }
 
 build() {
diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD
index 1206cb882..3c52f4588 100644
--- a/extra/refind-efi/PKGBUILD
+++ b/extra/refind-efi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 201584 2013-12-16 08:10:23Z tpowa $
+# $Id: PKGBUILD 203414 2014-01-10 13:20:00Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
@@ -17,7 +17,7 @@ _COMPILER="GCC47"
 #######
 
 pkgname="refind-efi"
-pkgver="0.7.6"
+pkgver="0.7.7"
 pkgrel="1"
 pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs"
 url="http://www.rodsbooks.com/refind/index.html"
@@ -40,13 +40,13 @@ for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModul
 	source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}#revision=${_TIANO_SVN_REV_}")
 done
 
-sha1sums=('431423452190c9840335f2dd9af887aded52a787'
-          '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP')
+md5sums=('868b178404446f77729823af3758b409'
+         'a83e45b10d5efbca1c93a63851728712'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP')
 
 [[ "${CARCH}" == "x86_64" ]] && _TIANO_ARCH="X64"
 [[ "${CARCH}" == "i686" ]] && _TIANO_ARCH="IA32"