Mon May 13 01:16:27 PDT 2013

author: root <root@rshg054.dnsready.net> 2013-05-13 01:16:28 -0700
committer: root <root@rshg054.dnsready.net> 2013-05-13 01:16:28 -0700
commit: 66cb4a487ad73063c6b000279a5d5558fb7603f5 (patch)
tree: ee73bbc414ba8aec6b9a578578ceaabd38fff01e
parent: 5b9e0d821dd428792bd51ed03af2b800924ce69d (diff)
145 files changed, 858 insertions, 1595 deletions
diff --git a/community/aiccu/01-fix-makefile.patch b/community/aiccu/01-fix-makefile.patch
new file mode 100644
index 000000000..211df7a6a
--- /dev/null
+++ b/community/aiccu/01-fix-makefile.patch
@@ -0,0 +1,39 @@
+--- a/Makefile	2007-01-11 01:29:33.000000000 +0100
++++ b/Makefile	2013-05-12 23:38:17.171000000 +0200
+@@ -17,9 +17,9 @@
+ PROJECT_VERSION=$(shell grep "AICCU_VER" common/aiccu.h | head -n 1 | awk '{print $$3}' | tr -d \")
+ 
+ # Misc bins
+-RM=@rm -f
+-MAKE:=@${MAKE}
+-CP=@echo [Copy]; cp
++RM=rm -f
++MAKE:=${MAKE}
++CP=cp
+ RPMBUILD=@echo [RPMBUILD]; rpmbuild
+ RPMBUILD_SILENCE=>/dev/null 2>/dev/null
+ 
+@@ -78,21 +78,11 @@
+ 	@mkdir -p ${DESTDIR}${dirdoc}
+ 	@echo "Configuration..."
+ 	@mkdir -p ${DESTDIR}${diretc}
+-ifeq ($(shell echo "A${RPM_BUILD_ROOT}"),A)
+-	$(shell [ -f ${DESTDIR}${diretc}${PROJECT}.conf ] || cp -R doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf)
++	@cp -R doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf
+ 	@echo "Documentation..."
+ 	@cp doc/README ${DESTDIR}${dirdoc}
+-	@cp doc/LICENSE ${DESTDIR}${dirdoc}
++	@cp doc/changelog ${DESTDIR}${dirdoc}
+ 	@cp doc/HOWTO  ${DESTDIR}${dirdoc}
+-	@echo "Installing Debian-style init.d"
+-	@mkdir -p ${DESTDIR}${diretc}init.d
+-	@cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT}
+-else
+-	@echo "Installing Redhat-style init.d"
+-	@mkdir -p ${DESTDIR}${diretc}init.d
+-	@cp doc/${PROJECT}.init.rpm ${DESTDIR}${diretc}init.d/${PROJECT}
+-	@cp doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf
+-endif
+ 	@echo "Installation into ${DESTDIR}/ completed"
+ 
+ help:
diff --git a/community/aiccu/01-no-init-script.patch b/community/aiccu/01-no-init-script.patch
deleted file mode 100644
index 930d5d21a..000000000
--- a/community/aiccu/01-no-init-script.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: aiccu-20070115/Makefile
-===================================================================
---- aiccu-20070115.orig/Makefile	2009-10-25 22:25:45.000000000 +0100
-+++ aiccu-20070115/Makefile	2009-10-25 22:25:58.000000000 +0100
-@@ -84,9 +84,9 @@
- 	@cp doc/README ${DESTDIR}${dirdoc}
- 	@cp doc/LICENSE ${DESTDIR}${dirdoc}
- 	@cp doc/HOWTO  ${DESTDIR}${dirdoc}
--	@echo "Installing Debian-style init.d"
--	@mkdir -p ${DESTDIR}${diretc}init.d
--	@cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT}
-+#	@echo "Installing Debian-style init.d"
-+#	@mkdir -p ${DESTDIR}${diretc}init.d
-+#	@cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT}
- else
- 	@echo "Installing Redhat-style init.d"
- 	@mkdir -p ${DESTDIR}${diretc}init.d
diff --git a/community/aiccu/PKGBUILD b/community/aiccu/PKGBUILD
index 118210c38..801c28866 100644
--- a/community/aiccu/PKGBUILD
+++ b/community/aiccu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84114 2013-02-10 18:32:51Z seblu $
+# $Id: PKGBUILD 90477 2013-05-12 21:46:51Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=aiccu
 pkgver=20070115
-pkgrel=2
+pkgrel=3
 pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility'
 arch=('i686' 'x86_64')
 url='http://www.sixxs.net/tools/aiccu/'
@@ -12,40 +12,40 @@ depends=('gnutls' 'iproute2')
 backup=('etc/aiccu.conf')
 source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz"
         'aiccu.service'
-        '01-no-init-script.patch'
+        '01-fix-makefile.patch'
         '02-allow-tunnels.patch'
         '03-no-quiet-gcc.patch'
         '04-skip-strip.patch'
         '05-spelling-error.patch'
         '06-setup-script.patch')
 md5sums=('c9bcc83644ed788e22a7c3f3d4021350'
-         'e038c9d7882e6e603d87962bac7a0f2a'
-         '6de05338752bfb01772dee37b1dc0454'
+         '891b0fa527c1b847ce803dac047cf80d'
+         '7c7c563ecc6d3fa64a7766de28ba1927'
          'b9b2c0e7186f3f96366caaa39252dccc'
          'b38db1d95760cd9687330b7db5f4ea1d'
          '6dfa2df27bb4859c7511bfea91337925'
          '21a37c376ebfcf787c0e7ee8552053ac'
          '98e73756609f4e09c45c4e5139fd5aed')
 
