Fri Nov 1 01:13:45 PDT 2013

24 files changed, 267 insertions, 168 deletions

diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD
index 702ac4fcb..d2f08274f 100644
--- a/community/elinks/PKGBUILD
+++ b/community/elinks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98692 2013-10-17 05:44:05Z kkeen $
+# $Id: PKGBUILD 100054 2013-10-31 20:47:13Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
@@ -8,19 +8,21 @@
 pkgname=elinks
 pkgver=0.13
 _commit="a3751107033599b835eaafa61177c8d4dda4b7ef"
-pkgrel=13
+pkgrel=15
 pkgdesc="An advanced and well-established feature-rich text mode web browser."
 arch=("i686" "x86_64")
 url="http://elinks.or.cz"
 license=('GPL')
 depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn' 'js185'
-	 'gc' 'tre')
+	 'gc' 'tre' 'desktop-file-utils')
 makedepends=('git')
+install=elinks.install
 source=("git+http://elinks.cz/elinks.git#commit=$_commit")
 md5sums=('SKIP')
 
 build() {
   cd elinks
+  sed -i 's/Terminal=1/Terminal=true/' "contrib/debian/$pkgname.desktop"
   [ -x configure ] || sh autogen.sh
   ./configure --prefix=/usr --mandir=/usr/share/man \
               --sysconfdir=/etc \
diff --git a/community/nemo-extensions/nemo-seahorse.install b/community/elinks/elinks.install
index 21f12fbda..e111ef946 100644
--- a/community/nemo-extensions/nemo-seahorse.install
+++ b/community/elinks/elinks.install
@@ -1,12 +1,11 @@
 post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
   update-desktop-database -q
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  post_install $1
+  post_install
 }
diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD
index 7ff5ad13d..33f851d6f 100644
--- a/community/kvirc/PKGBUILD
+++ b/community/kvirc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91653 2013-05-26 09:24:37Z bluewind $
+# $Id: PKGBUILD 100026 2013-10-31 04:13:45Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=kvirc
@@ -10,7 +10,6 @@ depends=('python2' 'libxss' 'qtwebkit')
 arch=(i686 x86_64)
 makedepends=('cmake')
 license=('GPL')
-options=("!libtool")
 install=kvirc.install
 source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2)
 md5sums=('bf7229aaae132933a18b6a35125a2328')
diff --git a/community/liblinebreak/PKGBUILD b/community/liblinebreak/PKGBUILD
index ce6a84fe4..be7db4658 100644
--- a/community/liblinebreak/PKGBUILD
+++ b/community/liblinebreak/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74591 2012-07-31 10:04:29Z spupykin $
+# $Id: PKGBUILD 100027 2013-10-31 04:14:36Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Orivej Desh <smpuj@bk.ru>
 
@@ -10,8 +10,6 @@ arch=("i686" "x86_64")
 url="http://vimgadgets.sourceforge.net/liblinebreak/"
 license=("custom:zlib/libpng")
 depends=("glibc")
-makedepends=()
-options=("!libtool")
 source=("http://downloads.sourceforge.net/vimgadgets/liblinebreak-$pkgver.tar.gz")
 md5sums=('9fe73b4b230434765be2305e50f8fe45')
 
diff --git a/community/libunibreak/PKGBUILD b/community/libunibreak/PKGBUILD
index 8c8623f9a..040d94c4d 100644
--- a/community/libunibreak/PKGBUILD
+++ b/community/libunibreak/PKGBUILD
@@ -10,9 +10,7 @@ arch=("i686" "x86_64")
 url="http://vimgadgets.sourceforge.net/libunibreak/"
 license=("custom:zlib/libpng")
 depends=("glibc")
-makedepends=()
 replaces=('liblinebreak')
-options=("!libtool")
 source=("$pkgname-$pkgver.tar.gz::https://github.com/adah1972/libunibreak/archive/libunibreak_${pkgver//./_}.tar.gz")
 md5sums=('80c933a03493bd920553c9380aa7f13d')
 
diff --git a/community/nemo-extensions/PKGBUILD b/community/nemo-extensions/PKGBUILD
index ba89a325c..5c312e523 100644
--- a/community/nemo-extensions/PKGBUILD
+++ b/community/nemo-extensions/PKGBUILD
@@ -1,62 +1,62 @@
 # $Id$
 # Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com>
 
