Sat May 31 03:30:32 UTC 2014

13 files changed, 84 insertions, 50 deletions

diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index ab4e9d512..aa35e4898 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 211687 2014-04-23 09:33:39Z bisson $
+# $Id: PKGBUILD 213860 2014-05-30 16:22:12Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=audacious
 pkgver=3.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, advanced audio player focused on audio quality'
 url='http://audacious-media-player.org/'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
 depends=('gtk3' 'glib2' 'libguess' 'libsm' 'audacious-plugins'
-         'hicolor-icon-theme' 'desktop-file-utils')
+         'gnome-icon-theme' 'hicolor-icon-theme' 'desktop-file-utils')
 optdepends=('unzip: zipped skins support')
 makedepends=('python2') # for gdbus-codegen
 source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
diff --git a/extra/burp/PKGBUILD b/extra/burp/PKGBUILD
index e85c798fa..8de12d28e 100644
--- a/extra/burp/PKGBUILD
+++ b/extra/burp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 213673 2014-05-28 05:10:10Z dreisner $
+# $Id: PKGBUILD 213839 2014-05-30 04:58:23Z dreisner $
 # Maintainer: Dave Reisner <d@falconindy.com>
 
 pkgname=burp
-pkgver=4
+pkgver=5
 pkgrel=1
 pkgdesc="A simple AUR uploader"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://github.com/falconindy/burp"
 license=('GPL')
 depends=('glibc' 'curl')
 source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
