Fri May 24 00:06:06 PDT 2013

100 files changed, 1040 insertions, 603 deletions

diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD
index 79f4bd51d..b99a70eda 100644
--- a/community/arpwatch/PKGBUILD
+++ b/community/arpwatch/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87787 2013-04-06 15:38:17Z seblu $
+# $Id: PKGBUILD 91484 2013-05-23 10:11:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sébastien Luttringer
 
 pkgname=arpwatch
 pkgver=2.1a15
-pkgrel=10
+pkgrel=11
 pkgdesc='Ethernet/FDDI station activity monitor'
 arch=('i686' 'x86_64')
 url='ftp://ftp.ee.lbl.gov/'
@@ -16,7 +16,7 @@ source=("ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
 md5sums=('cebfeb99c4a7c2a6cee2564770415fe7'
          '9359518c500562281e76cdb0b2fa9062'
-         '2324a202222303daa1a41d8abd7a7e4a')
+         '43e2358ba0532da38e5296250a7fcfd8')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -28,13 +28,13 @@ prepare() {
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make SENDMAIL=/usr/sbin/sendmail
+  ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin
+  make SENDMAIL=`which sendmail`
 }
 
 package() {
   cd $pkgname-$pkgver
-  install -d -m 0755 "$pkgdir"/usr/{sbin,share/man}
+  install -d -m 0755 "$pkgdir"/usr/{bin,share/man}
   make DESTDIR="$pkgdir" install install-man
   # install ether prefix database
   install -Dm644 ethercodes.dat "$pkgdir/var/lib/$pkgname/ethercodes.dat"
diff --git a/community/arpwatch/arpwatch.service b/community/arpwatch/arpwatch.service
index 570f93852..ede31f3f7 100644
--- a/community/arpwatch/arpwatch.service
+++ b/community/arpwatch/arpwatch.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 ExecStartPre=/usr/bin/touch /var/lib/arpwatch/%I.dat
-ExecStart=/usr/sbin/arpwatch -f /var/lib/arpwatch/%I.dat -i %I
+ExecStart=/usr/bin/arpwatch -f /var/lib/arpwatch/%I.dat -i %I
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD
index b875b26f6..1b1e71bbb 100644
--- a/community/busybox/PKGBUILD
+++ b/community/busybox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 85655 2013-03-04 13:07:52Z spupykin $
+# $Id: PKGBUILD 91555 2013-05-23 15:08:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Pranaitis <jens@jenux.homelinux.org>
 
 pkgname=busybox
 pkgver=1.20.2
-pkgrel=2
+pkgrel=5
 pkgdesc="Utilities for rescue and embedded systems"
 arch=("i686" "x86_64")
 url="http://www.busybox.net"
@@ -27,5 +27,5 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  install -Dm755 busybox $pkgdir/bin/busybox
+  install -Dm755 busybox $pkgdir/usr/bin/busybox
 }
diff --git a/community/busybox/busybox.install b/community/busybox/busybox.install
index ecbeec39a..7bf2a83ac 100644
--- a/community/busybox/busybox.install
+++ b/community/busybox/busybox.install
@@ -1,13 +1,14 @@
 post_install() {
-  echo "You may want to do setuid on /bin/busybox"
-  echo "  chmod 4555 /bin/busybox"
+  echo "You may want to do setuid on /usr/bin/busybox"
+  echo "  chmod 4555 /usr/bin/busybox"
 }
 
 pre_upgrade() {
-  busybox stat -c %a bin/busybox >tmp/busybox.upgrade.script
+  busybox stat -c %a usr/bin/busybox >tmp/busybox.upgrade.script
 }
 
 post_upgrade() {
-  [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` bin/busybox
+  [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` usr/bin/busybox
   busybox rm -f tmp/busybox.upgrade.script
+  echo "busybox is un /usr/bin now. Readjust its mode if you modified it."
 }
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
index 3769e32f9..e53dd9e88 100644
--- a/community/cinnamon-control-center/PKGBUILD
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90971 2013-05-16 22:26:24Z bgyorgy $
+# $Id: PKGBUILD 91472 2013-05-23 01:19:04Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com
 # Based on gnome-control-center:
 # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=cinnamon-control-center
-pkgver=1.8.0
-pkgrel=2
+pkgver=1.8.2
+pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64')
 depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet')
@@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
         "gnomerrlabeler.patch"
         "idle-delay.patch")
-sha256sums=('7230d509f5837906b5497279cfbd96180e5c8dad89777fb31a81fd0c73354fa9'
+sha256sums=('78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f'
             'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db'
             '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67')
 
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index cc936eaf3..f7164d02a 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90347 2013-05-11 17:08:40Z faidoc $
+# $Id: PKGBUILD 91564 2013-05-23 20:10:59Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.8.2
-pkgrel=2
+pkgver=1.8.6
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
@@ -31,14 +31,16 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/
         "switch-applications.patch"
         "fallback-helpers.patch"
         "idle-dim.patch")
-sha256sums=('83179f98f9e6c88928146d43a9d3f581c64706c0a60dac5e58d845a30a275a91'
+sha256sums=('6b1d606e9b42892877b481f456f2dee4684c4d7aedf8e656ec1114037d7b5fc8'
             'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
             'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
-            '9a091c0b651a5af1700c8eca90b9e81bb9a50a8a9bfa6a7352d0c0daa2f3f271'
+            '01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e'
             '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
             'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e'
             'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100')
 
+
+
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*
 
diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch
index 5af7c3a79..b79ea497a 100644
--- a/community/cinnamon/gnome-3.8.patch
+++ b/community/cinnamon/gnome-3.8.patch
@@ -1404,7 +1404,9 @@ index 50c4e1e..c8427ac 100644
          this._trackInfosTop.set_child(this.infos_top);
          this._trackInfosBottom.set_child(this.infos_bottom);
  
-@@ -414,90 +256,39 @@ Player.prototype = {
+--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+@@ -414,45 +414,20 @@
          this._trackControls.set_child(this.controls);
          this.addActor(this._trackControls);
  
@@ -1463,14 +1465,8 @@ index 50c4e1e..c8427ac 100644
 +    }
  
          /* this players don't support seek */
--        if (support_seek.indexOf(this._name) == -1) {
-+        if (support_seek.indexOf(this._name) == -1)
-             this._time.hide();
--            this.showPosition = false;
--            this._positionSlider.hide();
--        }
-         this._getStatus();
-         this._trackId = {};
+         if (support_seek.indexOf(this._name) == -1) {
+@@ -465,39 +440,23 @@
          this._getMetadata();
          this._currentTime = 0;
          this._getPosition();
@@ -1486,14 +1482,17 @@ index 50c4e1e..c8427ac 100644
 -                this._setMetadata(iface, value["Metadata"]);
 -            //qmmp
 -            if(sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
--                if (value["playbackStatus"])
++                this._setMetadata(value["Metadata"]);
++            // qmmp
++            if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
+                 if (value["playbackStatus"])
 -                    this._setStatus(iface, value["playbackStatus"]);
--                if (value["metadata"])
++                    this._setStatus(value["playbackStatus"]);
+                 if (value["metadata"])
 -                    this._setMetadata(sender, value["metadata"]);
 -            } 
-+                this._setMetadata(value["Metadata"]);
-         }));
- 
+-        }));
+-
 -        this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) {
 -            if (value > 0) {
 -                this._setPosition(value);
@@ -1504,17 +1503,20 @@ index 50c4e1e..c8427ac 100644
 -                // when the track is seeked so we set the position at the
 -                // value we set on the slider
 -                this._setPosition(this._wantedSeekValue);
--            }
++                    this._setMetadata(value["metadata"]);
+             }
 -            // Seek value send by the player
 -            else
 -                this._setPosition(value);
--
++        }));
+ 
 -            this._wantedSeekValue = 0;
 +        this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) {
 +            this._setPosition(sender, value);
          }));
  
          Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition));
+
 @@ -512,45 +303,26 @@ Player.prototype = {
          this._playerInfo.setText(this._getName() + " - " + _(status));
      },
@@ -3923,20 +3925,7 @@ index c8427ac..a7b2e09 100644
  /* dummy vars for translation */
  let x = _("Playing");
  x = _("Paused");
-@@ -285,6 +285,13 @@ Player.prototype = {
-                 this._setStatus(value["PlaybackStatus"]);
-             if (value["Metadata"])
-                 this._setMetadata(value["Metadata"]);
-+            // qmmp
-+            if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
-+                if (value["playbackStatus"])
-+                    this._setStatus(value["playbackStatus"]);
-+                if (value["metadata"])
-+                    this._setMetadata(value["metadata"]);
-+            }
-         }));
- 
-         this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) {
+
 @@ -377,7 +384,8 @@ Player.prototype = {
                      cover.read_async(null, null, Lang.bind(this, this._onReadCover));
                  }
@@ -4181,3 +4170,17 @@ index 418fb60..773fb65 100644
  static void
 -- 
 1.8.1.6
+
+--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+@@ -801,7 +801,7 @@
+             this._players = {};
+             // watch players
+             for (var p=0; p<compatible_players.length; p++) {
+-                DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false,
++                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
+                     Lang.bind(this, this._addPlayer),
+                     Lang.bind(this, this._removePlayer)
+                 );
+-- 
+1.8.1.6
\ No newline at end of file
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index 284566097..9dc722249 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90653 2013-05-13 14:20:23Z spupykin $
+# $Id: PKGBUILD 91488 2013-05-23 10:12:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
 
 pkgname=dbmail
 pkgver=3.0.2
-pkgrel=10
+pkgrel=11
 pkgdesc="Fast and scalable sql based mail services"
 arch=('i686' 'x86_64')
 depends=('gmime24' 'libzdb' 'mhash' 'libevent')
@@ -31,19 +31,19 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
 	dbmail-timsieved.xinetd)
 md5sums=('eb32235abffdf967253ee9d004e0e4a9'
          'c4b5793c5422b62a675d4c66ff7e9300'
-         '84efa46eaac66057c4eb131d9bc27fa8'
-         '19560277f6a56d1f3f2fdb02315dcf0f'
-         '89a0f793737eaf36291409f8c840891e'
-         'dd1b5b2c542f55d9d934a58a36d0513d'
-         '8fa791f2e4d107ba461453c054359477'
-         '069cd4285c4b2ec95dfdcebc2cfee387'
-         '44f87ce81e786fcee501daa17e55412a'
-         'a66927cb94d4f26428211e3ad2d540c8')
+         '5a6297cb03c8d0b424f978ea1d7402de'
+         '070db88538af9833f003f4cb516d337b'
+         '422f0399f97a780b7cab84443e8f429a'
+         '15c7d367d4242aebac5f87649a2250aa'
+         '890de13361afbdf4fed12d6d7eb53e66'
+         '961593658cd596297d03d25eb9c9e98f'
+         '4cb764894abd3914802e90602bf90a0c'
+         'e78dc86355f9aaf24590bc7c6611162f')
 
 build() {
   cd $srcdir/dbmail-${pkgver/_/-}/
-
-  [ -f Makefile ] || ./configure --prefix=/usr --with-ldap --with-sieve
+  [ -f Makefile ] || ./configure --prefix=/usr --sbindir=/usr/bin \
+    --with-ldap --with-sieve
   make
 }
 
diff --git a/community/dbmail/dbmail-imapd.service b/community/dbmail/dbmail-imapd.service
index e67e0c4e8..bc3319fd0 100644
--- a/community/dbmail/dbmail-imapd.service
+++ b/community/dbmail/dbmail-imapd.service
@@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/dbmail/dbmail-imapd.pid
-ExecStart=/usr/sbin/dbmail-imapd -p /var/run/dbmail/dbmail-imapd.pid
+PIDFile=/run/dbmail/dbmail-imapd.pid
+ExecStart=/usr/bin/dbmail-imapd -p /run/dbmail/dbmail-imapd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-imapd.xinetd b/community/dbmail/dbmail-imapd.xinetd
index eee3635df..20f7d607d 100644
--- a/community/dbmail/dbmail-imapd.xinetd
+++ b/community/dbmail/dbmail-imapd.xinetd
@@ -3,9 +3,11 @@ service imap
       socket_type     = stream
       wait            = no
       user            = nobody
-      server          = /usr/sbin/dbmail-imapd
+      server          = /usr/bin/dbmail-imapd
       protocol        = tcp
       server_args     = -n
       log_on_failure  += USERID
       disable         = yes
+#      env             = EVENT_NOEPOLL=yes
+#      instances       = 200
 }
diff --git a/community/dbmail/dbmail-lmtpd.service b/community/dbmail/dbmail-lmtpd.service
index 2a059a15c..570ba1ec7 100644
--- a/community/dbmail/dbmail-lmtpd.service
+++ b/community/dbmail/dbmail-lmtpd.service
@@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/dbmail/dbmail-lmtpd.pid
-ExecStart=/usr/sbin/dbmail-lmtpd -p /var/run/dbmail/dbmail-lmtpd.pid
+PIDFile=/run/dbmail/dbmail-lmtpd.pid
+ExecStart=/usr/bin/dbmail-lmtpd -p /run/dbmail/dbmail-lmtpd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-lmtpd.xinetd b/community/dbmail/dbmail-lmtpd.xinetd
index 63365fee4..0a0e05620 100644
--- a/community/dbmail/dbmail-lmtpd.xinetd
+++ b/community/dbmail/dbmail-lmtpd.xinetd
@@ -5,7 +5,7 @@ service lmtp
       socket_type     = stream
       wait            = no
       user            = nobody
-      server          = /usr/sbin/dbmail-lmtpd
+      server          = /usr/bin/dbmail-lmtpd
       protocol        = tcp
       server_args     = -n
       log_on_failure  += USERID
diff --git a/community/dbmail/dbmail-pop3d.service b/community/dbmail/dbmail-pop3d.service
index 907f43b2b..edfa2570a 100644
--- a/community/dbmail/dbmail-pop3d.service
+++ b/community/dbmail/dbmail-pop3d.service
@@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/dbmail/dbmail-pop3d.pid
-ExecStart=/usr/sbin/dbmail-pop3d -p /var/run/dbmail/dbmail-pop3d.pid
+PIDFile=/run/dbmail/dbmail-pop3d.pid
+ExecStart=/usr/bin/dbmail-pop3d -p /run/dbmail/dbmail-pop3d.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-pop3d.xinetd b/community/dbmail/dbmail-pop3d.xinetd
index 6c5b06735..f073aca8b 100644
--- a/community/dbmail/dbmail-pop3d.xinetd
+++ b/community/dbmail/dbmail-pop3d.xinetd
@@ -3,9 +3,11 @@ service pop3
       socket_type     = stream
       wait            = no
       user            = nobody
-      server          = /usr/sbin/dbmail-pop3d
+      server          = /usr/bin/dbmail-pop3d
       protocol        = tcp
       server_args     = -n
       log_on_failure  += USERID
       disable         = yes
+#      env             = EVENT_NOEPOLL=yes
+#      instances       = 200
 }
diff --git a/community/dbmail/dbmail-timsieved.service b/community/dbmail/dbmail-timsieved.service
index 7f34bacec..32623e038 100644
--- a/community/dbmail/dbmail-timsieved.service
+++ b/community/dbmail/dbmail-timsieved.service
@@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/dbmail/dbmail-timsieved.pid
-ExecStart=/usr/sbin/dbmail-timsieved -p /var/run/dbmail/dbmail-timsieved.pid
+PIDFile=/run/dbmail/dbmail-timsieved.pid
+ExecStart=/usr/bin/dbmail-timsieved -p /run/dbmail/dbmail-timsieved.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-timsieved.xinetd b/community/dbmail/dbmail-timsieved.xinetd
index 77ed27c31..69f6dd66b 100644
--- a/community/dbmail/dbmail-timsieved.xinetd
+++ b/community/dbmail/dbmail-timsieved.xinetd
@@ -1,11 +1,15 @@
 service sieve
 {
+#      port            = 2000
+#      type            = UNLISTED
       socket_type     = stream
       wait            = no
       user            = nobody
-      server          = /usr/sbin/dbmail-timsieved
+      server          = /usr/bin/dbmail-timsieved
       protocol        = tcp
       server_args     = -n
       log_on_failure  += USERID
       disable         = yes
+#      env             = EVENT_NOEPOLL=yes
+#      instances       = 200
 }
diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index c4f7bbe21..0b414feb2 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91432 2013-05-22 10:39:51Z spupykin $
+# $Id: PKGBUILD 91490 2013-05-23 10:12:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ejabberd
 pkgver=2.1.12
-pkgrel=3
+pkgrel=4
 pkgdesc="Jabber server written in Erlang"
 arch=('x86_64' 'i686')
 url="http://www.ejabberd.im/"
@@ -35,8 +35,10 @@ package() {
   install -d "$pkgdir/var/lib/$pkgname"
   install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
   chmod ug+r "$pkgdir/etc/$pkgname/"*
-  chmod a+rx "$pkgdir/usr/sbin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
-  rm -rf "$pkgdir/var/lock"
+  mkdir -p $pkgdir/usr/bin
+  mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
+  chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
+  rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
   install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
 }
 
diff --git a/community/f2fs-tools/PKGBUILD b/community/f2fs-tools/PKGBUILD
deleted file mode 100644
index a089b0e35..000000000
--- a/community/f2fs-tools/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Christian Hesse <mail@eworm.de>
-
-pkgname=f2fs-tools
-pkgver=1.1.0
-pkgrel=2
-pkgdesc="Tools for Flash-Friendly File System (F2FS)"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/f2fs-tools/"
-depends=('util-linux')
-license=('GPL')
-source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz')
-sha256sums=('c8cfb6895a0b3775f0df00a776fd451558739289684dd43f1fd75f876fa62867')
-
-build() {
-	cd "${pkgname}-${pkgver}"
-
-	autoreconf -fi
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}/" install
-}
-
diff --git a/community/igmpproxy/PKGBUILD b/community/igmpproxy/PKGBUILD
index 1e2002b0c..5255e1648 100644
--- a/community/igmpproxy/PKGBUILD
+++ b/community/igmpproxy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90675 2013-05-13 14:26:33Z spupykin $
+# $Id: PKGBUILD 91494 2013-05-23 10:13:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: sda <sda00@himki.net>
 
 pkgname=igmpproxy
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="a simple multicast router for Linux only using the IGMP protocol"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/igmpproxy"
@@ -15,11 +15,11 @@ backup=("etc/igmpproxy.conf")
 source=("http://downloads.sourceforge.net/sourceforge/igmpproxy/igmpproxy-$pkgver.tar.gz"
 	"igmpproxy.service")
 md5sums=('c56f41ec195bc1fe016369bf74efc5a1'
-         '2ff8500f8a59cdfaf910e48cd54ab659')
+         '2a4387442ce00297d97371f729f8b21e')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make
 }
 
diff --git a/community/igmpproxy/igmpproxy.service b/community/igmpproxy/igmpproxy.service
index c10ec63b1..734d600ab 100644
--- a/community/igmpproxy/igmpproxy.service
+++ b/community/igmpproxy/igmpproxy.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart=/usr/sbin/igmpproxy /etc/igmpproxy.conf
+ExecStart=/usr/bin/igmpproxy /etc/igmpproxy.conf
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/leafnode/PKGBUILD b/community/leafnode/PKGBUILD
index 5be60f7df..c6cf6e9c9 100644
--- a/community/leafnode/PKGBUILD
+++ b/community/leafnode/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 64337 2012-02-11 23:22:13Z allan $
+# $Id: PKGBUILD 91512 2013-05-23 11:13:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=leafnode
 pkgver=1.11.8
-pkgrel=5
+pkgrel=6
 pkgdesc="implements a store & forward NNTP proxy (client and server) with IPv4 and IPv6"
 arch=('i686' 'x86_64')
 url="http://leafnode.sourceforge.net/"
@@ -15,11 +15,11 @@ backup=('etc/xinetd.d/leafnode')
 source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
 	leafnode.xinetd)
 md5sums=('a3edafeb854efaa3fbb0f7951d02160f'
-         'db3c6ad1ff9fc03442949456d1d21304')
+         '08cd0a81d6efe0803b5d0747ab31903f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode \
+  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode --sbindir=/usr/bin \
 	--with-user=9 \
 	--with-group=13
   sed -i 's|#define NEWS_USER .*|#define NEWS_USER "news"|' config.h
diff --git a/community/leafnode/leafnode.install b/community/leafnode/leafnode.install
index 5f8a74c04..8c5f10484 100644
--- a/community/leafnode/leafnode.install
+++ b/community/leafnode/leafnode.install
@@ -1,7 +1,7 @@
 post_install() {
   echo "-- Adding user 'news' and group 'news', chowning /var/spool/news"
-  grep -e "^news:" /etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&-
-  grep -e "^news:" /etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&-
+  grep -e "^news:" etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&-
+  grep -e "^news:" etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&-
   chown -R root:news etc/leafnode
   # create dir if necessary
   if [ ! -d var/spool/news ]; then
diff --git a/community/leafnode/leafnode.xinetd b/community/leafnode/leafnode.xinetd
index 94c7c6ca7..98b5c24e0 100644
--- a/community/leafnode/leafnode.xinetd
+++ b/community/leafnode/leafnode.xinetd
@@ -7,7 +7,7 @@ service nntp
 	socket_type		= stream
 	wait			= no
 	user			= news
-	server			= /usr/sbin/leafnode
+	server			= /usr/bin/leafnode
 	log_type		= SYSLOG news
 	log_on_success		+= USERID
 	log_on_failure		+= USERID
diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD
index f47d44565..d4e752e51 100755
--- a/community/lightdm-gtk2-greeter/PKGBUILD
+++ b/community/lightdm-gtk2-greeter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90810 2013-05-14 08:06:07Z alucryd $
+# $Id: PKGBUILD 91482 2013-05-23 08:41:25Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Padfoot <padfoot@exemail.com.au>
 
 pkgname=lightdm-gtk2-greeter
 pkgver=1.5.2
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="GTK+ greeter for LightDM"
 arch=('i686' 'x86_64')
@@ -13,6 +13,7 @@ license=('GPL3' 'LGPL3')
 depends=('gtk2' 'lightdm')
 makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool')
 provides=("${pkgname/2/}")
+conflicts=("${pkgname/2/3}")
 backup=('etc/lightdm/lightdm-gtk-greeter.conf')
 source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz")
 sha256sums=('0de611783a9306130b0f0865c533fcaf2d21fcda9f85e7ee81b58cfa5bd781cc')
diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD
index abf027725..9eaefdb98 100755
--- a/community/lightdm-gtk3-greeter/PKGBUILD
+++ b/community/lightdm-gtk3-greeter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90802 2013-05-14 07:23:18Z alucryd $
+# $Id: PKGBUILD 91480 2013-05-23 08:39:59Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Padfoot <padfoot@exemail.com.au>
 
 pkgname=lightdm-gtk3-greeter
 pkgver=1.5.2
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="GTK+ greeter for LightDM"
 arch=('i686' 'x86_64')
@@ -13,6 +13,7 @@ license=('GPL3' 'LGPL3')
 depends=('gtk3' 'lightdm')
 makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool')
 provides=("${pkgname/3/}")
+conflicts=("${pkgname/3/2}")
 backup=('etc/lightdm/lightdm-gtk-greeter.conf')
 source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz")
 sha256sums=('0de611783a9306130b0f0865c533fcaf2d21fcda9f85e7ee81b58cfa5bd781cc')
diff --git a/community/lshw/PKGBUILD b/community/lshw/PKGBUILD
index 1efa7fb5c..46563504b 100644
--- a/community/lshw/PKGBUILD
+++ b/community/lshw/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87848 2013-04-08 09:23:17Z spupykin $
+# $Id: PKGBUILD 91516 2013-05-23 11:14:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
 # Contributor: Chuck Yang <Chuck.Yang@gmail.com>
 
 pkgname=lshw
 pkgver=B.02.16
-pkgrel=4
+pkgrel=5
 pkgdesc="A small tool to provide detailed information on the hardware configuration of the machine."
 url="http://ezix.org/project/wiki/HardwareLiSter"
 license=('GPL')
@@ -19,14 +19,14 @@ md5sums=('67479167add605e8f001097c30e96d0d')
 build() {
   cd $srcdir/$pkgname-$pkgver
   sed -i 's|/usr/bin/gtk-lshw|/usr/sbin/gtk-lshw|' src/gui/integration/gtk-lshw.desktop
-  make
-  make gui
+  make SBINDIR=/usr/bin
+  make SBINDIR=/usr/bin gui
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir/ install
-  make DESTDIR=$pkgdir/ install-gui
+  make DESTDIR=$pkgdir/ SBINDIR=/usr/bin install
+  make DESTDIR=$pkgdir/ SBINDIR=/usr/bin install-gui
   install -Dm0644 src/gui/integration/gtk-lshw.desktop $pkgdir/usr/share/applications/gtk-lshw.desktop
   install -Dm0644 src/gui/integration/gtk-lshw.pam $pkgdir/usr/share/doc/$pkgname/gtk-lshw.pam
   install -Dm0644 src/gui/integration/console.apps $pkgdir/usr/share/doc/$pkgname/console.apps
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index 2f1f91bae..6c5b8036d 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90434 2013-05-12 10:57:52Z dwallace $
+# $Id: PKGBUILD 91463 2013-05-23 00:34:07Z 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=21
+pkgrel=22
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/lxdm/"
@@ -13,6 +13,7 @@ license=('GPL')
 groups=('lxde')
 depends=('gtk2' 'xorg-server')
 makedepends=('intltool')
+optdepends=('librsvg: display the default background')
 install=${pkgname}.install
 backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
         'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
@@ -25,13 +26,27 @@ source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
 		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)
+		lxdm-0.4.1-pam-env-vars.patch
+        lxdm-0.4.1-kill_user_processes.patch
+        )
+md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
+         '9cc734228696a3c6f06d91bba61b03c1'
+         'b86317143ae44d7ed38c150fe4f25502'
+         'd2e4a4a22ee2aa1a986be154c647b6c6'
+         'c50dd01b715b0a236407d48066191601'
+         'a1e3c46a8bef691bc544028f5b6cfe22'
+         '2c4afdbe3532be4f90d8f6240d352766'
+         'baed9055e8825a5511712bc095197519'
+         '28475239d0c8b4fd778ec49f5ec72962'
+         '4c1d43e81e9a256e8d1ea7686c24b3d3'
+         '3ac63085f9df9296dfa645fa623af0e2')
 
 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
+    patch -Np1 -i $srcdir/lxdm-0.4.1-kill_user_processes.patch
 }
 
 build() {
@@ -65,14 +80,3 @@ package() {
     # avoid conflict with filesystem>=2012.06
     rm -r $pkgdir/var/run
 }
-
-md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
-         '9cc734228696a3c6f06d91bba61b03c1'
-         'b86317143ae44d7ed38c150fe4f25502'
-         'd2e4a4a22ee2aa1a986be154c647b6c6'
-         'c50dd01b715b0a236407d48066191601'
-         'a1e3c46a8bef691bc544028f5b6cfe22'
-         '2c4afdbe3532be4f90d8f6240d352766'
-         'baed9055e8825a5511712bc095197519'
-         '28475239d0c8b4fd778ec49f5ec72962'
-         '4c1d43e81e9a256e8d1ea7686c24b3d3')
diff --git a/community/lxdm/lxdm-0.4.1-kill_user_processes.patch b/community/lxdm/lxdm-0.4.1-kill_user_processes.patch
new file mode 100644
index 000000000..f267b105a
--- /dev/null
+++ b/community/lxdm/lxdm-0.4.1-kill_user_processes.patch
@@ -0,0 +1,35 @@
+diff -aur lxdm/src/xconn.c lxdm.modified/src/xconn.c
+--- lxdm/src/xconn.c	2012-12-23 19:27:04.512531088 -0800
++++ lxdm/src/xconn.c	2012-12-23 19:28:31.659227448 -0800
+@@ -172,7 +172,7 @@
+ 	free(c);
+ }
+ 
+-#if 0
++//#if 0
+ static xcb_window_t xconn_get_root(xconn_t c)
+ {
+ 	const xcb_setup_t *setup;
+@@ -181,11 +181,11 @@
+ 	xcb_screen_t *screen = iter.data;
+ 	return screen->root;
+ }
+-#endif
++//#endif
+ 
+ void xconn_clean(xconn_t c)
+ {
+-#if 0
++//#if 0
+ 	xcb_query_tree_cookie_t wintree;
+ 	xcb_query_tree_reply_t *rep;
+ 	xcb_window_t *children;
+@@ -202,7 +202,7 @@
+ 		xcb_kill_client(c->c,children[i]);
+ 	free(rep);
+ 	xcb_flush(c->c);
+-#endif
++//#endif
+ }
+ 
+ #endif
diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install
index 4d1285dc5..875dc59e3 100644
--- a/community/lxdm/lxdm.install
+++ b/community/lxdm/lxdm.install
@@ -1,18 +1,21 @@
 post_install() {
-    if ! getent group lxdm > /dev/null ; then
-        groupadd --system lxdm
-        chgrp -R lxdm /var/lib/lxdm
-        chgrp lxdm /etc/lxdm/lxdm.conf
-        chmod +r /etc/lxdm/lxdm.conf
-    fi
+  getent group lxdm >/dev/null && groupmod -g 121 lxdm || groupadd -g 121 lxdm
+  getent passwd lxdm >/dev/null && usermod -u 121 -g 121 lxdm || useradd -r -d /var/lib/lxdm -u 121 -g 121 lxdm
+  chown -R 121:121 /var/lib/lxdm
+  chgrp 121 /etc/lxdm/lxdm.conf
+  chmod +r /etc/lxdm/lxdm.conf
 }
 
 post_upgrade() {
-    post_install $1
+  post_install $1
+  if [[ $(vercmp $2 0.4.1-22) < 0 ]]; then
+    groupmod -g 121 lxdm
+    usermod -g 121 -u 121 lxdm
+  fi
 }
 
 post_remove() {
-    if ! getent group lxdm > /dev/null ; then
-        groupdel lxdm
-    fi
+  userdel -f lxdm
+  groupdel lxdm
+  true
 }
diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD
index f508e02af..0fbce0077 100644
--- a/community/mcelog/PKGBUILD
+++ b/community/mcelog/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90683 2013-05-13 14:28:13Z spupykin $
+# $Id: PKGBUILD 91518 2013-05-23 11:14:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Thomas Mudrunka <harvie@@email..cz>
 # Maintainer: Thomas Mudrunka <harvie@@email..cz>
 
 pkgname=mcelog
-pkgver=20130411
-pkgrel=2
+pkgver=20130523
+pkgrel=1
 pkgdesc="Print machine check event log from x86-64 kernel"
 url="http://freshmeat.net/projects/mcelog/"
 license=("GPL")
@@ -16,7 +16,12 @@ backup=('etc/mcelog/mcelog.conf')
 source=("git://github.com/andikleen/mcelog.git"
 	"mcelog.service")
 md5sums=('SKIP'
-         'b71eb82e532aed3918ebf6b30e158e7f')
+         'afd7fc2b7a2f92a75e040b23d6b15958')
+
+prepare() {
+  cd "${srcdir}/mcelog"
+  sed -i 's|sbin|bin|g' Makefile mcelog.cron
+}
 
 build() {
   cd "${srcdir}/mcelog"
diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service
index 35c18bc6f..9d6c84f40 100644
--- a/community/mcelog/mcelog.service
+++ b/community/mcelog/mcelog.service
@@ -4,7 +4,7 @@ After=syslog.target
 
 [Service]
 PIDFile=/run/mcelog.pid
-ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground --pidfile /run/mcelog.pid
+ExecStart=/usr/bin/mcelog --ignorenodev --daemon --foreground --pidfile /run/mcelog.pid
 StandardOutput=syslog
 
 [Install]
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index be80755bf..adf1e58e0 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90574 2013-05-13 09:53:22Z spupykin $
+# $Id: PKGBUILD 91520 2013-05-23 11:15:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=minidlna
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/minidlna/"
@@ -21,12 +21,12 @@ source=(http://downloads.sourceforge.net/project/minidlna/minidlna/$pkgver/minid
 	minidlna.service
 	minidlna.tmpfiles)
 md5sums=('26484a84af3fceafdee26595aae097f7'
-         '10ef548e6b2ad15b17b5090e6e074db8'
+         '7e3890ee50aa4dfa4d1754261e6cc965'
          '26de27b12d6a37c47d9714107d07aac9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
diff --git a/community/minidlna/minidlna.service b/community/minidlna/minidlna.service
index a2a20720e..bc79e96ef 100644
--- a/community/minidlna/minidlna.service
+++ b/community/minidlna/minidlna.service
@@ -5,8 +5,8 @@ After=network.target
 [Service]
 Type=forking
 User=nobody
-ExecStart=/usr/sbin/minidlnad -P /run/minidlna/minidlna.pid
-PIDFile=/var/run/minidlna/minidlna.pid
+ExecStart=/usr/bin/minidlnad -P /run/minidlna/minidlna.pid
+PIDFile=/run/minidlna/minidlna.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD
index c0f4cfea3..f30cc1461 100644
--- a/community/miredo/PKGBUILD
+++ b/community/miredo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90687 2013-05-13 14:29:09Z spupykin $
+# $Id: PKGBUILD 91522 2013-05-23 11:15:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=miredo
 pkgver=1.2.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Teredo client and server."
 arch=('i686' 'x86_64')
 url="http://www.remlab.net/miredo/"
@@ -17,7 +17,7 @@ source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz
 	miredo.service)
 md5sums=('5114debbf9fcab5d292176e4548f8cd1'
          'd1b655d7a851cdb46c91c3418ed1962f'
-         'abd7d8831cab7f3ea6d0d4e51b8f8f6a')
+         'fd6d5b355b2356426eeefd6047f6bb7c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -27,6 +27,7 @@ build() {
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--libexecdir=/usr/lib \
+	--sbindir=/usr/bin \
 	--with-Judy
   make
 }
diff --git a/community/miredo/miredo.service b/community/miredo/miredo.service
index d28803efd..e824f99e1 100644
--- a/community/miredo/miredo.service
+++ b/community/miredo/miredo.service
@@ -3,7 +3,7 @@ Description=Teredo IPv6 Tunneling Daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/miredo -f
+ExecStart=/usr/bin/miredo -f
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index 462b6ff07..a577edb80 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90969 2013-05-16 21:05:16Z bgyorgy $
+# $Id: PKGBUILD 91466 2013-05-23 00:58:44Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=1.8.1
-pkgrel=2
+pkgver=1.8.2
+pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/muffin"
@@ -16,11 +16,9 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
 options=('!libtool' '!emptydirs')
 install=$pkgname.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
-        "switch-applications.patch"
-        "fix-dnd.patch")
-sha256sums=('6907d2b2fb78c7b710c4454ef321d40cffe5ab1273df14facbbd5cda691ccb34'
-            '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96'
-            '4d8f5ed1bec02160d252a956ffd441ab3c119db29f690f86568dbd34474d1a90')
+        "switch-applications.patch")
+sha256sums=('903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049'
+            '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -28,8 +26,6 @@ build() {
   # Fix windows switcher keybinding with default settings in GNOME 3.8
   patch -Np1 -i ../switch-applications.patch
 
-  # Fix unresponsive panel on DND
-  patch -Np1 -i ../fix-dnd.patch
 
   PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
   				 			 --localstatedir=/var --disable-static --disable-schemas-compile
diff --git a/community/muffin/fix-dnd.patch b/community/muffin/fix-dnd.patch
deleted file mode 100644
index 268ea296e..000000000
--- a/community/muffin/fix-dnd.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 9f3216b081104c92c4ce5ce3ca2cc48f14bad85a Mon Sep 17 00:00:00 2001
-From: Albert Pool <albertpool@solcon.nl>
-Date: Mon, 13 May 2013 12:04:17 +0200
-Subject: [PATCH 1/2] Remove NOTIFICATION from top window group
-
----
- src/compositor/meta-window-actor.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
-index de8d292..7b0f83c 100644
---- a/src/compositor/meta-window-actor.c
-+++ b/src/compositor/meta-window-actor.c
-@@ -1514,7 +1514,6 @@ const char *meta_window_actor_get_description (MetaWindowActor *self)
-   if (window->type == META_WINDOW_DROPDOWN_MENU ||
-       window->type == META_WINDOW_POPUP_MENU ||
-       window->type == META_WINDOW_COMBO ||
--      window->type == META_WINDOW_NOTIFICATION ||
-       window->type == META_WINDOW_OVERRIDE_OTHER){
-     clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group),
- 			       CLUTTER_ACTOR (self));
--- 
-1.8.1.6
-
-
-From bbbde724320036f894779c2402fc6eba969428d2 Mon Sep 17 00:00:00 2001
-From: Albert Pool <albertpool@solcon.nl>
-Date: Mon, 13 May 2013 12:09:58 +0200
-Subject: [PATCH 2/2] Remove OVERRIDE_OTHER from top window group
-
----
- src/compositor/meta-window-actor.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
-index 7b0f83c..fb77f1d 100644
---- a/src/compositor/meta-window-actor.c
-+++ b/src/compositor/meta-window-actor.c
-@@ -1513,8 +1513,7 @@ const char *meta_window_actor_get_description (MetaWindowActor *self)
-   
-   if (window->type == META_WINDOW_DROPDOWN_MENU ||
-       window->type == META_WINDOW_POPUP_MENU ||
--      window->type == META_WINDOW_COMBO ||
--      window->type == META_WINDOW_OVERRIDE_OTHER){
-+      window->type == META_WINDOW_COMBO) {
-     clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group),
- 			       CLUTTER_ACTOR (self));
-   }
--- 
-1.8.1.6
-
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
index 7ebb2959a..fc19add74 100644
--- a/community/nemo/PKGBUILD
+++ b/community/nemo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90132 2013-05-06 22:22:04Z faidoc $
+# $Id: PKGBUILD 91469 2013-05-23 00:59:51Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Ner0
 
 pkgname=nemo
-pkgver=1.8.0
+pkgver=1.8.2
 pkgrel=1
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ install=nemo.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
         "tracker-0.16.patch"
         "remove-desktop-background.patch")
-sha256sums=('4812381bd2e926fa3cd4efcddc79585bab3ff1c226d1db69e7ce3802c783d18a'
+sha256sums=('93ab8b21938de249e60cf278b6e2abf65720fdb2ae0c3a8c7301ca6983f5ca59'
             '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626'
             '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5')
 
diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD
index 6afba6f7c..d88c3a5f1 100644
--- a/community/opendkim/PKGBUILD
+++ b/community/opendkim/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90693 2013-05-13 14:31:00Z spupykin $
+# $Id: PKGBUILD 91498 2013-05-23 10:14:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thomas Jost <schnouki@schnouki.net>
 
 pkgname=opendkim
 pkgver=2.8.3
-pkgrel=2
+pkgrel=3
 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter."
 arch=(i686 x86_64)
 url="http://www.opendkim.org/"
@@ -19,11 +19,11 @@ source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.g
 	opendkim.service)
 md5sums=('0ae9d37e3221a244eb34c3e0e2d665cc'
          '3e2bb1058ac0662f01e675aa6ac7ee8f'
-         'bc1b73856bc1941faaa4842e00437cb5')
+         '85010750a21954e2d3cf5d57fe210d3f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --with-db
+  ./configure --prefix=/usr --sbindir=/usr/bin --with-db
   make
 }
 
diff --git a/community/opendkim/opendkim.service b/community/opendkim/opendkim.service
index d34c62960..7d2eb79aa 100644
--- a/community/opendkim/opendkim.service
+++ b/community/opendkim/opendkim.service
@@ -5,7 +5,7 @@ After=network.target remote-fs.target nss-lookup.target
 [Service]
 Type=forking
 EnvironmentFile=/etc/conf.d/opendkim
-ExecStart=/usr/sbin/opendkim $OPENDKIM_FILTER
+ExecStart=/usr/bin/opendkim $OPENDKIM_FILTER
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD
index 02b44cb29..4eafda56d 100644
--- a/community/openntpd/PKGBUILD
+++ b/community/openntpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80248 2012-11-18 11:40:59Z jelle $
+# $Id: PKGBUILD 91455 2013-05-22 23:28:35Z seblu $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch)
@@ -6,32 +6,35 @@
 
 pkgname=openntpd
 pkgver=3.9p1
-pkgrel=21
-pkgdesc="Free, easy to use implementation of the Network Time Protocol."
-url="http://www.openntpd.org/"
+pkgrel=22
+pkgdesc='Free, easy to use implementation of the Network Time Protocol.'
+url='http://www.openntpd.org/'
 arch=('x86_64' 'i686')
 license=('BSD')
 depends=('openssl')
 conflicts=('ntp')
-backup=('etc/ntpd.conf' 'etc/conf.d/openntpd')
+backup=('etc/ntpd.conf')
 install=$pkgname.install
-source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz
-	'openntpd' 'openntpd.conf' 'linux-adjtimex.patch' 'openntpd.tmpfiles' 'openntpd.service')
+source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz"
+	      'linux-adjtimex.patch'
+        'openntpd.tmpfiles'
+        'openntpd.service')
 sha256sums=('83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49'
-            'b486b7034b8d3d790b6bc1793dd8a44c68b82c8dc833b617c60674b0a7c9d98f'
-            '77a0d1f3439d779c2ce259becf3fa583c21a16682a4f5327094da2e9837f6f96'
             '3abcec94c072b5913ef7156a22049d796ff04e19105befe1ea81a66522928fd2'
             'fe12841110c3c080519e248988c4b6334f54bd9646b015753c7e15de2a9600c5'
-            '7ad4d3ce4af3a6ff47ba2e5428092139666ad821101dafe1599b209d53f6943f')
+            '3239fc6f69d661cd9233233da9e68bebdf7b12888febbc2f2d794742db2d8ed1')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+  patch -Np1 -d $pkgname-$pkgver < linux-adjtimex.patch
+}
 
-  patch -Np1 -i ../linux-adjtimex.patch
+build() {
+  cd $pkgname-$pkgver
   autoreconf -fi
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
+    --sbindir=/usr/bin \
     --with-privsep-user=ntp \
     --with-privsep-path=/run/openntpd/ \
     --with-adjtimex
@@ -42,8 +45,6 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname"
-  install -Dm644 "$srcdir/$pkgname.conf" "$pkgdir/etc/conf.d/$pkgname"
   install -Dm644 "$srcdir/$pkgname-$pkgver/LICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENCE"
   sed -i 's/\*/0.0.0.0/' $pkgdir/etc/ntpd.conf
diff --git a/community/openntpd/openntpd b/community/openntpd/openntpd
deleted file mode 100644
index 59fa8107d..000000000
--- a/community/openntpd/openntpd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-CONF=/etc/conf.d/openntpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[[ -f $CONF ]] && . "$CONF"
-
-PID=$(pidof -o %PPID /usr/sbin/ntpd)
-case $1 in
-  start)
-    stat_busy "Starting OpenNTPD"
-    [[ -d /run/openntpd ]] || mkdir /run/openntpd
-    if [[ $PID ]] || ! /usr/sbin/ntpd $PARAMS; then
-      stat_fail
-    else
-      pidof -o %PPID /usr/sbin/ntpd >/run/openntpd.pid
-      add_daemon openntpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenNTPD"
-    if [[ -z $PID ]] || ! kill $PID &>/dev/null; then
-      stat_fail
-    else
-      rm_daemon openntpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/openntpd/openntpd.conf b/community/openntpd/openntpd.conf
deleted file mode 100644
index a2af277f7..000000000
--- a/community/openntpd/openntpd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#  -s Set the time immediately at startup if the local clock is off by more than#  180 seconds.
-PARAMS="-s"
-
-
diff --git a/community/openntpd/openntpd.service b/community/openntpd/openntpd.service
index e419204d4..ebaf10540 100644
--- a/community/openntpd/openntpd.service
+++ b/community/openntpd/openntpd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/ntpd -s
+ExecStart=/usr/bin/ntpd -s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD
index 818ef5086..7a39ec2b6 100644
--- a/community/opensips/PKGBUILD
+++ b/community/opensips/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90577 2013-05-13 09:54:15Z spupykin $
+# $Id: PKGBUILD 91536 2013-05-23 11:21:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=opensips
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..."
 url="http://www.opensips.org"
 depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2')
