Thu Sep 20 01:37:13 PDT 2012

13 files changed, 235 insertions, 29 deletions

diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index fd13bdd73..295d98174 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 161295 2012-06-08 23:50:11Z heftig $
+# $Id: PKGBUILD 166855 2012-09-19 22:46:12Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apache
-pkgver=2.2.22
-pkgrel=4
+pkgver=2.2.23
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -37,10 +37,10 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
         apache.tmpfiles.conf
         httpd.logrotate
         httpd
-        arch.layout
-        pcre_info.patch)
-md5sums=('9fe3093194c8a57f085ff7c3fc43715f'
-         '41b3a6e4948679cab70b9caf490877c4'
+        httpd.service
+        arch.layout)
+md5sums=('ca133de0e4b4b15316990a97186b9993'
+         '3289ae3b16e1a2dc633c811d6569abb6'
          'f1d9d41360908ceb2374da55ae99197a'
          'cdfa04985a0efa850976aef01c2a0c40'
          '0930d2d0612eb0a53a0d00aea7e8687f'
@@ -56,13 +56,12 @@ md5sums=('9fe3093194c8a57f085ff7c3fc43715f'
          '82068753dab92fe86312b1010a2904d7'
          '6382331e9700ed9e8cc78ea51887b537'
          'c7e300a287ef7e2e066ac7639536f87e'
-         '3d659d41276ba3bfcb20c231eb254e0c'
-         'fde5121e32b5aeef5a7eedb5a97009ff')
+         'ed219c8228d4d5ae9b7a55107cf79706'
+         '3d659d41276ba3bfcb20c231eb254e0c')
 
 build() {
 	cd "${srcdir}/httpd-${pkgver}"
 
-	patch -p1 -i "${srcdir}/pcre_info.patch"
 	patch -Np0 -i "${srcdir}/apachectl-confd.patch"
 
 	# set default user
@@ -133,7 +132,7 @@ build() {
 
 	# symlinks for /etc/httpd
 	ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"
-	ln -fs /var/run/httpd "${pkgdir}/etc/httpd/run"
+	ln -fs /run/httpd "${pkgdir}/etc/httpd/run"
 	ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules"
 	ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build"
 
@@ -152,4 +151,8 @@ build() {
 	rm -rf "${pkgdir}/srv/"
 	rm -rf "${pkgdir}/usr/bin"
 	rm -rf "${pkgdir}/var/run"
+
+
+        install -m755 -d "${pkgdir}/usr/lib/systemd/system"
+        install -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/"
 }
diff --git a/extra/apache/httpd.service b/extra/apache/httpd.service
new file mode 100644
index 000000000..bb02b5992
--- /dev/null
+++ b/extra/apache/httpd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Apache Web Server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/run/httpd/httpd.pid
+ExecStart=/usr/sbin/apachectl start
+ExecStop=/usr/sbin/apachectl graceful-stop
+ExecReload=/usr/sbin/apachectl graceful
+PrivateTmp=true
+LimitNOFILE=infinity
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/dbus-c++/PKGBUILD b/extra/dbus-c++/PKGBUILD
new file mode 100644
index 000000000..d79922ec5
--- /dev/null
+++ b/extra/dbus-c++/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Xavier D. <magicrhesus@ouranos.be>
+# Contributor: Zarra <zarraxx@gmail.com>
+
+pkgname=dbus-c++
+_pkgname=lib$pkgname
+pkgver=0.9.0
+pkgrel=4
+pkgdesc="A C++ API for D-BUS"
+url="http://sourceforge.net/projects/dbus-cplusplus/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus>=1.2.0' 'glib2')
+makedepends=('autoconf' 'automake' 'libtool')
+options=('!libtool')
+source=("http://sourceforge.net/projects/dbus-cplusplus/files/dbus-c%2B%2B/$pkgver/libdbus-c%2B%2B-$pkgver.tar.gz"
+	      'gcc47.patch')
+md5sums=('e752116f523fa88ef041e63d3dee4de2'
+         '9319b402b15f37d881b51bc758368900')
+
+build() {
+    cd "$srcdir/$_pkgname-$pkgver"
+
+    patch -Np0 -i "$srcdir/gcc47.patch"
+    export LDFLAGS+=" -lexpat -lpthread" # -lpthread needed for i686
+
+    ./autogen.sh --prefix=/usr \
+                 --disable-static \
+                 --enable-glib \
+                 --disable-ecore
+    make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/dbus-c++/gcc47.patch b/extra/dbus-c++/gcc47.patch
new file mode 100644
index 000000000..6a8277300
--- /dev/null
+++ b/extra/dbus-c++/gcc47.patch
@@ -0,0 +1,10 @@
+--- src/eventloop-integration.cpp.orig	2012-05-09 11:22:09.683290763 +0200
++++ src/eventloop-integration.cpp	2012-05-09 11:22:44.313288912 +0200
+@@ -38,6 +38,7 @@
+ #include <cassert>
+ #include <sys/poll.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ using namespace DBus;
+ using namespace std;
diff --git a/extra/libconfig/PKGBUILD b/extra/libconfig/PKGBUILD
new file mode 100644
index 000000000..fe7ac1e23
--- /dev/null
+++ b/extra/libconfig/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 55397 2011-09-11 21:15:58Z spupykin $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: see .contrib
+
+pkgname=libconfig
+pkgver=1.4.8
+pkgrel=1
+pkgdesc="C/C++ Configuration File Library"
+arch=('i686' 'x86_64')
+url="http://hyperrealm.com/libconfig/libconfig.html"
+license=('LGPL')
+depends=('gcc-libs' 'texinfo')
+install=$pkgname.install
+options=('!libtool' '!emptydirs' 'zipman')
+source=("http://www.hyperrealm.com/libconfig/$pkgname-$pkgver.tar.gz")
+md5sums=('36788da452e9fcfc8efb7661ef5d31ef')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir/usr/share/info/dir"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/libconfig/libconfig.install b/extra/libconfig/libconfig.install
new file mode 100644
index 000000000..c03d5f7fa
--- /dev/null
+++ b/extra/libconfig/libconfig.install
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+filelist=(libconfig.info.gz)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 7f7e29d14..ce20f2421 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165616 2012-08-27 12:03:29Z bisson $
+# $Id: PKGBUILD 166807 2012-09-19 13:11:09Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,14 +7,13 @@
 
 pkgname=mpd
 pkgver=0.17.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
-         'libpulse')
+         'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl')
 makedepends=('doxygen')
 source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
         'tmpfiles.d'
@@ -32,8 +31,9 @@ build() {
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--enable-lastfm \
 		--enable-jack \
+		--enable-lastfm \
+		--enable-soundcloud \
 		--enable-pulse \
 		--disable-sidplay \
 		--with-systemdsystemunitdir=/usr/lib/systemd/system
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index f349fed07..f48b107ab 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166518 2012-09-09 15:40:49Z heftig $
+# $Id: PKGBUILD 166778 2012-09-19 08:12:49Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor: Tor Krill <tor@krill.nu>
@@ -8,7 +8,7 @@
 pkgname=networkmanager
 _pkgname=NetworkManager
 pkgver=0.9.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -26,17 +26,22 @@ options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch)
+        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch
+        nm-polkit-permissive.patch repair-signals.patch)
 sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb')