-build() {
+prepare() {
   cd $pkgname
   for _p in "$srcdir"/*.patch; do
     patch -p1 -i "$_p"
   done
+}
+
+build() {
+  cd $pkgname
   [[ $LDFLAGS ]] && LDFLAGS="$LDFLAGS,--no-as-needed"
   make
 }
 
 package() {
   cd $pkgname
-  make DESTDIR="$pkgdir" install
-  # default config
-  install -Dm640 doc/aiccu.conf "$pkgdir/etc/aiccu.conf"
+  make DESTDIR="$pkgdir" dirsbin="/usr/bin/" install
   # license
   install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  # doc
-  install -dm755 "$pkgdir/usr/share/doc/$pkgname"
-  install -m644 doc/{README,HOWTO,changelog} "$pkgdir/usr/share/doc/$pkgname/"
+  # man
   install -Dm644 doc/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1"
   # systemd
   install -Dm644 "$srcdir/aiccu.service" "$pkgdir/usr/lib/systemd/system/aiccu.service"
diff --git a/community/aiccu/aiccu.service b/community/aiccu/aiccu.service
index 7371b2849..23f562ea0 100644
--- a/community/aiccu/aiccu.service
+++ b/community/aiccu/aiccu.service
@@ -5,8 +5,8 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/var/run/aiccu.pid
-ExecStart=/usr/sbin/aiccu start
-ExecStop=/usr/sbin/aiccu stop
+ExecStart=/usr/bin/aiccu start
+ExecStop=/usr/bin/aiccu stop
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/at/PKGBUILD b/community/at/PKGBUILD
index 43bdaf5af..da3a905ac 100644
--- a/community/at/PKGBUILD
+++ b/community/at/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88443 2013-04-17 18:45:36Z eric $
+# $Id: PKGBUILD 90448 2013-05-12 14:38:17Z eric $
 # Maintainer: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Todd Musall <tmusall@comcast.net>
 
 pkgname=at
 pkgver=3.1.13
-pkgrel=2
+pkgrel=3
 pkgdesc="AT and batch delayed command scheduling utility and daemon"
 arch=('i686' 'x86_64')
 url="http://packages.qa.debian.org/a/at.html"
@@ -14,23 +14,20 @@ makedepends=('ssmtp')
 backup=('etc/at.deny')
 options=('!makeflags')
 source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz
-        atd atd.service)
+        atd.service)
 md5sums=('1da61af6c29e323abaaf13ee1a8dad79'
-         '35574e34829e7df07a3269d4ab646a29'
-         '33976a813f4fe7f5659354601044c6f8')
+         '58856a1081e101ed6f0f02f9a20ada4e')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man  \
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin \
               --with-jobdir=/var/spool/atd \
               --with-atspool=/var/spool/atd
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make IROOT="${pkgdir}" docdir=/usr/share/doc install
-  install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd"
   install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service"
 }
diff --git a/community/at/atd b/community/at/atd
deleted file mode 100644
index d10a46a3b..000000000
--- a/community/at/atd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/atd`
-case "$1" in
-  start)
-    stat_busy "Starting ATD Daemon"
-    [ -z "$PID" ] && /usr/sbin/atd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon atd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ATD Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon atd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/at/atd.service b/community/at/atd.service
index ba359878c..df754956a 100644
--- a/community/at/atd.service
+++ b/community/at/atd.service
@@ -3,7 +3,7 @@ Description=ATD daemon
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/atd
+ExecStart=/usr/bin/atd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
index b2160ddb0..e6de95ded 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 88732 2013-04-22 07:51:09Z mtorromeo $
+# $Id: PKGBUILD 90472 2013-05-12 21:18:29Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Connor Behan <connor.behan@gmail.com>
 # Contributor: henning mueller <henning@orgizm.net>
 
 pkgname=audit
 pkgver=2.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
 url=http://people.redhat.com/sgrubb/$pkgname
 arch=(i686 x86_64)
@@ -27,7 +27,6 @@ backup=(
 )
 source=(
 	$url/$pkgname-$pkgver.tar.gz
-	auditd.rc
 	auditd.service
 	python2.patch
 )
@@ -37,6 +36,7 @@ build() {
 	patch -p0 -i "$srcdir/python2.patch"
 	./configure \
 		--prefix=/usr \
+		--sbindir=/usr/bin \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/audit \
 		--with-python=yes \
@@ -52,14 +52,12 @@ package() {
 	install -Dm755 "$srcdir/auditd.service" "$pkgdir/usr/lib/systemd/system/auditd.service"
 
 	cd "$pkgdir"
-	install -m755 "$srcdir/auditd.rc" etc/rc.d/auditd
 	install -d var/log/audit
 	rm -rf etc/rc.d/init.d etc/sysconfig
 
-	sed -ri 's| /sbin| /usr/sbin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf
+	sed -ri 's| /sbin| /usr/bin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf
 }
 
 sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02'
-            '1e374ff164667b6a11f84c825a39996b449dc712d573996907cd47f063bf0dd5'
-            '3c7179f40216b594675f26bb73884406c8ac91577b609dd1ab9837f889954007'
+            '83ebda69bbc2d4058d7baddbf91ab8a2aafd70e64ceb2137d9c9335f8d8d4b83'
             '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4')
diff --git a/community/audit/auditd.rc b/community/audit/auditd.rc
deleted file mode 100644
index 13976341c..000000000
--- a/community/audit/auditd.rc
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID auditd`
-
-case "$1" in
-	start)
-		stat_busy "Starting auditd"
-		[ -z "$PID" ] && {
-			/usr/sbin/auditctl -R /etc/audit/audit.rules >/dev/null || stat_die
-			/usr/sbin/auditd || stat_die
-		}
-		add_daemon auditd
-		stat_done
-		;;
-
-	stop)
-		stat_busy "Stopping auditd"
-		[ ! -z "$PID" ] && kill $PID &> /dev/null
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm_daemon auditd
-			stat_done
-		fi
-		;;
-
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-
-	reload)
-		stat_busy "Reloading auditd"
-		[ ! -z "$PID" ] && kill -HUP $PID &> /dev/null
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm_daemon auditd
-			stat_done
-		fi
-		;;
-
-	*)
-		echo "usage: $0 {start|stop|restart|reload}"
-esac
-
-exit 0
diff --git a/community/audit/auditd.service b/community/audit/auditd.service
index 208b5c38e..959dcc112 100644
--- a/community/audit/auditd.service
+++ b/community/audit/auditd.service
@@ -3,8 +3,8 @@ Description=Security Auditing Service
 After=syslog.target
 
 [Service]
-ExecStart=/usr/sbin/auditd -n
-ExecStartPost=/usr/sbin/auditctl -R /etc/audit/audit.rules
+ExecStart=/usr/bin/auditd -n
+ExecStartPost=/usr/bin/auditctl -R /etc/audit/audit.rules
 
 [Install]
 WantedBy=multi-user.target
 \ No newline at end of file
diff --git a/community/bind/remove-tools.patch b/community/bind/01-remove-tools.patch
index 29b4c9c5f..29b4c9c5f 100644
--- a/community/bind/remove-tools.patch
+++ b/community/bind/01-remove-tools.patch
diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD
index 4cff0b633..72136f2ba 100644
--- a/community/bind/PKGBUILD
+++ b/community/bind/PKGBUILD
@@ -1,85 +1,82 @@
-# $Id: PKGBUILD 89171 2013-04-27 13:07:51Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# $Id: PKGBUILD 90480 2013-05-12 21:56:44Z seblu $
+# Maintainer: Sébastien Luttringer
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
 
 pkgname=bind
 _pkgver=9.9.2-P2
 pkgver=${_pkgver//-/.}
-pkgrel=1
-pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
+pkgrel=3
+pkgdesc='The ISC BIND nameserver'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
 arch=('i686' 'x86_64')
 options=('!makeflags' '!libtool')
 depends=('openssl' 'krb5' 'libxml2')
+provides=('dns-server')
+backup=('etc/logrotate.d/named'
+        'etc/named.conf')
+install=$pkgname.install
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'root.hint::http://www.internic.net/zones/named.root'
-        'remove-tools.patch'
         'tmpfiles.d'
-        'named'
         'named.conf'
-        'named.conf.d'
         'named.service'
         'named.logrotate'
         'localhost.zone'
-        '127.0.0.zone')
+        '127.0.0.zone'
+        '01-remove-tools.patch')
 sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d'
           '029f89c49550c40ec7a95116b6a33f0e5a041094'
-          '14264affa71bcfe7703d0fb7c3556c4c47efaa8b'
           'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
-          '47f9ac4f6f70bc9167c1cf7859a298531197ad20'
           'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
-          '7848edbfb9a848843f57c11c02b0289eefd42d00'
-          '7de92fff4b90c4821b3b133a05affd186fb93951'
+          'cb2e81b4cbf9efafb3e81e3752f0154e779cc7ec'
           '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b'
           '76a0d4cd1b913db177a5a375bebc47e5956866ec'
-          '53be0f1437ebe595240d8dbdd819939582b97fb9')
-provides=('dns-server')
+          '53be0f1437ebe595240d8dbdd819939582b97fb9'
+          '14264affa71bcfe7703d0fb7c3556c4c47efaa8b')
 
-install=install
-backup=('etc/logrotate.d/named'
-        'etc/conf.d/named'
-        'etc/named.conf')
+prepare() {
+  patch -p1 -d bind-$_pkgver < 01-remove-tools.patch
+}
 
 build() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	patch -p1 -i ../remove-tools.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-linux-caps \
-		--with-openssl \
-		--with-libxml2 \
-		--with-libtool \
-
-	make
+  cd bind-$_pkgver
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-linux-caps \
+    --with-openssl \
+    --with-libxml2 \
+    --with-libtool
+  make
 }
 
 package() {
-	cd "${srcdir}/bind-${_pkgver}"
+  cd "bind-$_pkgver"
 
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-	make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
-	rmdir "${pkgdir}/var/run"
-	install -d "${pkgdir}"/usr/share/doc/bind
-	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind
+  rmdir "$pkgdir/var/run"
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  install doc/arm/*.html "$pkgdir/usr/share/doc/$pkgname"
 
-	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
-	install -D -m644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/named.conf
-	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
-	install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service
-	install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
-	install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
+  cd "$srcdir"
+  install -D -m644 tmpfiles.d "$pkgdir/usr/lib/tmpfiles.d/named.conf"
+  install -D -m644 named.service "$pkgdir/usr/lib/systemd/system/named.service"
+  install -D -m600 named.logrotate "$pkgdir/etc/logrotate.d/named"
+  install -D -m640 -o 0 -g 40 named.conf "$pkgdir/etc/named.conf"
 
-	install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named
+  install -d -m750 -o 0 -g 40 "$pkgdir/var/named"
+  install    -m640 -o 0 -g 40 root.hint "$pkgdir/var/named"
+  install    -m640 -o 0 -g 40 127.0.0.zone "$pkgdir/var/named"
+  install    -m640 -o 0 -g 40 localhost.zone "$pkgdir/var/named"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/bind/bind.install b/community/bind/bind.install
new file mode 100644
index 000000000..170042111
--- /dev/null
+++ b/community/bind/bind.install
@@ -0,0 +1,23 @@
+post_install() {
+  getent group named &>/dev/null || groupadd -g 40 named
+  getent passwd named &>/dev/null || useradd -u 40 -c 'BIND DNS Server' -g named -d /var/named -s /bin/false named
+  passwd -l named &>/dev/null
+
+  touch var/log/named.log
+  chown named:named var/log/named.log
+
+  # create an rndc.key if it doesn't already exist
+  if [[ ! -s etc/rndc.key ]]; then
+    rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
+    chown root:named etc/rndc.key
+    chmod 640 etc/rndc.key
+  fi
+}
+
+pre_remove() {
+  getent passwd named &>/dev/null && userdel named >/dev/null
+  getent group named &>/dev/null && groupdel named >/dev/null
+  return 0
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/bind/install b/community/bind/install
deleted file mode 100644
index 287d0e05b..000000000
--- a/community/bind/install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-	getent group named &>/dev/null || groupadd -g 40 named
-	getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
-	passwd -l named &>/dev/null
-
-	touch var/log/named.log
-	chown named:named var/log/named.log
-
-	# create an rndc.key if it doesn't already exist
-	if [[ ! -s etc/rndc.key ]]; then
-		usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
-		chown root:named etc/rndc.key
-		chmod 640 etc/rndc.key
-	fi
-}
-
-pre_remove() {
-	getent passwd named &>/dev/null && userdel named >/dev/null
-	getent group named &>/dev/null && groupdel named >/dev/null
-	return 0
-}
diff --git a/community/bind/named b/community/bind/named
deleted file mode 100755
index 65dd0fe82..000000000
--- a/community/bind/named
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/named
-
-PIDFILE=/run/named/named.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
-
-case "$1" in
-  start)
-    stat_busy "Starting BIND"
-    [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon named
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping BIND"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon named
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  reload)
-    stat_busy "Reloading BIND"
-    [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart}"
-esac
-exit 0
diff --git a/community/bind/named.conf.d b/community/bind/named.conf.d
deleted file mode 100644
index aecbd2307..000000000
--- a/community/bind/named.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to BIND
-#
-NAMED_ARGS="-u named"
diff --git a/community/bind/named.service b/community/bind/named.service
index c21f13f4b..1a7832edc 100644
--- a/community/bind/named.service
+++ b/community/bind/named.service
@@ -3,9 +3,9 @@ Description=Internet domain name server
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/named -f -u named
-ExecReload=/usr/sbin/rndc reload
-ExecStop=/usr/sbin/rndc stop
+ExecStart=/usr/bin/named -f -u named
+ExecReload=/usr/bin/rndc reload
+ExecStop=/usr/bin/rndc stop
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD
index 42af8ff73..defb3c128 100644
--- a/community/chrony/PKGBUILD
+++ b/community/chrony/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 85509 2013-03-02 08:05:25Z thestinger $
-# Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Maintainer:  Daniel Micay <danielmicay@gmail.com>
+# $Id: PKGBUILD 90367 2013-05-12 04:56:34Z thestinger $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
 # Contributor: cdhotfire <cdhotfire@gmail.com>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
@@ -9,7 +9,7 @@
 
 pkgname=chrony
 pkgver=1.27
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight NTP client and server'
 arch=('i686' 'x86_64')
 url="http://chrony.tuxfamily.org/"
@@ -20,25 +20,28 @@ backup=('etc/chrony.conf')
 source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz
         service)
 sha256sums=('d44835ee2180a9a0f4f320fc498c39d59dec33d35c2aa05b446fe65a2a83ae9d'
-            'b4f68b335820b6a8429591750da294e5a9fafc1e8f6af8d865f6604516ecb306')
+            'bef4305fa7e5828e1a1fd43aa8e631f22f21902f6cdc2d3b5b41a57bd9a175dc')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 
-  install -Dm0644 $srcdir/$pkgname-$pkgver/examples/chrony.conf.example $pkgdir/etc/chrony.conf
+  install -Dm0644 "$srcdir/$pkgname-$pkgver/examples/chrony.conf.example" "$pkgdir/etc/chrony.conf"
 
   # Arch's kernel has enhanced RTC support, make chrony use it by default
-  sed -ie '/^! \(rtconutc\|rtcfile \/etc\/chrony.rtc\)$/ s/^! //' \
+  sed -i '/^! \(rtconutc\|rtcfile \/etc\/chrony.rtc\)$/ s/^! //' \
     "$pkgdir/etc/chrony.conf"
 
-  install -Dm644  $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service
+  mv "$pkgdir/usr/sbin/chronyd" "$pkgdir/usr/bin"
+  rmdir "$pkgdir/usr/sbin"
+
+  install -Dm644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/chrony.service"
 
   install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d"
   echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list"
diff --git a/community/chrony/service b/community/chrony/service
index b04196f77..3a012ffac 100644
--- a/community/chrony/service
+++ b/community/chrony/service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/chronyd
+ExecStart=/usr/bin/chronyd
 PIDFile=/var/run/chronyd.pid
 
 [Install]
diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD
index d545e739c..a35e27aee 100644
--- a/community/connman/PKGBUILD
+++ b/community/connman/PKGBUILD
@@ -1,10 +1,10 @@
-#$Id: PKGBUILD 88577 2013-04-20 14:52:33Z dwallace $
+#$Id: PKGBUILD 90387 2013-05-12 06:30:53Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com>
 
 pkgname=connman
-pkgver=1.13
-pkgrel=1
+pkgver=1.14
+pkgrel=2
 pkgdesc="Wireless LAN network manager"
 url="http://connman.net/"
 arch=('i686' 'x86_64')
@@ -17,15 +17,20 @@ makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn')
 options=('!libtool')
 source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'allow_group_network.diff')
-md5sums=('12c0d5a52ad3749afac260ebc7151d16'
+md5sums=('d8c98071ca244d2e66ae49becfcd0634'
          'a8d22ee089fb0ed725130d16ad393047')
 
-build() {
+prepare(){
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   patch -Np1 -i "${srcdir}/allow_group_network.diff"
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+	  --bindir=/usr/bin \
+	  --sbindir=/usr/bin \
       --with-systemdunitdir=/usr/lib/systemd/system \
       --enable-threads \
       --enable-openconnect \
@@ -39,5 +44,6 @@ build() {
 
 package(){
   make -C "${srcdir}/${pkgname}-${pkgver}" DESTDIR="${pkgdir}" install
-  install -Dm755 "$srcdir/$pkgname-$pkgver/client/${pkgname}ctl" "$pkgdir/usr/sbin/${pkgname}ctl"
+  install -Dm755 "$srcdir/$pkgname-$pkgver/client/${pkgname}ctl" "$pkgdir/usr/bin/${pkgname}ctl"
+  find "$pkgdir/usr" -name \*.service -exec sed -i 's/s\(bin\)/\1/' {} +
 }
diff --git a/community/e4rat/PKGBUILD b/community/e4rat/PKGBUILD
deleted file mode 100644
index 3bc3a883b..000000000
--- a/community/e4rat/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 70306 2012-05-04 08:21:46Z mtorromeo $
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-# Contributor: graysky <graysky AT archlinux DOT us>
-
-pkgname=e4rat
-pkgver=0.2.3
-pkgrel=1
-pkgdesc="Toolset to accelerate the boot process and application startups for systems with ext4 root partitions."
-arch=('i686' 'x86_64')
-url="http://e4rat.sourceforge.net/"
-license=('GPL')
-depends=('e2fsprogs')
-makedepends=('audit' 'boost' 'cmake')
-options=(!strip)
-backup=(etc/e4rat.conf)
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  unset LDFLAGS
-  cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_CORE_LIBRARY_STATIC=true .
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-  install -dm755 "$pkgdir/var/lib/$pkgname"
-}
-
-md5sums=('e8e7db69018036f11d509b65c32d3ea4')
-sha256sums=('f6feda9618eff0f9442baf771b4776b634e5a2f39e678c10e4c7946b2c6a96a0')
diff --git a/community/e4rat/e4rat-static_core.patch b/community/e4rat/e4rat-static_core.patch
deleted file mode 100644
index f9aac8208..000000000
--- a/community/e4rat/e4rat-static_core.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/CMakeLists.txt.orig	2012-04-16 13:52:10.993586393 +0200
-+++ src/CMakeLists.txt	2012-04-16 13:52:22.503586159 +0200
-@@ -5,11 +5,7 @@
-   MESSAGE(FATAL_ERROR "Do not run cmake on subdirectories")
- ENDIF()
-
--if(CMAKE_SIZEOF_VOID_P MATCHES 4)
--    SET(BUILD_CORE_LIBRARY_STATIC 0)
--else(CMAKE_SIZEOF_VOID_P MATCHES 4)
--    SET(BUILD_CORE_LIBRARY_STATIC 1)
--endif(CMAKE_SIZEOF_VOID_P MATCHES 4)
-+SET(BUILD_CORE_LIBRARY_STATIC 1)
-
- #TODO permit link dependencies not static
- #set(LINK_DEPENDENIES "static")
diff --git a/community/ebtables/PKGBUILD b/community/ebtables/PKGBUILD
index 1430af343..4bc2b44ba 100644
--- a/community/ebtables/PKGBUILD
+++ b/community/ebtables/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83705 2013-02-04 14:45:58Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# $Id: PKGBUILD 90459 2013-05-12 18:54:00Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Michal Soltys <soltys@ziu.info>
 
 pkgname=ebtables
 pkgver=2.0.10_4
-pkgrel=3
+pkgrel=4
 pkgdesc='Ethernet bridge filtering utilities'
 arch=('i686' 'x86_64')
 url='http://ebtables.sourceforge.net/'
@@ -32,12 +32,13 @@ package() {
     DESTDIR="$pkgdir" \
     LIBDIR=/usr/lib \
     MANDIR=/usr/share/man \
-    BINDIR=/usr/sbin \
+    BINDIR=/usr/bin \
     INITDIR=/etc/rc.d \
     SYSCONFIGDIR=/etc
   popd
   # rm package ebtables rc.d scripts
   rm "$pkgdir/etc/ebtables-config"
+  rm -r "$pkgdir/etc/rc.d"
   # systemd
   install -Dm 755 $pkgname.systemd \
     "$pkgdir/usr/lib/systemd/scripts/$pkgname"
diff --git a/community/espeakup/PKGBUILD b/community/espeakup/PKGBUILD
index 5cad1dcf7..b7ca9b086 100644
--- a/community/espeakup/PKGBUILD
+++ b/community/espeakup/PKGBUILD
@@ -4,33 +4,27 @@
 
 pkgname=espeakup
 pkgver=0.71
-pkgrel=7
+pkgrel=8
 pkgdesc='Allows the Speakup screen review system to use the ESpeak synthesizer.'
 arch=('i686' 'x86_64')
-url="http://github.com/williamh/espeakup"
+url='http://github.com/williamh/espeakup'
 license=('GPL3')
-#source=("ftp://linux-speakup.org/pub/linux/goodies/${pkgname}-${pkgver}.tar.bz2"
-# temporary location
-source=("http://the-brannons.com/espeakup-0.71.tar.bz2"
-        espeakup espeakup.conf.d espeakup.service espeakup.modules-load.d)
-depends=(speakup-utils espeak)
-backup=(etc/conf.d/espeakup)
+source=(http://the-brannons.com/espeakup-0.71.tar.bz2
+        espeakup.service espeakup.modules-load.d)
+depends=('speakup-utils' 'espeak')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install 
-  install -m755 -D "${srcdir}/espeakup" "${pkgdir}/etc/rc.d/espeakup"
-  install -m644 -D "${srcdir}/espeakup.conf.d" "${pkgdir}/etc/conf.d/espeakup"
   install -m644 -D "${srcdir}/espeakup.service" "${pkgdir}/usr/lib/systemd/system/espeakup.service"
   install -m644 -D "${srcdir}/espeakup.modules-load.d" "${pkgdir}/usr/lib/modules-load.d/espeakup.conf"
 }
-md5sums=('03daa70b3db3f4f6fbb42c2ee428eda7'
-         '7cf0abd493710ed924b7bb7c8d279fb3'
-         '0f93974845b15efa12f5e7a74cc0eecd'
-         '2c80525983a700d3763d4c90c3ab79a8'
-         '75eb512d510d6701b6f63390475dd34f')
+
+sha256sums=('8307986998256db21e615c4edc1befedde28a6995971da258e9d513dd79bd3ab'
+            '0d17413611db3fc4d70e34e84c1e55e832d9eec29482ed7d8c3d737e4ba162b8'
+            '916abe0c03b843194705940ef062046809a68b51c5696f505d5444a73b45f214')
diff --git a/community/espeakup/espeakup b/community/espeakup/espeakup
deleted file mode 100644
index 94a71701a..000000000
--- a/community/espeakup/espeakup
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/conf.d/espeakup
-. /etc/rc.d/functions
-
-PID=`pidof espeakup`
-PIDFILE=/var/run/espeakup.pid
-case "$1" in
-  start)
-    stat_busy "Starting Espeakup"
-    if [ -z "$PID" ]; then
-      if [ -f $PIDFILE ]; then
-        rm $PIDFILE
-      fi
-      /usr/bin/espeakup $ESPEAKUP_ARGS
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon espeakup
-        stat_done
-      fi
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Espeakup"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon espeakup
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index f7d9c9299..777c75284 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 78961 2012-10-28 07:30:38Z bpiotrowski $
+# $Id: PKGBUILD 90378 2013-05-12 06:05:15Z bpiotrowski $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=exim
 pkgver=4.80.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Message Transfer Agent"
 arch=('x86_64' 'i686')
 url='http://www.exim.org/'
 license=('GPL')
-backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim etc/conf.d/exim)
+backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim)
 install=exim.install
 depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
 provides=('smtp-server')
@@ -18,9 +18,7 @@ conflicts=('smtp-server')
 options=('!makeflags')
 source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2"
         aliases
-        exim
         exim.logrotate
-        exim.conf.d
         exim.Makefile
         exim-submission@.service
         exim.service
@@ -29,13 +27,11 @@ source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2
         exim-submission.socket)
 sha256sums=('9565b10f06be224fd03adafae2e07e6fdbb479f8873e3894ddb13f98eeebe78f'
             '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
-            '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6'
             '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
-            '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01'
-            '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55'
-            '32def7387aaa040b994c0d399c6053dc42d9da4c8c8f0a34d33da653be27e324'
-            '99aaf3c960396fc08ec918fdca1cf73850960f6c519982d1a653f2e673754445'
-            '0436411932d6b6268db54a84e4ffc209bde0fa7567442d8e3d138557eeccbad4'
+            'd33b8595e92ec812c9f6961f98e50b6a3986d5bd966ed4efec2c52c1fce47636'
+            '55719e8b823702b0054584326ca28349b7487e5be9e567ddc7a6e6259767e05b'
+            '652250d99479b58b7127ff60c29f28ca09ebac09cab7e54771d62ce38407012d'
+            'faad96dadbb2750faa5652d830f10d5a14be487a42e8db1cec797164acf14b73'
             '3e3d8b6be2741d2587a496196c08b3f2ffa05b5803b2bf9fb49359cef3a98d26'
             'd3bb58f0fbeaaa33c812a823708664bbcd828da7d24e2a098f84a15aee443fee')
 
@@ -50,19 +46,17 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   install -Dm0644 $srcdir/exim.logrotate "${pkgdir}/etc/logrotate.d/exim"
-  install -Dm0644 $srcdir/exim.conf.d "${pkgdir}/etc/conf.d/exim"
   install -Dm0644 doc/exim.8 "${pkgdir}/usr/share/man/man8/exim.8"
-  install -Dm0755 $srcdir/exim "${pkgdir}/etc/rc.d/exim"
 
   mkdir -p "${pkgdir}/var/spool/exim/db" "${pkgdir}/etc/mail" \
-    "${pkgdir}/var/log/exim" "${pkgdir}/usr"/{lib,sbin}
+    "${pkgdir}/var/log/exim" "${pkgdir}/usr"/{lib,bin}
 
   chmod 770 "${pkgdir}/var/spool/exim" "${pkgdir}/var/spool/exim/db" "${pkgdir}/var/log/exim"
 
   cd build-Linux-*
   for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb exipick exiqsumm exigrep \
     exim_dbmbuild exim exim_fixdb eximstats exinext exiqgrep exiwhat; do
-    install -m0755 "$i" "$pkgdir/usr/sbin"
+    install -m0755 "$i" "$pkgdir/usr/bin"
   done
 
   cd "$srcdir/exim-$pkgver/src"
@@ -71,12 +65,12 @@ package() {
 
   cp "$srcdir/aliases" "$pkgdir/etc/mail"
 
-  cd "$pkgdir/usr/sbin"
+  cd "$pkgdir/usr/bin"
   for i in mailq rmail rsmtp runq sendmail; do
     ln -s exim "$i"
   done
   # fhs compliancy
-  ln -s ../sbin/exim ../lib/sendmail
+  ln -s ../bin/exim ../lib/sendmail
 
   install -Dm0644 "$srcdir/exim-submission@.service" \
     "${pkgdir}/usr/lib/systemd/system/exim-submission@.service"
diff --git a/community/exim/exim b/community/exim/exim
deleted file mode 100644
index 8e9640b32..000000000
--- a/community/exim/exim
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/exim ] && . /etc/conf.d/exim
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/exim`
-
-case "$1" in
-  start)
-    stat_busy "Starting Exim"
-    [ -z "$PID" ] && /usr/sbin/exim $EXIM_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon exim
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Exim"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/exim.pid
-      rm_daemon exim
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/exim/exim-submission@.service b/community/exim/exim-submission@.service
index 8b1d056a8..4f90cd83d 100644
--- a/community/exim/exim-submission@.service
+++ b/community/exim/exim-submission@.service
@@ -6,6 +6,6 @@
 Description=Exim Mail Daemon per-connection server (message submission)
 
 [Service]
-ExecStart=-/usr/sbin/exim -bs
+ExecStart=-/usr/bin/exim -bs
 StandardInput=socket
 StandardError=syslog
diff --git a/community/exim/exim.Makefile b/community/exim/exim.Makefile
index a304ce829..2bf77f434 100644
--- a/community/exim/exim.Makefile
+++ b/community/exim/exim.Makefile
@@ -100,7 +100,7 @@
 # /usr/local/sbin. The installation script will try to create this directory,
 # and any superior directories, if they do not exist.
 
-BIN_DIRECTORY=/usr/sbin
+BIN_DIRECTORY=/usr/bin
 
 
 #------------------------------------------------------------------------------
diff --git a/community/exim/exim.conf.d b/community/exim/exim.conf.d
deleted file mode 100644
index b9bec4335..000000000
--- a/community/exim/exim.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-EXIM_ARGS="-bd -q15m"
diff --git a/community/exim/exim.install b/community/exim/exim.install
index 8ed329559..d666be17f 100644
--- a/community/exim/exim.install
+++ b/community/exim/exim.install
@@ -9,7 +9,7 @@ post_install() {
   passwd -l exim > /dev/null
   chown root.exim /var/spool/exim /var/log/exim
   chown exim.exim /var/spool/exim/db
-  chmod u+s /usr/sbin/exim
+  chmod u+s /usr/bin/exim
 }
 
 # arg 1:  the new package version
diff --git a/community/exim/exim.service b/community/exim/exim.service
index de52fd14f..dc48bd752 100644
--- a/community/exim/exim.service
+++ b/community/exim/exim.service
@@ -3,7 +3,7 @@ Description=Exim Mail Daemon
 
 [Service]
 PIDFile=/var/run/exim.pid
-ExecStart=/usr/sbin/exim -bdf -q30m
+ExecStart=/usr/bin/exim -bdf -q30m
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/community/exim/exim@.service b/community/exim/exim@.service
index 120485b8b..19c07a51b 100644
--- a/community/exim/exim@.service
+++ b/community/exim/exim@.service
@@ -2,6 +2,6 @@
 Description=Exim Mail Daemon per-connection server
 
 [Service]
-ExecStart=-/usr/sbin/exim -bs
+ExecStart=-/usr/bin/exim -bs
 StandardInput=socket
 StandardError=syslog
diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD
index 90582160b..f16796299 100644
--- a/community/gnote/PKGBUILD
+++ b/community/gnote/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 88699 2013-04-21 22:24:06Z heftig $
+# $Id: PKGBUILD 90444 2013-05-12 12:57:54Z heftig $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: uastasi <uastasi@archlinux.us>
 pkgname=gnote
-pkgver=3.8.0
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A note taking application."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'boost')
 options=('!libtool')
 install=gnote.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('603e2cc8782f910a5b4fdfd3588d955d59f0f4ddcd5685d1f2feadb955e0e9e6')
+sha256sums=('35bb4c5c0fd94bb3e8e5b91dcfff7e376408dd95fb2468ce9e248f6738d036aa')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD
index 38bcf4d00..545c80acc 100644
--- a/community/haveged/PKGBUILD
+++ b/community/haveged/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86268 2013-03-14 14:36:13Z bpiotrowski $
+# $Id: PKGBUILD 90384 2013-05-12 06:27:41Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: kfgz <kfgz at interia dot pl>
 # Contributor: pootzko <pootzko at gmail dot com>
@@ -6,26 +6,27 @@
 pkgname=haveged
 pkgver=1.7.a
 _pkgver=${pkgver/.a/a}
-pkgrel=1
+pkgrel=2
 pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('i686' 'x86_64')
 url='http://www.issihosts.com/haveged'
 license=('GPL')
 depends=('glibc')
+options=('!libtool')
 source=($url/$pkgname-$_pkgver.tar.gz
         service)
 sha256sums=('8e7b0779bd8a4b9b73769ddaf626918355e2a542d3ac35e5ec31b74a58b9b051'
-            '85aed005b7d0d0bae74f7fc0ca70907a6f67ddbcb2df77ca004f9a919028564a')
+            'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12')
 
 build() {
-  cd $srcdir/$pkgname-$_pkgver
-  ./configure --prefix=/usr
+  cd $pkgname-$_pkgver
+  ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$_pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$_pkgver
+  make DESTDIR="$pkgdir" install
 
   rm -rf $pkgdir/etc/init.d
   install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/haveged.service
diff --git a/community/haveged/haveged-1.7-build.patch b/community/haveged/haveged-1.7-build.patch
deleted file mode 100644
index c32d1927e..000000000
--- a/community/haveged/haveged-1.7-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: haveged-1.7/src/Makefile.am
-===================================================================
---- haveged-1.7.orig/src/Makefile.am
-+++ haveged-1.7/src/Makefile.am
-@@ -27,7 +27,7 @@ pkginclude_HEADERS = havege.h
- 
- haveged_SOURCES = haveged.c haveged.h
- 
--haveged_LDADD = @HA_LDFLAGS@ $(top_builddir)/src/libhavege.la
-+haveged_LDADD = @HA_LDFLAGS@ libhavege.la
- ##libtool_end##
- 
- MAINTAINERCLEANFILES = Makefile.in
diff --git a/community/haveged/service b/community/haveged/service
index 6803a0dec..676fb1893 100644
--- a/community/haveged/service
+++ b/community/haveged/service
@@ -4,7 +4,7 @@ Documentation=man:haveged(8)
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/haveged -w 1024 -v 1
+ExecStart=/usr/bin/haveged -w 1024 -v 1
 PIDFile=/var/run/haveged.pid
 
 [Install]
diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD
index 8691061c0..9830537de 100755
--- a/community/lightdm-gtk2-greeter/PKGBUILD
+++ b/community/lightdm-gtk2-greeter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90180 2013-05-08 09:22:25Z alucryd $
+# $Id: PKGBUILD 90483 2013-05-12 21:57:46Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Padfoot <padfoot@exemail.com.au>
 
 pkgname=lightdm-gtk2-greeter
 pkgver=1.5.1
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="GTK+ greeter for LightDM"
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621')
 build() {
   cd "${srcdir}"/${pkgname/2/}-${pkgver}
 
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static --with-gtk2
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static --with-gtk2
   make
 }
 
diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD
index 6be73d8aa..7cdb2ab7d 100755
--- a/community/lightdm-gtk3-greeter/PKGBUILD
+++ b/community/lightdm-gtk3-greeter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90178 2013-05-08 09:14:37Z alucryd $
+# $Id: PKGBUILD 90482 2013-05-12 21:57:34Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Padfoot <padfoot@exemail.com.au>
 
 pkgname=lightdm-gtk3-greeter
 pkgver=1.5.1
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="GTK+ greeter for LightDM"
 arch=('i686' 'x86_64')
@@ -20,15 +20,13 @@ sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621')
 build() {
   cd "${srcdir}"/${pkgname/3/}-${pkgver}
 
-# Build
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static
   make
 }
 
 package() {
   cd "${srcdir}"/${pkgname/3/}-${pkgver}
 
-# Install
   make DESTDIR="${pkgdir}" install
 }
 
diff --git a/community/lightdm-kde-greeter/PKGBUILD b/community/lightdm-kde-greeter/PKGBUILD
index 4625234db..8954c1d66 100755
--- a/community/lightdm-kde-greeter/PKGBUILD
+++ b/community/lightdm-kde-greeter/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88435 2013-04-17 15:31:11Z alucryd $
+# $Id: PKGBUILD 90484 2013-05-12 21:57:59Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Mladen Pejakovic <pejakm@gmail.com>
@@ -6,12 +6,12 @@
 
 pkgname=lightdm-kde-greeter
 pkgver=0.3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE greeter for LightDM"
 arch=('i686' 'x86_64')
 url="https://projects.kde.org/projects/playground/base/lightdm"
 license=('GPL')
-depends=('kdelibs' 'liblightdm-qt4')
+depends=('kdebase-runtime' 'liblightdm-qt4')
 makedepends=('cmake' 'automoc4')
 backup=('etc/lightdm/lightdm-kde-greeter.conf'
         'etc/dbus-1/system.d/org.kde.kcontrol.kcmlightdm.conf')
@@ -36,6 +36,7 @@ package() {
   cd "${srcdir}"/lightdm-${pkgver}/build
 
   make DESTDIR="${pkgdir}" install
+  mv "${pkgdir}"/usr/{sbin,bin}
   install -dm 755 "${pkgdir}"/etc/lightdm
   install -m 644 ../../lightdm-kde-greeter.conf "${pkgdir}"/etc/lightdm/lightdm-kde-greeter.conf
 }
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
index 69b3ba567..e6e550661 100755
--- a/community/lightdm/PKGBUILD
+++ b/community/lightdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 88301 2013-04-16 08:19:06Z alucryd $
+# $Id: PKGBUILD 90481 2013-05-12 21:56:51Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Morfeo <morfeo89@hotmail.it>
 
 pkgbase=lightdm
 pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
 pkgver=1.6.0
-pkgrel=1
+pkgrel=3
 epoch=1
 pkgdesc="A lightweight display manager"
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgv
         'lightdm-lock-screen-before-switch.patch'
         'xsession')
 sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419'
-            '2e03423cbe88c9fdc3a9684d6d14221aa6e92d105f9d1d53b08747d966c45125'
+            '3daf2f7e1b751415eab9b2aa92d78d8e00c3447a77fa31f7e75863136286a86f'
             'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
             'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
             '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
@@ -44,7 +44,7 @@ prepare() {
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
 
-   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${pkgbase} --with-greeter-user=lightdm --with-greeter-session=lightdm-gtk-greeter --disable-{static,tests}
+   ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${pkgbase} --with-greeter-user=lightdm --with-greeter-session=lightdm-gtk-greeter --disable-{static,tests}
    make
 }
 
diff --git a/community/lightdm/lightdm.service b/community/lightdm/lightdm.service
index 7eb46ceba..a5556c7ca 100755
--- a/community/lightdm/lightdm.service
+++ b/community/lightdm/lightdm.service
@@ -4,7 +4,7 @@ Documentation=man:lightdm(1)
 After=systemd-user-sessions.service
 
 [Service]
-ExecStart=/usr/sbin/lightdm
+ExecStart=/usr/bin/lightdm
 StandardOutput=syslog
 Restart=always
 IgnoreSIGPIPE=no
diff --git a/community/lksctp-tools/0001-Modernize-autotools.patch b/community/lksctp-tools/0001-Modernize-autotools.patch
deleted file mode 100644
index 2fa0b23c6..000000000
--- a/community/lksctp-tools/0001-Modernize-autotools.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From 6812d5ed157869d466058ad7383e1a94c3ead65c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu@seblu.net>
-Date: Thu, 24 Jan 2013 12:41:49 +0100
-Subject: [PATCH] Modernize autotools
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Allow compilation with last version of autotools
-- libtool 2.4.2
-- m4 1.4.16
-- autoconf 2.69
-- automake 1.13.1
-- make 3.82
-
-Signed-off-by: Sébastien Luttringer <seblu@seblu.net>
----
- Makefile.am                |  2 ++
- configure.ac               | 75 ++++++++++++++++++++++++++++++++++++++++++++++
- configure.in               | 74 ---------------------------------------------
- src/apps/Makefile.am       |  2 +-
- src/func_tests/Makefile.am |  2 +-
- src/lib/Makefile.am        |  2 +-
- src/testlib/Makefile.am    |  2 +-
- 7 files changed, 81 insertions(+), 78 deletions(-)
- create mode 100644 configure.ac
- delete mode 100644 configure.in
-
-diff --git a/Makefile.am b/Makefile.am
-index 109f01d..2c9c8c6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -12,6 +12,8 @@ EXTRA_DIST += ChangeLog AUTHORS COPYING COPYING.lib INSTALL \
- # bin or src products may be required to generate stuff in test/
- SUBDIRS = man bin src doc
- 
-+ACLOCAL_AMFLAGS=-I m4
-+
- # Libtool support
- LIBTOOL_DEPS = @LIBTOOL_DEPS@
- libtool: $(LIBTOOL_DEPS)
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..9af138b
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,75 @@
-+dnl -*-autoconf-*-
-+
-+dnl lksctp-tools: Autoconf script
-+dnl 
-+dnl $Id: configure.in,v 1.1.1.2 2002/08/06 23:55:45 inaky Exp $
-+
-+dnl (C) 2002 Intel Corporation
-+dnl     I�aky P�rez-Gonz�lez <inaky.perez-gonzalez@intel.com>
-+dnl      - Initial packaging
-+
-+dnl Package info
-+dnl (CONFIG_AUX_DIR is for putting stuff in $TOPSRCDIR/bin, so we
-+dnl reduce clutter in the root; if we put it below AM_INIT_AUTOMAKE,
-+dnl configure will fail ...)
-+
-+AC_INIT([lksctp-tools], [1.0.13])
-+AC_CONFIG_AUX_DIR(bin)
-+AC_CONFIG_SRCDIR([src/apps/sctp_darn.c])
-+AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_MACRO_DIR([m4])
-+AC_REVISION($Revision: 1.1.1.2 $)
-+AM_INIT_AUTOMAKE
-+AM_SILENT_RULES([yes])
-+
-+dnl Set defaults
-+dnl CFLAGS="$CFLAGS -g -Wall"
-+
-+dnl Checks for programs.
-+AC_PROG_AWK
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_ISC_POSIX
-+
-+dnl Checks for libraries.
-+AC_LIBTOOL_DLOPEN
-+AC_PROG_LIBTOOL
-+AC_SUBST(LIBTOOL_DEPS)
-+
-+dnl Checks for header files.
-+AC_HEADER_STDC
-+AC_HEADER_SYS_WAIT
-+AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
-+
-+dnl Checks for typedefs, structures, and compiler characteristics.
-+AC_C_CONST
-+AC_C_INLINE
-+AC_TYPE_SIZE_T
-+AC_HEADER_TIME
-+AC_STRUCT_TM
-+AC_C_VOLATILE
-+
-+# Checks for library functions.
-+AC_FUNC_MALLOC
-+AC_FUNC_MEMCMP
-+AC_FUNC_REALLOC
-+AC_FUNC_SELECT_ARGTYPES
-+AC_FUNC_SETVBUF_REVERSED
-+AC_FUNC_VPRINTF
-+AC_CHECK_FUNCS([bzero gethostbyname gettimeofday memmove memset select socket strchr strerror strtol strtoul])
-+
-+AC_CONFIG_FILES([lksctp-tools.spec
-+		Makefile
-+		bin/Makefile
-+		man/Makefile
-+		src/Makefile
-+        	src/apps/Makefile
-+        	src/func_tests/Makefile
-+        	src/include/Makefile
-+        	src/include/netinet/Makefile
-+        	src/lib/Makefile
-+        	src/testlib/Makefile
-+        	src/withsctp/Makefile
-+        	doc/Makefile])
-+AC_OUTPUT
-diff --git a/configure.in b/configure.in
-deleted file mode 100644
-index c43ed9d..0000000
---- a/configure.in
-+++ /dev/null
-@@ -1,74 +0,0 @@
--dnl -*-autoconf-*-
--
--dnl lksctp-tools: Autoconf script
--dnl 
--dnl $Id: configure.in,v 1.1.1.2 2002/08/06 23:55:45 inaky Exp $
--
--dnl (C) 2002 Intel Corporation
--dnl     I�aky P�rez-Gonz�lez <inaky.perez-gonzalez@intel.com>
--dnl      - Initial packaging
--
--dnl Package info
--dnl (CONFIG_AUX_DIR is for putting stuff in $TOPSRCDIR/bin, so we
--dnl reduce clutter in the root; if we put it below AM_INIT_AUTOMAKE,
--dnl configure will fail ...)
--
--AC_INIT([src/apps/sctp_darn.c])
--AC_CONFIG_AUX_DIR(bin)
--AM_INIT_AUTOMAKE(lksctp-tools,1.0.13)
--AC_CONFIG_SRCDIR([config.h.in])
--AM_CONFIG_HEADER([config.h])
--AC_REVISION($Revision: 1.1.1.2 $)
--AM_SILENT_RULES([yes])
--
--dnl Set defaults
--dnl CFLAGS="$CFLAGS -g -Wall"
--
--dnl Checks for programs.
--AC_PROG_AWK
--AC_PROG_CC
--AC_PROG_INSTALL
--AC_PROG_LN_S
--AC_ISC_POSIX
--
--dnl Checks for libraries.
--AC_LIBTOOL_DLOPEN
--AC_PROG_LIBTOOL
--AC_SUBST(LIBTOOL_DEPS)
--
--dnl Checks for header files.
--AC_HEADER_STDC
--AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
--
--dnl Checks for typedefs, structures, and compiler characteristics.
--AC_C_CONST
--AC_C_INLINE
--AC_TYPE_SIZE_T
--AC_HEADER_TIME
--AC_STRUCT_TM
--AC_C_VOLATILE
--
--# Checks for library functions.
--AC_FUNC_MALLOC
--AC_FUNC_MEMCMP
--AC_FUNC_REALLOC
--AC_FUNC_SELECT_ARGTYPES
--AC_FUNC_SETVBUF_REVERSED
--AC_FUNC_VPRINTF
--AC_CHECK_FUNCS([bzero gethostbyname gettimeofday memmove memset select socket strchr strerror strtol strtoul])
--
--AC_CONFIG_FILES([lksctp-tools.spec
--		Makefile
--		bin/Makefile
--		man/Makefile
--		src/Makefile
--        	src/apps/Makefile
--        	src/func_tests/Makefile
--        	src/include/Makefile
--        	src/include/netinet/Makefile
--        	src/lib/Makefile
--        	src/testlib/Makefile
--        	src/withsctp/Makefile
--        	doc/Makefile])
--AC_OUTPUT
-diff --git a/src/apps/Makefile.am b/src/apps/Makefile.am
-index c2e34e4..6d53e6d 100644
---- a/src/apps/Makefile.am
-+++ b/src/apps/Makefile.am
-@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.rules
- include $(top_srcdir)/Makefile.dirs
- 
- # General compilation flags
--INCLUDES = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib 
-+AM_CPPFLAGS = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib 
- AM_CFLAGS = -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes -Wimplicit-function-declaration
- AM_LDFLAGS = 
- LDADD = $(top_builddir)/src/testlib/libsctputil.la \
-diff --git a/src/func_tests/Makefile.am b/src/func_tests/Makefile.am
-index 9092ffb..b21e151 100644
---- a/src/func_tests/Makefile.am
-+++ b/src/func_tests/Makefile.am
-@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.rules
- include $(top_srcdir)/Makefile.dirs
- 
- # General compilation flags
--INCLUDES = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib 
-+AM_CPPFLAGS = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib 
- AM_CFLAGS = -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes -Wimplicit-function-declaration
- AM_LDFLAGS = -lpthread
- LDADD = $(top_builddir)/src/testlib/libsctputil.la \
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index 81cc814..af8bb51 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.rules
- include $(top_srcdir)/Makefile.dirs
- 
- # General compilation flags
--INCLUDES = -I$(top_srcdir)/src/include
-+AM_CPPFLAGS = -I$(top_srcdir)/src/include
- 
- lib_LTLIBRARIES = libsctp.la
- libsctp_la_SOURCES = bindx.c connectx.c peeloff.c opt_info.c addrs.c sendmsg.c recvmsg.c Versions.map
-diff --git a/src/testlib/Makefile.am b/src/testlib/Makefile.am
-index 3d7fd49..fae6bbc 100644
---- a/src/testlib/Makefile.am
-+++ b/src/testlib/Makefile.am
-@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.rules
- include $(top_srcdir)/Makefile.dirs
- 
- # General compilation flags
--INCLUDES = -I$(top_srcdir)/src/include
-+AM_CPPFLAGS = -I$(top_srcdir)/src/include
- 
- noinst_LTLIBRARIES = libsctputil.la
- libsctputil_la_SOURCES = sctputil.c sctputil.h
--- 
-1.8.1.1
-
diff --git a/community/lksctp-tools/PKGBUILD b/community/lksctp-tools/PKGBUILD
index 9bb4bd729..13d3d93e9 100644
--- a/community/lksctp-tools/PKGBUILD
+++ b/community/lksctp-tools/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributer: Nicolas Martyanoff <khaelin@gmail.com>
 
 pkgname=lksctp-tools
-pkgver=1.0.14
+pkgver=1.0.15
 pkgrel=1
 pkgdesc='An implementation of the SCTP protocol'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL2' 'LGPL2.1')
 depends=('bash')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/lksctp/$pkgname-$pkgver.tar.gz")
-md5sums=('12bc67f9b47ea631328a592ce7a53ca1')
+md5sums=('d829677541fb41061e7f4d61f8413b07')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index f7958abdd..2f1f91bae 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 79125 2012-10-30 23:07:13Z heftig $
+# $Id: PKGBUILD 90434 2013-05-12 10:57:52Z dwallace $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=18
+pkgrel=21
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/lxdm/"
@@ -18,52 +18,61 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
         'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
         'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
 source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
-        glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch
-        greeter-session.patch pam-env-vars.patch industrial-greeterui.patch
-        rc.d lxdm-pam service)
+		lxdm.pam  lxdm.service
+		lxdm-0.4.1-Xsession-source-profile.patch
+		lxdm-0.4.1-conf.patch
+		lxdm-0.4.1-event-check-bug.patch
+		lxdm-0.4.1-industrial-greeter-ui.patch
+		lxdm-0.4.1-modern-systems.patch
+		lxdm-0.4.1-nolang-show-sessions.patch
+		lxdm-0.4.1-pam-env-vars.patch)
+
+prepare(){
+    cd $srcdir/$pkgname-$pkgver
+    patch -Np1 -i $srcdir/lxdm-0.4.1-event-check-bug.patch
+    patch -Np1 -i $srcdir/lxdm-0.4.1-nolang-show-sessions.patch
+    patch -Np1 -i $srcdir/lxdm-0.4.1-pam-env-vars.patch
+}
 
 build() {
     cd $srcdir/$pkgname-$pkgver
 
-    patch -Np1 -i $srcdir/glib2-2.32.0.patch
-    patch -Np1 -i $srcdir/greeter-session.patch
-    patch -Np1 -i $srcdir/pam-env-vars.patch
 
-    ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm
+    ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin
     make
   	
-    patch -Np0 -i $srcdir/lxdm.patch
-    patch -Np0 -i $srcdir/lxdm.conf.patch
-    patch -Np0 -i $srcdir/Xsession.patch
-    patch -Np0 -i $srcdir/industrial-greeterui.patch
+    patch -Np0 -i $srcdir/lxdm-0.4.1-modern-systems.patch
+    patch -Np0 -i $srcdir/lxdm-0.4.1-conf.patch
+    patch -Np0 -i $srcdir/lxdm-0.4.1-Xsession-source-profile.patch
+    patch -Np0 -i $srcdir/lxdm-0.4.1-industrial-greeter-ui.patch
 }
 
 
 package() {
     cd $srcdir/$pkgname-$pkgver
-    make DESTDIR=$pkgdir install
+    make DESTDIR=$pkgdir sbindir=/usr/bin install
 
-    install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm
-    install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm
-    install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service
+    install -m644 $srcdir/lxdm.pam $pkgdir/etc/pam.d/lxdm
+    install -Dm644 $srcdir/lxdm.service $pkgdir/usr/lib/systemd/system/lxdm.service
     install -d $pkgdir/var/{lib,run}/lxdm
 
     # fix the greeter location
     sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf
+	sed -i 's:sbin:bin:' $pkgdir/usr/bin/lxdm
 
     # avoid conflict with filesystem>=2012.06
     rm -r $pkgdir/var/run
 }
 
 md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
+         '9cc734228696a3c6f06d91bba61b03c1'
+         'b86317143ae44d7ed38c150fe4f25502'
+         'd2e4a4a22ee2aa1a986be154c647b6c6'
+         'c50dd01b715b0a236407d48066191601'
          'a1e3c46a8bef691bc544028f5b6cfe22'
+         '2c4afdbe3532be4f90d8f6240d352766'
          'baed9055e8825a5511712bc095197519'
-         'c50dd01b715b0a236407d48066191601'
-         'd2e4a4a22ee2aa1a986be154c647b6c6'
          '28475239d0c8b4fd778ec49f5ec72962'
-         '4c1d43e81e9a256e8d1ea7686c24b3d3'
-         '2c4afdbe3532be4f90d8f6240d352766'
-         '705f394052fdd0dec22e95321d170de0'
-         '9cc734228696a3c6f06d91bba61b03c1'
-         'e8cc66eb1a2405d2d9d184a727cbd9d8')
-
+         '4c1d43e81e9a256e8d1ea7686c24b3d3')
diff --git a/community/lxdm/Xsession.patch b/community/lxdm/lxdm-0.4.1-Xsession-source-profile.patch
index 035ff0383..035ff0383 100644
--- a/community/lxdm/Xsession.patch
+++ b/community/lxdm/lxdm-0.4.1-Xsession-source-profile.patch
diff --git a/community/lxdm/lxdm.conf.patch b/community/lxdm/lxdm-0.4.1-conf.patch
index 1744e557e..1744e557e 100644
--- a/community/lxdm/lxdm.conf.patch
+++ b/community/lxdm/lxdm-0.4.1-conf.patch
diff --git a/community/lxdm/glib2-2.32.0.patch b/community/lxdm/lxdm-0.4.1-event-check-bug.patch
index cebfc6133..cebfc6133 100644
--- a/community/lxdm/glib2-2.32.0.patch
+++ b/community/lxdm/lxdm-0.4.1-event-check-bug.patch
diff --git a/community/lxdm/industrial-greeterui.patch b/community/lxdm/lxdm-0.4.1-industrial-greeter-ui.patch
index a2a366809..a2a366809 100644
--- a/community/lxdm/industrial-greeterui.patch
+++ b/community/lxdm/lxdm-0.4.1-industrial-greeter-ui.patch
diff --git a/community/lxdm/lxdm.patch b/community/lxdm/lxdm-0.4.1-modern-systems.patch
index a703a386d..a703a386d 100644
--- a/community/lxdm/lxdm.patch
+++ b/community/lxdm/lxdm-0.4.1-modern-systems.patch
diff --git a/community/lxdm/greeter-session.patch b/community/lxdm/lxdm-0.4.1-nolang-show-sessions.patch
index f3b94a57a..f3b94a57a 100644
--- a/community/lxdm/greeter-session.patch
+++ b/community/lxdm/lxdm-0.4.1-nolang-show-sessions.patch
diff --git a/community/lxdm/pam-env-vars.patch b/community/lxdm/lxdm-0.4.1-pam-env-vars.patch
index ab8605ff1..ab8605ff1 100644
--- a/community/lxdm/pam-env-vars.patch
+++ b/community/lxdm/lxdm-0.4.1-pam-env-vars.patch
diff --git a/community/lxdm/lxdm-pam b/community/lxdm/lxdm.pam
index 57f33b221..57f33b221 100644
--- a/community/lxdm/lxdm-pam
+++ b/community/lxdm/lxdm.pam
diff --git a/community/lxdm/service b/community/lxdm/lxdm.service
index e1840476c..026d62b50 100644
--- a/community/lxdm/service
+++ b/community/lxdm/lxdm.service
@@ -3,7 +3,7 @@ Description=LXDE Display Manager
 After=systemd-user-sessions.service
 
 [Service]
-ExecStart=/usr/sbin/lxdm
+ExecStart=/usr/bin/lxdm
 
 [Install]
 Alias=display-manager.service
diff --git a/community/lxdm/rc.d b/community/lxdm/rc.d
deleted file mode 100644
index 68eb6225d..000000000
--- a/community/lxdm/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID `which lxdm-binary`)
-case "$1" in
-  start)
-    stat_busy "Starting LXDM Display Manager"
-    [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lxdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping LXDM Display Manager"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lxdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/lxnm/PKGBUILD b/community/lxnm/PKGBUILD
index 6561411fe..d44a06750 100644
--- a/community/lxnm/PKGBUILD
+++ b/community/lxnm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64694 2012-02-17 18:44:05Z bluewind $
+# $Id: PKGBUILD 90454 2013-05-12 16:50:48Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Cainã Costa <cainan.costa@gmail.com>
 
 pkgname=lxnm
 pkgver=0.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A Network Manager (Part of LXDE)"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -14,7 +14,7 @@ source=("http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 package() {
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index d6b99ae91..44d341870 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90146 2013-05-07 12:27:35Z bpiotrowski $
+# $Id: PKGBUILD 90389 2013-05-12 06:32:22Z bpiotrowski $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
@@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx
 
 pkgname=nginx
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl' 'geoip')
@@ -30,7 +30,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz
 		service
 		logrotate)
 sha256sums=('bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119'
-            '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a'
+            '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
             '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16')
 
 build() {
@@ -39,7 +39,7 @@ build() {
 	./configure \
         --prefix=$_cfgdir \
         --conf-path=$_cfgdir/nginx.conf \
-        --sbin-path=/usr/sbin/nginx \
+        --sbin-path=/usr/bin/nginx \
         --pid-path=/var/run/nginx.pid \
         --lock-path=/var/lock/nginx.lock \
         --user=http --group=http \
diff --git a/community/nginx/service b/community/nginx/service
index 8e28f0cde..29d3aa877 100644
--- a/community/nginx/service
+++ b/community/nginx/service
@@ -5,10 +5,10 @@ After=syslog.target network.target
 [Service]
 Type=forking
 PIDFile=/run/nginx.pid
-ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload
-ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit
+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
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD
index 0896a50ac..9145e8d2a 100644
--- a/community/notmuch/PKGBUILD
+++ b/community/notmuch/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86877 2013-03-23 23:10:36Z td123 $
+# $Id: PKGBUILD 90380 2013-05-12 06:14:15Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: fauno <fauno at kiwwwi.com.ar>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
@@ -7,7 +7,7 @@
 pkgbase=notmuch
 pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime')
 pkgver=0.15.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://notmuchmail.org/"
 license=('GPL3')
@@ -29,7 +29,6 @@ build() {
 
     cd bindings/ruby
     ruby extconf.rb
-    make
 
     cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2}
 
@@ -50,7 +49,7 @@ package_notmuch-runtime(){
     cd "$srcdir/${pkgname}-$pkgver"
     make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install
 
-    install -Dm644 notmuch "$pkgdir/usr/sbin/notmuch"
+    install -Dm644 notmuch "$pkgdir/usr/bin/notmuch"
 
     mkdir -p "$pkgdir"/usr/share/vim/vimfiles/{plugin,syntax}
 
@@ -84,7 +83,7 @@ package_notmuch(){
     # Install ruby bindings
     cd "$srcdir/${pkgname}-${pkgver}/bindings/ruby"
     sed -i -e 's,/site_ruby,,g' Makefile
-    make DESTDIR="$pkgdir" includedir=/usr/include install
+    make exec_prefix=$pkgdir/usr prefix=/usr install
 
 }
 
diff --git a/community/partclone/PKGBUILD b/community/partclone/PKGBUILD
index 35162ec52..43ea2831b 100644
--- a/community/partclone/PKGBUILD
+++ b/community/partclone/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87807 2013-04-06 20:01:09Z jsteel $
+# $Id: PKGBUILD 90410 2013-05-12 09:03:51Z jsteel $
 # Maintainer: Jonathan Steel <mail at jsteel dot org>
 # Contrinutor: Dan Serban
 # Contributor: Franz Burgmann
@@ -7,7 +7,7 @@
 
 pkgname=partclone
 pkgver=0.2.58
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities to save and restore used blocks on a partition"
 arch=('i686' 'x86_64')
 url="http://partclone.org"
@@ -20,7 +20,7 @@ build() {
   cd "$srcdir"/$pkgname-$pkgver
 
   ./configure --prefix=/usr --enable-extfs --enable-reiserfs --enable-fat \
-    --enable-hfsp --enable-btrfs --enable-ncursesw --enable-ntfs
+    --enable-hfsp --enable-btrfs --enable-ncursesw --enable-ntfs --sbindir=/usr/bin
 
   make
 }
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index c6a31dcb3..7dc881071 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88512 2013-04-19 08:19:36Z fyan $
+# $Id: PKGBUILD 90442 2013-05-12 11:52:36Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=pidgin-lwqq
-pkgver=0.1d
-_pkgver=0.1-d
-pkgrel=3
+pkgver=0.1e
+_pkgver=0.1e
+pkgrel=1
 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
 arch=('i686' 'x86_64')
 url="https://github.com/xiehuc/pidgin-lwqq"
@@ -14,13 +14,11 @@ optdepends=('pidgin: Multi-protocol instant messaging client'
 	    'telepathy-haze: Empathy plugin support')
 makedepends=('git' 'cmake')
 install=$pkgname.install
-source=("https://github.com/xiehuc/$pkgname/archive/${_pkgver}.tar.gz"
-	https://github.com/xiehuc/pidgin-lwqq/commit/afdefd3fb8ecce36f6387c5895339671f5833b4e.patch)
+source=("https://github.com/xiehuc/$pkgname/archive/${_pkgver}.tar.gz")
 
 build()
 {
   cd "${srcdir}/$pkgname-${_pkgver}"
-  patch -Np1 -i ../afdefd3fb8ecce36f6387c5895339671f5833b4e.patch
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr .
   make
@@ -31,5 +29,5 @@ package()
   cd "$srcdir/$pkgname-${_pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('5ec83a5a3328dac2ded431bcd7c5c034'
-         '18fcaf7c7c9a4fb944d34e90e622a9dd')
+
+sha512sums=('0e5c49dd5b0c9ba9f9eef90cb075c66839a6691aae93789da409a758a36916aef8fceea0d272ee9b67a5e6279bafea2907d2acba10c9d3858a94f4509f4b1f4b')
diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD
index 192c47071..144e4fe19 100644
--- a/community/polipo/PKGBUILD
+++ b/community/polipo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80790 2012-12-03 18:01:33Z ttoepper $
+# $Id: PKGBUILD 90446 2013-05-12 13:12:12Z jelle $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Jelle van der Waa <jelle vdwaa nl>
 # Contributor: Thomas Holmquist <thomas@vorget.com>
@@ -7,7 +7,7 @@
 
 pkgname=polipo
 pkgver=1.0.4.1
-pkgrel=9
+pkgrel=10
 pkgdesc="A small and fast caching web proxy."
 arch=('i686' 'x86_64')
 url="http://www.pps.jussieu.fr/~jch/software/polipo/"
@@ -16,9 +16,8 @@ depends=('bash')
 makedepends=('texinfo')
 install=polipo.install
 source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz"
-        "polipo.rc.d" "polipo.conf.d" "polipo.service")
+        "polipo.conf.d" "polipo.service")
 md5sums=('bfc5c85289519658280e093a270d6703'
-         '7406aad26807fb3a4e5f7b01ecb97a59'
          '685aa0c6070dee11c701932d23afcc6a'
          '143ef45db99dc745b6c3a606847be9fe')
 
@@ -45,8 +44,7 @@ package() {
   # install license
   install -Dm644 COPYING $pkgdir/usr/share/licenses/polipo/LICENSE
 
-  # install daemon scripts / cron
-  install -Dm 755  $srcdir/polipo.rc.d $pkgdir/etc/rc.d/polipo
+  # install systemd service / cron
   install -Dm 644  $srcdir/polipo.service $pkgdir/usr/lib/systemd/system/polipo.service
   install -Dm 644  $srcdir/polipo.conf.d $pkgdir/etc/conf.d/polipo.conf
 }
diff --git a/community/polipo/polipo.rc.d b/community/polipo/polipo.rc.d
deleted file mode 100644
index 0333ded57..000000000
--- a/community/polipo/polipo.rc.d
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-daemon_name=polipo
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-	start)
-		stat_busy "Starting $daemon_name daemon"
-
-		PID=$(get_pid)
-		if [[ -z $PID ]]; then
-			[[ -f /run/$daemon_name.pid ]] &&
-				rm -f /run/$daemon_name.pid
-		# RUN
-		su -c "/usr/bin/$daemon_name ${POLIPO_ARGS}" -s /bin/sh - nobody
-		#
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-			exit 1
-		else
-			echo $(get_pid) > /run/$daemon_name.pid
-			add_daemon $daemon_name
-			stat_done
-		fi
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-
-	stop)
-		stat_busy "Stopping $daemon_name daemon"
-		PID=$(get_pid)
-		# KILL
-		[[ -n $PID ]] && kill $PID &> /dev/null
-		#
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-			exit 1
-		else
-			rm -f /run/$daemon_name.pid &> /dev/null
-			rm_daemon $daemon_name
-			stat_done
-		fi
-		;;
-
-	restart)
-		$0 stop
-		sleep 3
-		$0 start
-		;;
-
-	status)
-		stat_busy "Checking $daemon_name status";
-		ck_status $daemon_name
-		;;
-
-	*)
-		echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/python-numexpr/PKGBUILD b/community/python-numexpr/PKGBUILD
new file mode 100644
index 000000000..ac6d8d3fa
--- /dev/null
+++ b/community/python-numexpr/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 90422 2013-05-12 09:41:18Z aginiewicz $
+# Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
+# Contributor: Sebastien Binet <binet@lblbox>
+
+pkgbase=python-numexpr
+pkgname=('python2-numexpr' 'python-numexpr')
+pkgver=2.1
+pkgrel=1
+pkgdesc="A JIT compiler for Python expressions"
+url="http://code.google.com/p/numexpr/"
+arch=('i686' 'x86_64')
+license=('MIT')
+makedepends=('python2-distribute' 'python-distribute' 'python-numpy' 'python2-numpy')
+source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz)
+md5sums=('8c138e81fb4214d05453da0fc88bf0d5')
+
+build() {
+  cd "$srcdir"
+  cp -a numexpr-$pkgver numexpr-py2-$pkgver
+
+  msg "Building Python2"
+  cd "$srcdir"/numexpr-py2-$pkgver
+  python2 setup.py build
+
+  msg "Building Python3"
+  cd "$srcdir"/numexpr-$pkgver
+  python setup.py build
+}
+
+package_python2-numexpr() {
+  depends=('python2-numpy')
+
+  cd "$srcdir"/numexpr-py2-$pkgver
+
+  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+
+  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/python2|" \
+    $(find "${pkgdir}" -name '*.py')
+
+  install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_python-numexpr() {
+  depends=('python-numpy')
+
+  cd "$srcdir"/numexpr-$pkgver
+
+  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+
+  install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
diff --git a/community/python2-numexpr/PKGBUILD b/community/python2-numexpr/PKGBUILD
deleted file mode 100644
index 3c5a1630d..000000000
--- a/community/python2-numexpr/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 76243 2012-09-15 08:46:42Z aginiewicz $
-# Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
-# Contributor: Sebastien Binet <binet@lblbox>
-
-pkgname=python2-numexpr
-pkgver=2.0.1
-pkgrel=2
-pkgdesc="A JIT compiler for Python expressions"
-url="http://code.google.com/p/numexpr/"
-arch=('i686' 'x86_64')
-license=('MIT')
-depends=('python2-numpy')
-makedepends=('python2-distribute')
-provides=('python-numexpr') # temporary compatibility because of rename
-replaces=('python-numexpr') # (there is no python 3 version yet)
-source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz)
-md5sums=('5cdc05c2ef8761daeae8a3182e468ba4')
-
-build() {
-  cd "$srcdir"/numexpr-$pkgver
-
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir"/numexpr-$pkgver
-
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-
-  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/python2|" \
-    $(find "${pkgdir}" -name '*.py')
-
-  install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
diff --git a/community/qingy/PKGBUILD b/community/qingy/PKGBUILD
index be106c095..2d4b62b95 100644
--- a/community/qingy/PKGBUILD
+++ b/community/qingy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80226 2012-11-18 01:50:13Z eric $
+# $Id: PKGBUILD 90406 2013-05-12 08:49:01Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=qingy
 pkgver=1.0.0
-pkgrel=7
+pkgrel=8
 pkgdesc="A DirectFB getty replacement"
 arch=('i686' 'x86_64')
 url="http://qingy.sourceforge.net/"
@@ -18,7 +18,7 @@ source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.
         qingy.logrotate qingy@.service)
 sha1sums=('22ee505e935bf7ddcbd33e23f754a5a1ca082c81'
           '21676cf0b71334c666f7b3e4f3d8b4f319266c81'
-          '67f8fc1da5264cdaf79bd41a476451f4eef8f905')
+          '43a6f1cee03ffa598a77cb3c333cb1e8c63b4a2c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -32,8 +32,6 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/sbin"
-  ln -s ../usr/bin/qingy "${pkgdir}/sbin/qingy"
   install -D -m644 "${srcdir}/qingy.logrotate" "${pkgdir}/etc/logrotate.d/qingy"
   install -D -m644 "${srcdir}/qingy@.service" "${pkgdir}/usr/lib/systemd/system/qingy@.service"
 }
diff --git a/community/qingy/qingy.install b/community/qingy/qingy.install
index 5cf234b72..0defe31d8 100644
--- a/community/qingy/qingy.install
+++ b/community/qingy/qingy.install
@@ -2,6 +2,7 @@ infodir=usr/share/info
 filelist=(qingy.info.gz)
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
@@ -12,6 +13,7 @@ post_upgrade() {
 }
 
 pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
     install-info --delete $infodir/$file $infodir/dir 2> /dev/null
   done
diff --git a/community/qingy/qingy@.service b/community/qingy/qingy@.service
index ef9e7bfc2..537eb53fd 100644
--- a/community/qingy/qingy@.service
+++ b/community/qingy/qingy@.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Quingy on %I
+Description=Qingy on %I
 Documentation=info:qingy
 After=systemd-user-sessions.service plymouth-quit-wait.service
 
diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD
index 55558bef9..cf32eb72e 100644
--- a/community/qupzilla/PKGBUILD
+++ b/community/qupzilla/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 89115 2013-04-26 22:11:32Z speps $
+# $Id: PKGBUILD 90359 2013-05-11 23:23:44Z speps $
 # Maintainer: speps <speps at aur dot archlinux dot org>
 
 _name=QupZilla
 pkgname=qupzilla
-pkgver=1.4.2
+pkgver=1.4.3
 pkgrel=1
 pkgdesc="Cross-platform QtWebKit browser"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=('qtwebkit' 'hunspell')
 optdepends=('bash-completion: bash completion support')
 install="$pkgname.install"
 source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/v$pkgver")
-md5sums=('e1989427fea976312ca4c0ec84ce41b2')
+md5sums=('20187fcce11dbba876e1ee7dc5e32583')
 
 build() {
   cd "$srcdir/$_name-$pkgname-"*
diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD
index 7891929e3..0f62663b4 100644
--- a/community/rekonq/PKGBUILD
+++ b/community/rekonq/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 89389 2013-04-29 06:54:51Z andrea $
+# $Id: PKGBUILD 90424 2013-05-12 10:14:44Z andrea $
 # Maintainer: Peter Lewis <plewis@aur.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net>
 
 pkgname=rekonq
 pkgver=2.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A WebKit based web browser for KDE'
 arch=('i686' 'x86_64')
 url='http://rekonq.kde.org/'
 license=('GPL')
 depends=('kdebase-keditbookmarks' 'qoauth')
 makedepends=('cmake' 'automoc4')
-optdepends=('qca-ossl: to use the sync handler')
+optdepends=('kdebase-konqueror: search engines support'
+            'qca-ossl: to use the sync handler')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 sha256sums=('f84fe975e79cbdcd218eb73d5371ee5ca0e11a2aea0d1d890ba9f24a505cf65c')
diff --git a/community/rng-tools/PKGBUILD b/community/rng-tools/PKGBUILD
index 8e886488a..a149da819 100644
--- a/community/rng-tools/PKGBUILD
+++ b/community/rng-tools/PKGBUILD
@@ -1,22 +1,23 @@
+# $Id: PKGBUILD 90470 2013-05-12 20:57:31Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Alasdair Haswell <ali at arhaswell dot co dot uk>
 
 pkgname=rng-tools
 pkgver=4
-pkgrel=1
+pkgrel=2
 pkgdesc="Random number generator related utilities"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/gkernel/"
 license=('GPL')
+depends=('glibc')
 backup=(etc/conf.d/rngd)
 source=(http://downloads.sourceforge.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz
-        rngd
         rngd.conf
         rngd.service)
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr
+	./configure --prefix=/usr --sbindir=/usr/bin
 	make
 }
 
@@ -24,11 +25,9 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 	install -Dm0644 "$srcdir/rngd.service" "$pkgdir/usr/lib/systemd/system/rngd.service"
-	install -Dm0755 "$srcdir/rngd" "$pkgdir/etc/rc.d/rngd"
 	install -Dm0644 "$srcdir/rngd.conf" "$pkgdir/etc/conf.d/rngd"
 }
 
 sha256sums=('b71bdfd4222c05e8316001556be90e1606f2a1bac3efde60153bd84e873cc195'
-            '45084eff83306c74e707a72b44b5b20d8b94777377af414e1c43f738c7a720ed'
             'a4a19dbe5403b9dcb2bc6b3699dcaba7a47ff3e3ccf58aa3bdbfe14eb1d16003'
-            'abf163089fc466e45955fd0da98a20a966b3b0b4c714c27b470d03fedfc04ca3')
+            'd3e38ac1460e3072792def73281faf5f59dffe9ac43b00916252cc69f7c7d1b5')
diff --git a/community/rng-tools/rngd b/community/rng-tools/rngd
deleted file mode 100755
index bd6b8d62f..000000000
--- a/community/rng-tools/rngd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-rnd_device=/dev/random
-rng_device=/dev/hw_random
-timeout=0
-
-[ -f /etc/conf.d/rngd ] && . /etc/conf.d/rngd
-PID=$(pidof -o %PPID /usr/sbin/rngd)
-case "$1" in
-  start)
-    stat_busy "Starting RNG"
-    [ -z "$PID" ] && /usr/sbin/rngd $RNGD_OPTS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon rngd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping RNG"
-    [ ! -z "$PID" ]  && kill -s SIGALRM $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon rngd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/rng-tools/rngd.service b/community/rng-tools/rngd.service
index 87185bc32..33f6a6e38 100644
--- a/community/rng-tools/rngd.service
+++ b/community/rng-tools/rngd.service
@@ -3,7 +3,7 @@ Description=Hardware RNG Entropy Gatherer Daemon
 
 [Service]
 EnvironmentFile=/etc/conf.d/rngd
-ExecStart=/usr/sbin/rngd -f $RNGD_OPTS
+ExecStart=/usr/bin/rngd -f $RNGD_OPTS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD
index 1a66faf0f..901855851 100644
--- a/community/supercollider/PKGBUILD
+++ b/community/supercollider/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88666 2013-04-21 13:40:47Z speps $
+# $Id: PKGBUILD 90361 2013-05-12 02:59:43Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor:  <farid at archlinux-br.org>
 
 _name=SuperCollider
 pkgname=supercollider
-pkgver=3.6.4
+pkgver=3.6.5
 pkgrel=1
 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ optdepends=('emacs: emacs interface'
             'ruby: vim support')
 install="$pkgname.install"
 source=("http://download.sourceforge.net/project/$pkgname/Source/${pkgver%.*}/$_name-$pkgver-Source-linux.tar.bz2")
-md5sums=('a6f0c1183f311ffcfbc143dce2332d74')
+md5sums=('ac176ea512fc2b9a9be645322c5b20b4')
 
 build() {
   cd "$srcdir/$_name-Source"
diff --git a/community/unionfs-fuse/PKGBUILD b/community/unionfs-fuse/PKGBUILD
index e75504ae0..22db49cff 100644
--- a/community/unionfs-fuse/PKGBUILD
+++ b/community/unionfs-fuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 76241 2012-09-15 08:29:07Z aginiewicz $
+# $Id: PKGBUILD 90408 2013-05-12 09:00:26Z aginiewicz $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 # Contributor: Smith Dhumbumroong <zodmaner at gmail dot com>
 
 pkgname=unionfs-fuse
 pkgver=0.26
-pkgrel=1
+pkgrel=2
 pkgdesc="A user space unionfs implementation"
 arch=('i686' 'x86_64')
 url="http://podgorny.cz/moin/UnionFsFuse"
@@ -20,7 +20,7 @@ build() {
 
 package() {
   cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" PREFIX=/usr install
+  make SBINDIR="/bin" DESTDIR="$pkgdir" PREFIX=/usr install
   install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 08ca3d9d2..838f836fd 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 89225 2013-04-28 06:44:11Z tpowa $
+# $Id: PKGBUILD 90419 2013-05-12 09:09:05Z thomas $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.2.12
-pkgrel=3
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -17,7 +17,7 @@ makedepends=('linux-headers'
 
 build() {
   _kernver=$(expac -Q '%v' linux-headers)-ARCH
-
+  #_kernver=3.9.0-1-ARCH
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -31,8 +31,8 @@ build() {
 
 package_virtualbox-host-modules(){
   _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  #_kernver=3.9.0-1-ARCH
   _extraver=extramodules-${_kernver%.*}-ARCH
-
   pkgdesc='Host kernel modules for VirtualBox'
   depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)")
   replaces=('virtualbox-modules')
@@ -48,6 +48,7 @@ package_virtualbox-host-modules(){
 
 package_virtualbox-guest-modules(){
   _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  #_kernver=3.9.0-1-ARCH
   _extraver=extramodules-${_kernver%.*}-ARCH
 
   pkgdesc='Guest kernel modules for VirtualBox'
diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install
index 3e61f3447..9084c05fd 100644
--- a/community/virtualbox-modules/virtualbox-guest-modules.install
+++ b/community/virtualbox-modules/virtualbox-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.8-ARCH'
+    EXTRAMODULES='extramodules-3.9-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.8-ARCH'
+    EXTRAMODULES='extramodules-3.9-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.8-ARCH'
+    EXTRAMODULES='extramodules-3.9-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install
index 378dab975..78791f71d 100644
--- a/community/virtualbox-modules/virtualbox-host-modules.install
+++ b/community/virtualbox-modules/virtualbox-host-modules.install
@@ -3,17 +3,17 @@ cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.8-ARCH'
+    EXTRAMODULES='extramodules-3.9-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.8-ARCH'
+    EXTRAMODULES='extramodules-3.9-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.8-ARCH'
+    EXTRAMODULES='extramodules-3.9-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/community/vlan/PKGBUILD b/community/vlan/PKGBUILD
index 8cdaddd47..ca8374104 100644
--- a/community/vlan/PKGBUILD
+++ b/community/vlan/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59555 2011-11-28 01:48:10Z seblu $
-# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# $Id: PKGBUILD 90479 2013-05-12 21:50:43Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=vlan
 pkgver=1.9
-pkgrel=1
+pkgrel=2
 pkgdesc='Virtual LAN configuration utility'
 arch=('i686' 'x86_64')
 url='http://www.candelatech.com/~greear/vlan.html'
@@ -13,15 +13,15 @@ source=("http://www.candelatech.com/~greear/vlan/vlan.${pkgver}.tar.gz")
 md5sums=('5f0c6060b33956fb16e11a15467dd394')
 
 build() {
-  cd vlan
+  cd $pkgname
   make clean all
 }
 
 package() {
-  cd vlan
-  install -D -m755 'vconfig' "$pkgdir/usr/sbin/vconfig"
-  install -D -m755 'macvlan_config' "$pkgdir/usr/sbin/macvlan_config"
+  cd $pkgname
+  install -D -m755 'vconfig' "$pkgdir/usr/bin/vconfig"
+  install -D -m755 'macvlan_config' "$pkgdir/usr/bin/macvlan_config"
   install -D -m644 'vconfig.8' "$pkgdir/usr/share/man/man8/vconfig.8"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD
index fdff92bbd..5c6bc3b11 100644
--- a/community/vsftpd/PKGBUILD
+++ b/community/vsftpd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 76440 2012-09-18 15:37:11Z bpiotrowski $
+# $Id: PKGBUILD 90372 2013-05-12 05:50:20Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=vsftpd
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Very Secure FTP daemon"
 arch=('i686' 'x86_64')
 url="https://security.appspot.com/vsftpd.html"
@@ -14,21 +14,20 @@ depends=('openssl')
 backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
 install=vsftpd.install
 source=(https://security.appspot.com/downloads/$pkgname-$pkgver.tar.gz{,.asc}
-        vsftpd.xinetd vsftpd.d  vsftpd-ssl.socket  vsftpd.socket
+        vsftpd.xinetd vsftpd-ssl.socket  vsftpd.socket
         vsftpd.service  vsftpd@.service vsftpd-ssl.service vsftpd-ssl@.service)
-sha1sums=('f36976bb1c5df25ac236d8a29e965ba2b825ccd0'
-          '42c6055c1418ad93340bfa3b176b60f1e5b15e0a'
-          'c87b4ce56dac15223694a6e86c01ea813b877596'
-          '24f268956c24e78be0c234c6d31f41487922eafe'
-          'f81dab50243f7e82dc9722ca79b2b24de0882eb2'
-          '5b7a7a1e0c04acfcc2dba1346557f1193b9905ba'
-          'cde3528825b073d3941c263e9e63b4c298a97c47'
-          '3a040a18893a5103a1d4a22e631ee247bde8c8d3'
-          '2b0a778d7b2329a6d4c01a64ef6c7d90144cd3ab'
-          'e5bd183664008bb0cc0353d4efb2e8e92a365798')
+sha256sums=('be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56'
+            'SKIP'
+            '5909f9b95479429c236170a06879d27d07ddda52d9c4c5543c961500c4cac2e0'
+            'd5185e48fffc6253499a55e0fe0f90a3424fc639640af11a9d38df33fb145afe'
+            '9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9'
+            '50c392f373f8ce37aa226a9af7a6b038a8683ee3e041ebbad1bb483e47e8a1f8'
+            'd7b8e4827d4f6bafcbf52f9d2d7380958c7b08bb3f757806aa89d4bc06c9671c'
+            'b88a50fc68b3bf746d13c9a777df77791cd3eac6eb7c2df655418071c2adf422'
+            '4a55c2468b08d858f71bacf1f4885847bec8e548b0e92088068d9bdd3884af84')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   # build-time config
   sed \
@@ -39,14 +38,13 @@ build() {
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
-  install -D -m755 vsftpd $pkgdir/usr/sbin/vsftpd
+  install -D -m755 vsftpd $pkgdir/usr/bin/vsftpd
   install -D -m644 vsftpd.conf $pkgdir/etc/vsftpd.conf
   install -D -m644 vsftpd.8 $pkgdir/usr/share/man/man8/vsftpd.8
   install -D -m644 vsftpd.conf.5 $pkgdir/usr/share/man/man5/vsftpd.conf.5
   install -D -m644 $srcdir/vsftpd.xinetd $pkgdir/etc/xinetd.d/vsftpd
-  install -D -m755 $srcdir/vsftpd.d $pkgdir/etc/rc.d/vsftpd
 
   install -D -m644 $srcdir/vsftpd.service $pkgdir/usr/lib/systemd/system/vsftpd.service
   install -D -m644 $srcdir/vsftpd@.service $pkgdir/usr/lib/systemd/system/vsftpd@.service 
diff --git a/community/vsftpd/vsftpd-ssl.service b/community/vsftpd/vsftpd-ssl.service
index b5b84b3c3..3343bc920 100644
--- a/community/vsftpd/vsftpd-ssl.service
+++ b/community/vsftpd/vsftpd-ssl.service
@@ -2,7 +2,7 @@
 Description=vsftpd daemon (legacy implicit SSL)
 
 [Service]
-ExecStart=/usr/sbin/vsftpd -oimplicit_ssl=yes
+ExecStart=/usr/bin/vsftpd -oimplicit_ssl=yes
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 
diff --git a/community/vsftpd/vsftpd-ssl@.service b/community/vsftpd/vsftpd-ssl@.service
index e53fad324..8bcf78e55 100644
--- a/community/vsftpd/vsftpd-ssl@.service
+++ b/community/vsftpd/vsftpd-ssl@.service
@@ -2,7 +2,7 @@
 Description=vsftpd per-connection server (legacy implicit SSL)
 
 [Service]
-ExecStart=-/usr/sbin/vsftpd -oimplicit_ssl=yes
+ExecStart=-/usr/bin/vsftpd -oimplicit_ssl=yes
 ExecReload=/bin/kill -HUP $MAINPID
 StandardInput=socket
 StandardOutput=socket
diff --git a/community/vsftpd/vsftpd.d b/community/vsftpd/vsftpd.d
deleted file mode 100644
index 27310855c..000000000
--- a/community/vsftpd/vsftpd.d
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-daemon_name=vsftpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name &
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/community/vsftpd/vsftpd.service b/community/vsftpd/vsftpd.service
index cbd10d9d1..63876460c 100644
--- a/community/vsftpd/vsftpd.service
+++ b/community/vsftpd/vsftpd.service
@@ -2,7 +2,7 @@
 Description=vsftpd daemon
 
 [Service]
-ExecStart=/usr/sbin/vsftpd
+ExecStart=/usr/bin/vsftpd
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 
diff --git a/community/vsftpd/vsftpd.xinetd b/community/vsftpd/vsftpd.xinetd
index eff2eb3db..2a6f38c80 100644
--- a/community/vsftpd/vsftpd.xinetd
+++ b/community/vsftpd/vsftpd.xinetd
@@ -3,7 +3,7 @@ service ftp
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/vsftpd
+        server                  = /usr/bin/vsftpd
         log_on_success  += HOST DURATION
         log_on_failure  += HOST
         disable                 = yes
diff --git a/community/vsftpd/vsftpd@.service b/community/vsftpd/vsftpd@.service
index 353f95f82..81e142990 100644
--- a/community/vsftpd/vsftpd@.service
+++ b/community/vsftpd/vsftpd@.service
@@ -2,7 +2,7 @@
 Description=vsftpd per-connection server
 
 [Service]
-ExecStart=-/usr/sbin/vsftpd
+ExecStart=-/usr/bin/vsftpd
 ExecReload=/bin/kill -HUP $MAINPID
 StandardInput=socket
 StandardError=syslog
diff --git a/community/xe-guest-utilities/PKGBUILD b/community/xe-guest-utilities/PKGBUILD
index feafca99b..3fd142e5c 100644
--- a/community/xe-guest-utilities/PKGBUILD
+++ b/community/xe-guest-utilities/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89210 2013-04-28 05:04:55Z dwallace $
+# $Id: PKGBUILD 90393 2013-05-12 07:10:12Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at code gtmanfred com>
 # Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gnu-tech.pl>
@@ -6,15 +6,12 @@
 pkgbase=xe-guest-utilities
 pkgname=('xe-guest-utilities' 'xenstore')
 pkgver=6.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Citrix XenServer Tools"
 arch=('i686' 'x86_64')
 url="http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"
 license=('GPL' 'LGPL')
 makedepends=(python2)
-optdepends=('linux: DomU kernel for x86_64'
-	          'linux-xen: DomU kernel for i686'
-            'kernel-lts-xen: DomU kernel for i686')
 source=("ftp://ftp.archlinux.org/other/community/$pkgbase/${pkgbase}_${pkgver}-1033.tar.gz"
       	'ip_address.patch'
         'xe-linux-distribution.service'
@@ -23,8 +20,8 @@ source=("ftp://ftp.archlinux.org/other/community/$pkgbase/${pkgbase}_${pkgver}-1
         'tmpfile')
 md5sums=('26fd52ffc5ddeb7d3e510e6f272c2860'
          '9bd39e95384056069f7faa870a28413a'
-         'abf49bd0925142e51ce2875cd5e5ad45'
-         '43264c6954c9c036b260521653ade41f'
+         '95064a7d8a32cd3aaca14e3b48c69599'
+         '173fed74c76817702b062ed653002db0'
          '3252fa21362fd55246f9d8b923070151'
          'cadad1eb5b1fa6d5fe463a1a0fd82fff')
 
@@ -52,7 +49,7 @@ package_xenstore() {
   fi
   for f in include libxc xenstore; do
     [[ ! -d "$srcdir"/uclibc-sources/tools/$f ]] && continue
-    make -C ""$srcdir"/uclibc-sources/tools/$f" DESTDIR="$pkgdir" install
+    make -C ""$srcdir"/uclibc-sources/tools/$f" DESTDIR="$pkgdir" SBINDIR=/usr/bin install
   done
   cd "$srcdir/$pkgbase-$pkgver"
   install -Dm644 "COPYING.LGPL" "$pkgdir/usr/share/licenses/$pkgname/COPYING.LGPL"
@@ -65,9 +62,9 @@ package_xenstore() {
 package_xe-guest-utilities(){
   cd "$srcdir/$pkgname-$pkgver"
   depends=('xenstore' 'bash')
-  install -Dm755 xe-linux-distribution "$pkgdir/usr/sbin/xe-linux-distribution"
-  install -Dm755 xe-update-guest-attrs "$pkgdir/usr/sbin/xe-update-guest-attrs"
-  install -Dm755 xe-daemon "$pkgdir/usr/sbin/xe-daemon"
+  install -Dm755 xe-linux-distribution "$pkgdir/usr/bin/xe-linux-distribution"
+  install -Dm755 xe-update-guest-attrs "$pkgdir/usr/bin/xe-update-guest-attrs"
+  install -Dm755 xe-daemon "$pkgdir/usr/bin/xe-daemon"
   install -Dm644 xen-vcpu-hotplug.rules "$pkgdir/usr/lib/udev/rules.d/10-xen-vcpu-hotplug.rules"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
   install -Dm644 $srcdir/xe-daemon.service "$pkgdir/usr/lib/systemd/system/xe-daemon.service"
diff --git a/community/xe-guest-utilities/xe-daemon.service b/community/xe-guest-utilities/xe-daemon.service
index 5245c702d..0a5a6ee92 100644
--- a/community/xe-guest-utilities/xe-daemon.service
+++ b/community/xe-guest-utilities/xe-daemon.service
@@ -5,8 +5,8 @@ Requires=proc-xen.mount
 
 [Service]
 PIDFile=/run/xe-daemon.pid
-ExecStart=/usr/sbin/xe-daemon -p /run/xe-daemon.pid
-ExecStop=/bin/pkill -TERM  -F /run/xe-daemon.pid
+ExecStart=/usr/bin/xe-daemon -p /run/xe-daemon.pid
+ExecStop=/usr/bin/pkill -TERM  -F /run/xe-daemon.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/xe-guest-utilities/xe-linux-distribution.service b/community/xe-guest-utilities/xe-linux-distribution.service
index 5f3f91cc0..eb0b32ff4 100644
--- a/community/xe-guest-utilities/xe-linux-distribution.service
+++ b/community/xe-guest-utilities/xe-linux-distribution.service
@@ -5,7 +5,7 @@ Before=xend.service
 [Service]
 Type=simple
 RemainAfterExit=yes
-ExecStart=/usr/sbin/xe-linux-distribution /var/cache/xe-linux-distribution
+ExecStart=/usr/bin/xe-linux-distribution /var/cache/xe-linux-distribution
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index 0faf735c5..e18bb22cd 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179636 2013-03-08 23:40:39Z foutrelis $
+# $Id: PKGBUILD 185217 2013-05-12 09:08:11Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=iw
-pkgver=3.8
-pkgrel=3
+pkgver=3.10
+pkgrel=1
 pkgdesc="nl80211 based CLI configuration utility for wireless devices"
 arch=("i686" "x86_64")
 url="http://wireless.kernel.org/en/users/Documentation/iw"
@@ -11,7 +11,7 @@ license=("GPL")
 depends=("libnl")
 makedepends=("linux-api-headers")
 source=(https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('50c07d5fcf38240b3912fb6950f6ec566b8d27c321cbdacc1de53fc3be96af9a')
+sha256sums=('456ee212cfb728e292667caa508a7dff902666c78579814756a3012d68d64fe9')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD
index c648eda47..2e200ea46 100644
--- a/core/libpcap/PKGBUILD
+++ b/core/libpcap/PKGBUILD
@@ -1,25 +1,21 @@
-# $Id: PKGBUILD 179638 2013-03-08 23:40:41Z foutrelis $
+# $Id: PKGBUILD 185218 2013-05-12 09:08:12Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=libpcap
-pkgver=1.3.0
-pkgrel=3
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="A system-independent interface for user-level packet capture"
 arch=('i686' 'x86_64')
 url="http://www.tcpdump.org/"
 license=('BSD')
 depends=('glibc' 'libnl' 'sh' 'libusbx')
 makedepends=('flex')
-source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig}
-        libnl32.patch)
-sha256sums=('41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9'
-            'a078cf1c0f36151cc84a0da7c25ad81fef87afa6bece58c990c62886a7beef99'
-            '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6')
+source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig})
+sha256sums=('7c6a2a4f71e8ab09804e6b4fb3aff998c5583108ac42c0e2967eee8e1dbc7406'
+            'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}/libnl32.patch"
-  autoreconf -f -i
   ./configure --prefix=/usr --enable-ipv6 --with-libnl
   make
 }
diff --git a/core/libpcap/libnl32.patch b/core/libpcap/libnl32.patch
deleted file mode 100644
index 633fd003e..000000000
--- a/core/libpcap/libnl32.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u -r libpcap-1.2.1/configure.in libpcap-1.2.1-libnl32/configure.in
---- libpcap-1.2.1/configure.in	2012-01-02 01:47:37.000000000 +0100
-+++ libpcap-1.2.1-libnl32/configure.in	2012-02-09 19:29:29.405603749 +0100
-@@ -433,12 +433,13 @@
- 		#
- 		# Try libnl 2.x first.
- 		#
--		AC_CHECK_LIB(nl, nl_socket_alloc,
-+		AC_CHECK_LIB(nl-3, nl_socket_alloc,
- 		[
- 			#
- 			# Yes, we have libnl 2.x.
- 			#
--			LIBS="-lnl-genl -lnl $LIBS"
-+			LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS"
-+			V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)"
- 			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
- 			AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x])
- 		],
diff --git a/core/systemd/0001-login-add-missing-_public_-to-sd_get_machine_names.patch b/core/systemd/0001-login-add-missing-_public_-to-sd_get_machine_names.patch
deleted file mode 100644
index dee8e549e..000000000
--- a/core/systemd/0001-login-add-missing-_public_-to-sd_get_machine_names.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4d5fb96252d289e7899bc0bb87262127d19de949 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Tue, 7 May 2013 12:47:30 +0200
-Subject: [PATCH] login: add missing _public_ to sd_get_machine_names()
-
----
- src/login/sd-login.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/login/sd-login.c b/src/login/sd-login.c
-index 66c4487..d0dc42f 100644
---- a/src/login/sd-login.c
-+++ b/src/login/sd-login.c
-@@ -591,7 +591,7 @@ _public_ int sd_get_uids(uid_t **users) {
-         return r;
- }
- 
--int sd_get_machine_names(char ***machines) {
-+_public_ int sd_get_machine_names(char ***machines) {
-         _cleanup_closedir_ DIR *d = NULL;
-         _cleanup_strv_free_ char **l = NULL;
-         _cleanup_free_ char *md = NULL;
--- 
-1.8.2.2
-
diff --git a/core/systemd/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch b/core/systemd/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch
deleted file mode 100644
index 186a9c554..000000000
--- a/core/systemd/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0ee8d63649ab475fe2a16b2d62b5a5e2a8a69829 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 7 May 2013 11:35:23 -0400
-Subject: [PATCH] systemd-sleep: it is not an error if the config file is
- missing
-
----
- src/shared/sleep-config.c | 19 ++++++++-----------
- 1 file changed, 8 insertions(+), 11 deletions(-)
-
-diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
-index 73a3acb..cd3238b 100644
---- a/src/shared/sleep-config.c
-+++ b/src/shared/sleep-config.c
-@@ -47,19 +47,16 @@ int parse_sleep_config(const char *verb, char ***modes, char ***states) {
-         FILE _cleanup_fclose_ *f;
- 
-         f = fopen(PKGSYSCONFDIR "/sleep.conf", "re");
--        if (!f) {
--                if (errno == ENOENT)
--                        return 0;
--
--                log_warning("Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
--                return 0;
-+        if (!f)
-+                log_full(errno == ENOENT ? LOG_DEBUG: LOG_WARNING,
-+                         "Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
-+        else {
-+                r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
-+                                 config_item_table_lookup, (void*) items, false, false, NULL);
-+                if (r < 0)
-+                        log_warning("Failed to parse configuration file: %s", strerror(-r));
-         }
- 
--        r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
--                         config_item_table_lookup, (void*) items, false, false, NULL);
--        if (r < 0)
--                log_warning("Failed to parse configuration file: %s", strerror(-r));
--
-         if (streq(verb, "suspend")) {
-                 /* empty by default */
-                 *modes = suspend_mode;
--- 
-1.8.2.2
-
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 9db7a26e4..e9546663e 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=203
-pkgrel=2
+pkgver=204
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,15 +16,11 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
-        '0001-login-add-missing-_public_-to-sd_get_machine_names.patch'
-        '0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch'
         'use-split-usr-path.patch')
-md5sums=('b5a124ae8aee2b9fa357f912e87e9048'
+md5sums=('a07619bb19f48164fbf0761d12fd39a8'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
-         '8504a59afaa5d52fa6b5b26fc89873cf'
-         '988cf83af952990ff48d3b97bcf06845'
          '76bf83fe34c5b40533abc5dc940576a6')
 
 prepare() {
@@ -32,9 +28,6 @@ prepare() {
 
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
-
-  patch -Np1 <"$srcdir/0001-login-add-missing-_public_-to-sd_get_machine_names.patch"
-  patch -Np1 <"$srcdir/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch"
 }
 
 build() {
@@ -91,9 +84,6 @@ package_systemd() {
 
   printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
 
-  install -dm755 "$pkgdir/bin"
-  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
   # fix .so links in manpage stubs
   find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
       -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} +
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index 53cd4b4af..508b384c3 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -82,6 +82,11 @@ post_upgrade() {
     printf '==> Persistent net naming rules have been shipped as disabled.\n'
     printf '    See /etc/udev/rules.d/80-net-name-slot.rules for more detail\n'
   fi
+
+  if [ "$(vercmp 204-1 "$2")" -eq 1 ]; then
+    printf '==> The /bin/systemd symlink has been removed. Any references in your\n'
+    printf '    bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n'
+  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/c-ares/PKGBUILD b/extra/c-ares/PKGBUILD
index 865d13f06..b2f70453e 100644
--- a/extra/c-ares/PKGBUILD
+++ b/extra/c-ares/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 175878 2013-01-23 00:23:32Z dreisner $
+# $Id: PKGBUILD 185276 2013-05-12 20:05:21Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=c-ares
-pkgver=1.9.1
+pkgver=1.10.0
 pkgrel=1
 pkgdesc='C library that performs DNS requests and name resolves asynchronously'
 arch=('i686' 'x86_64')
@@ -15,20 +15,20 @@ depends=('glibc')
 options=('!libtool')
 source=("http://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
         'LICENSE')
-md5sums=('389db4917a3b58c4ce4ebfe961fd84c4'
-         '8a180aabbd7565e1a9f3ca5c6be6e99c'
+md5sums=('1196067641411a75d3cbebe074fd36d8'
+         'SKIP'
          'c69f2042941b708ce3e7121424d0b7e6')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-	./configure --prefix=/usr --enable-shared
-	make
+  ./configure --prefix=/usr --enable-shared
+  make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-	make DESTDIR="$pkgdir" install
-	install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index d075a808d..1a0bc65cd 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 183352 2013-04-21 22:08:58Z heftig $
+# $Id: PKGBUILD 185256 2013-05-12 15:18:01Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
-arch=('i686' 'x86_64')
-depends=('gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
-makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
+arch=(i686 x86_64)
+depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata)
+makedepends=(intltool gperf gobject-introspection vala python2)
 options=('!libtool')
 install=$pkgname.install
 url="http://www.gnome.org"
-license=('GPL')
+license=(GPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0425d8b73dcf705840cdf9fc955b3ca05b9aacc6eb2d2d97f159725be3a8b896')
+sha256sums=('570d97150ed04e8b6681814731c4d216bda44e164533b28953e38319fec21015')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -21,7 +21,7 @@ build() {
       --localstatedir=/var --with-openldap=yes \
       --libexecdir=/usr/lib/evolution-data-server \
       --with-krb5=/usr --with-libdb=/usr \
-      --enable-vala-bindings --disable-uoa
+      --enable-vala-bindings --disable-uoa PYTHON=python2
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
   make
 }
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index a8de938ca..b49515e4f 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183353 2013-04-21 22:09:00Z heftig $
+# $Id: PKGBUILD 185258 2013-05-12 15:23:32Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
 makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('26fea90285189ee0e370ea04baef31bc0907d0cf400a63fafc95631111d378c9')
+sha256sums=('ff3586b76013f71b0c32339279985cb0e2e1706bd181726ce9d00ebf4387cdd9')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index d0a613d92..189417191 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183351 2013-04-21 22:08:56Z heftig $
+# $Id: PKGBUILD 185257 2013-05-12 15:22:50Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('89b775c5757ddf791d181c82eaee6ddc42252eb54aa2f5dc5a80ff5b9246803b')
+sha256sums=('6333864015e83c2120ffe7adb262ac3055ac82995a915071440be96e08a73112')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD
index 7fdc2b3a6..29a522892 100644
--- a/extra/fakechroot/PKGBUILD
+++ b/extra/fakechroot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 182910 2013-04-16 04:51:02Z allan $
+# $Id: PKGBUILD 185194 2013-05-12 04:33:49Z allan $
 # Maintainer : Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=fakechroot
 pkgver=2.16
-pkgrel=2
+pkgrel=3
 pkgdesc="Gives a fake chroot environment"
 arch=('i686' 'x86_64')
 url="https://github.com/fakechroot/fakechroot/wiki"
@@ -24,7 +24,8 @@ prepare() {
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot --sysconfdir=/etc
+  ./configure --prefix=/usr --sbindir=/usr/bin \
+    --libdir=/usr/lib/libfakeroot --sysconfdir=/etc
   make
 }
 
diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD
index 82a8321e3..bea3d7327 100644
--- a/extra/fsarchiver/PKGBUILD
+++ b/extra/fsarchiver/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 178753 2013-02-26 16:58:17Z eric $
+# $Id: PKGBUILD 185201 2013-05-12 06:37:28Z bpiotrowski $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=fsarchiver
 pkgver=0.6.17
-pkgrel=1
-pkgdesc="A safe and flexible file-system backup and deployment tool"
+pkgrel=2
+pkgdesc='Safe and flexible file-system backup and deployment tool'
 arch=('i686' 'x86_64')
-url="http://www.fsarchiver.org/"
+url='http://www.fsarchiver.org/'
 license=('GPL2')
 depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
 sha1sums=('3b1049b674f3be45ecda5a91a584c7ddc3781e6b')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/gifsicle/PKGBUILD b/extra/gifsicle/PKGBUILD
index b2688d96c..7995e5133 100644
--- a/extra/gifsicle/PKGBUILD
+++ b/extra/gifsicle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 149400 2012-02-07 14:30:32Z eric $
+# $Id: PKGBUILD 185185 2013-05-11 22:17:24Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gifsicle
-pkgver=1.64
+pkgver=1.70
 pkgrel=1
 pkgdesc="A powerful command-line program for creating, editing, manipulating and getting information about GIF images and animations"
 arch=('i686' 'x86_64')
@@ -10,15 +10,15 @@ url="http://www.lcdf.org/gifsicle/"
 license=('GPL')
 depends=('libx11')
 source=(http://www.lcdf.org/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('14f1f69d41287eb06d69ae98b672a0f8c5cf28e5')
+sha1sums=('f5017c7e3298108f2063a926f83392c66f0652ae')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index d836bd86e..d8aedbebb 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178231 2013-02-18 16:07:47Z jgc $
+# $Id: PKGBUILD 185255 2013-05-12 15:16:09Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtkhtml4
 _pkgbasename=gtkhtml
-pkgver=4.6.4
+pkgver=4.6.5
 pkgrel=1
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('intltool')
 url="http://www.gnome.org"
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('8c75278a4382150ae2d6e477cbcebf541367be05176edd05669f046e24736a0d')
+sha256sums=('d5145919708250b3dd0e650f90d156984217356d953da936394ceb8da59ff546')
 
 build() {
     cd "$_pkgbasename-$pkgver"
diff --git a/extra/i8kutils/PKGBUILD b/extra/i8kutils/PKGBUILD
index a1c7a6d7f..120c6a2fd 100644
--- a/extra/i8kutils/PKGBUILD
+++ b/extra/i8kutils/PKGBUILD
@@ -1,28 +1,42 @@
-# $Id: PKGBUILD 138168 2011-09-18 03:14:27Z eric $
+# $Id: PKGBUILD 185227 2013-05-12 10:04:52Z eric $
 # Maintainer: Thayer Williams <thayer@archlinux.org>
 # Contributor: Eric Johnson <eric@coding-zone.com>
 
 pkgname=i8kutils
 pkgver=1.33
-pkgrel=2
+pkgrel=3
 pkgdesc="Dell Inspiron/Latitude kernel driver and utilities"
 arch=('i686' 'x86_64')
 url="http://people.debian.org/~dz/i8k/"
 license=('GPL2')
 depends=('glibc')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}_${pkgver}.tar.gz)
-md5sums=('1ab077b301dbb0f4be8ef52eb3b97628')
+optdepends=('tk: for i8kmon deamon')
+conflicts=('i8kmon')
+provides=('i8kmon')
+replaces=('i8kmon')
+backup=('etc/i8kutils/i8kmon.conf')
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}_${pkgver}.tar.gz
+        i8kmon.service)
+md5sums=('1ab077b301dbb0f4be8ef52eb3b97628'
+         '32c159616f72ab65969db95b9e824ced')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # conform to Arch Linux guidelines
+  sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon.1
+  sed -i 's|/etc/i8kmon.conf|/etc/i8kutils/i8kmon.conf|g' i8kmon
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -D -m755 i8kctl "$pkgdir/usr/bin/i8kctl"
-  install -D -m755 i8kbuttons "$pkgdir/usr/bin/i8kbuttons"
-  install -D -m644 i8kbuttons.1 "$pkgdir/usr/share/man/man1/i8kbuttons.1"
-  install -D -m644 i8kctl.1 "$pkgdir/usr/share/man/man1/i8kctl.1"
-  ln -fs ./i8kctl "$pkgdir/usr/bin/i8kfan"
+  cd $pkgname-$pkgver
+  install -d "$pkgdir"/usr/{bin,share/man/man1}
+  make DESTDIR="$pkgdir" install install-man
+  install -D -m644 i8kmon.conf "$pkgdir/etc/i8kutils/i8kmon.conf"
+  install -D -m644 ../i8kmon.service "$pkgdir/usr/lib/systemd/system/i8kmon.service"
 }
diff --git a/extra/i8kutils/i8kmon.service b/extra/i8kutils/i8kmon.service
new file mode 100644
index 000000000..3b80f4633
--- /dev/null
+++ b/extra/i8kutils/i8kmon.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Dell laptop thermal monitoring
+ConditionPathExists=/proc/i8k
+
+[Service]
+ExecStart=/usr/bin/i8kmon -d
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index c5d6503ef..d005414fe 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184393 2013-05-06 19:37:55Z foutrelis $
+# $Id: PKGBUILD 185248 2013-05-12 14:13:52Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.5.3
+pkgver=6.8.5.6
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -13,7 +13,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
 #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
 source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('84be2c2fa42cefdf1d7e6cb3a6c73163e2007653'
+sha1sums=('3c932aa3febb1e992a780e9091925bdbc0d61613'
           'e143cf9d530fabf3b58023899b5cc544ba93daec')
 
 prepare() {
diff --git a/extra/imap/PKGBUILD b/extra/imap/PKGBUILD
index 22fcf11ac..44835eea1 100644
--- a/extra/imap/PKGBUILD
+++ b/extra/imap/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173922 2012-12-28 05:23:44Z pierre $
+# $Id: PKGBUILD 185244 2013-05-12 11:04:34Z pierre $
 
 pkgname=imap
 pkgver=2007f
-pkgrel=2
+pkgrel=3
 pkgdesc="An IMAP/POP server"
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -14,9 +14,9 @@ source=("ftp://ftp.cac.washington.edu/imap/${pkgname}-${pkgver}.tar.gz"
         'imap' 'ipop2' 'ipop3')
 backup=(etc/xinetd.d/{imap,ipop2,ipop3} etc/ssl/certs/{imapd,ipop3d}.pem)
 md5sums=('2126fd125ea26b73b20f01fcd5940369'
-         'e77dedb80c2fec9bf2ef784ed5f976fb'
-         'cc3eba6453242aa0b1bc8881160b2136'
-         '0a5e27183a9b7e8ec5f6703125371e0a')
+         '3ae5b3b333bc8ea2da106f6a97d7bd8d'
+         '448f988dc5f9bdb2223dcea3abc4f5f1'
+         '1499b13015075f0aafba04324a6f523a')
 
 build() {
   sed \
@@ -58,10 +58,10 @@ EOF
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  install -d $pkgdir/usr/sbin
-  install -D -m755 imapd/imapd $pkgdir/usr/sbin/imapd
-  install -D -m755 ipopd/ipop2d $pkgdir/usr/sbin/ipop2d
-  install -D -m755 ipopd/ipop3d $pkgdir/usr/sbin/ipop3d
+  install -d $pkgdir/usr/bin
+  install -D -m755 imapd/imapd $pkgdir/usr/bin/imapd
+  install -D -m755 ipopd/ipop2d $pkgdir/usr/bin/ipop2d
+  install -D -m755 ipopd/ipop3d $pkgdir/usr/bin/ipop3d
   for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \
     osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do
     install -D -m644 c-client/${i}.h $pkgdir/usr/include/imap/${i}.h
diff --git a/extra/imap/imap b/extra/imap/imap
index da45739d4..fc8309595 100644
--- a/extra/imap/imap
+++ b/extra/imap/imap
@@ -3,7 +3,7 @@ service imap2
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/imapd
+        server                  = /usr/bin/imapd
         log_on_success  += HOST DURATION
         log_on_failure  += HOST
         disable                 = yes
diff --git a/extra/imap/ipop2 b/extra/imap/ipop2
index bd74c8380..0eee38434 100644
--- a/extra/imap/ipop2
+++ b/extra/imap/ipop2
@@ -3,7 +3,7 @@ service pop2
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/ipop2d
+        server                  = /usr/bin/ipop2d
         log_on_success  += HOST DURATION 
         log_on_failure  += HOST
         disable                 = yes
diff --git a/extra/imap/ipop3 b/extra/imap/ipop3
index 410a45a64..44565b0c1 100644
--- a/extra/imap/ipop3
+++ b/extra/imap/ipop3
@@ -3,7 +3,7 @@ service pop3
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/ipop3d
+        server                  = /usr/bin/ipop3d
         log_on_success  += HOST DURATION
         log_on_failure  += HOST
         disable                 = yes
diff --git a/extra/libnl1/PKGBUILD b/extra/libnl1/PKGBUILD
index 6130b5cde..8f17590ca 100644
--- a/extra/libnl1/PKGBUILD
+++ b/extra/libnl1/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182913 2013-04-16 05:29:35Z eric $
+# $Id: PKGBUILD 185225 2013-05-12 09:29:56Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libnl1
-pkgver=1.1.3
+pkgver=1.1.4
 pkgrel=1
 pkgdesc="Library for applications dealing with netlink sockets (Legacy version)"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('glibc')
 options=('!staticlibs')
 source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz")
-md5sums=('4e4fa2197f4412b20c2952325d674b12')
+md5sums=('580cb878be536804daca87fb75ae46cc')
 
 build() {
   cd libnl-${pkgver}
diff --git a/extra/libxfce4util/PKGBUILD b/extra/libxfce4util/PKGBUILD
index 2c5407ae4..a4bbc1020 100644
--- a/extra/libxfce4util/PKGBUILD
+++ b/extra/libxfce4util/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184282 2013-05-05 17:43:38Z foutrelis $
+# $Id: PKGBUILD 185207 2013-05-12 07:25:42Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=libxfce4util
 pkgver=4.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Basic utility non-GUI functions for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -21,6 +21,7 @@ build() {
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
+    --sbindir=/usr/bin \
     --libexecdir=/usr/lib \
     --localstatedir=/var \
     --disable-static \
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index daee6ab4a..f96e5a3e0 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180683 2013-03-25 19:15:34Z bpiotrowski $
+# $Id: PKGBUILD 185242 2013-05-12 10:58:13Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
 pkgver=1.4.32
-pkgrel=4
+pkgrel=5
 pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -21,16 +21,17 @@ source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}
         "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
         'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
 sha256sums=('1368f80069ce71f5928cad59c8e60c0b95876942ca9e02c53853e54ae24aedc1'
-            '5456a90967df6774386010baa3fa67dba1c80c3b7058c70c80931d8dea5093e7'
+            'SKIP'
             '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
             'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa'
             'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
-            '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696')
+            '503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
 
 	./configure --prefix=/usr \
+		--sbindir=/usr/bin \
 		--libdir=/usr/lib/lighttpd/ \
 		--sysconfdir=/etc/lighttpd \
 		--with-mysql \
diff --git a/extra/lighttpd/lighttpd.service b/extra/lighttpd/lighttpd.service
index b80db7695..568948dda 100644
--- a/extra/lighttpd/lighttpd.service
+++ b/extra/lighttpd/lighttpd.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 PrivateTmp=true
-ExecStart=/usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
+ExecStart=/usr/bin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
 ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGINT
 
diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index f79be1058..a75c633b5 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 181375 2013-04-04 00:53:02Z eric $
+# $Id: PKGBUILD 185203 2013-05-12 06:52:48Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=lm_sensors
 pkgver=3.3.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
 arch=('i686' 'x86_64')
 url="http://www.lm-sensors.org/"
@@ -17,31 +17,35 @@ source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz
 	healthd healthd.conf fancontrol.service sensord.service healthd.service \
         linux_3.0.patch lm_sensors-fancontrol.patch)
 sha1sums=('b55c06f425993e42f13553f204066c446da36fd3'
-          '035a721f20e4ad568f4fdde2d7c25d906c192458'
-          'afaad558d2ad4732aa53b69afa23ccf37bc67ab1'
+          'SKIP'
+          '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
           '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
-          '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c'
-          'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51'
-          'a7a20eb3c799d70287e6c7968a7ab42165925293'
+          '73cd658f4a418197dc75f65d6d309701c72cfd81'
+          'cea1ff07374a784cc4be1d28dc6c80641fcae99d'
+          'd72ec328e9303acef86342483b6f8537de6117d9'
           '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c'
           'd3e419b4019451fb039ae3d3b8e0ec55121b9f17')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/lm_sensors.service}
   sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect
   sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
   patch -p0 -i "${srcdir}/linux_3.0.patch"
   patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   make PREFIX=/usr
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
-    PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
+    PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
   install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
-  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
+  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd"
   install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
   install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service"
   install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service"
diff --git a/extra/lm_sensors/fancontrol.service b/extra/lm_sensors/fancontrol.service
index c86b498f8..813dbd60d 100644
--- a/extra/lm_sensors/fancontrol.service
+++ b/extra/lm_sensors/fancontrol.service
@@ -3,7 +3,7 @@ Description=Fan control daemon
 
 [Service]
 PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/sbin/fancontrol
+ExecStart=/usr/bin/fancontrol
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/lm_sensors/healthd b/extra/lm_sensors/healthd
index 5ffed5681..b1e2fd699 100644
--- a/extra/lm_sensors/healthd
+++ b/extra/lm_sensors/healthd
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# /usr/sbin/healthd
+# /usr/bin/healthd
 #
 
 . /etc/healthd.conf
diff --git a/extra/lm_sensors/healthd.service b/extra/lm_sensors/healthd.service
index 59d3270b0..1933192d3 100644
--- a/extra/lm_sensors/healthd.service
+++ b/extra/lm_sensors/healthd.service
@@ -3,7 +3,7 @@ Description=A daemon which can be used to alert you in the event of a hardware h
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/healthd
+ExecStart=/usr/bin/healthd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/lm_sensors/sensord.service b/extra/lm_sensors/sensord.service
index 6d272f1ef..1d62ab9e8 100644
--- a/extra/lm_sensors/sensord.service
+++ b/extra/lm_sensors/sensord.service
@@ -3,7 +3,7 @@ Description=Sensor information logging daemon
 
 [Service]
 PIDFile=/var/run/sensord.pid
-ExecStart=/usr/sbin/sensord
+ExecStart=/usr/bin/sensord
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD
index ddd34a2c9..2de510c5d 100644
--- a/extra/memcached/PKGBUILD
+++ b/extra/memcached/PKGBUILD
@@ -1,25 +1,20 @@
-# $Id: PKGBUILD 166159 2012-09-04 23:45:23Z dan $
+# $Id: PKGBUILD 185263 2013-05-12 16:29:01Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Michael Irwin <6d6469@gmail.com>
 
 pkgname=memcached
 pkgver=1.4.15
-pkgrel=1
+pkgrel=2
 pkgdesc="A distributed memory object caching system"
 arch=(i686 x86_64)
 url="http://memcached.org/"
 license=('GPL')
 depends=('libevent')
 optdepends=('perl: for memcached-tool usage')
-backup=('etc/conf.d/memcached')
 install=memcached.install
 source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        memcached.conf
-		memcached.sh
 		memcached.service)
 sha256sums=('169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4'
-            '17f66873b77e96c6706dcf13ab0aa8ddff94b2851366c787fc23e614dfc11f47'
-            '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb'
             '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6')
 
 build() {
@@ -32,7 +27,5 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool
-  install -D -m 644 ../memcached.conf "$pkgdir"/etc/conf.d/memcached
-  install -D -m 755 ../memcached.sh "$pkgdir"/etc/rc.d/memcached
   install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service
 }
diff --git a/extra/memcached/memcached.sh b/extra/memcached/memcached.sh
deleted file mode 100644
index 9c9727507..000000000
--- a/extra/memcached/memcached.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/memcached
-
-PIDFILE='/var/run/memcached.pid'
-
-getpid() {
-  local pid
-  pid=$(cat $PIDFILE 2>/dev/null)
-  # if the process is no longer valid, don't return it
-  if [ -n "$pid" ]; then
-    if ! ps -p $pid >/dev/null; then
-      rm -f $PIDFILE
-      pid=""
-    fi
-  fi
-  echo $pid
-}
-
-PID="$(getpid)"
-
-case "$1" in
-  start)
-    stat_busy "Starting memcached"
-    # memcached is retarded and doesn't write to the pidfile
-    # before it drops permissions
-    if [ -n "$PID" ]; then
-      stat_fail
-    elif [ -z "$MEMCACHED_USER"  ]; then
-      echo "MEMCACHED_USER must be defined in /etc/conf.d/memcached"
-      stat_fail
-    else
-      touch $PIDFILE && chown $MEMCACHED_USER $PIDFILE
-      /usr/bin/memcached -d -P $PIDFILE -u $MEMCACHED_USER $MEMCACHED_ARGS
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon memcached
-        stat_done
-      fi
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping memcached"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f $PIDFILE
-      rm_daemon memcached
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 8b0964afa..bca90c592 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183544 2013-04-22 22:24:46Z eric $
+# $Id: PKGBUILD 185211 2013-05-12 07:33:11Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=msmtp
 pkgname=('msmtp' 'msmtp-mta')
 pkgver=1.4.31
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://msmtp.sourceforge.net"
@@ -46,7 +46,8 @@ package_msmtp-mta() {
   pkgdesc="A mini smtp client - the regular MTA"
   depends=('msmtp')
   provides=('smtp-forwarder')
+  conflicts=('smtp-forwarder')
 
-  install -d "${pkgdir}/usr/sbin"
-  ln -s /usr/bin/msmtp "${pkgdir}/usr/sbin/sendmail"
+  install -d "${pkgdir}/usr/bin"
+  ln -s msmtp "${pkgdir}/usr/bin/sendmail"
 }
diff --git a/extra/quota-tools/PKGBUILD b/extra/quota-tools/PKGBUILD
index 41bb7f216..d58311b23 100644
--- a/extra/quota-tools/PKGBUILD
+++ b/extra/quota-tools/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167201 2012-09-27 19:22:41Z eric $
+# $Id: PKGBUILD 185213 2013-05-12 07:52:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=quota-tools
 pkgver=4.01
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Tools to manage kernel-level quotas in Linux"
 arch=('i686' 'x86_64')
@@ -16,14 +16,14 @@ source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.
 sha1sums=('64d2ab8b039cfea1aa4bd9e77e8c373488a7f0bf')
 
 build() {
-  cd "${srcdir}/${pkgname}"
+  cd ${pkgname}
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
-  make ROOTDIR="${pkgdir}" install
+  cd ${pkgname}
+  make ROOTDIR="${pkgdir}" sbindir=/usr/bin root_sbindir=/usr/bin STRIP="" install
   install -d "${pkgdir}/usr/share/licenses/${pkgname}"
   head -33 quota.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index bfa7063cd..9cc142f00 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 168629 2012-10-13 16:16:09Z thomas $
+# $Id: PKGBUILD 185234 2013-05-12 10:36:09Z pierre $
 
 pkgname=rsync
 pkgver=3.0.9
-pkgrel=5
+pkgrel=6
 pkgdesc="A file transfer program to keep remote files in sync"
 arch=('i686' 'x86_64')
 url="http://samba.anu.edu.au/rsync/"
@@ -10,13 +10,12 @@ license=('GPL3')
 depends=('perl')
 backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
 source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz"
-        'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service'
+        'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service'
         'rsyncd.socket' 'rsyncd@.service')
 md5sums=('5ee72266fe2c1822333c407e1761b92b'
          'bce64d122a8e0f86872a4a21a03bc7f3'
-         'ba413da4ebca05c57860151fda21efbc'
          'ea3e9277dc908bc51f9eddc0f6b935c1'
-         'ec96f9089d71109557cdcaa3f0633ed6'
+         '084140868d38cf3e937a2db716d47c0f'
          'ae4c381e0c02d6132c7f6ded3f473041'
          '53f94e613e0bc502d38dd61bd2cd7636')
 
@@ -34,7 +33,6 @@ check() {
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
-	install -Dm755 ../rsyncd "$pkgdir/etc/rc.d/rsyncd"
 	install -Dm644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf"
 	install -Dm644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync"
 	install -Dm644 ../rsyncd.service "$pkgdir/usr/lib/systemd/system/rsyncd.service"
diff --git a/extra/rsync/rsyncd b/extra/rsync/rsyncd
deleted file mode 100644
index 27836d5c4..000000000
--- a/extra/rsync/rsyncd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/rsyncd ] && . /etc/conf.d/rsyncd
-
-case "$1" in
-  start)
-    stat_busy "Starting rsyncd"
-    [ ! -f /run/daemons/rsyncd ] && /usr/bin/rsync --daemon $RSYNCD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon rsyncd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping rsyncd"
-    [ -f /run/rsyncd.pid ] && kill `cat /run/rsyncd.pid`
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon rsyncd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/rsync/rsyncd.service b/extra/rsync/rsyncd.service
index ea2e32c68..8502c08cf 100644
--- a/extra/rsync/rsyncd.service
+++ b/extra/rsync/rsyncd.service
@@ -2,8 +2,7 @@
 Description=A file transfer program to keep remote files in sync
 
 [Service]
-EnvironmentFile=-/etc/conf.d/rsyncd
-ExecStart=/usr/bin/rsync --daemon --no-detach ${RSYNCD_ARGS}
+ExecStart=/usr/bin/rsync --daemon --no-detach
 RestartSec=1
 
 [Install]
diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD
index 6aaf6b25b..999b2b0b4 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -1,29 +1,20 @@
-# $Id: PKGBUILD 184186 2013-05-03 10:19:10Z foutrelis $
+# $Id: PKGBUILD 185252 2013-05-12 15:00:41Z foutrelis $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: shamrok <szamrok@gmail.com>
 
 pkgname=smplayer
-pkgver=0.8.4
-pkgrel=2
+pkgver=0.8.5
+pkgrel=1
 pkgdesc="A complete front-end for MPlayer"
 arch=('i686' 'x86_64')
 url="http://smplayer.sourceforge.net/"
 license=('GPL')
 depends=('qt4' 'mplayer')
-makedepends=('optipng')
 install=smplayer.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('4691b569c4209d7e5a2c1386d9319881')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  # Fix invalid PNG icons to work with libpng 1.6
-  # http://sourceforge.net/p/smplayer/bugs/571/
-  find -name '*.png' -exec optipng -quiet -force -fix {} +
-}
+md5sums=('deb781ecdc4dd9f0533ccce8f1772865')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD
index 9e80adbea..8782d5e5d 100644
--- a/extra/spamassassin/PKGBUILD
+++ b/extra/spamassassin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169317 2012-10-19 09:03:47Z bluewind $
+# $Id: PKGBUILD 185272 2013-05-12 17:03:55Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.3.2
-pkgrel=7
+pkgrel=8
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -14,8 +14,7 @@ depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
          'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
 makedepends=('razor' 'perl-dbi') 
 optdepends=('razor: to identify collaborately-flagged spam')
-backup=('etc/conf.d/spamd' 
-        'etc/mail/spamassassin/local.cf'
+backup=('etc/mail/spamassassin/local.cf'
         'etc/mail/spamassassin/init.pre'
         'etc/mail/spamassassin/v310.pre'
         'etc/mail/spamassassin/v312.pre'
@@ -24,10 +23,8 @@ backup=('etc/conf.d/spamd'
 install="${pkgname}.install"
 options=('!emptydirs')
 source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"
-        'spamd.conf.d' 'spamd' 'spamassassin.service')
+        'spamassassin.service')
 md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
-         'af501c6b0bb937a2775b747cc4b6d150'
-         '57545e6877503d897db21e9a2e8bd2b9'
          'ded3e012a4d502df001f2d97c495cc4e')
 
 build() {
@@ -55,7 +52,5 @@ package() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd"
-  install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd"
   install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service"
 }
diff --git a/extra/spamassassin/spamd b/extra/spamassassin/spamd
deleted file mode 100644
index 3fb97566e..000000000
--- a/extra/spamassassin/spamd
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/spamd ] && . /etc/conf.d/spamd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PIDFILE=/var/run/spamd.pid
-if [ -f $PIDFILE ]; then
-  PID=$(cat $PIDFILE)
-else
-  PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting spamd"
-    [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d -r "$PIDFILE" ${SPAMD_OPTS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon spamd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping spamd"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      # Some users report that a second attempt at stopping the process
-      # works.  So, take a little nap and give it another whirl...
-      sleep 2
-      kill $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon spamd
-        stat_done
-      fi
-    else
-      rm_daemon spamd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/spamassassin/spamd.conf.d b/extra/spamassassin/spamd.conf.d
deleted file mode 100644
index 4295e0073..000000000
--- a/extra/spamassassin/spamd.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-SPAMD_OPTS="-c"
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index 123c35111..1688fdf7d 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183246 2013-04-19 14:14:54Z giovanni $
+# $Id: PKGBUILD 185261 2013-05-12 16:27:13Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=whois
-pkgver=5.0.24
+pkgver=5.0.25
 pkgrel=1
 pkgdesc="The whois client by Marco d'Itri"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('libidn')
 makedepends=('perl')
 source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz")
-md5sums=('34c45f9beaafa5ae58d7d8b366c7c262')
+md5sums=('8f873c1c51592ee419b2a46b0a3c8432')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD
index 6adb11b90..cfed51c91 100644
--- a/extra/xfce4-power-manager/PKGBUILD
+++ b/extra/xfce4-power-manager/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 160263 2012-05-31 17:40:20Z foutrelis $
+# $Id: PKGBUILD 185209 2013-05-12 07:30:46Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfce4-power-manager
 pkgver=1.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Power manager for Xfce desktop"
 arch=('i686' 'x86_64')
-url="http://xfce-goodies.berlios.de/"
+url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
 depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme')
@@ -30,6 +30,7 @@ build() {
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
+    --sbindir=/usr/bin \
     --libexecdir=/usr/lib \
     --localstatedir=/var \
     --disable-network-manager \
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 0daf90aec..f52891d3d 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -10,7 +10,7 @@ _pkgname=clementine
 pkgname=clementine-libre
 pkgver=1.1.1
 pkgrel=8
-pkgdesc="A music player and library organizer, without spotify support"
+pkgdesc="A music player and library organizer, without nonfree artwork and spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -27,7 +27,8 @@ conflicts=('clementine')
 provides=("clementine=$pkgver")
 source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
         'clementine-1.1.1-libimobiledevice-fix.patch'
-        'remove-and-disable-spotify.patch')
+        'remove-nonfree-artwork-and-spotify.patch'
+        'moognu.png')
 install=clementine.install
 
 build() {
@@ -35,18 +36,25 @@ build() {
 
    patch -Np1 < "$srcdir"/clementine-1.1.1-libimobiledevice-fix.patch
 
-   # Remove nonfree spotify references on files
-   patch -Np1 -i ../remove-and-disable-spotify.patch
+   # Remove nonfree nonfree artwork and spotify references on files
+   patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
 
    # Remove nonfree spotifyblob folders
    rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob}
 
    # Remove nonfree spotify files
    rm -v cmake/SpotifyVersion.cmake
+   rm -v data/spotify-core-logo-128x128.png
    rm -v data/icons/svg/spotify.svg
    rm -v data/schema/schema-30.sql
    rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}}
 