@@ -26,10 +26,9 @@ options=('!emptydirs' 'zipman' '!makeflags' 'docs')
 source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz
 	opensips.service)
 md5sums=('0b7b93f4df29a96daedf12e490e7ec86'
-         '7b786d758fe3174af34e2ced44b549e7')
+         '35cdcb3692f6925236fd5fe7e9484c58')
 
-build()
-{
+prepare() {
   cd $srcdir/$pkgname-$pkgver-tls/
 
   # python2 fix
@@ -38,6 +37,13 @@ build()
     sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
+  sed -i 's|sbin|bin|g' Makefile
+  sed -i 's|bin-dir = sbin/|bin-dir = bin/|' Makefile.defs
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver-tls/
+
   make \
 	include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \
 	TLS=1 LIBDIR=lib
@@ -62,7 +68,7 @@ package() {
   cd $pkgdir/usr/lib/opensips/opensipsctl
   find -type f -exec sed -i "s#$pkgdir##" {} \;
 
-  cd $pkgdir/usr/sbin
+  cd $pkgdir/usr/bin
   sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole
 
   cd $pkgdir/etc
diff --git a/community/opensips/opensips.init b/community/opensips/opensips.init
deleted file mode 100644
index 1c883c4c2..000000000
--- a/community/opensips/opensips.init
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-BINNAME=opensips
-OSRDIR=/usr/sbin
-OPENSIPS=$OSRDIR/$BINNAME
-
-TMPDIR=/var/tmp
-CORE=$TMPDIR/core
-
-ETC=/etc/opensips/opensips.cfg
-PIDFILE=/var/run/opensips.pid
-
-case "$1" in
-  start)
-    stat_busy "Starting OpenSIPS server"
-    cd $TMPDIR
-    $OPENSIPS -f $ETC -w $TMPDIR -P $PIDFILE 2>&1 > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon opensips
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenSIPS server"
-    if [ -r $PIDFILE ]
-    then
-	cat $PIDFILE | xargs kill
-	if [ $? -gt 0 ]; then
-	  stat_fail
-	else
-	  rm_daemon opensips
-	  stat_done
-	fi
-    else
-	stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/opensips/opensips.install b/community/opensips/opensips.install
index 9e8f2a47b..40973a77a 100644
--- a/community/opensips/opensips.install
+++ b/community/opensips/opensips.install
@@ -1,5 +1,3 @@
-post_install() 
-{
-  echo "To use MySQL, you should install mysql package and run '/usr/sbin/openser_mysql.sh create'"
-  /bin/true
+post_install() {
+  echo "To use MySQL, you should install mysql package and run '/usr/bin/openser_mysql.sh create'"
 }
diff --git a/community/opensips/opensips.service b/community/opensips/opensips.service
index 81f6fd93e..220a5d419 100644
--- a/community/opensips/opensips.service
+++ b/community/opensips/opensips.service
@@ -4,8 +4,8 @@ After=network.target remote-fs.target nss-lookup.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/opensips.pid
-ExecStart=/usr/sbin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid
+PIDFile=/run/opensips.pid
+ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /run/opensips.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD
index 5b08531df..d8fe5189d 100644
--- a/community/pdnsd/PKGBUILD
+++ b/community/pdnsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91143 2013-05-20 09:54:25Z spupykin $
+# $Id: PKGBUILD 91500 2013-05-23 10:14:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Henrik Nymann Jensen <h@henriknj.dk>
 
 pkgname=pdnsd
 pkgver=1.2.9.a
 _pkgver=${pkgver/.a/a}
-pkgrel=3
+pkgrel=4
 pkgdesc="Proxy DNS server with permanent caching"
 arch=(i686 x86_64)
 url="http://members.home.nl/p.a.rombouts/pdnsd/"
@@ -14,11 +14,11 @@ depends=('glibc')
 source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$_pkgver-par.tar.gz
 	service)
 md5sums=('2f3e705d59a0f9308ad9504b24400769'
-         'fad5e518d126b29fc947941d57a0a494')
+         '4f86bdbd8495b53341070d5720491996')
 
 build() {
 	cd $srcdir/$pkgname-${_pkgver}
-	./configure --prefix=/usr --sysconfdir=/etc --enable-ipv6
+	./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-ipv6
 	make
 }
 
diff --git a/community/pdnsd/service b/community/pdnsd/service
index 5821dbcb2..d284cd933 100644
--- a/community/pdnsd/service
+++ b/community/pdnsd/service
@@ -3,7 +3,7 @@ Description=proxy name server
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/pdnsd
+ExecStart=/usr/bin/pdnsd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index b3880d224..b2178d0f1 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90076 2013-05-06 19:39:02Z foutrelis $
+# $Id: PKGBUILD 91562 2013-05-23 19:50:14Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=performous
 pkgver=0.7.0
-pkgrel=6
+pkgrel=7
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('i686' 'x86_64')
 url="http://performous.org/"
@@ -13,15 +13,25 @@ depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'li
 makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa')
 optdepends=('performous-freesongs: free songs for performous')
 source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2
-        performous-0.7.0-cmake.patch)
+        performous-0.7.0-cmake.patch
+	fix-noisy-sound-output.patch)
 md5sums=('60f3f72b51a630a4aa996484aedb9526'
-         '7da8aef3f4dd28e19f95957ae9ac2bb1')
+         '7da8aef3f4dd28e19f95957ae9ac2bb1'
+         '820dc6d1a91c23f0ef56e2cd1759afb6')
 