+            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
+            'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06'
+            'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6')
 
 build() {
   cd $_pkgname-$pkgver
 
   patch -Np1 -i ../disable_set_hostname.patch
   patch -Np1 -i ../dnsmasq-path.patch
+  patch -Np1 -i ../nm-polkit-permissive.patch
+  patch -Np1 -i ../repair-signals.patch # FS#31115
 
   ./configure \
     --prefix=/usr \
@@ -46,7 +51,7 @@ build() {
     --with-crypto=nss \
     --with-distro=arch \
     --with-dhclient=/usr/sbin/dhclient \
-    --with-dhcpcd=/sbin/dhcpcd \
+    --with-dhcpcd=/usr/sbin/dhcpcd \
     --with-iptables=/usr/sbin/iptables \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --with-udev-dir=/usr/lib/udev \
diff --git a/extra/networkmanager/nm-polkit-permissive.patch b/extra/networkmanager/nm-polkit-permissive.patch
new file mode 100644
index 000000000..1ac406224
--- /dev/null
+++ b/extra/networkmanager/nm-polkit-permissive.patch
@@ -0,0 +1,12 @@
+diff -up NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in
+--- NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive	2011-03-24 14:21:35.100912222 -0500
++++ NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in	2011-03-24 14:21:49.916726997 -0500
+@@ -95,7 +95,7 @@
+     <_message>System policy prevents modification of network settings for all users</_message>
+     <defaults>
+       <allow_inactive>no</allow_inactive>
+-      <allow_active>auth_admin_keep</allow_active>
++      <allow_active>yes</allow_active>
+     </defaults>
+   </action>
+ 
diff --git a/extra/networkmanager/repair-signals.patch b/extra/networkmanager/repair-signals.patch
new file mode 100644
index 000000000..cf1319dc5
--- /dev/null
+++ b/extra/networkmanager/repair-signals.patch
@@ -0,0 +1,37 @@
+From 64342a313ef497fca8a4fb7567900d4a1460065f Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Thu, 13 Sep 2012 09:32:53 +0000
+Subject: core: wait until we daemonized before setting up signals (bgo #683932)
+
+If we mask signals before daemonizing, the daemon process will not be
+able to handle them, and thus would be unkillable with anything other
+than SIGKILL.
+---
+diff --git a/src/main.c b/src/main.c
+index 8bc6d3f..5b82cfa 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -401,10 +401,6 @@ main (int argc, char *argv[])
+ 		exit (1);
+ 	}
+ 
+-	/* Set up unix signal handling */
+-	if (!setup_signals ())
+-		exit (1);
+-
+ 	/* Set locale to be able to use environment variables */
+ 	setlocale (LC_ALL, "");
+ 
+@@ -501,6 +497,10 @@ main (int argc, char *argv[])
+ 			wrote_pidfile = TRUE;
+ 	}
+ 
++	/* Set up unix signal handling - before creating threads, but after daemonizing! */
++	if (!setup_signals ())
++		exit (1);
++
+ 	if (g_fatal_warnings) {
+ 		GLogLevelFlags fatal_mask;
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 0193aafa4..009098785 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 165667 2012-08-28 12:51:24Z tpowa $
+# $Id: PKGBUILD 166802 2012-09-19 10:45:08Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.7
+pkgver=3.6.8
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.7
-pkgrel=2
+_realver=3.6.8
+pkgrel=1
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -157,7 +157,7 @@ install='samba.install'
   install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf
   rm -rf ${pkgdir}/var/run
 }
-md5sums=('b23be56c15dd52f64eb7ba54c0ea1ed5'
+md5sums=('fbb245863eeef2fffe172df779a217be'
          'a45a4283723be2b0ae32439dc4496a09'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index 0d702e470..f1d525b93 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165089 2012-08-10 08:30:57Z allan $
+# $Id: PKGBUILD 166800 2012-09-19 10:37:35Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=valgrind
-pkgver=3.8.0
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('glibc>=2.16' 'glibc<2.17' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ec04dfd1256307432b2a7b520398c526')
+md5sums=('288758010b271119a0ffc0183f1d6e38')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/yajl/PKGBUILD b/extra/yajl/PKGBUILD
new file mode 100644
index 000000000..8cd912127
--- /dev/null
+++ b/extra/yajl/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Dave Reisner <d@falconindy.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
+
+pkgname=yajl
+pkgver=2.0.4
+pkgrel=1
+pkgdesc='Yet Another JSON Library.'
+arch=('i686' 'x86_64')
+url='http://lloyd.github.com/yajl/'
+license=('ISC')
+makedepends=('cmake')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/lloyd/$pkgname/tarball/$pkgver")
+md5sums=('ee6208e697c43dcccf798ce80d370379')
+
+build() {
+  dirname=$(tar tf "$srcdir/$pkgname-$pkgver.tar.gz" | sed 1q);
+  cd "$dirname"
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+
+  make
+}
+
+package() {
+  dirname=$(tar tf "$srcdir/$pkgname-$pkgver.tar.gz" | sed 1q);
+  cd "$dirname"
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}