+   ## Remove nonfree nyancat.png
+   rm -v data/nyancat.png
+
+   ## Put moognu.png to the source code
+   cp -v ../moognu.png data
+
    # Create a blank file due that is a dependency for clementine
    touch data/schema/schema-30.sql  
 
@@ -59,4 +67,6 @@ package() {
    make DESTDIR="${pkgdir}" install
 }
 md5sums=('28e4afb822388bd337a761db8f86febf'
-         '736df6cd828a3172701f63c8dc978cb9')
+         '736df6cd828a3172701f63c8dc978cb9'
+         '5cc8f800dd4df7bd5548196009ab68e0'
+         '59a8c0d7659898c457b95f877718cf1c')
diff --git a/libre/clementine-libre/moognu.png b/libre/clementine-libre/moognu.png
new file mode 100644
index 000000000..177041886
--- /dev/null
+++ b/libre/clementine-libre/moognu.png
diff --git a/libre/clementine-libre/remove-and-disable-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
index a9352b275..6008b2d28 100644
--- a/libre/clementine-libre/remove-and-disable-spotify.patch
+++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
@@ -86,9 +86,9 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
  if(HAVE_MOODBAR)
    add_subdirectory(gst/moodbar)
  endif()
-diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc
---- clementine-1.1.0/data/data.qrc	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/data/data.qrc	2012-10-26 01:59:52.333078474 -0200
+diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
+--- clementine-1.1.1/data/data.qrc		2012-11-18 06:51:26.000000000 -0200
++++ clementine-libre-1.1.1/data/data.qrc	2013-05-13 02:55:19.579440533 -0300
 @@ -1,7 +1,6 @@
  <RCC>
      <qresource prefix="/">
@@ -121,7 +121,19 @@ diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc
          <file>icons/48x48/view-choose.png</file>
          <file>icons/48x48/view-fullscreen.png</file>
          <file>icons/48x48/view-media-equalizer.png</file>
-@@ -339,7 +334,6 @@
+@@ -261,10 +257,10 @@
+         <file>lumberjacksong.txt</file>
+         <file>lyrics/ultimate_providers.xml</file>
+         <file>mainwindow.css</file>
++        <file>moognu.png</file>
+         <file>nocover.png</file>
+         <file>nomusic.png</file>
+         <file>now_playing_tooltip.txt</file>
+-        <file>nyancat.png</file>
+         <file>osd_background.png</file>
+         <file>osd_shadow_corner.png</file>
+         <file>osd_shadow_edge.png</file>
+@@ -339,7 +335,6 @@
          <file>smartplaylistsearchterm.css</file>
          <file>songinfo.css</file>
          <file>spinner.gif</file>
@@ -526,10 +538,14 @@ diff -rauN clementine-1.1.0/src/internet/internetmodel.cpp clementine-libre-1.1.
  }
  
  void InternetModel::AddService(InternetService *service) {
-diff -rauN clementine-1.0.1/src/ui/about.cpp clementine-libre-1.0.1/src/ui/about.cpp
---- clementine-1.0.1/src/ui/about.cpp	2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/src/ui/about.cpp	2012-05-28 19:44:38.760244927 -0300
-@@ -79,12 +79,6 @@
+diff -rauN clementine-1.1.1/src/ui/about.cpp clementine-libre-1.1.1/src/ui/about.cpp
+--- clementine-1.1.1/src/ui/about.cpp		2012-10-11 09:16:40.000000000 -0200
++++ clementine-libre-1.1.1/src/ui/about.cpp	2013-05-13 02:19:40.262472593 -0300
+@@ -75,16 +75,9 @@
+ 
+   ret += QString("<br />%1</p>").arg(tr("...and all the Amarok contributors"));
+   ret += QString("<p><b>%1</b>").arg(tr("And:"));
+-  ret += QString("<br /><a href=\"http://rainymood.com\">Rainy Mood</a>");
    ret += QString("<br /><a href=\"http://www.smitelli.com/?page=blog&p=54\">Scott Smitelli</a>");
    ret += QString("<br /><a href=\"http://hyperboleandahalf.blogspot.com\">Allie Brosh</a></p>");
  
@@ -621,3 +637,34 @@ diff -rauN clementine-1.0.1/src/core/timeconstants.h clementine-libre-1.0.1/src/
  #ifndef TIMECONSTANTS_H
  #define TIMECONSTANTS_H
  
+diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1.1/src/core/backgroundstreams.cpp
+--- clementine-1.1.1/src/core/backgroundstreams.cpp		2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.1/src/core/backgroundstreams.cpp	2013-05-13 02:20:21.506864034 -0300
+@@ -9,7 +9,6 @@
+ 
+ const char* BackgroundStreams::kSettingsGroup = "BackgroundStreams";
+ const char* BackgroundStreams::kHypnotoadUrl = "hypnotoad:///";
+-const char* BackgroundStreams::kRainUrl = "http://data.clementine-player.org/rainymood";
+ const char* BackgroundStreams::kEnterpriseUrl = "enterprise:///";
+ 
+ BackgroundStreams::BackgroundStreams(EngineBase* engine, QObject* parent)
+@@ -28,7 +27,6 @@
+   int version = s.value("version", 0).toInt();
+   if (version < 1) {
+     AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl));
+-    AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl));
+   }
+ 
+   if (version < kVersion) {
+diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp
+--- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp	2012-10-16 08:17:37.000000000 -0200
++++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp	2013-05-13 03:56:04.732771832 -0300
+@@ -29,7 +29,7 @@
+ 
+ NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent)
+   : Analyzer::Base(parent, 9),
+-    cat_(":/nyancat.png"),
++    cat_(":/moognu.png"),
+     timer_id_(startTimer(kFrameIntervalMs)),
+     frame_(0),
+     current_buffer_(0),
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 173af8d0a..4c1daea62 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.9.1
+_kernver=3.9.2
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _version=v3.9-rc4
 _pkgver=3.9-rc4-2-su
 pkgver=3.9rc4.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 596cbbf4a..cf56e1f37 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184768 2013-05-08 09:45:41Z tpowa $
