Tue Jan 21 03:36:05 UTC 2014

9 files changed, 64 insertions, 67 deletions

diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 089ba8f7d..2c3cd9c7f 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 203439 2014-01-10 21:08:52Z heftig $
+# $Id: PKGBUILD 204483 2014-01-20 20:35:39Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
-pkgver=1.16.0
-pkgrel=3
+pkgver=1.16.2
+pkgrel=1
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=('i686' 'x86_64')
 url="http://www.clutter-project.org/"
@@ -12,7 +12,7 @@ depends=('mesa' 'libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'p
 makedepends=('gobject-introspection')
 options=(!emptydirs)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094')
+sha256sums=('65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD
index 31982b9af..fd6be0868 100644
--- a/extra/gnome-chess/PKGBUILD
+++ b/extra/gnome-chess/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 201495 2013-12-12 22:17:22Z heftig $
+# $Id: PKGBUILD 204484 2014-01-20 20:37:38Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-chess
-pkgver=3.10.2
-pkgrel=2
+pkgver=3.10.3
+pkgrel=1
 pkgdesc="Play the classic two-player boardgame of chess"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,7 +18,7 @@ install=gnome-chess.install
 url="https://live.gnome.org/Chess"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3aae8d501fce8ffd30bee6740e61bfbd7c48336f4ca254912f2646c8486324b1')
+sha256sums=('239a373dc318eeb33ecbbe175880d95239aa8500f7b67d554e084ed6ace69324')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-online-miners/PKGBUILD b/extra/gnome-online-miners/PKGBUILD
index 6db473249..e2ef5a1b6 100644
--- a/extra/gnome-online-miners/PKGBUILD
+++ b/extra/gnome-online-miners/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 200220 2013-11-22 18:17:22Z heftig $
+# $Id: PKGBUILD 204482 2014-01-20 20:34:48Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-miners
-pkgver=3.10.2
+pkgver=3.10.3
 pkgrel=1
 pkgdesc="Tracker miners for online accounts"
 arch=(i686 x86_64)
@@ -10,7 +10,7 @@ url="http://www.gnome.org"
 license=(GPL)
 depends=(libgdata gnome-online-accounts grilo libzapojit tracker)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('38c9e60cf56b6d0ec32e972256268d6038d15e32521a91aede1ec168f5e31cd9')
+sha256sums=('129807d398e7744870110e6875629b6858d289021271550569ce5afa10fe9ea8')
  
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 8736b9a0e..eb453ae40 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 199543 2013-11-15 09:39:54Z pierre $
+# $Id: PKGBUILD 204468 2014-01-20 16:04:30Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
-pkgver=1.4.33
-pkgrel=3
+pkgver=1.4.34
+pkgrel=1
 pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -19,37 +19,14 @@ options=('emptydirs')
 install='lighttpd.install'
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
         "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
-        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch"
-        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch.asc"
-        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch"
-        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch.asc"
-        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch"
-        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch.asc"
         'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
-sha256sums=('2886aedc23857ca44df91b8fe6f36059ec82a859ae0eb230220e42abc331610c'
-            'SKIP'
-            '87792bcf62a554ac094263b931a8ae369d975b7e6bf83778f8f0a6c0ff31b979'
-            'SKIP'
-            '1772cae2a0678c93dd5fa54f2622a563c3eb0a0047ba2a6648a5680d50d3bfde'
-            'SKIP'
-            'babf177f2e88a1444550825ce8e8ad1a95dbc78cfaa59c2c3f121ccbb37799d2'
+sha256sums=('3e067bd12a6c953862139f0ee4cb03a0cd8cff9b3ffe393ddc7dc3956431cb72'
             'SKIP'
             '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
             'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f'
             'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
             '503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147')
 
-prepare() {
-	cd $srcdir/$pkgname-$pkgver
-
-	# http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_02.txt
-	patch -p1 -i $srcdir/lighttpd-1.4.33_fix_setuid.patch
-	# http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_03.txt
-	patch -p1 -i $srcdir/lighttpd-1.4.33_fix_fam_use_after_free.patch
-	# http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_01.txt
-	patch -p1 -i $srcdir/lighttpd-1.4.33_fix_ssl_sni.patch
-}
-
 build() {
 	cd $srcdir/$pkgname-$pkgver
 
diff --git a/extra/pycurl/PKGBUILD b/extra/pycurl/PKGBUILD
index 04f2fe87b..3db793090 100644
--- a/extra/pycurl/PKGBUILD
+++ b/extra/pycurl/PKGBUILD
@@ -1,31 +1,51 @@
-# $Id: PKGBUILD 196757 2013-10-17 23:38:31Z eric $
+# $Id: PKGBUILD 204461 2014-01-20 15:09:51Z eric $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
 
 pkgbase=pycurl
-pkgname=('python2-pycurl')
-pkgver=7.19.0.2
+pkgname=('python-pycurl' 'python2-pycurl')
+pkgver=7.19.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pycurl.sourceforge.net/"
-license=('GPL')
-makedepends=('python2' 'curl')
+license=('LGPL' 'MIT')
+makedepends=('python' 'python2' 'curl')
 source=("http://pycurl.sourceforge.net/download/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('518be33976dbc6838e42495ada64b43f')
+sha1sums=('5d8b7a7f869362421061d72f6d234bf805ebebb5')
+
+prepare() {
+  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python3|" {} +
+  sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python-pycurl"/' setup.py
+  cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+  find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python2|" {} +
+  sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python2-pycurl"/' setup.py
+}
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  python3 setup.py build --with-ssl
+  cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+  python2 setup.py build --with-ssl
+}
+
+package_python-pycurl() {
+  pkgdesc="A Python 3.x interface to libcurl"
+  depends=('python' 'curl')
+
+  cd ${pkgbase}-${pkgver}
+  python setup.py install --root="${pkgdir}"
+  install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
 
 package_python2-pycurl() {
   pkgdesc="A Python 2.x interface to libcurl"
   depends=('python2' 'curl')
-  replaces=('pycurl' 'python-pycurl')
-  provides=('pycurl' 'python-pycurl')
-  conflicts=('python-pycurl')
-
-  cd ${pkgbase}-${pkgver}
-  python2 setup.py install --curl-config=/usr/bin/curl-config \
-    --prefix "${pkgdir}"/usr --optimize=1
 
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find "${pkgdir}" -name '*.py')
+  cd python2-${pkgbase}-${pkgver}
+  python2 setup.py install --root="${pkgdir}"
+  install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD
index 3bf81bf20..c114cfea2 100644
--- a/extra/syslog-ng/PKGBUILD
+++ b/extra/syslog-ng/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 201450 2013-12-11 20:06:25Z eric $
+# $Id: PKGBUILD 204459 2014-01-20 13:39:40Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=syslog-ng
-pkgver=3.5.2
+pkgver=3.5.3
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ backup=('etc/syslog-ng/scl.conf'
         'etc/logrotate.d/syslog-ng')
 source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz
         syslog-ng.conf syslog-ng.logrotate)
-sha1sums=('f0c91e14ee1f691cf680daf942d84ed87e5469c0'
-          'b5b0d54ec295c6f8a62f68238c36fe62da01ef6e'
+sha1sums=('7a8070f384e0dba1dfd6622c40bc6e402fa6178f'
+          'cf61571ffde34ecf36be76881fce20944fd3efa4'
           '949128fe3d7f77a7aab99048061f885bc758000c')
 
 prepare() {
diff --git a/extra/syslog-ng/syslog-ng.conf b/extra/syslog-ng/syslog-ng.conf
index bb89a82f3..2b9a325fd 100644
--- a/extra/syslog-ng/syslog-ng.conf
+++ b/extra/syslog-ng/syslog-ng.conf
@@ -1,4 +1,5 @@
 @version: 3.5
+@include "scl.conf"
 #
 # /etc/syslog-ng/syslog-ng.conf
 #
@@ -18,9 +19,8 @@ options {
 };
 
 source src {
-  unix-dgram("/run/systemd/journal/syslog");
+  system();
   internal();
-  file("/proc/kmsg");
 };
 
 destination d_authlog { file("/var/log/auth.log"); };
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD
index 981db5bed..4eee1ce66 100644
--- a/extra/x2goserver/PKGBUILD
+++ b/extra/x2goserver/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204356 2014-01-17 19:43:50Z andyrtr $
+# $Id: PKGBUILD 204466 2014-01-20 15:33:19Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
@@ -7,8 +7,8 @@
 # Contributor: Milan Knížek <knizek@volny.cz>
 
 pkgname=x2goserver
-pkgver=4.0.1.12
-pkgrel=5
+pkgver=4.0.1.13
+pkgrel=1
 pkgdesc="Open source terminal server"
 arch=('i686' 'x86_64')
 url="http://www.x2go.org/"
@@ -61,7 +61,7 @@ options=('emptydirs')
 install=x2goserver.install
 backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2f41accfb7b7d8b8113eb6f2f686e340')
+md5sums=('24181098a9c4d7a5ca2c1416b0cee22d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 6a310c2bf..67602c919 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200773 2013-12-04 20:25:36Z andyrtr $
+# $Id: PKGBUILD 204457 2014-01-20 06:42:42Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=300
+pkgver=301
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('6adc7c7f39ab2a71fd83747049d60358'
+md5sums=('50ba12a4decca06213203bff1b35ef19'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {