Fri Jan 18 00:06:07 PST 2013

9 files changed, 66 insertions, 28 deletions

diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index f4e43d2b5..5ce3a4d12 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170783 2012-11-11 10:23:15Z andyrtr $
+# $Id: PKGBUILD 175502 2013-01-17 14:41:27Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.40
+pkgver=2.4.41
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
@@ -14,15 +14,20 @@ options=('!libtool')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
         no-pthread-stubs.patch
-        COPYING)
-sha256sums=('48c14e4600ea0fde522292893eb4055d2f6d86a69d093d379c827deaccffaa1f'
+        COPYING
+        buildfix.diff)
+sha256sums=('52b3ca670df43fc9f5164f0f55fa40b008de297c0ceedab7c77c30bf9022f212'
             '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded'
-            '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
+            '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93'
+            '9b293bbe682381b6822b5abfb1b1ce713185bcefde255d300367b26f47102ddc')
 
 build() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../no-pthread-stubs.patch
 
+  # man/Makefile,in is missing
+  patch -Np1 -i ${srcdir}/buildfix.diff
+
   #libtoolize --force
   autoreconf --force --install
   ./configure --prefix=/usr \
diff --git a/extra/libdrm/buildfix.diff b/extra/libdrm/buildfix.diff
new file mode 100644
index 000000000..879fbf1b8
--- /dev/null
+++ b/extra/libdrm/buildfix.diff
@@ -0,0 +1,11 @@
+diff --git a/configure.ac b/configure.ac
+index 10cc9a4..1776610 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -348,7 +348,6 @@ AC_CONFIG_FILES([
+ 	tests/vbltest/Makefile
+ 	include/Makefile
+ 	include/drm/Makefile
+-	man/Makefile
+ 	libdrm.pc])
+ AC_OUTPUT
diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD
index 045880e34..70071774d 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158868 2012-05-12 16:25:29Z andyrtr $
+# $Id: PKGBUILD 175509 2013-01-17 15:47:55Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxi
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="X11 Input extension library"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'xorg-util-macros')
 options=(!libtool)
 license=('custom')
 source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
-sha1sums=('4b53b41fdaa3acc86606c696c68d5eed11454612')
+sha256sums=('3250fd34cdd099a15b78abdb87c7e1a9b7a2188ab893f273e90d831dbc604058')
 
 build() {
   cd "${srcdir}/libXi-${pkgver}"
diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD
index 2e9f8c08e..3b3057c7b 100644
--- a/extra/nettle/PKGBUILD
+++ b/extra/nettle/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163476 2012-07-12 19:05:48Z andyrtr $
+# $Id: PKGBUILD 175512 2013-01-17 18:26:40Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=nettle
-pkgver=2.5
+pkgver=2.6
 pkgrel=1
 pkgdesc="A low-level cryptographic library"
 arch=('i686' 'x86_64')
@@ -12,13 +12,12 @@ license=('GPL2')
 install=$pkgname.install
 depends=('gmp')
 source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz)
-md5sums=('d66882e6ad31a9f651b73d7a1a93bd4c')
+md5sums=('02f76b668855c4da67186c04cd3a222f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --libdir=/usr/lib \
-	--enable-shared \
-	--disable-static # <-- seems not working now
+	--enable-shared
   make
 }
 
@@ -31,6 +30,6 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
   
-  # remove static libs
+  # remove static libs 	#--disable-static - build would break (since nettle 2.6) - and had no effect before
   rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a
 }
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index d86e739e0..71c124d1e 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173841 2012-12-25 00:34:23Z foutrelis $
+# $Id: PKGBUILD 175505 2013-01-17 15:01:31Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase='ocaml'
 pkgname=('ocaml' 'ocaml-compiler-libs')
 pkgver=4.00.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A functional language with OO extensions"
 arch=('i686' 'x86_64')
 license=('LGPL2' 'custom: QPL-1.0')