-pkgbase="nemo-extensions"
+pkgbase=nemo-extensions
 pkgname=('nemo-fileroller'
-	'nemo-share'
-	'nemo-python'
-	'nemo-seahorse')
-	# 'nemo-media-columns'
+	 'nemo-preview'
+	 'nemo-python'
+	 'nemo-share'
+	 'nemo-seahorse')
+	#'nemo-media-columns'
 	#'nemo-pastebin'
-	#'nemo-preview'
-	# 'nemo-compare'
+	#'nemo-compare'
 	#'nemo-rabbitvcs'
 pkgver=2.0.0
-pkgrel=1
+_gitver=adeeeb12ea
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="https://github.com/linuxmint/nemo-extensions"
-depends=(nemo python2-gobject gconf libgnome-keyring libcryptui file-roller samba pastebinit \
-		 clutter-gtk clutter-gst gst-plugins-good cjs libmusicbrainz5 evince gtksourceview3 webkitgtk \
-     python2-dbus)
-makedepends=(gnome-common gtk-doc intltool python2-distutils-extra gobject-introspection)
+depends=(nemo file-roller cjs clutter-gtk clutter-gst gst-plugins-good libmusicbrainz5
+         evince gtksourceview3 webkitgtk python2-gobject seahorse-nautilus samba)
+makedepends=(gconf gnome-common gtk-doc intltool) # python2-distutils-extra
 options=('!emptydirs')