-build() {
+prepare() {
   cd performous-${pkgver}
 
+  # patch from gentoo
   patch -Np0 -i ../performous-0.7.0-cmake.patch
 
+  # fix FS#33948 (merged upstream)
+  patch -Np1 -i ../fix-noisy-sound-output.patch
+}
+
+build() {
+  cd performous-${pkgver}
+
   mkdir -p build
   cd build
 
diff --git a/community/performous/fix-noisy-sound-output.patch b/community/performous/fix-noisy-sound-output.patch
new file mode 100644
index 000000000..e4ba0c246
--- /dev/null
+++ b/community/performous/fix-noisy-sound-output.patch
@@ -0,0 +1,440 @@
+diff -ur performous-0.7.0/game/audio.cc performous-0.7.0b/game/audio.cc
+--- performous-0.7.0/game/audio.cc	2012-11-12 23:14:08.000000000 +0100
++++ performous-0.7.0b/game/audio.cc	2013-05-23 19:38:26.568498744 +0200
+@@ -140,7 +140,8 @@
+ 		FFmpeg mpeg;
+ 		float fadeLevel;
+ 		float pitchFactor;
+-		Track(std::string const& filename, unsigned int sr): mpeg(false, true, filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {}
++		//Track(std::string const& filename, unsigned int sr): mpeg(false, true, filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {}
++		Track(std::string const& filename, unsigned int sr): mpeg(filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {}
+ 	};
+ 	typedef boost::ptr_map<std::string, Track> Tracks;
+ 	Tracks tracks; ///< Audio decoders
+@@ -241,7 +242,8 @@
+ 	FFmpeg mpeg;
+ 	bool eof;
+   public:
+-	Sample(std::string const& filename, unsigned sr) : srate(sr), m_pos(), mpeg(false, true, filename, sr), eof(true) { }
++	//Sample(std::string const& filename, unsigned sr) : srate(sr), m_pos(), mpeg(false, true, filename, sr), eof(true) { }
++	Sample(std::string const& filename, unsigned sr) : m_pos(), mpeg(filename, sr), eof(true) { }
+ 	void operator()(float* begin, float* end) {
+ 		if(eof) {
+ 			// No more data to play in this sample
+diff -ur performous-0.7.0/game/ffmpeg.cc performous-0.7.0b/game/ffmpeg.cc
+--- performous-0.7.0/game/ffmpeg.cc	2012-11-12 23:14:08.000000000 +0100
++++ performous-0.7.0b/game/ffmpeg.cc	2013-05-23 21:41:09.057986491 +0200
+@@ -3,6 +3,7 @@
+ #include "config.hh"
+ #include "util.hh"
+ #include "xtime.hh"
++#include <boost/smart_ptr/shared_ptr.hpp>
+ #include <iostream>
+ #include <stdexcept>
+ 
+@@ -20,15 +21,20 @@
+ 
+ /*static*/ boost::mutex FFmpeg::s_avcodec_mutex;
+ 
+-FFmpeg::FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& _filename, unsigned int rate):
+-  width(), height(), m_filename(_filename), m_rate(rate), m_quit(), m_running(), m_eof(),
+-  m_seekTarget(getNaN()), m_position(), m_streamId(-1), m_mediaType(),
+-  m_formatContext(), m_codecContext(), m_codec(), m_resampleContext(), m_swsContext(),
++//FFmpeg::FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& _filename, unsigned int rate):
++//  width(), height(), m_filename(_filename), m_rate(rate), m_quit(), m_running(), m_eof(),
++// m_seekTarget(getNaN()), m_position(), m_streamId(-1), m_mediaType(),
++//  m_formatContext(), m_codecContext(), m_codec(), m_resampleContext(), m_swsContext(),
++FFmpeg::FFmpeg(std::string const& _filename, unsigned int rate):
++  width(), height(), m_filename(_filename), m_rate(rate), m_quit(),
++  m_seekTarget(getNaN()), m_position(), m_duration(), m_streamId(-1),
++  m_mediaType(rate ? AVMEDIA_TYPE_AUDIO : AVMEDIA_TYPE_VIDEO),
++  m_formatContext(), m_codecContext(), m_resampleContext(), m_swsContext(),
+   m_thread(new boost::thread(boost::ref(*this)))
+ {
+-	if (decodeVideo) m_mediaType = AVMEDIA_TYPE_VIDEO;
+-	else if (decodeAudio) m_mediaType = AVMEDIA_TYPE_AUDIO;
+-	else throw std::logic_error("Can only decode one track");
++//	if (decodeVideo) m_mediaType = AVMEDIA_TYPE_VIDEO;
++//	else if (decodeAudio) m_mediaType = AVMEDIA_TYPE_AUDIO;
++//	else throw std::logic_error("Can only decode one track");
+ }
+ 
+ FFmpeg::~FFmpeg() {
+@@ -36,20 +42,20 @@
+ 	videoQueue.reset();
+ 	audioQueue.quit();
+ 	m_thread->join();
+-	// TODO: use RAII for freeing resources (to prevent memory leaks)
+-	boost::mutex::scoped_lock l(s_avcodec_mutex); // avcodec_close is not thread-safe
+-	if (m_resampleContext) audio_resample_close(m_resampleContext);
+-	if (m_codecContext) avcodec_close(m_codecContext);
+-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
+-	if (m_formatContext) avformat_close_input(&m_formatContext);
+-#else
+-	if (m_formatContext) av_close_input_file(m_formatContext);
+-#endif
+-}
+-
+-double FFmpeg::duration() const {
+-	double d = m_running ? m_formatContext->duration / double(AV_TIME_BASE) : getNaN();
+-	return d >= 0.0 ? d : getInf();
++// 	// TODO: use RAII for freeing resources (to prevent memory leaks)
++// 	boost::mutex::scoped_lock l(s_avcodec_mutex); // avcodec_close is not thread-safe
++// 	if (m_resampleContext) audio_resample_close(m_resampleContext);
++// 	if (m_codecContext) avcodec_close(m_codecContext);
++// #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++// 	if (m_formatContext) avformat_close_input(&m_formatContext);
++// #else
++// 	if (m_formatContext) av_close_input_file(m_formatContext);
++// #endif
++// }
++// 
++// double FFmpeg::duration() const {
++// 	double d = m_running ? m_formatContext->duration / double(AV_TIME_BASE) : getNaN();
++// 	return d >= 0.0 ? d : getInf();
+ }
+ 
+ void FFmpeg::open() {
+@@ -60,11 +66,14 @@
+ 	if (avformat_find_stream_info(m_formatContext, NULL) < 0) throw std::runtime_error("Cannot find stream information");
+ 	m_formatContext->flags |= AVFMT_FLAG_GENPTS;
+ 	// Find a track and open the codec
+-	m_streamId = av_find_best_stream(m_formatContext, (AVMediaType)m_mediaType, -1, -1, &m_codec, 0);
++//	m_streamId = av_find_best_stream(m_formatContext, (AVMediaType)m_mediaType, -1, -1, &m_codec, 0);
++	AVCodec* codec = NULL;
++	m_streamId = av_find_best_stream(m_formatContext, (AVMediaType)m_mediaType, -1, -1, &codec, 0);
+ 	if (m_streamId < 0) throw std::runtime_error("No suitable track found");
+ 
+ 	AVCodecContext* cc = m_formatContext->streams[m_streamId]->codec;
+-	if (avcodec_open2(cc, m_codec, NULL) < 0) throw std::runtime_error("Cannot open audio codec");
++//	if (avcodec_open2(cc, m_codec, NULL) < 0) throw std::runtime_error("Cannot open audio codec");
++	if (avcodec_open2(cc, codec, NULL) < 0) throw std::runtime_error("Cannot open codec");
+ 	cc->workaround_bugs = FF_BUG_AUTODETECT;
+ 	m_codecContext = cc;
+ 
+@@ -90,18 +99,20 @@
+ 
+ void FFmpeg::operator()() {
+ 	try { open(); } catch (std::exception const& e) { std::clog << "ffmpeg/error: Failed to open " << m_filename << ": " << e.what() << std::endl; m_quit = true; return; }
+-	m_running = true;
+-	audioQueue.setDuration(duration());
++//	m_running = true;
++//	audioQueue.setDuration(duration());
++	m_duration = m_formatContext->duration / double(AV_TIME_BASE);
++	audioQueue.setDuration(m_duration);
+ 	int errors = 0;
+ 	while (!m_quit) {
+ 		try {
+ 			if (audioQueue.wantSeek()) m_seekTarget = 0.0;
+ 			if (m_seekTarget == m_seekTarget) seek_internal();
+ 			decodePacket();
+-			m_eof = false;
++//			m_eof = false;
+ 			errors = 0;
+ 		} catch (eof_error&) {
+-			m_eof = true;
++//			m_eof = true;
+ 			videoQueue.push(new VideoFrame()); // EOF marker
+ 			boost::thread::sleep(now() + 0.1);
+ 		} catch (std::exception& e) {
+@@ -109,10 +120,19 @@
+ 			if (++errors > 2) { std::clog << "ffmpeg/error: FFMPEG terminating due to multiple errors" << std::endl; m_quit = true; }
+ 		}
+ 	}
+-	m_running = false;
+-	m_eof = true;
++//	m_running = false;
++//	m_eof = true;
+ 	audioQueue.setEof();
+ 	videoQueue.push(new VideoFrame()); // EOF marker
++	// TODO: use RAII for freeing resources (to prevent memory leaks)
++	boost::mutex::scoped_lock l(s_avcodec_mutex); // avcodec_close is not thread-safe
++	if (m_resampleContext) audio_resample_close(m_resampleContext);
++	if (m_codecContext) avcodec_close(m_codecContext);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++	if (m_formatContext) avformat_close_input(&m_formatContext);
++#else
++	if (m_formatContext) av_close_input_file(m_formatContext);
++#endif
+ }
+ 
+ void FFmpeg::seek(double time, bool wait) {
+@@ -125,7 +145,8 @@
+ 	videoQueue.reset();
+ 	audioQueue.reset();
+ 	int flags = 0;
+-	if (m_seekTarget < position()) flags |= AVSEEK_FLAG_BACKWARD;
++//	if (m_seekTarget < position()) flags |= AVSEEK_FLAG_BACKWARD;
++	if (m_seekTarget < m_position) flags |= AVSEEK_FLAG_BACKWARD;
+ 	av_seek_frame(m_formatContext, -1, m_seekTarget * AV_TIME_BASE, flags);
+ 	m_seekTarget = getNaN(); // Signal that seeking is done
+ }
+@@ -139,16 +160,16 @@
+ 		~ReadFramePacket() { av_free_packet(this); }
+ 	};
+ 
+-	struct AVFrameWrapper {
+-		AVFrame* m_frame;
+-		AVFrameWrapper(): m_frame(avcodec_alloc_frame()) {
+-			if (!m_frame) throw std::runtime_error("Unable to allocate AVFrame");
+-		}
+-		~AVFrameWrapper() { av_free(m_frame); }
+-		operator AVFrame*() { return m_frame; }
+-		AVFrame* operator->() { return m_frame; }
+-	};
+-
++// 	struct AVFrameWrapper {
++// 		AVFrame* m_frame;
++// 		AVFrameWrapper(): m_frame(avcodec_alloc_frame()) {
++// 			if (!m_frame) throw std::runtime_error("Unable to allocate AVFrame");
++// 		}
++// 		~AVFrameWrapper() { av_free(m_frame); }
++// 		operator AVFrame*() { return m_frame; }
++// 		AVFrame* operator->() { return m_frame; }
++// 	};
++// 
+ 	// Read an AVPacket and decode it into AVFrames
+ 	ReadFramePacket packet(m_formatContext);
+ 	int packetSize = packet.size;
+@@ -156,19 +177,27 @@
+ 		if (packetSize < 0) throw std::logic_error("negative packet size?!");
+ 		if (m_quit || m_seekTarget == m_seekTarget) return;
+ 		if (packet.stream_index != m_streamId) return;
+-		AVFrameWrapper frame;
++//		AVFrameWrapper frame;
++		boost::shared_ptr<AVFrame> frame(avcodec_alloc_frame(), &av_free);
+ 		int frameFinished = 0;
+ 		int decodeSize = (m_mediaType == AVMEDIA_TYPE_VIDEO ?
+-		  avcodec_decode_video2(m_codecContext, frame, &frameFinished, &packet) :
+-		  avcodec_decode_audio4(m_codecContext, frame, &frameFinished, &packet));
+-		if (decodeSize < 0) throw std::runtime_error("cannot decode avframe");
++// 		  avcodec_decode_video2(m_codecContext, frame, &frameFinished, &packet) :
++// 		  avcodec_decode_audio4(m_codecContext, frame, &frameFinished, &packet));
++// 		if (decodeSize < 0) throw std::runtime_error("cannot decode avframe");
++		  avcodec_decode_video2(m_codecContext, frame.get(), &frameFinished, &packet) :
++		  avcodec_decode_audio4(m_codecContext, frame.get(), &frameFinished, &packet));
++		if (decodeSize < 0) return; // Packet didn't produce any output (could be waiting for B frames or something)
+ 		packetSize -= decodeSize; // Move forward within the packet
+ 		if (!frameFinished) continue;
+ 		// Update current position if timecode is available
+-		if (frame->pkt_pts != uint64_t(AV_NOPTS_VALUE)) {
+-			m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base);
+-		}
+-		if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame); else processAudio(frame);
++//		if (frame->pkt_pts != uint64_t(AV_NOPTS_VALUE)) {
++		if (int64_t(frame->pkt_pts) != int64_t(AV_NOPTS_VALUE)) {
++//			m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base);
++			m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base)
++			  - double(m_formatContext->start_time) / AV_TIME_BASE;
++ 		}
++//		if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame); else processAudio(frame);
++		if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame.get()); else processAudio(frame.get());
+ 	}
+ }
+ 
+@@ -189,9 +218,29 @@
+ }
+ 
+ void FFmpeg::processAudio(AVFrame* frame) {
++	void* data = frame->data[0];
++	// New FFmpeg versions use non-interleaved audio decoding and samples may be in float format.
++	// Do a conversion here, allowing us to use the old (deprecated) avcodec audio_resample().
++	std::vector<int16_t> input;
++	unsigned inFrames = frame->nb_samples;
++	if (frame->data[1]) {
++		unsigned channels = m_codecContext->channels;
++		input.reserve(channels * inFrames);
++		for (unsigned i = 0; i < inFrames; ++i) {
++			for (unsigned ch = 0; ch < channels; ++ch) {
++				data = frame->data[ch];
++				input.push_back(m_codecContext->sample_fmt == AV_SAMPLE_FMT_FLTP ?
++				  da::conv_to_s16(reinterpret_cast<float*>(data)[i]) :
++				  reinterpret_cast<int16_t*>(data)[i]
++				);
++			}
++		}
++		data = &input[0];
++	}
+ 	// Resample to output sample rate, then push to audio queue and increment timecode
+ 	std::vector<int16_t> resampled(AVCODEC_MAX_AUDIO_FRAME_SIZE);
+-	int frames = audio_resample(m_resampleContext, &resampled[0], (short*)frame->data[0], frame->nb_samples);
++//	int frames = audio_resample(m_resampleContext, &resampled[0], (short*)frame->data[0], frame->nb_samples);
++	int frames = audio_resample(m_resampleContext, &resampled[0], reinterpret_cast<short*>(data), inFrames);
+ 	resampled.resize(frames * AUDIO_CHANNELS);
+ 	audioQueue.push(resampled, m_position);  // May block
+ 	m_position += double(frames)/m_formatContext->streams[m_streamId]->codec->sample_rate;
+diff -ur performous-0.7.0/game/ffmpeg.hh performous-0.7.0b/game/ffmpeg.hh
+--- performous-0.7.0/game/ffmpeg.hh	2012-11-12 23:14:08.000000000 +0100
++++ performous-0.7.0b/game/ffmpeg.hh	2013-05-23 20:42:22.868566247 +0200
+@@ -3,7 +3,8 @@
+ #include "util.hh"
+ #include "libda/sample.hpp"
+ #include <boost/circular_buffer.hpp>
+-#include <boost/ptr_container/ptr_set.hpp>
++//#include <boost/ptr_container/ptr_set.hpp>
++#include <boost/ptr_container/ptr_deque.hpp>
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/thread/condition.hpp>
+ #include <boost/thread/mutex.hpp>
+@@ -47,25 +48,29 @@
+ 	}
+ };
+ 
+-static bool operator<(VideoFrame const& a, VideoFrame const& b) {
+-	return a.timestamp < b.timestamp;
+-}
++// static bool operator<(VideoFrame const& a, VideoFrame const& b) {
++// 	return a.timestamp < b.timestamp;
++// }
+ 
+ /// video queue: first in first out
+ class VideoFifo {
+   public:
+-	VideoFifo(): m_available(), m_timestamp(), m_eof() {}
++// 	VideoFifo(): m_available(), m_timestamp(), m_eof() {}
++	VideoFifo(): m_timestamp(), m_eof() {}
+ 	/// trys to pop a VideoFrame from queue
+ 	bool tryPop(VideoFrame& f) {
+ 		boost::mutex::scoped_lock l(m_mutex);
+-		if (!m_queue.empty() && m_queue.begin()->data.empty()) { m_eof = true; return false; }
+-		statsUpdate();
+-		if (m_available == 0) return false; // Nothing to deliver
++// 		if (!m_queue.empty() && m_queue.begin()->data.empty()) { m_eof = true; return false; }
++// 		statsUpdate();
++// 		if (m_available == 0) return false; // Nothing to deliver
++		if (m_queue.empty()) return false; // Nothing to deliver
++		if (m_queue.begin()->data.empty()) { m_eof = true; return false; }
+ 		f.swap(*m_queue.begin());
+-		m_queue.erase(m_queue.begin());
++// 		m_queue.erase(m_queue.begin());
++		m_queue.pop_front();
+ 		m_cond.notify_all();
+ 		m_timestamp = f.timestamp;
+-		statsUpdate();
++// 		statsUpdate();
+ 		return true;
+ 	}
+ 	/// pushes VideoFrames to queue
+@@ -73,38 +78,41 @@
+ 		boost::mutex::scoped_lock l(m_mutex);
+ 		while (m_queue.size() > m_max) m_cond.wait(l);
+ 		if (m_queue.empty()) m_timestamp = f->timestamp;
+-		m_queue.insert(f);
+-		statsUpdate();
+-	}
+-	/// updates stats
+-	void statsUpdate() {
+-		m_available = std::max(0, int(m_queue.size()) - int(m_min));
+-		if (m_available == 0 && !m_queue.empty() && m_queue.rbegin()->data.empty()) m_available = m_queue.size() - 1;
++// 		m_queue.insert(f);
++// 		statsUpdate();
++// 	}
++// 	/// updates stats
++// 	void statsUpdate() {
++// 		m_available = std::max(0, int(m_queue.size()) - int(m_min));
++// 		if (m_available == 0 && !m_queue.empty() && m_queue.rbegin()->data.empty()) m_available = m_queue.size() - 1;
++		m_queue.push_back(f);
+ 	}
+ 	/// resets video queue
+ 	void reset() {
+ 		boost::mutex::scoped_lock l(m_mutex);
+ 		m_queue.clear();
+ 		m_cond.notify_all();
+-		statsUpdate();
++// 		statsUpdate();
+ 		m_eof = false;
+ 	}
+ 	/// returns current position
+ 	double position() const { return m_timestamp; }
+-	/// returns m_available / m_max
+-	double percentage() const { return double(m_available) / m_max; }
++// 	/// returns m_available / m_max
++// 	double percentage() const { return double(m_available) / m_max; }
+ 	/// simple eof check
+ 	double eof() const { return m_eof; }
+ 
+   private:
+-	boost::ptr_set<VideoFrame> m_queue;
++// 	boost::ptr_set<VideoFrame> m_queue;
++	boost::ptr_deque<VideoFrame> m_queue;
+ 	mutable boost::mutex m_mutex;
+ 	boost::condition m_cond;
+-	volatile unsigned m_available;
++// 	volatile unsigned m_available;
+ 	double m_timestamp;
+ 	bool m_eof;
+-	static const unsigned m_min = 16; // H.264 may have 16 consecutive B frames
+-	static const unsigned m_max = 50;
++// 	static const unsigned m_min = 16; // H.264 may have 16 consecutive B frames
++// 	static const unsigned m_max = 50;
++	static const unsigned m_max = 20;
+ };
+ 
+ class AudioBuffer {
+@@ -195,7 +203,7 @@
+ 
+ // ffmpeg forward declarations
+ extern "C" {
+-  struct AVCodec;
++//   struct AVCodec;
+   struct AVCodecContext;
+   struct AVFormatContext;
+   struct AVFrame;
+@@ -206,8 +214,10 @@
+ /// ffmpeg class
+ class FFmpeg {
+   public:
+-	/// constructor
+-	FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& file, unsigned int rate = 48000);
++// 	/// constructor
++// 	FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& file, unsigned int rate = 48000);
++	/// Decode file; if no rate is specified, decode video, otherwise decode audio.
++	FFmpeg(std::string const& file, unsigned int rate = 0);
+ 	~FFmpeg();
+ 	void operator()(); ///< Thread runs here, don't call directly
+ 	unsigned width, ///< width of video
+@@ -220,8 +230,8 @@
+ 	void seek(double time, bool wait = true);
+ 	/// duration
+ 	double duration() const;
+-	/// return current position
+-	double position() { return videoQueue.position(); /* FIXME: remove */ }
++// 	/// return current position
++// 	double position() { return videoQueue.position(); /* FIXME: remove */ }
+ 	bool terminating() const { return m_quit; }
+ 
+ 	class eof_error: public std::exception {};
+@@ -234,16 +244,17 @@
+ 	std::string m_filename;
+ 	unsigned int m_rate;
+ 	volatile bool m_quit;
+-	volatile bool m_running;
+-	volatile bool m_eof;
++// 	volatile bool m_running;
++// 	volatile bool m_eof;
+ 	volatile double m_seekTarget;
+ 	double m_position;
++	double m_duration;
+ 	// libav-specific variables
+ 	int m_streamId;
+ 	int m_mediaType;  // enum AVMediaType
+ 	AVFormatContext* m_formatContext;
+ 	AVCodecContext* m_codecContext;
+-	AVCodec* m_codec;
++// 	AVCodec* m_codec;
+ 	ReSampleContext* m_resampleContext;
+ 	SwsContext* m_swsContext;
+ 	// Make sure the thread starts only after initializing everything else
+diff -ur performous-0.7.0/game/video.cc performous-0.7.0b/game/video.cc
+--- performous-0.7.0/game/video.cc	2012-11-12 23:14:08.000000000 +0100
++++ performous-0.7.0b/game/video.cc	2013-05-23 20:33:30.612096870 +0200
+@@ -3,7 +3,8 @@
+ #include "util.hh"
+ #include <cmath>
+ 
+-Video::Video(std::string const& _videoFile, double videoGap): m_mpeg(true, false, _videoFile), m_videoGap(videoGap), m_surfaceTime(), m_lastTime(), m_alpha(-0.5, 1.5) {}
++// Video::Video(std::string const& _videoFile, double videoGap): m_mpeg(true, false, _videoFile), m_videoGap(videoGap), m_surfaceTime(), m_lastTime(), m_alpha(-0.5, 1.5) {}
++Video::Video(std::string const& _videoFile, double videoGap): m_mpeg(_videoFile), m_videoGap(videoGap), m_surfaceTime(), m_lastTime(), m_alpha(-0.5, 1.5) {}
+ 
+ void Video::prepare(double time) {
+ 	time += m_videoGap;
diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD
index fdfbfa4de..8a3a1bd05 100644
--- a/community/pptpd/PKGBUILD
+++ b/community/pptpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90707 2013-05-13 14:34:48Z spupykin $
+# $Id: PKGBUILD 91528 2013-05-23 11:16:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pptpd
 pkgver=1.3.4
-pkgrel=12
+pkgrel=13
 pkgdesc="Poptop server"
 arch=(i686 x86_64)
 url="http://poptop.sourceforge.net/"
@@ -14,7 +14,7 @@ source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz
 	pptpd.service
 	unrecognized-opt.patch)
 md5sums=('b38df9c431041922c997c1148bedf591'
-         '144c17c7d5c1b95cfb3450eb73aa2e50'
+         'f17df2a137282adbd04c75dd25784a9c'
          'cfa02c86d0413eb94fac15599986f54c')
 
 build() {
@@ -26,7 +26,12 @@ build() {
   patch -p1 <$srcdir/unrecognized-opt.patch
   sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.in
   autoreconf -i
-  ./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share/man
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib \
+    --sbindir=/usr/bin \
+    --exec-prefix=/usr \
+    --mandir=/usr/share/man
   sed -i "s|#define VERSION.*|#define VERSION \"${_pppver}\"|" plugins/patchlevel.h
   make
   sed -i 's|install -o root|install|g' plugins/Makefile
diff --git a/community/pptpd/pptpd.service b/community/pptpd/pptpd.service
index 739508b60..c907c0b9f 100644
--- a/community/pptpd/pptpd.service
+++ b/community/pptpd/pptpd.service
@@ -3,7 +3,7 @@ Description=PPTP Server
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f
+ExecStart=/usr/bin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f
 StandardOutput=null
 
 [Install]
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index 27c573cb0..57d6934a8 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87136 2013-03-27 19:52:53Z dwallace $
+# $Id: PKGBUILD 91566 2013-05-23 21:46:56Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Antonio Rojas < nqn1976 @ gmail.com >
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.8
+pkgver=5.9
 pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
@@ -15,17 +15,16 @@ arch=('i686' 'x86_64')
 license=('GPL')
 #depends=('xz' 'java-environment=7' 'desktop-file-utils' 'libxmu' 'libtiff' 'sqlite' 'libjpeg-turbo')
 depends=('desktop-file-utils')
-makedepends=('gcc-fortran' )
+makedepends=('gcc-fortran' 'freetype2')
 optdepends=('imagemagick: some plotting functionality benefits from it'
             'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
             'openssh: to use the notebook in secure mode'
-            'ffmpeg: to show animations')
-options=('!makeflags')
+            'ffmpeg: to show animations'
+            'cairo: R plots')
 install="${pkgname}.install"
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
-        'SAGE-notebook.desktop')
-md5sums=('fc5b401174ee1efa7aea163e804c2b42'
-         'b82f94383829eee26648feb977e2d89b')
+        'SAGE-notebook.desktop'
+        'sage.service')
 
 build() {
   cd sage-${pkgver}
@@ -38,8 +37,7 @@ build() {
   unset LDFLAGS
 
   # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS
-  export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }')
-  export MAKE="make -j${SAGE_BUILD_THREADS}"
+  export MAKE="make -j$(nproc)"
 
   # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran
   export FC=/usr/bin/gfortran
@@ -52,7 +50,11 @@ build() {
   export SAGE_FAT_BINARY='yes'
 
   # can't write to root in a clean chroot
-  export DOT_SAGE='/build/src/'
+  mkdir "$srcdir/buiild"
+  export DOT_SAGE="$srcdir/build"
+
+  # Singular is broken
+  export CPP='/usr/bin/cpp'
 
   # only build sage, no documents
   #make build
@@ -95,8 +97,12 @@ package() {
   # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
   rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
   rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
+
+  # install a systemd user unit
+  install -Dm755 $srcdir/sage.service $pkgdir/usr/lib/systemd/user/sage.service
 }
 
 # vim :set ts=2 sw=2 et:
-md5sums=('b91d6c20798f396a9c875527c78b3587'
-         'b82f94383829eee26648feb977e2d89b')
+md5sums=('708520904f2d42039c714ac72a631948'
+         'b82f94383829eee26648feb977e2d89b'
+         '985da1c1d1dcdc3ea9aa73035cb7996b')
diff --git a/community/sage-mathematics/sage-mathematics.install b/community/sage-mathematics/sage-mathematics.install
index ab5dae235..3da751689 100644
--- a/community/sage-mathematics/sage-mathematics.install
+++ b/community/sage-mathematics/sage-mathematics.install
@@ -41,6 +41,8 @@ echo '
 
 post_upgrade() {
   post_install $1
+  echo "There is now a user session unit included to run a sage notebook as your user."
+  echo "The wiki includes a guide on starting systemd user sessions"
 }
 
 post_remove() {
diff --git a/community/sage-mathematics/sage.service b/community/sage-mathematics/sage.service
new file mode 100644
index 000000000..d999414de
--- /dev/null
+++ b/community/sage-mathematics/sage.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=A free open-source mathematics software system
+
+[Service]
+ExecStart=/opt/sage/sage -n
+
+[Install]
+WantedBy=default.target
diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD
index f384b7f70..e95d7fee6 100644
--- a/community/scponly/PKGBUILD
+++ b/community/scponly/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65429 2012-02-21 05:43:32Z spupykin $
+# $Id: PKGBUILD 91530 2013-05-23 11:17:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=scponly
 pkgver=4.8
-pkgrel=8
+pkgrel=9
 pkgdesc="A limited shell for ssh/scp"
 arch=(i686 x86_64)
 url="http://sublimation.org/scponly/"
@@ -19,9 +19,9 @@ md5sums=('139ac9abd7f3b8dbc5c5520745318f8a'
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc \
-	--enable-scp-compat --enable-winscp-compat --enable-chrooted-binary
+	--enable-scp-compat --enable-winscp-compat --enable-chrooted-binary \
+	--sbindir=/usr/bin
   sed -i 's|^#elif|#else|' helper.c
   make
 }
diff --git a/community/ser2net/PKGBUILD b/community/ser2net/PKGBUILD
index 02b694c11..a8100ef32 100644
--- a/community/ser2net/PKGBUILD
+++ b/community/ser2net/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90721 2013-05-13 14:37:29Z spupykin $
+# $Id: PKGBUILD 91532 2013-05-23 11:17:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 
 pkgname=ser2net
 pkgver=2.8rc3
-pkgrel=2
+pkgrel=3
 pkgdesc="A proxy that allows telnet/tcp connections to be made to serial ports"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/ser2net"
@@ -14,11 +14,11 @@ backup=(etc/ser2net.conf)
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver/rc/-rc}.tar.gz
 	ser2net.service)
 md5sums=('bbe95fb557781c314d321356897a50b9'
-         '7f9d879325b9ed6ddc313dcbc3f83e56')
+         '9a94f9ba5595359c92d099465ab7c828')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/rc/-rc}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
diff --git a/community/ser2net/ser2net.service b/community/ser2net/ser2net.service
index fcf054e22..7bb3137d4 100644
--- a/community/ser2net/ser2net.service
+++ b/community/ser2net/ser2net.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/ser2net
+ExecStart=/usr/bin/ser2net
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index 43b5a4a5e..f0a68eb21 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91385 2013-05-21 13:59:14Z spupykin $
+# $Id: PKGBUILD 91502 2013-05-23 10:15:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
 
 pkgname=squid
 pkgver=3.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686')
 url='http://www.squid-cache.org'