+# $Id: PKGBUILD 185176 2013-05-11 19:40:40Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.9
-_sublevel=1
+_sublevel=2
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('120df29f88622dabf7015a22c7cc8e25'
-         '72f23e5909202cf5124a2a3bedec3852'
+         '1a5e653d2c281cccef9b44340a94a866'
          '9684934c48eb2c7bb7179b7e5b2c245f'
          'd9ff747f6c2bd3a6e4a94a2abc4af9ca'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -39,7 +39,7 @@ md5sums=('120df29f88622dabf7015a22c7cc8e25'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
-         'e7efe89395507569550103e0504232f8')
+         '2cc468726d0b215d45cbd28be6dee198')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index cef317042..f849635c1 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.9.1-1-LIBRE
+KERNEL_VERSION=3.9.2-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/pcr/ha-glue/PKGBUILD b/pcr/ha-glue/PKGBUILD
new file mode 100644
index 000000000..d170155d9
--- /dev/null
+++ b/pcr/ha-glue/PKGBUILD
@@ -0,0 +1,98 @@
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=ha-glue
+_pkgname=${pkgname:3}
+pkgver=1.0.11
+pkgrel=2
+pkgdesc='A set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack.'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url=http://linux-ha.org/wiki/Cluster_${_pkgname^}
+license=GPL
+depends=(
+  curl
+  glib2
+  libaio
+  libtool
+  libxml2
+  net-snmp
+  python2
+  util-linux
+)
+source=(
+  http://hg.linux-ha.org/$_pkgname/archive/$_pkgname-$pkgver.tar.bz2
+  ha-logd.service
+)
+sha512sums=(
+  35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
+  9252472a6d7a1bbad765c63becdec4064d882b1eb98abdf27833a6e06d8750f06663b2460d32a4c72d04f10a7480ef0a2093b8a18b4d1fc62a989cde54ee056a
+)
+install=$pkgname.install
+options=(
+  '!libtool'
+  docs
+)
+
+prepare() {
+  export _CLUSTER_USER=hacluster
+  export _CLUSTER_GROUP=haclient
+  _DGID=666
+  _DUID=666
+
+  #verify the cluster user and group
+  if ! getent group $_CLUSTER_GROUP >/dev/null;then
+    msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER GROUP, EXECUTE AS ROOT:'
+    echo -e "# groupadd -r -g $_DGID $_CLUSTER_GROUP\n"
+    _EXITCODE=1
+  fi
+  if ! getent passwd $_CLUSTER_USER >/dev/null;then
+    msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER USER, EXECUTE AS ROOT:'
+    echo -e "# useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/$_CLUSTER_USER -s /sbin/nologin -c \"cluster user\" $_CLUSTER_USER\n"
+    _EXITCODE=1
+  fi
+  if [[ $_EXITCODE -eq 1 ]] ;then
+    return 1
+  fi
+
+  cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.ac
+}
+
+build() {
+  cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver
+  sed -i 's/<glib\/gtypes\.h>/<glib\.h>/g' include/clplumbing/cl_uuid.h
+  setarch $CARCH ./autogen.sh
+  setarch $CARCH ./configure --prefix=/usr\
+    --enable-fatal-warnings=no\
+    --libdir=/usr/lib\
+    --libexecdir=/usr/lib/$pkgname\
+    --localstatedir=/var\
+    --sysconfdir=/etc\
+    --with-daemon-group=$_CLUSTER_GROUP\
+    --with-daemon-user=$_CLUSTER_USER
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  #python path correction
+  for py in `grep -r -l "\#\!\/usr\/bin\/python" $pkgdir`;do
+    sed -i 's:/usr/bin/python$:/usr/bin/python2:g' $py
+  done 
+  for py in `grep -r -l "\#\!\/usr\/bin\/env python" $pkgdir`;do
+    sed -i 's:/usr/bin/env python$:/usr/bin/env python2:g' $py
+  done
+  #end python path correction
+
+  install -d $pkgdir/usr/lib/systemd/system
+  install -Dm644 $srcdir/ha-logd.service $pkgdir/usr/lib/systemd/system
+
+  msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:'
+  echo -e "# userdel $_CLUSTER_USER"
+  echo -e "# groupdel $_CLUSTER_GROUP"
+}
diff --git a/pcr/ha-glue/ha-glue.install b/pcr/ha-glue/ha-glue.install
new file mode 100644
index 000000000..abfedb7c4
--- /dev/null
+++ b/pcr/ha-glue/ha-glue.install
@@ -0,0 +1,22 @@
+_CLUSTER_USER=hacluster
+_CLUSTER_GROUP=haclient
+_PREFIX=/usr
+_PREFIXETC=/etc
+_PREFIXVAR=/var
+_LCRSODIR=$PREFIX/libexec/lcrso
+_DGID=666
+_DUID=666
+pre_install() {
+	getent group $_CLUSTER_GROUP >/dev/null || groupadd -r -g $_DGID $_CLUSTER_GROUP
+	getent passwd $_CLUSTER_USER >/dev/null || useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin -c "cluster user" ${_CLUSTER_USER}
+}
+
+post_install() {
+	echo -e "\nNow you must install ha-resourceagent, ha-heartbeat and ha-pacemaker\n"
+
+}
+post_remove() {
+	echo -e "\nDeleting user $_CLUSTER_USER and group $_CLUSTER_GROUP "
+	userdel $_CLUSTER_USER
+	groupdel $_CLUSTER_GROUP
+}
diff --git a/pcr/ha-glue/ha-logd.service b/pcr/ha-glue/ha-logd.service
new file mode 100644
index 000000000..1847d8cdd
--- /dev/null
+++ b/pcr/ha-glue/ha-logd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Startup script logd service.
+Requires=network.target remote-fs.target
+
+[Service]
+Type=forking
+ExecStart=/usr/lib/heartbeat/ha_logd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD
new file mode 100644
index 000000000..538949f60
--- /dev/null
+++ b/pcr/lcmc/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=lcmc
+pkgver=1.5.1
+pkgrel=1
+pkgdesc='Linux Cluster Management Console'
+arch=any
+url=http://$pkgname.sourceforge.net/
+license=GPL
+depends=(
+  java-runtime
+  libxtst
+)
+source=(
+  http://downloads.sourceforge.net/$pkgname/${pkgname^^*}-$pkgver.jar
+  $pkgname.desktop
+)
+sha512sums=(
+  7f8c68ef45078bda1bf6a811affb782e1ae440fd7d9aceca6a73fb315ffb37a4483d0a8fa80fb058c6522d2053088dd9bcfcb9a9f09b8660ab200594cb38d7af
+  232866f1fbb806edc8d2844527bb44ba5c568fa57da308e7457e1d1140113ad173c2c7c40f29eac6712e1e2601db85cfecdcca525eecda355b32f8a370f9f87e
+)
+
+package() {
+  cd $srcdir
+  install -d $pkgdir/usr/bin
+  echo "#!/bin/bash\njava -jar /usr/lib/$pkgname/${pkgname^^}-$pkgver.jar" > $pkgdir/usr/bin/lcmc
+  install -d $pkgdir/usr/lib/$pkgname
+  install -t $pkgdir/usr/lib/$pkgname ${pkgname^^}-$pkgver.jar
+  for i in 16x16 32x32 48x48 64x64 128x128 256x256; do
+    install -d $pkgdir/usr/share/icons/hicolor/$i/apps
+    install -t $pkgdir/usr/share/icons/hicolor/$i/apps\
+      $srcdir/images/Icons/$i/$pkgname.png
+  done
+  install -d $pkgdir/usr/share/applications
+  install -t $pkgdir/usr/share/applications $pkgname.desktop
+}
+
+# vim:set ts=2 sw=2 et:
+
diff --git a/pcr/lcmc/lcmc.desktop b/pcr/lcmc/lcmc.desktop
new file mode 100644
index 000000000..2bcd93de6
--- /dev/null
+++ b/pcr/lcmc/lcmc.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.5.1
+Encoding=UTF-8
+Name=Linux Cluster Management Console
+Comment=Linux Cluster Management Console
+Exec=/usr/bin/lcmc
+Icon=/usr/share/icons/hicolor/256x256/apps/lcmc.png
+Terminal=false
+Type=Application
+Categories=Java;Network;
diff --git a/pcr/torque/PKGBUILD b/pcr/torque/PKGBUILD
index 7ed85c1d8..5f469fa5f 100644
--- a/pcr/torque/PKGBUILD
+++ b/pcr/torque/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=torque
 pkgver=4.2.2
 _pkgver=1065
-pkgrel=1
+pkgrel=2
 pkgdesc='An open source resource manager providing control over batch jobs and distributed compute nodes.'
 url=http://www.adaptivecomputing.com/products/open-source/$pkgname/
 arch=(
@@ -53,8 +53,9 @@ build() {
 package() {
   cd $srcdir/$pkgname-$pkgver
   setarch $CARCH make DESTDIR=$pkgdir install
-  mkdir -p $pkgdir/etc/systemd/system
-  cp $srcdir/*.service $pkgdir/etc/systemd/system
+
+  install -d $pkgdir/usr/lib/systemd/system
+  install -Dm644 $srcdir/*.service $pkgdir/usr/lib/systemd/system
 }
 
 # vim:set ts=2 sw=2 et:
author	root <root@rshg054.dnsready.net>	2013-05-13 01:16:28 -0700
committer	root <root@rshg054.dnsready.net>	2013-05-13 01:16:28 -0700
commit	66cb4a487ad73063c6b000279a5d5558fb7603f5 (patch)
tree	ee73bbc414ba8aec6b9a578578ceaabd38fff01e
parent	5b9e0d821dd428792bd51ed03af2b800924ce69d (diff)