-source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/master.zip")
-md5sums=('ecc7f8c34065d0bdb34778d53cf7b2fa')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/${_gitver}.tar.gz")
+md5sums=('de6a36ee77265f2a1528b29526fd6afb')
 
 prepare() {
+  cd ${pkgbase}-${_gitver}*
 
-    cd ${pkgbase}-master
+  # Python2 fix
+  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
-    # Python2 fix
-    find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-    
+  # Fix nemo-preview build
+  sed -i '/AM_GNU_GETTEXT/d' nemo-preview/configure.ac
 }
 
 build() {
-    cd ${pkgbase}-master
-
-    _configure_pkgs="nemo-fileroller nemo-share nemo-seahorse"
-    for dir in ${_configure_pkgs}
-    do
-      cd ${dir}
-      autoreconf -fi
-    	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  cd ${pkgbase}-${_gitver}*
+
+  _configure_pkgs="nemo-fileroller nemo-seahorse nemo-share"
+  for dir in ${_configure_pkgs}
+  do
+    pushd ${dir}
+    autoreconf -fi
+    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${dir} \
                 --disable-static --disable-schemas-compile
-    	make
-    	cd ..
-    done
-
-    #_autogen_pkgs="nemo-python nemo-preview"
-    _autogen_pkgs="nemo-python"
-    for dir in ${_autogen_pkgs}
-    do
-    	cd ${dir}
-    	./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-                --disable-static
-    	make
-    	cd ..
-    done
+    make
+    popd
+  done
+
+  _autogen_pkgs="nemo-preview nemo-python"
+  for dir in ${_autogen_pkgs}
+  do
+    pushd ${dir}
+    ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${dir} \
+                 --disable-static --disable-schemas-compile
+    make
+    popd
+  done
 
     # # nemo-pastebin
     # cd nemo-pastebin
@@ -76,46 +76,50 @@ build() {
 }
 
 package_nemo-fileroller(){
-	cd ${pkgbase}-master/nemo-fileroller
+  pkgdesc="File archiver extension for Nemo"
+  depends=(nemo file-roller)
 
-	pkgdesc="Nemo fileroller extension"
-	arch=('i686' 'x86_64')
-	depends=(nemo file-roller)
-	make DESTDIR="${pkgdir}" install
+  cd ${pkgbase}-${_gitver}*/nemo-fileroller
+  make DESTDIR="${pkgdir}" install
 }
 
-package_nemo-share(){
-	cd ${pkgbase}-master/nemo-share
+package_nemo-preview(){
+  pkgdesc=("GtkClutter and Javascript-based quick previewer for Nemo")
+  depends=(nemo cjs clutter-gtk clutter-gst gst-plugins-good libmusicbrainz5 evince gtksourceview3 webkitgtk)
 
-	pkgdesc="Samba extension for Nemo"
-	arch=('i686' 'x86_64')
-	depends=(nemo samba)
-	make DESTDIR="${pkgdir}" install
+  cd ${pkgbase}-${_gitver}*/nemo-preview
+  make DESTDIR="${pkgdir}" install
 }
 
 package_nemo-python() {
- cd ${pkgbase}-master/nemo-python
+  pkgdesc="Python2 binding for Nemo components"
+  depends=(nemo python2-gobject)
+
+  cd ${pkgbase}-${_gitver}*/nemo-python
+  make DESTDIR="${pkgdir}" install
+}
 
- pkgdesc="Python2 binding for Nemo components"
- arch=('i686' 'x86_64')
- depends=(nemo python2-gobject)
+package_nemo-seahorse(){
+  pkgdesc="PGP encryption and signing extension for Nemo"
+  depends=(nemo seahorse-nautilus)
 
- make DESTDIR="${pkgdir}" install
+  cd ${pkgbase}-${_gitver}*/nemo-seahorse
+  make DESTDIR="${pkgdir}" install
 
+  # seahorse-tool is already in seahorse-nautilus package
+  make -C tool DESTDIR="${pkgdir}" uninstall
 }
 
-package_nemo-seahorse(){
-	cd ${pkgbase}-master/nemo-seahorse
+package_nemo-share(){
+  pkgdesc="Samba extension for Nemo"
+  depends=(nemo samba)
 
-	pkgdesc="Seahorse plugins and utilities for encryption"
-  arch=('i686' 'x86_64')
-	depends=(nemo seahorse gconf libgnome-keyring libcryptui)
-  install=nemo-seahorse.install
-	make DESTDIR="${pkgdir}" install
+  cd ${pkgbase}-${_gitver}*/nemo-share
+  make DESTDIR="${pkgdir}" install
 }
 
 # package_nemo-media-columns(){
-# 	cd ${pkgbase}-master/nemo-media-columns
+# 	cd ${pkgbase}-${_gitver}*/nemo-media-columns
 
 # 	pkgdesc=("A Nemo extension to display music/EXIF and PDF metadata info in the Nemo List View")
 # 	arch=(any)
@@ -126,7 +130,7 @@ package_nemo-seahorse(){
 # }
 
 # package_nemo-pastebin(){
-# 	cd ${pkgbase}-master/nemo-pastebin
+# 	cd ${pkgbase}-${_gitver}*/nemo-pastebin
 
 # 	pkgdesc="Nemo extension to send files to a pastebin"
 # 	arch=(any)
@@ -137,18 +141,8 @@ package_nemo-seahorse(){
 # 		--no-compile -O0
 # }
 
-# package_nemo-preview(){
-# 	cd ${pkgbase}-master/nemo-preview
-
-# 	pkgdesc=("Nemo-preview is a GtkClutter and Javascript-based quick previewer for Nemo")
-# 	arch=(any)
-# 	depends=(nemo cjs libmusicbrainz5 evince gtksourceview3 webkitgtk clutter-gtk clutter-gst gst-plugins-good)
-
-# 	make DESTDIR="${pkgdir}" install
-# }
-
 # package_nemo-compare() {
-#   cd ${pkgbase}-master/nemo-compare
+#   cd ${pkgbase}-${_gitver}*/nemo-compare
 
 #   pkgdesc="Context menu comparison extension for Nemo file manager"
 #   depends=(python2 python2-xdg meld nemo-python)
@@ -170,7 +164,7 @@ package_nemo-seahorse(){
 # }
 
 # package_nemo-rabbitvcs(){
-# 	cd ${pkgbase}-master/nemo-rabbitvcs
+# 	cd ${pkgbase}-${_gitver}*/nemo-rabbitvcs
 
 #   depends=(nemo-python python2-dbus)
 
diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD
index 06bf8a75b..c788d6441 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 94613 2013-07-28 13:05:24Z bisson $
+# $Id: PKGBUILD 100048 2013-10-31 16:25:17Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=nsd
-pkgver=3.2.16
+pkgver=4.0.0
 pkgrel=1
 pkgdesc='Authoritative only, high performance and simple DNS server'
 url='http://www.nlnetlabs.nl/nsd/'
 license=('BSD')
-depends=('openssl')
-makedepends=('flex')
 arch=('i686' 'x86_64')
+depends=('openssl' 'libevent')
+makedepends=('flex')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'service')
-sha1sums=('cb95efa819902799365691a0a7ddb3690a97df88'
-          'f35ecb887e86ae0a54ac70aef5a7577fc8761877')
+sha1sums=('b3ebd669be8e830f62062d12be55242ca41da369'
+          '9957762b810374c4eaa1461169f3c848b50466fe')
 
 install=install
 
diff --git a/community/nsd/service b/community/nsd/service
index ca423c29c..d5e2d14b4 100644
--- a/community/nsd/service
+++ b/community/nsd/service
@@ -3,11 +3,10 @@ Description=NSD Name Server Daemon
 After=network.target
 
 [Service]
-Type=forking
 PIDFile=/run/nsd.pid
-ExecStart=/usr/bin/nsdc start
-ExecReload=/usr/bin/nsdc reload
-ExecStop=/usr/bin/nsdc stop
+ExecStart=/usr/bin/nsd -c /etc/nsd/nsd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStop=/bin/kill -TERM $MAINPID
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD
index 40bc9c897..b226c742f 100644
--- a/community/pdns-recursor/PKGBUILD
+++ b/community/pdns-recursor/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 93880 2013-07-11 16:32:02Z arodseth $
+# $Id: PKGBUILD 100036 2013-10-31 11:20:57Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Jan Steffens <heftig@archlinux.org>
 
 pkgname=pdns-recursor
-pkgver=3.5.2
+pkgver=3.5.3
 pkgrel=1
 pkgdesc='PowerDNS recursor'
 url='https://www.powerdns.com/'
@@ -15,11 +15,11 @@ makedepends=('boost')
 backup=('etc/powerdns/recursor.conf')
 source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2"
         'pdns-recursor.service')
-sha256sums=('ffe3158ee5b3f62e927198fd44e839a01d3241a41a4e61afdca6709113c276bd'
+sha256sums=('192c0b47a1cfcdccaa88d70fd33766a4c381f4223f966416f15e169df5d58eaa'
             '51688d9576736fdf210048098fa96c8710bfbd6a63eb4d69d20bac57b299b5f9')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make -j1 LUA=1 \
     LUA_CPPFLAGS_CONFIG="$(pkg-config --cflags lua5.1)" \
@@ -27,7 +27,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make SBINDIR="/usr/bin" DESTDIR="$pkgdir" install
   mv "$pkgdir/etc/powerdns/recursor.conf-dist" \
diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD
index 4bd2e9f84..40e637e1f 100644
--- a/community/perl-json-xs/PKGBUILD
+++ b/community/perl-json-xs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92759 2013-06-14 17:40:33Z spupykin $
+# $Id: PKGBUILD 100056 2013-10-31 21:46:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tor Krill <tor@krill.nu>
 
 pkgname=perl-json-xs
-pkgver=2.34
+pkgver=3.01
 pkgrel=1
 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast"
 url="http://search.cpan.org/dist/JSON-XS/"
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64')
 depends=('perl' 'perl-common-sense')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz)
-md5sums=('dda3c03335665cdeff91c37a269b833b')
+md5sums=('b7be65295baf6dd9233c6494782c1153')
 
 build() {
   cd  $srcdir/JSON-XS-$pkgver
diff --git a/community/psqlodbc/PKGBUILD b/community/psqlodbc/PKGBUILD
index 6cc6ae1d9..f95be3ecb 100644
--- a/community/psqlodbc/PKGBUILD
+++ b/community/psqlodbc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99965 2013-10-31 02:43:57Z allan $
+# $Id: PKGBUILD 100038 2013-10-31 13:15:52Z spupykin $
 # Maintainer:
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux-br.org>
 # Contributor: Rick Rein <jeebusroxors@gmail.com>
 
 pkgname=psqlodbc
-pkgver=09.01.0200
-pkgrel=2
+pkgver=09.02.0100
+pkgrel=1
 pkgdesc="PostgreSQL ODBC driver"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,7 +13,7 @@ url="http://www.postgresql.org"
 depends=('unixodbc' 'postgresql-libs')
 makedepends=('postgresql')
 source=(ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz)
-md5sums=('0f4ac0e6b0755af2452764db4cfe4e8f')
+md5sums=('0d591c8f7233c863fd93f6c36316451a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/snapper/PKGBUILD b/community/snapper/PKGBUILD
new file mode 100644
index 000000000..35f66933d
--- /dev/null
+++ b/community/snapper/PKGBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Contributor: Tom Kuther <gimpel@sonnenkinder.org>
+
+pkgname=snapper
+pkgver=0.1.7
+pkgrel=1
+pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping."
+arch=('i686' 'x86_64')
+url="http://snapper.io"
+license=('GPL2')
+depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs')
+makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git')
+backup=('etc/conf.d/snapper')
+source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2"
+        'libbtrfs.patch')
+options=(!libtool)
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i "$srcdir"/libbtrfs.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # rename cron scripts
+  sed -i -e 's@suse.de-@@g' scripts/Makefile.am
+  # fix config location in cron scripts
+  sed -i -e 's@/etc/sysconfig/@/etc/conf.d/@g' scripts/snapper-{daily,hourly}
+
+  # boost fixlets - Arch doesn't use -mt suffix
+  sed -i -e 's@lboost_thread-mt@lboost_thread@g' snapper/Makefile.am
+  sed -i -e 's@lboost_system-mt@lboost_system@g' snapper/Makefile.am
+
+  # fix pam plugin install location
+  sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am
+  # Arch all in /usr/bin
+  sed -i -e 's@/usr/sbin@/usr/bin@g' data/org.opensuse.Snapper.service
+
+  aclocal
+  libtoolize --force --automake --copy
+  autoheader
+  automake --add-missing --copy
+  autoconf
+  ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
+              --with-conf=/etc/conf.d \
+              --disable-zypp \
+              --disable-silent-rules
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm644 data/sysconfig.snapper "$pkgdir"/etc/conf.d/snapper
+}
+
+sha256sums=('fcb8d98aa36021970b214a2b6ea85f86aa29e107559bf677226e2e4ade2c6ed0'
+            '0d0289e7448a357c78450f6690d684fef0e889921be152038a73401d37294317')
diff --git a/community/snapper/libbtrfs.patch b/community/snapper/libbtrfs.patch
new file mode 100644
index 000000000..805c36b44
--- /dev/null
+++ b/community/snapper/libbtrfs.patch
@@ -0,0 +1,13 @@
+diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
+index 2c110c3..be9e974 100644
+--- a/snapper/Btrfs.cc
++++ b/snapper/Btrfs.cc
+@@ -982,7 +982,7 @@ namespace snapper
+ 	{
+ 	    boost::this_thread::interruption_point();
+ 
+-	    int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this);
++	    int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0);
+ 
+ 	    if (r < 0)
+ 	    {
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index 0bcf22721..ed8eac791 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197872 2013-10-30 11:23:14Z allan $
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# $Id: PKGBUILD 198641 2013-10-31 16:48:15Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=10
+pkgrel=11
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -41,6 +41,7 @@ prepare() {
 	sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
 	sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
 	sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
+	sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
 }
 
 build() {
@@ -54,7 +55,6 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--sbindir=/usr/bin \
-		--disable-static \
 		--disable-monodoc \
 		--enable-compat-libdns_sd \
 		--enable-compat-howl \
diff --git a/extra/avahi/install b/extra/avahi/install
index d333389ee..d4ae23e71 100644
--- a/extra/avahi/install
+++ b/extra/avahi/install
@@ -1,18 +1,7 @@
 post_install() {
 	getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
 	getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
-
-	cat <<EOF
-==> The following daemons may be added to DAEMONS in /etc/rc.conf:
-==> avahi-daemon: the mdns responder, you probably want this.
-==>               dbus needs to be running when you start it.
-==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns
-==>                 configuration on dhcp-less networks.
-
-==> To use some of the client applications you will have to install python.
-==> In addition, pygtk is required for the graphical ones and
-==> twisted for avahi-bookmarks.
-EOF
+	true
 }
 
 post_remove() {
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 2fd2009b4..b6a02cb9d 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 197751 2013-10-29 17:42:37Z bpiotrowski $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 198639 2013-10-31 16:28:32Z bpiotrowski $
+# Maintainer:  Ionut Biru <ibiru@archlinux.org>
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
 pkgver=2.1
-pkgrel=1
+pkgrel=2
 epoch=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
+pkgdesc='Complete and free Internet live audio and video broadcasting solution'
 arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
+url='http://ffmpeg.org/'
 license=('GPL')
 depends=(
       'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass'
@@ -18,8 +19,15 @@ depends=(
       'v4l-utils' 'x264' 'xvidcore' 'zlib'
       )
 makedepends=('libvdpau' 'yasm')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-sha256sums=('926603fd974e9b38071a5cfc6fd0d93857801d1968145dfce7fdc627ab1d68df')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2
+        ffmpeg-2.1-avformat-http.fix-cookies.patch)
+sha256sums=('926603fd974e9b38071a5cfc6fd0d93857801d1968145dfce7fdc627ab1d68df'
+            '0168bc6f77115ef6f3bd428b1b05a1543d0dd53d8d74c15a24879b119ce8655c')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../ffmpeg-2.1-avformat-http.fix-cookies.patch
+}
 
 build() {
   cd $pkgname-$pkgver
@@ -70,7 +78,7 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
+  install -D -m755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch b/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch
new file mode 100644
index 000000000..7c826a3b8
--- /dev/null
+++ b/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch
@@ -0,0 +1,28 @@
+From b73900b8a6c0a23e63e84a5eed0a5b9b3ffe1198 Mon Sep 17 00:00:00 2001
+From: Michael Niedermayer <michaelni@gmx.at>
+Date: Thu, 31 Oct 2013 01:42:13 +0100
+Subject: [PATCH] avformat/http: fix cookies
+
+Fixes Ticket3096
+
+Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
+---
+ libavformat/http.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavformat/http.c b/libavformat/http.c
+index c5b5c53..9be1181 100644
+--- a/libavformat/http.c
++++ b/libavformat/http.c
+@@ -95,7 +95,7 @@ static const AVOption options[] = {
+ {"multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E },
+ {"post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D|E },
+ {"mime_type", "set MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
+-{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
++{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, D },
+ {"icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D },
+ {"icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
+ {"icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
+-- 
+1.8.4.1
+
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index 8bf04bbba..5dd71a169 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198054 2013-10-30 12:31:30Z allan $
+# $Id: PKGBUILD 198636 2013-10-31 15:44:36Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gssdp
-pkgver=0.14.5
+pkgver=0.14.6
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=(libsoup)
 makedepends=(gobject-introspection gtk3 gtk-doc vala)
 optdepends=('gtk3: gssdp-device-sniffer')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e847940a852c968d18c7ca044783e9b938c84c3b5f53978a29b636bf95c91af1')
+sha256sums=('9acfdeb99080b165c34ea7c65fb909ea356b4550937972a73df5b69b419eeacd')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index 41dc9258e..d4d35454c 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198091 2013-10-30 12:44:53Z allan $
+# $Id: PKGBUILD 198637 2013-10-31 15:45:29Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.20.7
+pkgver=0.20.8
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=(gssdp util-linux)
 makedepends=(gobject-introspection gtk-doc vala) 
 optdepends=('python2: gupnp-binding-tool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('ccfa6b04935d81bbcd4aa1f15b6dada977fb32386cf3b99c59a4166067ce3102')
+sha256sums=('f70da127e0d35a7b8aecaf6f58b740bbb56836451be33d7aeb7979a5c131eac8')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index c887f420c..51e32b721 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196535 2013-10-14 22:08:24Z bisson $
+# $Id: PKGBUILD 198643 2013-10-31 16:50:38Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=mpd
-pkgver=0.17.6
+pkgver=0.18
 pkgrel=1
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='http://www.musicpd.org/'
@@ -15,18 +15,19 @@ arch=('i686' 'x86_64')
 depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
          'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl')
 makedepends=('doxygen')
-source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
-        'tmpfiles.d')
-sha1sums=('c8cea5cbf87ece252d15457d2249090e73a8d11f'
-          'f4d5922abb69abb739542d8e93f4dfd748acdad7')
+source=("http://www.musicpd.org/download/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+        'tmpfiles.d'
+        'conf')
+sha1sums=('e3cc99de0c2c595ca576cdb455c6aaedd4f7726a'
+          'f4d5922abb69abb739542d8e93f4dfd748acdad7'
+          '67c145c046cddd885630d72ce8ebe71f8321ff3b')
 
 backup=('etc/mpd.conf')
 install=install
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:g' -i src/input/cdio_paranoia_input_plugin.c
-	sed 's:AVCODEC_MAX_AUDIO_FRAME_SIZE:192000:g' -i src/decoder/ffmpeg_decoder_plugin.c
+	sed 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:g' -i src/input/CdioParanoiaInputPlugin.cxx
 }
 
 build() {
@@ -35,7 +36,6 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-jack \
-		--enable-lastfm \
 		--enable-soundcloud \
 		--enable-pipe-output \
 		--enable-pulse \
@@ -47,16 +47,9 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -d "${pkgdir}"/usr/lib/systemd/user
-	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
-	install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf
+	install -Dm644 ../conf "${pkgdir}"/etc/mpd.conf
 	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
+	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
+	install -d "${pkgdir}"/usr/lib/systemd/user
 	ln -s ../system/mpd.service "${pkgdir}"/usr/lib/systemd/user/mpd.service
-	sed \
-		-e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \
-		-e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \
-		-e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \
-		-e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \
-		-e '/^#user/c user "mpd"' \
-		-i "${pkgdir}"/etc/mpd.conf
 }
diff --git a/extra/mpd/conf b/extra/mpd/conf
new file mode 100644
index 000000000..d23880eb5
--- /dev/null
+++ b/extra/mpd/conf
@@ -0,0 +1,7 @@
+# See: /usr/share/doc/mpd/mpdconf.example
+
+user "mpd"
+pid_file "/run/mpd/mpd.pid"
+db_file "/var/lib/mpd/mpd.db"
+state_file "/var/lib/mpd/mpdstate"
+playlist_directory "/var/lib/mpd/playlists"
diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD
index d3c6463a2..bcb40c614 100644
--- a/libre/netsurf-libre/PKGBUILD
+++ b/libre/netsurf-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95886 2013-08-18 11:31:23Z arodseth $
+# $Id: PKGBUILD 100033 2013-10-31 10:58:22Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Georgij Kondratjev <smpuj@bk.ru>
@@ -8,7 +8,7 @@
 _pkgname=netsurf
 pkgname=netsurf-libre
 pkgver=3.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight and fast web browser, without non-privacy search providers'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/'
@@ -20,9 +20,11 @@ depends=('gtk2' 'libmng' 'curl' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libns
 makedepends=('js' 're2c' 'gendesk' 'netsurf-buildsystem' 'libglade' 'addinclude')
 install="$_pkgname.install"
 source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
-        "http://download.$_pkgname-browser.org/$_pkgname/releases/source/$_pkgname-$pkgver-src.tar.gz")
+        "http://download.$_pkgname-browser.org/$_pkgname/releases/source/$_pkgname-$pkgver-src.tar.gz"
+        'netsurf.sh')
 sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
-            '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6')
+            '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6'
+            '3efaf14b95c9aeb83caac488135bd5b6040d2ede382caa5589ff7ebd2bd506cc')
 
 prepare() {
   cd "$_pkgname-$pkgver"
@@ -115,6 +117,8 @@ package() {
   cd "$_pkgname-$pkgver"
 
   make install PREFIX=/usr DESTDIR="$pkgdir"
+  mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname.elf"
+  install -Dm755 "../$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
   install -Dm644 "../$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
   install -Dm644 "$_pkgname.desktop" \
     "$pkgdir/usr/share/applications/$_pkgname.desktop"
diff --git a/libre/netsurf-libre/netsurf.sh b/libre/netsurf-libre/netsurf.sh
new file mode 100644
index 000000000..49b1e161e
--- /dev/null
+++ b/libre/netsurf-libre/netsurf.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+shortname=`echo $LANG | cut -b1-2`
+if [[ -d /usr/share/netsurf/$shortname ]]; then
+	/usr/bin/netsurf.elf "$@"
+else
+	LANG=en_US /usr/bin/netsurf.elf "$@"
+fi
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index e16042e95..e745c3dbe 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197193 2013-10-23 17:24:50Z heftig $
+# $Id: PKGBUILD 198628 2013-10-31 13:07:39Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -8,7 +8,7 @@
 
 pkgname=sdl-libre
 pkgver=1.2.15
-pkgrel=4
+pkgrel=5
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org"
@@ -20,7 +20,7 @@ depends=('glibc' 'libxext' 'libxrender' 'libx11')
 makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
 optdepends=('alsa-lib: ALSA audio driver'
             'libpulse: PulseAudio audio driver')
-options=('!libtool')
+options=('staticlibs')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
         sdl-1.2.14-fix-mouse-clicking.patch
         sdl-1.2.14-disable-mmx.patch