@@ -23,8 +23,8 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
         'squid.service')
 md5sums=('c7991aa8528034af0e21a69edf26e41b'
          '270977cdd9b47ef44c0c427ab9034777'
-         'b499c2b725aefd7bd60bec2f1a9de392'
-         '20e00e1aa1198786795f3da32db3c1d8')
+         'a71425c4951f2e5b640d19e6a5048531'
+         'ceeb57c69ebb165676219222f109a24e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -41,6 +41,7 @@ build() {
 
   ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
     --datadir=/usr/share/squid \
     --sysconfdir=/etc/squid \
     --libexecdir=/usr/lib/squid \
diff --git a/community/squid/squid.cron b/community/squid/squid.cron
index c78e51105..7425df894 100644
--- a/community/squid/squid.cron
+++ b/community/squid/squid.cron
@@ -4,6 +4,6 @@
 { read pid </run/squid.pid; } 2>/dev/null || exit 0
 
 # make sure found PID really is a squid process
-if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then
-  /usr/sbin/squid -k rotate
+if [ /proc/$pid/exec -ef /usr/bin/squid ]; then
+  /usr/bin/squid -k rotate
 fi
diff --git a/community/squid/squid.install b/community/squid/squid.install
index e7aa5ff68..a7c76d87a 100644
--- a/community/squid/squid.install
+++ b/community/squid/squid.install
@@ -1,10 +1,10 @@
 post_install() {
   if [ -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupadd -g 15 proxy &>/dev/null
+    groupadd -g 15 proxy &>/dev/null
   fi
 
   id proxy &>/dev/null || \
-    usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy
+    useradd -u 15 -g proxy -d /var/empty proxy
 
   chown proxy.proxy var/{cache,log}/squid
 
@@ -18,9 +18,9 @@ post_upgrade() {
 }
 
 pre_remove() {
-  usr/sbin/userdel proxy &> /dev/null
+  userdel proxy &> /dev/null
   if [ ! -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupdel proxy &>/dev/null
+    groupdel proxy &>/dev/null
   fi
 }
 
diff --git a/community/squid/squid.service b/community/squid/squid.service
index 9d41cc243..1db8860e5 100644
--- a/community/squid/squid.service
+++ b/community/squid/squid.service
@@ -5,9 +5,9 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/run/squid.pid
-ExecStart=/usr/sbin/squid -sYC
-ExecStop=/usr/sbin/squid -k shutdown
-ExecReload=/usr/sbin/squid -k reconfigure
+ExecStart=/usr/bin/squid -sYC
+ExecStop=/usr/bin/squid -k shutdown
+ExecReload=/usr/bin/squid -k reconfigure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index 660cfa102..c87811366 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -2,15 +2,16 @@
 # Contributor: Jelle van der Waa <jelle vdwaa nl>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
+# Contributor: Michael Düll <mail@akurei.me>
 
 pkgname=synergy
-pkgver=1.4.10
-pkgrel=2
+pkgver=1.4.12
+pkgrel=1
 pkgdesc="Share a single mouse and keyboard between multiple computers"
 url="http://synergy-foss.org"
 arch=('i686' 'x86_64')
-depends=('gcc-libs' 'libxtst' 'libxinerama')
-makedepends=('libxt' 'cmake' 'qt4')
+depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++')
+makedepends=('libxt' 'cmake' 'qt4' 'unzip')
 optdepends=('qt4: gui support')
 license=('GPL2')
 source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
@@ -18,15 +19,13 @@ source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
         "synergys.service"
         "synergy.png"
         "synergy.desktop")
-md5sums=('18aee04a7e232e4d821f46ff24da3364'
-         '58f48336836d6faf3d5eecbe4155b77e'
-         'b95e4b83d8a19c0bd81a15280078fcd5'
-         '11fdb13390908e02c6e2f19c4c09eded'
-         '1e8d574c19994d13e6f342ed08e531bb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
 
+  # Unzip the crypto library
+  unzip -d tools/cryptopp562 tools/cryptopp562.zip
+
   cmake -D CMAKE_INSTALL_PREFIX=/usr . 
   make
 
@@ -55,3 +54,9 @@ package() {
   install -Dm644 "$srcdir/synergy.png" "$pkgdir/usr/share/pixmaps/synergy.png"
   install -Dm644 "$srcdir/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
 }
+
+sha512sums=('5305e03d871e5408640ece55364067418f9b8b160dda31f994ebafe807b31291bdaa688a901f2e81710acb0857952c37f0c1823a50c927573feaec0c8659be9d'
+            'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad'
+            'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f'
+            'cb3db9593c943bce11ce5ae962e120feb70e6afa9206887a6971c77491711afcebc78653e7413e87e33d031c43a507f4a9a6e8747d10b60c6642106ae1690f18'
+            'c1c76ecfbed5c22f1a2a7562dce20971a784ff6b0edbf5c9b5f7c796f9ead882b82f970bb24f35533b928c341f87f66b0b10d9d96e122d14d74102cac8997445')
diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD
index b1a758000..3941eda98 100644
--- a/community/uptimed/PKGBUILD
+++ b/community/uptimed/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90733 2013-05-13 14:40:26Z spupykin $
+# $Id: PKGBUILD 91504 2013-05-23 10:15:34Z spupykin $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Tom Killian <tomk@runbox.com>
@@ -6,7 +6,7 @@
 
 pkgname=uptimed
 pkgver=0.3.17
-pkgrel=3
+pkgrel=4
 pkgdesc="A system uptime record daemon"
 arch=(i686 x86_64)
 url="http://podgorny.cz/uptimed/"
@@ -18,7 +18,7 @@ install=$pkgname.install
 source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2
         service)
 md5sums=('528b62c33454b33537c3bf2366977bdb'
-         '657102b06613ddb9811427bee1973c6b')
+         '6d1e97b9c54d622edc0bd607acbf3c10')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -33,7 +33,7 @@ build() {
   autoreconf
   libtoolize --force
 
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make
 }
 
diff --git a/community/uptimed/service b/community/uptimed/service
index 2fd785318..36e074d04 100644
--- a/community/uptimed/service
+++ b/community/uptimed/service
@@ -4,8 +4,8 @@ Description=System uptime record daemon
 [Service]
 Type=forking
 PIDFile=/var/run/uptimed
-ExecStartPre=/usr/sbin/uptimed -b
-ExecStart=/usr/sbin/uptimed
+ExecStartPre=/usr/bin/uptimed -b
+ExecStart=/usr/bin/uptimed
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/uptimed/uptimed.install b/community/uptimed/uptimed.install
index 178061706..7edd1f66c 100644
--- a/community/uptimed/uptimed.install
+++ b/community/uptimed/uptimed.install
@@ -1,7 +1,3 @@
-# arg 1: the old package version
 pre_remove() {
-	# clean up after ourselves
-	#
-	/bin/rm -rf /var/log/uptimed
+  rm -rf var/log/uptimed
 }
-
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index 606b24cb6..1e8402072 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 80001 2012-11-15 11:55:13Z spupykin $
+# $Id: PKGBUILD 91506 2013-05-23 10:15:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 _pkgdata=20121109
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64')
@@ -22,7 +22,7 @@ md5sums=('c393603908eceab95444c5bde790f6f0'
 build() {
   cd $srcdir/usb-modeswitch-$pkgver/
   make clean
-  make
+  make SBINDIR=/usr/bin
 }
 
 package() {
@@ -32,7 +32,7 @@ package() {
   mkdir -p $pkgdir/etc
   mkdir -p $pkgdir/usr/share/man/man1
 
-  make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev install
+  make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev SBINDIR=$pkgdir/usr/bin install
 
   cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup
 
diff --git a/community/vnstat/PKGBUILD b/community/vnstat/PKGBUILD
index 1efe1b8ca..29d424a9e 100644
--- a/community/vnstat/PKGBUILD
+++ b/community/vnstat/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90737 2013-05-13 14:41:25Z spupykin $
+# $Id: PKGBUILD 91534 2013-05-23 11:17:51Z spupykin $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=vnstat
 pkgver=1.11
-pkgrel=4
+pkgrel=5
 pkgdesc="A console-based network traffic monitor"
 arch=('i686' 'x86_64')
 url="http://humdi.net/vnstat/"
@@ -17,16 +17,16 @@ backup=(etc/vnstat.conf)
 source=(http://humdi.net/vnstat/$pkgname-$pkgver.tar.gz
 	service)
 md5sums=('a5a113f9176cd61fb954f2ba297f5fdb'
-         'fcc189e3dee616ff414dac72637c1a19')
+         'df452896729db4a569005f1ebf6b57f4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  make all
+  make all SBIN=/usr/bin
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver 
-  make DESTDIR=$pkgdir install
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install SBIN=$pkgdir/usr/bin
 
   install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/vnstat.service
 
diff --git a/community/vnstat/service b/community/vnstat/service
index f312351ea..5c593eb1b 100644
--- a/community/vnstat/service
+++ b/community/vnstat/service
@@ -2,7 +2,7 @@
 Description=Network traffic monitor
 
 [Service]
-ExecStart=/usr/sbin/vnstatd -n
+ExecStart=/usr/bin/vnstatd -n
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/community/xe-guest-utilities/PKGBUILD b/community/xe-guest-utilities/PKGBUILD
index 3fd142e5c..f3af11392 100644
--- a/community/xe-guest-utilities/PKGBUILD
+++ b/community/xe-guest-utilities/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90393 2013-05-12 07:10:12Z dwallace $
+# $Id: PKGBUILD 91549 2013-05-23 14:44:31Z 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,7 +6,7 @@
 pkgbase=xe-guest-utilities
 pkgname=('xe-guest-utilities' 'xenstore')
 pkgver=6.1.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Citrix XenServer Tools"
 arch=('i686' 'x86_64')
 url="http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"
@@ -69,6 +69,7 @@ package_xe-guest-utilities(){
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
   install -Dm644 $srcdir/xe-daemon.service "$pkgdir/usr/lib/systemd/system/xe-daemon.service"
   install -Dm644 $srcdir/xe-linux-distribution.service "$pkgdir/usr/lib/systemd/system/"
+  sed -i 's:sbin:bin:' $pkgdir/usr/bin/xe-daemon
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD
index b6e76d97c..2c513c4fb 100644
--- a/community/xl2tpd/PKGBUILD
+++ b/community/xl2tpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90739 2013-05-13 14:42:05Z spupykin $
+# $Id: PKGBUILD 91508 2013-05-23 10:16:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Hengfu <rhfcaesar@gmail.com>
 
 pkgname=xl2tpd
 pkgver=1.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation"
 arch=('i686' 'x86_64')
 url="http://www.xelerance.com/services/software/xl2tpd/"
@@ -23,7 +23,7 @@ md5sums=('38c2461d3562f98b08454ca403706886'
          '5f0ae07026e61a3dd15a76fd4144a6d5'
          '16ed0886115d4dcc21072cfb847250bb'
          'ed57eb67335cdf246251285dad502cc7'
-         '5ba9ddaf66c9827fe4a2caef67cf61c2'
+         '219942dd098ce4fdba37d1db327baf57'
          '2e95e4fc03e1521ab20fd7e249efab5a'
          '4d258a58cc109d5c4d96af8f81d481cf')
 
@@ -32,13 +32,13 @@ build() {
 
   patch -p1 <$srcdir/ipparam.patch
 
-  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr
+  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr SBINDIR=/usr/bin
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir install
+  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir  SBINDIR=$pkgdir/usr/bin install
 
   install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example
   install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example
diff --git a/community/xl2tpd/xl2tpd.service b/community/xl2tpd/xl2tpd.service
index b47cadf02..e55b9cb12 100644
--- a/community/xl2tpd/xl2tpd.service
+++ b/community/xl2tpd/xl2tpd.service
@@ -7,8 +7,8 @@ After=ipsec.service
 
 [Service]
 Type=simple
-PIDFile=/var/run/xl2tpd/xl2tpd.pid
-ExecStart=/usr/sbin/xl2tpd -D
+PIDFile=/run/xl2tpd/xl2tpd.pid
+ExecStart=/usr/bin/xl2tpd -D
 Restart=on-abort
 
 [Install]
diff --git a/community/zathura-djvu/PKGBUILD b/community/zathura-djvu/PKGBUILD
index 70fb348b7..6d83912ef 100644
--- a/community/zathura-djvu/PKGBUILD
+++ b/community/zathura-djvu/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 82565 2013-01-21 01:01:19Z dwallace $
+# $Id: PKGBUILD 91452 2013-05-22 23:23:11Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: karnath <karnathtorjian@gmail.com>
 
 pkgname=zathura-djvu
-pkgver=0.2.2
+pkgver=0.2.3
 pkgrel=1
 pkgdesc="Adds DjVu support to zathura by using the djvulibre library"
 arch=('i686' 'x86_64')
 url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/"
 license=('custom')
 depends=('djvulibre' 'zathura')
+install="$pkgname.install"
 source=("https://pwmt.org/projects/zathura/plugins/download/zathura-djvu-$pkgver.tar.gz")
-md5sums=('38344cb762e1f5b5fe66f6ef49ac173f')
+md5sums=('a472f706d6f6384d8bc2750141a84fc6')
 
 build(){
   make -C "${srcdir}/$pkgname-$pkgver"
diff --git a/community/zathura-djvu/zathura-djvu.install b/community/zathura-djvu/zathura-djvu.install
new file mode 100644
index 000000000..247455a1d
--- /dev/null
+++ b/community/zathura-djvu/zathura-djvu.install
@@ -0,0 +1,6 @@
+post_install(){
+    update-desktop-database -q
+}
+post_remove(){
+    update-desktop-database -q
+}
diff --git a/community/zathura-pdf-poppler/PKGBUILD b/community/zathura-pdf-poppler/PKGBUILD
index c4c7a2337..14498ce13 100644
--- a/community/zathura-pdf-poppler/PKGBUILD
+++ b/community/zathura-pdf-poppler/PKGBUILD
@@ -4,15 +4,17 @@
 # Contributor: karnath <karnathtorjian@gmail.com>
 
 pkgname=zathura-pdf-poppler
-pkgver=0.2.2
-pkgrel=1
+pkgver=0.2.3
+pkgrel=2
 pkgdesc="Adds pdf support to zathura by using the poppler engine"
 arch=('i686' 'x86_64')
 url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/"
 license=('custom')
 depends=('poppler-glib' 'zathura')
+install="$pkgname.install"
+
 source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz")
-md5sums=('83f2dba1f6d715f5b1a33044d2a64829')
+md5sums=('1d8deb2d2ee5a6847267f977b8f2e542')
 
 build() {
   make -C "${srcdir}/$pkgname-$pkgver"
diff --git a/community/zathura-pdf-poppler/zathura-pdf-poppler.install b/community/zathura-pdf-poppler/zathura-pdf-poppler.install
new file mode 100644
index 000000000..247455a1d
--- /dev/null
+++ b/community/zathura-pdf-poppler/zathura-pdf-poppler.install
@@ -0,0 +1,6 @@
+post_install(){
+    update-desktop-database -q
+}
+post_remove(){
+    update-desktop-database -q
+}
diff --git a/community/zathura-ps/PKGBUILD b/community/zathura-ps/PKGBUILD
index 7e20349ea..9440bf22d 100644
--- a/community/zathura-ps/PKGBUILD
+++ b/community/zathura-ps/PKGBUILD
@@ -3,15 +3,16 @@
 # Contributor: karnath <karnathtorjian@gmail.com>
 
 pkgname=zathura-ps
-pkgver=0.2.1
+pkgver=0.2.2
 pkgrel=1
 pkgdesc="Adds ps support to zathura by using the libspectre library"
 arch=('i686' 'x86_64')
 url="https://pwmt.org/projects/zathura/plugins/zathura-ps/"
 license=('custom')
 depends=('libspectre' 'zathura')
+install="$pkgname.install"
 source=(https://pwmt.org/projects/zathura/plugins/download/zathura-ps-$pkgver.tar.gz)
-md5sums=('45619e744b69bf16b408b50cf32f2df5')
+md5sums=('338af976c03c0aa1471b156a0efdc45c')
 
 build(){
   make -C "$pkgname-$pkgver"
diff --git a/community/zathura-ps/zathura-ps.install b/community/zathura-ps/zathura-ps.install
new file mode 100644
index 000000000..247455a1d
--- /dev/null
+++ b/community/zathura-ps/zathura-ps.install
@@ -0,0 +1,6 @@
+post_install(){
+    update-desktop-database -q
+}
+post_remove(){
+    update-desktop-database -q
+}
diff --git a/core/ifenslave/PKGBUILD b/core/ifenslave/PKGBUILD
index a730f2f5e..32caed5b0 100644
--- a/core/ifenslave/PKGBUILD
+++ b/core/ifenslave/PKGBUILD
@@ -1,21 +1,17 @@
-# $Id: PKGBUILD 142704 2011-11-13 10:10:10Z bisson $
-# Maintainer: 
+# $Id: PKGBUILD 186263 2013-05-23 06:41:01Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=ifenslave
 pkgver=1.1.0
-pkgrel=7
+pkgrel=8
 pkgdesc='Utility for bonding ethernet interfaces'
-arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/en/Net:Bonding'
+arch=('i686' 'x86_64')
 license=('GPL2')
-depends=('glibc')
 makedepends=('linux-api-headers')
-backup=('etc/conf.d/bonding')
-source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=65968fbf'
-        'bonding.conf.d')
-sha1sums=('c657d9e6b8acb983bb8ef856f8f7f25ee6bf4f73'
-          '6843971c0254768868b556af33289d7d32d6208d')
+source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=450faacc')
+sha1sums=('cf0ca36e4a82f259f4bd5d7268ce758581a76fb0')
 
 build() {
 	cd "${srcdir}"
@@ -24,6 +20,5 @@ build() {
 
 package() {
 	cd "${srcdir}"
-	install -Dm755 ifenslave "${pkgdir}"/sbin/ifenslave
-	install -Dm644 bonding.conf.d "${pkgdir}"/etc/conf.d/bonding
+	install -Dm755 ifenslave "${pkgdir}"/usr/bin/ifenslave
 }
diff --git a/core/ifenslave/bonding.conf.d b/core/ifenslave/bonding.conf.d
deleted file mode 100644
index 3092c5e95..000000000
--- a/core/ifenslave/bonding.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Settings for ethernet bonding
-#
-# For each bond interface declared in INTERFACES (in rc.conf), declare
-# a bond_${IF} variable that contains the real ethernet interfaces that
-# should be bonded to the bond interface with the ifenslave utility.
-# Then list the bond interface name in the BOND_INTERFACES array.
-#
-
-#bond_bond0="eth0 eth1"
-#BOND_INTERFACES=(bond0)
-
diff --git a/core/jfsutils/PKGBUILD b/core/jfsutils/PKGBUILD
index fee4867a2..dc7ed30a6 100644
--- a/core/jfsutils/PKGBUILD
+++ b/core/jfsutils/PKGBUILD
@@ -1,21 +1,30 @@
-# $Id: PKGBUILD 142848 2011-11-17 00:38:27Z bisson $
+# $Id: PKGBUILD 186264 2013-05-23 06:41:02Z bisson $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=jfsutils
 pkgver=1.1.15
-pkgrel=3
+pkgrel=4
 pkgdesc='JFS filesystem utilities'
-arch=('i686' 'x86_64')
 url='http://jfs.sourceforge.net'
+arch=('i686' 'x86_64')
 license=('GPL')
+depends=('util-linux')
+source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz"
+        'inttypes.patch')
+sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50'
+          '88551e7d8418bab0df4643dce248110d4c9b0a53')
+
 groups=('base')
-depends=('util-linux-ng')
-source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../inttypes.patch
+}
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --sbindir=/sbin 
+	./configure --prefix=/usr --sbindir=/usr/bin 
 	make
 }
 
diff --git a/core/jfsutils/inttypes.patch b/core/jfsutils/inttypes.patch
new file mode 100644
index 000000000..2018bb8a8
--- /dev/null
+++ b/core/jfsutils/inttypes.patch
@@ -0,0 +1,12 @@
+diff -Naur old/libfs/devices.h new/libfs/devices.h
+--- old/libfs/devices.h	2005-11-23 07:43:55.000000000 +1100
++++ new/libfs/devices.h	2013-01-06 11:30:25.381538024 +1100
+@@ -40,6 +40,8 @@
+ #define ERROR_INVALID_PARAMETER	87
+ #define ERROR_DISK_FULL		112
+ 
++#include <inttypes.h>
++
+ struct stat;
+ 
+ int ujfs_get_dev_size(FILE *, int64_t * size);
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD
index 3ac08c05d..b58c7fec7 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -1,29 +1,23 @@
-# $Id: PKGBUILD 175740 2013-01-21 04:49:48Z bisson $
+# $Id: PKGBUILD 186265 2013-05-23 06:41:04Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rfkill
-pkgver=0.4
-pkgrel=7
+pkgver=0.5
+pkgrel=1
 pkgdesc='Tool for enabling and disabling wireless devices'
-url='http://linuxwireless.org/en/users/Documentation/rfkill'
+url='http://wireless.kernel.org/en/users/Documentation/rfkill'
 license=('custom')
 arch=('i686' 'x86_64')
-source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+source=("https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'service.unblock'
         'service.block'
-        'rules.d'
-        'conf.d'
-        'rc.d')
-sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b'
-          '4d0ef151891c32c882dcec8b03ab7204f015d0d1'
-          'c44581c4cc19509f53afd0abea1341cc30751fe2'
-          '6390eaa793b473098aaa11b13c5254d611a4c13a'
-          'd969fe927a9fb2926af43a311a7c1fa126fe59a9'
-          '380af0b002f51543557306ed68a27f0059fd5a6f')
-
-backup=('etc/conf.d/rfkill')
+        'rules.d')
+sha1sums=('03025d4ae285c40d5c19ec99ef7b317afda9d900'
+          '5f4a04a434df2ca28ca6687326c67c1f125aa3d4'
+          '6cc294af37232469cd5ba63455b571fe258e1cc6'
+          '6390eaa793b473098aaa11b13c5254d611a4c13a')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -32,11 +26,9 @@ build() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+	make SBINDIR=/usr/bin DESTDIR="${pkgdir}" install
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
 	install -Dm644 ../service.block "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
 	install -Dm644 ../service.unblock "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
-	install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill"
-	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill"
 }
diff --git a/core/rfkill/conf.d b/core/rfkill/conf.d
deleted file mode 100644
index 4483da26c..000000000
--- a/core/rfkill/conf.d
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# /etc/conf.d/rfkill
-# Configuration for the rfkill startup script
-#
-
-# List of devices to block on startup (space-separated)
-RFKILL_BLOCK=""
-
-# List of devices to unblock on startup (space-separated)
-RFKILL_UNBLOCK="all"
-
-# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ...
-# See "rfkill list" for available devices
-# Examples:
-#
-# Block all bluetooth devices:
-# RFKILL_BLOCK="bluetooth"
-#
-# Unblock the phy0 wifi device and all wwan devices:
-# RFKILL_UNBLOCK="phy0 wwan"
diff --git a/core/rfkill/rc.d b/core/rfkill/rc.d
deleted file mode 100755
index ce90ee150..000000000
--- a/core/rfkill/rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rfkill
-
-case "$1" in
-  start)
-    for device in ${RFKILL_BLOCK}; do
-      stat_busy "Blocking rfkill device: ${device}"
-      /usr/sbin/rfkill block ${device}
-      if [ $? -eq 0 ]; then
-        stat_done
-      else
-        stat_fail
-      fi
-    done
-    for device in ${RFKILL_UNBLOCK}; do
-      stat_busy "Unblocking rfkill device: ${device}"
-      /usr/sbin/rfkill unblock ${device}
-      if [ $? -eq 0 ]; then
-        stat_done
-      else
-        stat_fail
-      fi
-    done
-    ;;
-  stop)
-    ;;
-  restart)
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start}"
-    exit 1
-    ;;
-esac
-exit 0
diff --git a/core/rfkill/service.block b/core/rfkill/service.block
index 420272c5d..ede74d12d 100644
--- a/core/rfkill/service.block
+++ b/core/rfkill/service.block
@@ -4,7 +4,7 @@ After=rfkill-unblock@all.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/rfkill block %I
+ExecStart=/usr/bin/rfkill block %I
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/rfkill/service.unblock b/core/rfkill/service.unblock
index 40f4e3244..94ebf35af 100644
--- a/core/rfkill/service.unblock
+++ b/core/rfkill/service.unblock
@@ -4,7 +4,7 @@ After=rfkill-block@all.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/rfkill unblock %I
+ExecStart=/usr/bin/rfkill unblock %I
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD
index 6c377cc12..57ba7574f 100644
--- a/core/wireless_tools/PKGBUILD
+++ b/core/wireless_tools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165574 2012-08-25 15:33:20Z bisson $
+# $Id: PKGBUILD 186266 2013-05-23 06:41:05Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=wireless_tools
 pkgver=29