-md5sums=('f1369e5f46f9617654419d1e00a614d8'
+md5sums=('7c529122222b2376ad942a936fa7e0cc'
          'SKIP')
 
 build() {
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 8c20c1541..afac8c53e 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 213693 2014-05-28 14:54:23Z andyrtr $
+# $Id: PKGBUILD 213868 2014-05-30 17:12:12Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.7.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -33,7 +33,7 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
         ppd-poll-with-client-conf.patch)
 md5sums=('d498c3020acda0904ab0c13b6389a1ec'
          'SKIP'
-         'f861b18f4446c43918c8643dcbbd7f6d'
+         '26e9b4e65c0a4d76db5737c9b156fd80'
          '96f82c38f3f540b53f3e5144900acf17'
          '3ba9e3410df1dc3015463d615ef91b3b'
          'cc4101beccb5ed6deb1c92707a575925'
diff --git a/extra/cups/cups.logrotate b/extra/cups/cups.logrotate
index 9c49bbdaf..b4245bc52 100644
--- a/extra/cups/cups.logrotate
+++ b/extra/cups/cups.logrotate
@@ -1,8 +1,4 @@
-/var/log/cups/*log {
+/var/log/cups/*_log {
    missingok
    notifempty
-   delaycompress
-   postrotate
-      /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true
-   endscript
 }
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index fefd14ad0..9857c750d 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 212113 2014-05-07 17:45:06Z andyrtr $
+# $Id: PKGBUILD 213850 2014-05-30 13:32:16Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.3.2
+pkgver=3.3.3
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -13,11 +13,11 @@ install=gnutls.install
 options=('!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
 source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('590851c331b1851c0ed3388879922c06'
+md5sums=('e225247ec82513354a6bdc3be6246377'
          'SKIP')
 
 build() {
-  cd ${pkgname}-* #${pkgver}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
@@ -26,12 +26,12 @@ build() {
 }
 
 check() {
-  cd ${pkgname}-* #${pkgver}
+  cd ${pkgname}-${pkgver}
   make check # || /bin/true
 }
 
 package() {
-  cd ${pkgname}-* #${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
diff --git a/extra/libgadu/PKGBUILD b/extra/libgadu/PKGBUILD
index b6ac3e224..cc426a5c0 100644
--- a/extra/libgadu/PKGBUILD
+++ b/extra/libgadu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 205892 2014-02-13 10:02:12Z andrea $
+# $Id: PKGBUILD 213856 2014-05-30 15:47:45Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=libgadu
-pkgver=1.11.3
+pkgver=1.11.4
 pkgrel=1
 pkgdesc="This library implements the client side of the Gadu-Gadu protocol"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://libgadu.net/"
 license=('LGPL2.1')
 depends=('openssl' 'zlib')
 source=("http://github.com/wojtekka/libgadu/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('63b0870821bdb7077a952183db31db50')
+md5sums=('feef622126e21601798c7e4497890ca3')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD
index fa33dbae2..483ad364a 100644
--- a/extra/libtasn1/PKGBUILD
+++ b/extra/libtasn1/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 200598 2013-11-29 16:35:20Z andyrtr $
+# $Id: PKGBUILD 213848 2014-05-30 13:20:34Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=libtasn1
-pkgver=3.4
+pkgver=3.6
 pkgrel=1
 pkgdesc="The ASN.1 library used in GNUTLS"
 arch=('i686' 'x86_64')
@@ -12,7 +13,7 @@ url="http://www.gnu.org/software/libtasn1/"
 depends=('glibc' 'texinfo')
 install=libtasn1.install
 source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('21ec021c534b0f30b2834ce233c70f15'
+md5sums=('6ed38e161e11013054f2a2bb4c4da449'
          'SKIP')
 
 build() {
diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD
index 478b842e9..8e60be8f1 100644
--- a/extra/libx11/PKGBUILD
+++ b/extra/libx11/PKGBUILD
@@ -1,17 +1,26 @@
-# $Id: PKGBUILD 198269 2013-10-30 13:50:33Z allan $
+# $Id: PKGBUILD 213852 2014-05-30 14:31:43Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libx11
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('libxcb' 'xproto' 'kbproto')
 makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
 license=('custom')
-source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
-sha256sums=('2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16')
+source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
+        fix_typo.diff)
+sha256sums=('2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16'
+            '384a10e57e0d6125ebb7e6eaca046e02f59e8101eaa7ba470e52b5bcc18bedf3')
+
+prepare() {
+  cd "${srcdir}/libX11-${pkgver}"
+  # upstream patch for https://bugs.archlinux.org/task/40537
+  patch -Np1 -i ${srcdir}/fix_typo.diff
+}
 
 build() {
   cd "${srcdir}/libX11-${pkgver}"
diff --git a/extra/libx11/fix_typo.diff b/extra/libx11/fix_typo.diff
new file mode 100644
index 000000000..a55a94074
--- /dev/null
+++ b/extra/libx11/fix_typo.diff
@@ -0,0 +1,27 @@
+From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001
+From: James Cloos <cloos@jhcloos.com>
+Date: Tue, 17 Sep 2013 16:50:42 +0000
+Subject: nls/en_US.UTF-8/Compose.pre: Fix typo.
+
+Fix typo added in 215ce6a67863, s/actute/acute/.
+
+Fixes bug #69476.  Reported by Jean Krohn.
+
+Signed-off-by: James Cloos <cloos@jhcloos.com>
+---
+diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
+index a741332..7314d7f 100644
+--- a/nls/en_US.UTF-8/Compose.pre
++++ b/nls/en_US.UTF-8/Compose.pre
+@@ -743,7 +743,7 @@ XCOMM Part 3
+ <Multi_key> <i> <quotedbl> 		: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+ <Multi_key> <diaeresis> <i> 		: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+ <Multi_key> <i> <diaeresis> 		: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+-<dead_actute> <j>	 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
++<dead_acute> <j>	 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+ <Multi_key> <apostrophe> <j> 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+ <Multi_key> <j> <apostrophe> 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+ <Multi_key> <acute> <j> 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+--
+cgit v0.9.0.2-2-gbebe
+
diff --git a/extra/nginx/PKGBUILD b/extra/nginx/PKGBUILD
index 1f0d5dd47..510958dbb 100644
--- a/extra/nginx/PKGBUILD
+++ b/extra/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211728 2014-04-24 13:43:09Z bpiotrowski $
+# $Id: PKGBUILD 213863 2014-05-30 16:37:11Z 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=1
+pkgrel=4
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64')
 url='http://nginx.org'
@@ -28,7 +28,7 @@ source=($url/download/nginx-$pkgver.tar.gz
         service
         logrotate)
 md5sums=('8efa354f1c3c2ccf434a50d3fbe82340'
-         '5c0cd4fd992596938b2d4fd98b2bac41'
+         '5dd4d09914a4403b9df778ec1d66167c'
          '3441ce77cdd1aab6f0ab7e212698a8a7')
 
 build() {
diff --git a/extra/nginx/service b/extra/nginx/service
index a50eb4000..adfe6c0ab 100644
--- a/extra/nginx/service
+++ b/extra/nginx/service
@@ -1,15 +1,17 @@
 [Unit]
 Description=A high performance web server and a reverse proxy server
-After=syslog.target network.target
+After=network.target
 
 [Service]
 Type=forking
 PIDFile=/run/nginx.pid
-ExecStartPre=/usr/bin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecReload=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload
-ExecStop=/usr/bin/nginx -g 'pid /run/nginx.pid;' -s quit
 PrivateDevices=yes
+SyslogLevel=err
+
+ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; error_log stderr;'
+ExecReload=/usr/bin/kill -HUP $MAINPID
+KillSignal=SIGQUIT
+KillMode=mixed
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index 65cca2d1d..0106e963a 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 208741 2014-03-26 05:24:50Z fyan $
+# $Id: PKGBUILD 213833 2014-05-30 04:23:37Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=swig
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="Generate scripting interfaces to C/C++ code"
 arch=('i686' 'x86_64')
 url="http://www.swig.org/"
 license=('custom')
 depends=('pcre' 'gcc-libs')
-#checkdepends=('ruby' 'python' 'python2' 'java-environment' 'tcl' 'php' 'lua' 'ocaml' 'r' 'go')
+checkdepends=('ruby' 'python2' 'java-environment' 'tcl' 'php' 'lua' 'ocaml' 'r' 'go')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('10a1cc5ba6abbc7282b8146ccc0d8eefe233bfab')
+sha1sums=('68a70cc80a75bc8e08a5d7a9ec22cb6d7b034c2c')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -21,13 +21,10 @@ build() {
   make
 }
 
-# Testcases fail a LOT...
-<<EOF
 check() {
   cd ${pkgname}-${pkgver}
-  make check
+  make check || warning "Tests failed"
 }
-EOF
 
 package() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD
index 292a45cdb..d856d6573 100644
--- a/extra/x11vnc/PKGBUILD
+++ b/extra/x11vnc/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 202637 2013-12-23 05:41:09Z bisson $
+# $Id: PKGBUILD 213872 2014-05-30 21:30:40Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=x11vnc
 pkgver=0.9.13
-pkgrel=5
+pkgrel=6
 pkgdesc='VNC server for real X displays'
 url='http://www.karlrunge.com/x11vnc/'
 arch=('i686' 'x86_64')
 license=('GPL2')
-optdepends=('tk: for GUI support'
-            'net-tools: for -auth guess')
+optdepends=('tk: GUI support'
+            'net-tools: -auth guess'
+            'xf86-video-dummy: Xdummy script')
 depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
 source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'service')
@@ -26,6 +27,7 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
+	install x11vnc/misc/{rx11vnc,Xdummy} "${pkgdir}"/usr/bin
 	install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/x11vnc.service"
 	rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver
 }