@@ -12,7 +12,8 @@ url="http://caml.inria.fr/"
 depends=('gdbm')
 makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
-source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz)
+source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz
+        tk8.6-build.patch)
 options=('!makeflags' '!emptydirs')
 
 build() {
@@ -23,6 +24,8 @@ build() {
 
 package_ocaml() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
+  # fix https://bugs.archlinux.org/task/33302
+  patch -Np2 -i ../tk8.6-build.patch
   make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install
    
   # Save >10MB with this one, makepkg only strips debug symbols.
@@ -55,3 +58,5 @@ optdepends=()
   install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
 md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7')
+md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7'
+         '67b0a8a8885fc1221181b171541cb1b0')
diff --git a/extra/ocaml/tk8.6-build.patch b/extra/ocaml/tk8.6-build.patch
new file mode 100644
index 000000000..439a930f0
--- /dev/null
+++ b/extra/ocaml/tk8.6-build.patch
@@ -0,0 +1,20 @@
+--- src/ocaml-4.00.1/configure	2012-06-26 08:33:50.000000000 -0700
++++ p/src/ocaml-4.00.1/configure	2013-01-05 17:06:54.877900143 -0800
+@@ -804,6 +804,9 @@
+ echo "ARCMD=ar" >> Makefile
+ 
+ 
++bytecccompopts="$bytecccompopts -DUSE_INTERP_RESULT"
++nativecccompopts="$nativecccompopts -DUSE_INTERP_RESULT"
++
+ # Do #! scripts work?
+ 
+ if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then
+@@ -1450,6 +1453,7 @@
+   if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then
+     echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"."
+     case $tcl_version in
++    8.6) tclmaj=8 tclmin=6 tkmaj=8 tkmin=6 ;;
+     8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;;
+     8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
+     8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 225f66fd3..079af06d2 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173514 2012-12-20 05:52:50Z pierre $
+# $Id: PKGBUILD 175519 2013-01-17 21:13:35Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.4.10
+pkgver=5.4.11
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -31,14 +31,13 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
              'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
              'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
-        'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
+        'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('cb716b657a30570b9b468b9e7bc551a1'
+md5sums=('9975e68c22b86b013b934743ad2d2276'
          '0b0bc7a917fc592bdf11dcd3c5c255e9'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         '3cfde0cc4ed09b55f1ce531437a4eb88'
          '5c1f4c967b66ce3eaf819b46951dcbf5'
-         'f56b5bb7e93c802ae8519182fbea3387'
+         'e036c721e5ad927cd1613c7475a58b3a'
          'f8b206cb8fecb05cb1ded8bee45633ff'
          'c60343df74f8e1afb13b084d5c0e47ed')
 
@@ -240,7 +239,6 @@ package_php-fpm() {
 	install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm
 	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8
 	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf
-	install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm
 	install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm
 	install -d -m755 ${pkgdir}/etc/php/fpm.d
 	install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf
diff --git a/extra/php/logrotate.d.php-fpm b/extra/php/logrotate.d.php-fpm
index ac2d92a36..1895c5b97 100644
--- a/extra/php/logrotate.d.php-fpm
+++ b/extra/php/logrotate.d.php-fpm
@@ -3,6 +3,6 @@
 	notifempty
 	delaycompress
 	postrotate
-		kill -USR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true
+		systemctl reload php-fpm.service || true
 	endscript
 }
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index f20b720e3..5f86e44fb 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173952 2012-12-29 16:02:27Z andyrtr $
+# $Id: PKGBUILD 175503 2013-01-17 14:41:29Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.20.17
+pkgver=2.20.18
 pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('0bf5e9bd82b2643e06503665545f5cc8c3e24ab48ca4fe84f4e9e7ebbb9e7dbc')
+sha256sums=('f3daedf9571b04234053507940ba0a221abfcd294c3c350ff49eaf499b8437b5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"