-pkgrel=7
+pkgrel=8
 pkgdesc='Tools allowing to manipulate the Wireless Extensions'
 url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
 license=('GPL')
@@ -15,16 +15,20 @@ source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgve
 sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710'
           '5c297c7dff1ec1d2a3d918c20622ab3c6daf5b72')
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}.${pkgver}"
 	patch -p1 -i ../dense.patch # FS#15363
+}
+
+build() {
+	cd "${srcdir}/${pkgname}.${pkgver}"
 	make CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}"
 }
 
 package() {
 	cd "${srcdir}/${pkgname}.${pkgver}"
 	make \
-		INSTALL_DIR="${pkgdir}/usr/sbin" \
+		INSTALL_DIR="${pkgdir}/usr/bin" \
 		INSTALL_LIB="${pkgdir}/usr/lib" \
 		INSTALL_INC="${pkgdir}/usr/include" \
 		INSTALL_MAN="${pkgdir}/usr/share/man" \
diff --git a/extra/f2fs-tools/PKGBUILD b/extra/f2fs-tools/PKGBUILD
new file mode 100644
index 000000000..d033c1e3b
--- /dev/null
+++ b/extra/f2fs-tools/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 186280 2013-05-23 15:59:36Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Christian Hesse <mail@eworm.de>
+
+pkgname=f2fs-tools
+pkgver=1.1.0_130404
+pkgrel=1
+pkgdesc="Tools for Flash-Friendly File System (F2FS)"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/f2fs-tools/"
+depends=('util-linux')
+license=('GPL')
+#source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz')
+source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2")
+md5sums=('0bb44c174a2da2a7dd1216cc46b4612c')
+options=(!libtool)
+
+build() {
+	cd "${pkgname}-${pkgver}"
+
+	autoreconf -fi
+	./configure --prefix=/usr --sbindir=/usr/bin
+	make
+}
+
+package() {
+	cd "${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}/" sbindir=/usr/bin install
+}
+
diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD
index 27bfde990..cfae85ce5 100644
--- a/extra/fping/PKGBUILD
+++ b/extra/fping/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 185814 2013-05-19 12:00:14Z giovanni $
+# $Id: PKGBUILD 186276 2013-05-23 15:38:45Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=fping
-pkgver=3.4
-pkgrel=2
+pkgver=3.5
+pkgrel=1
 pkgdesc="A utility to ping multiple hosts at once"
 arch=('i686' 'x86_64')
 url="http://www.fping.org/"
 license=('custom') 
 depends=('glibc')
 source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a4bc97804e630dbf26dfac8f28c78091')
+md5sums=('2e17cb655aa4eb59b5a4a38a89e746ed')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 96cdd4a34..19bf3313a 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183266 2013-04-20 05:39:22Z heftig $
+# $Id: PKGBUILD 186259 2013-05-23 03:23:21Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=harfbuzz
-pkgver=0.9.16
+pkgver=0.9.17
 pkgrel=1
 pkgdesc="OpenType text shaping engine."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2')
 optdepends=('cairo: hb-view program')
 options=(!libtool)
 source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6da7e032f705d8a5c91487cd296628d64975672a5b0c1704829cf2285072c92b')
+sha256sums=('a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 5ca488f69..5b889c9c0 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185764 2013-05-18 14:49:17Z andyrtr $
+# $Id: PKGBUILD 186270 2013-05-23 15:26:49Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.4.6
+pkgver=4.4.7
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
 source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('377cc2caa2fc92755160270768e51604')
+md5sums=('a4e7b88d6b7aca389010ce6d6dca8099')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index 573ac890a..39967d9d4 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180833 2013-03-26 15:59:12Z bpiotrowski $
+# $Id: PKGBUILD 186282 2013-05-23 19:15:33Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
-pkgver=5.5.30
-pkgrel=2
+pkgver=5.5.31
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
@@ -14,7 +14,7 @@ source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunt
         mariadb.service
         mariadb-post.sh
         mariadb-tmpfile.conf)
-sha256sums=('64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f'
+sha256sums=('70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28'
             'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
             '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
@@ -106,7 +106,7 @@ package_mariadb() {
   pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
   backup=('etc/mysql/my.cnf')
   install=mariadb.install
-  depends=('mariadb-clients')
+  depends=('mariadb-clients' 'inetutils')
   conflicts=('mysql' 'mytop')
   provides=("mysql=$pkgver" 'mytop')
   optdepends=('perl-dbd-mysql: mytop dependency'
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index b7052f01b..14ce5932b 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 181379 2013-04-04 01:34:05Z eric $
+# $Id: PKGBUILD 186257 2013-05-23 01:22:39Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=mpg123
-pkgver=1.15.3
+pkgver=1.15.4
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64')
@@ -13,22 +13,20 @@ makedepends=('sdl' 'jack' 'libpulse')
 optdepends=('sdl: for sdl audio support'
             'jack: for jack audio support'
             'libpulse: for pulse audio support')
-conflicts=('mpg321')
-provides=('mpg321')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('915eb8782106a62b103a1171364571d69cb64e25'
-          '90614c85da88f965d9aa3165c111b6eeba711903')
+sha1sums=('f39d927bcf7abf4f9d857f10cd97c8ceccaffbfa'
+          'SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-int-quality --with-module-suffix=.so \
     --with-audio="alsa oss sdl jack pulse"
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m755 scripts/conplay "${pkgdir}/usr/bin/conplay"
 }
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 0d2f87b48..d295893d5 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 182150 2013-04-08 10:27:25Z stephane $
+# $Id: PKGBUILD 186286 2013-05-23 20:40:14Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
-pkgver=3.3.1
+pkgver=3.3.2
 pkgrel=1
 _pybasever=3.3
 pkgdesc="Next generation of the python high-level scripting language"
@@ -17,8 +17,10 @@ optdepends=('tk: for tkinter' 'sqlite')
 provides=('python3')
 replaces=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('393d7302c48bc911cd7faa7fa9b5fbcb9919bddc')
+source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
+        python-3.3.2-CVE-2013-2099.patch)
+sha1sums=('87009d0c156c6e1354dfec5c98c328cae93950ad'
+          'b7a386b2e2f0811b344898500860ec31ba81ed4d')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
@@ -32,6 +34,8 @@ build() {
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
 
+  patch -Np1 -i ../python-3.3.2-CVE-2013-2099.patch
+
   ./configure --prefix=/usr \
               --enable-shared \
               --with-threads \
@@ -48,8 +52,7 @@ build() {
 check() {
   cd "${srcdir}/Python-${pkgver}"
   LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \
-     test_urllib test_uuid test_pydoc test_logging
+     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_posixpath test_logging
 }
 
 package() {
diff --git a/extra/python/python-3.3.2-CVE-2013-2099.patch b/extra/python/python-3.3.2-CVE-2013-2099.patch
new file mode 100644
index 000000000..8162d8e54
--- /dev/null
+++ b/extra/python/python-3.3.2-CVE-2013-2099.patch
@@ -0,0 +1,50 @@
+
+# HG changeset patch
+# User Antoine Pitrou <solipsis@pitrou.net>
+# Date 1368892602 -7200
+# Node ID c627638753e2d25a98950585b259104a025937a9
+# Parent  9682241dc8fcb4b1aef083bd30860efa070c3d6d
+Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099).
+
+diff --git a/Lib/ssl.py b/Lib/ssl.py
+--- a/Lib/ssl.py
++++ b/Lib/ssl.py
+@@ -129,9 +129,16 @@ class CertificateError(ValueError):
+     pass
+ 
+ 
+-def _dnsname_to_pat(dn):
++def _dnsname_to_pat(dn, max_wildcards=1):
+     pats = []
+     for frag in dn.split(r'.'):
++        if frag.count('*') > max_wildcards:
++            # Issue #17980: avoid denials of service by refusing more
++            # than one wildcard per fragment.  A survery of established
++            # policy among SSL implementations showed it to be a
++            # reasonable choice.
++            raise CertificateError(
++                "too many wildcards in certificate DNS name: " + repr(dn))
+         if frag == '*':
+             # When '*' is a fragment by itself, it matches a non-empty dotless
+             # fragment.
+diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
+--- a/Lib/test/test_ssl.py
++++ b/Lib/test/test_ssl.py
+@@ -349,6 +349,17 @@ class BasicSocketTests(unittest.TestCase
+         self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com')
+         self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com')
+ 
++        # Issue #17980: avoid denials of service by refusing more than one
++        # wildcard per fragment.
++        cert = {'subject': ((('commonName', 'a*b.com'),),)}
++        ok(cert, 'axxb.com')
++        cert = {'subject': ((('commonName', 'a*b.co*'),),)}
++        ok(cert, 'axxb.com')
++        cert = {'subject': ((('commonName', 'a*b*.com'),),)}
++        with self.assertRaises(ssl.CertificateError) as cm:
++            ssl.match_hostname(cert, 'axxbxxc.com')
++        self.assertIn("too many wildcards", str(cm.exception))
++
+     def test_server_side(self):
+         # server_hostname doesn't work for server sockets
+         ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD
index d808390a3..6072f73e0 100644
--- a/extra/xorg-xdpyinfo/PKGBUILD
+++ b/extra/xorg-xdpyinfo/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 176903 2013-02-02 07:12:27Z andyrtr $
+# $Id: PKGBUILD 186272 2013-05-23 15:31:13Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xdpyinfo
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="Display information utility for X"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,7 +13,7 @@ depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 'l
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2)
-sha256sums=('23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f')
+sha256sums=('aef9285069a517ed870e5d8a02d13f7d8a953d7f7220146da563e04c7f128b94')
 
 build() {
   cd "${srcdir}/xdpyinfo-${pkgver}"
diff --git a/pcr/pybonjour/PKGBUILD b/pcr/pybonjour/PKGBUILD
new file mode 100644
index 000000000..9f77354b2
--- /dev/null
+++ b/pcr/pybonjour/PKGBUILD
@@ -0,0 +1,19 @@
+# Contributor: Ruben Schuller <r.schuller@orgizm.net>
+
+pkgname=pybonjour
+pkgver=1.1.1
+pkgrel=2
+pkgdesc="pybonjour provides a pure-Python interface to Apple Bonjour/Avahi"
+arch=('any')
+provides=('pybonjour')
+license=('MIT')
+url="http://code.google.com/p/pybonjour/"
+depends=('python2')
+makedepends=()
+source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+md5sums=('30cbfd3e9e9721b39f6aa67df1c315a2')
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  python2 setup.py install --root=$pkgdir
+  }