Merge branch '3.1' into 3.2

33 files changed, 186 insertions, 154 deletions

diff --git a/apache/apache-ssl_cert.patch b/apache/apache-ssl_cert.patch
deleted file mode 100644
index 610f1fa4a..000000000
--- a/apache/apache-ssl_cert.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nru httpd-2.2.26.orig/docs/conf/extra/httpd-ssl.conf.in httpd-2.2.26/docs/conf/extra/httpd-ssl.conf.in
---- httpd-2.2.26.orig/docs/conf/extra/httpd-ssl.conf.in	2013-11-17 10:46:25.992237273 +0100
-+++ httpd-2.2.26/docs/conf/extra/httpd-ssl.conf.in	2013-11-17 10:48:52.536996463 +0100
-@@ -117,7 +117,7 @@
- #   Some ECC cipher suites (http://www.ietf.org/rfc/rfc4492.txt)
- #   require an ECC certificate which can also be configured in
- #   parallel.
--SSLCertificateFile "@exp_sysconfdir@/server.crt"
-+SSLCertificateFile "/etc/ssl/certs/apache.crt"
- #SSLCertificateFile "@exp_sysconfdir@/server-dsa.crt"
- #SSLCertificateFile "@exp_sysconfdir@/server-ecc.crt"
- 
-@@ -127,7 +127,7 @@
- #   you've both a RSA and a DSA private key you can configure
- #   both in parallel (to also allow the use of DSA ciphers, etc.)
- #   ECC keys, when in use, can also be configured in parallel
--SSLCertificateKeyFile "@exp_sysconfdir@/server.key"
-+SSLCertificateKeyFile "/etc/ssl/keys/apache.key"
- #SSLCertificateKeyFile "@exp_sysconfdir@/server-dsa.key"
- #SSLCertificateKeyFile "@exp_sysconfdir@/server-ecc.key"
- 
diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum
index 742fa3f62..660483b04 100644
--- a/cups-filters/.md5sum
+++ b/cups-filters/.md5sum
@@ -1,2 +1,3 @@
 7540a6989be0042429f41770b1cdf215  cups-browsed
 f1e11dfe5fa52eb65aa0bdd3a7ee0117  cups-filters-1.0.71.tar.xz
+3b5258c23d3ebeb8ea733e5114a947c6  poppler-034.patch
diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile
index f0b00494c..3f183506d 100644
--- a/cups-filters/Pkgfile
+++ b/cups-filters/Pkgfile
@@ -5,13 +5,16 @@
 
 name=cups-filters
 version=1.0.71
-release=1
+release=2
 source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz
-        cups-browsed)
+        cups-browsed
+        poppler-034.patch)
 
 build () {
     cd $name-$version
 
+    patch -p0 -i $SRC/poppler-034.patch
+
     ./configure --prefix=/usr \
                 --sysconfdir=/etc \
                 --mandir=/usr/man \
diff --git a/cups-filters/poppler-034.patch b/cups-filters/poppler-034.patch
new file mode 100644
index 000000000..de7ee10ce
--- /dev/null
+++ b/cups-filters/poppler-034.patch
@@ -0,0 +1,38 @@
+# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7371
+
+=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx'
+--- filter/pdftoopvp/OPVPOutputDev.cxx	2015-02-18 03:17:28 +0000
++++ filter/pdftoopvp/OPVPOutputDev.cxx	2015-07-14 19:22:49 +0000
+@@ -1811,10 +1811,14 @@
+ #if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
+   maskSplash->drawImage(&imageSrc, &imgMaskData,
+ 			splashModeMono8, gFalse, maskWidth, maskHeight, mat);
+-#else
++#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
+   maskSplash->drawImage(&imageSrc, &imgMaskData,
+ 			splashModeMono8, gFalse, maskWidth, maskHeight,
+                         mat,gFalse);
++#else
++  maskSplash->drawImage(&imageSrc, 0, &imgMaskData,
++                          splashModeMono8, gFalse, maskWidth, maskHeight,
++			                          mat,gFalse);
+ #endif
+   delete imgMaskData.imgStr;
+   maskStr->close();
+
+=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx'
+--- filter/pdftoopvp/oprs/OPRS.cxx	2013-01-09 10:42:32 +0000
++++ filter/pdftoopvp/oprs/OPRS.cxx	2015-07-14 19:22:49 +0000
+@@ -240,8 +240,10 @@
+     if (rasterMode) {
+ #if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
+ 	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
+-#else
++#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
+ 	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
++#else
++	return splash->drawImage(src,0,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
+ #endif
+     } else {
+ 	return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
+
diff --git a/dbus/.footprint b/dbus/.footprint
index da004434f..90c7e153c 100644
--- a/dbus/.footprint
+++ b/dbus/.footprint
@@ -47,9 +47,9 @@ drwxr-xr-x	root/root	usr/lib/dbus-1.0/include/dbus/
 drwxr-xr-x	root/root	usr/lib/dbus/
 -rwsr-x---	root/messagebus	usr/lib/dbus/dbus-daemon-launch-helper
 -rwxr-xr-x	root/root	usr/lib/libdbus-1.la
-lrwxrwxrwx	root/root	usr/lib/libdbus-1.so -> libdbus-1.so.3.8.12
-lrwxrwxrwx	root/root	usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.8.12
--rwxr-xr-x	root/root	usr/lib/libdbus-1.so.3.8.12
+lrwxrwxrwx	root/root	usr/lib/libdbus-1.so -> libdbus-1.so.3.8.13
+lrwxrwxrwx	root/root	usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.8.13
+-rwxr-xr-x	root/root	usr/lib/libdbus-1.so.3.8.13
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/dbus-1.pc
 drwxr-xr-x	root/root	usr/sbin/
diff --git a/dbus/.md5sum b/dbus/.md5sum
index cacb87d72..04657ffa6 100644
--- a/dbus/.md5sum
+++ b/dbus/.md5sum
@@ -1,3 +1,3 @@
 23bc5ff22fe4f9a208d65fbbfd489ad9  30-dbus.launch
-83e607e9ccb1c921d5b6bbea2376a36c  dbus-1.8.18.tar.gz
+b49890bbabedab3a1c3f4f73c7ff8b2b  dbus-1.8.20.tar.gz
 0acb71de3d0fc3271d2391da168c6f9f  rc.dbus
diff --git a/dbus/Pkgfile b/dbus/Pkgfile
index 72bf552ef..d588da1fb 100644
--- a/dbus/Pkgfile
+++ b/dbus/Pkgfile
@@ -5,8 +5,8 @@
 # Depends on: expat
 
 name=dbus
-version=1.8.18
-release=2
+version=1.8.20
+release=1
 source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \
         rc.dbus 30-dbus.launch)
 
diff --git a/elilo/.footprint b/elilo/.footprint
new file mode 100644
index 000000000..7289b5804
--- /dev/null
+++ b/elilo/.footprint
@@ -0,0 +1,6 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/sbin/
+-rwxr-xr-x	root/root	usr/sbin/eliloalt
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/elilo/
+-rwxr-xr-x	root/root	usr/share/elilo/elilo.efi
diff --git a/elilo/.md5sum b/elilo/.md5sum
new file mode 100644
index 000000000..858c37a03
--- /dev/null
+++ b/elilo/.md5sum
@@ -0,0 +1 @@
+31ae4652b0bd4580b37640054e7146bc  elilo-3.16-all.tar.gz
diff --git a/elilo/Pkgfile b/elilo/Pkgfile
new file mode 100644
index 000000000..12ca4e3ad
--- /dev/null
+++ b/elilo/Pkgfile
@@ -0,0 +1,20 @@
+# Description: ELILO EFI boot loader
+# URL:         http://elilo.sf.net/
+# Maintainer:  Thomas Penteker, tek at serverop dot de
+# Depends on:  gnu-efi
+
+name=elilo
+version=3.16
+release=1
+source=(http://download.sourceforge.net/${name}/${name}-${version}-all.tar.gz)
+build() {
+  tar xzf elilo-$version-source.tar.gz
+  cd "${SRC}/elilo-${version}-source/"
+  #sed -i 's|-fno-stack-protector|-DGNU_EFI_USE_MS_ABI -fno-stack-protector|g' Make.defaults
+  #sed -i 's|DEBUGFLAGS = -Wall|DEBUGFLAGS = -Wall -Wno-error|g' Make.defaults
+  sed -i 's|dpkg-architecture -qDEB_BUILD_ARCH|uname -m|g' Make.defaults
+
+  make -j1
+  install -D elilo.efi $PKG/usr/share/elilo/elilo.efi
+  install -D tools/eliloalt $PKG/usr/sbin/eliloalt
+}
diff --git a/elilo/README b/elilo/README
new file mode 100644
index 000000000..57baaedd4
--- /dev/null
+++ b/elilo/README
@@ -0,0 +1,3 @@
+Note: for eliloalt to work you have to enable
+  CONFIG_EFI_VARS
+in your kernel config.
diff --git a/gst-plugins-base/.footprint b/gst-plugins-base/.footprint
index 6bd610520..97768893b 100644
--- a/gst-plugins-base/.footprint
+++ b/gst-plugins-base/.footprint
@@ -137,16 +137,10 @@ drwxr-xr-x	root/root	usr/lib/gstreamer-1.0/
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstaudioresample.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstaudiotestsrc.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstaudiotestsrc.so
--rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstcdparanoia.la
--rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstcdparanoia.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstencodebin.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstencodebin.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstgio.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstgio.so
--rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstlibvisual.la
--rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstlibvisual.so
--rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstogg.la
--rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstogg.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstpango.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstpango.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstplayback.la
@@ -155,8 +149,6 @@ drwxr-xr-x	root/root	usr/lib/gstreamer-1.0/
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstsubparse.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgsttcp.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgsttcp.so
--rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgsttheora.la
--rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgsttheora.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgsttypefindfunctions.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgsttypefindfunctions.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstvideoconvert.la
@@ -169,56 +161,54 @@ drwxr-xr-x	root/root	usr/lib/gstreamer-1.0/
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstvideotestsrc.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstvolume.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstvolume.so
--rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstvorbis.la
--rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstvorbis.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstximagesink.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstximagesink.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstxvimagesink.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstxvimagesink.so
 -rwxr-xr-x	root/root	usr/lib/libgstallocators-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstallocators-1.0.so -> libgstallocators-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstallocators-1.0.so.0 -> libgstallocators-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstallocators-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstallocators-1.0.so -> libgstallocators-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstallocators-1.0.so.0 -> libgstallocators-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstallocators-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstapp-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstapp-1.0.so -> libgstapp-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstapp-1.0.so.0 -> libgstapp-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstapp-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstapp-1.0.so -> libgstapp-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstapp-1.0.so.0 -> libgstapp-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstapp-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstaudio-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstaudio-1.0.so -> libgstaudio-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstaudio-1.0.so.0 -> libgstaudio-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstaudio-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstaudio-1.0.so -> libgstaudio-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstaudio-1.0.so.0 -> libgstaudio-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstaudio-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstfft-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstfft-1.0.so -> libgstfft-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstfft-1.0.so.0 -> libgstfft-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstfft-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstfft-1.0.so -> libgstfft-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstfft-1.0.so.0 -> libgstfft-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstfft-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstpbutils-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstpbutils-1.0.so -> libgstpbutils-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstpbutils-1.0.so.0 -> libgstpbutils-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstpbutils-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstpbutils-1.0.so -> libgstpbutils-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstpbutils-1.0.so.0 -> libgstpbutils-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstpbutils-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstriff-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstriff-1.0.so -> libgstriff-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstriff-1.0.so.0 -> libgstriff-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstriff-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstriff-1.0.so -> libgstriff-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstriff-1.0.so.0 -> libgstriff-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstriff-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstrtp-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstrtp-1.0.so -> libgstrtp-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstrtp-1.0.so.0 -> libgstrtp-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstrtp-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstrtp-1.0.so -> libgstrtp-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstrtp-1.0.so.0 -> libgstrtp-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstrtp-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstrtsp-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstrtsp-1.0.so -> libgstrtsp-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstrtsp-1.0.so.0 -> libgstrtsp-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstrtsp-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstrtsp-1.0.so -> libgstrtsp-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstrtsp-1.0.so.0 -> libgstrtsp-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstrtsp-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstsdp-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstsdp-1.0.so -> libgstsdp-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstsdp-1.0.so.0 -> libgstsdp-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstsdp-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstsdp-1.0.so -> libgstsdp-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstsdp-1.0.so.0 -> libgstsdp-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstsdp-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgsttag-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgsttag-1.0.so -> libgsttag-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgsttag-1.0.so.0 -> libgsttag-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgsttag-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgsttag-1.0.so -> libgsttag-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgsttag-1.0.so.0 -> libgsttag-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgsttag-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstvideo-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstvideo-1.0.so -> libgstvideo-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstvideo-1.0.so.0 -> libgstvideo-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstvideo-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstvideo-1.0.so -> libgstvideo-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstvideo-1.0.so.0 -> libgstvideo-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstvideo-1.0.so.0.405.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gstreamer-allocators-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gstreamer-app-1.0.pc
diff --git a/gst-plugins-base/.md5sum b/gst-plugins-base/.md5sum
index b876b5a7d..c64563cd8 100644
--- a/gst-plugins-base/.md5sum
+++ b/gst-plugins-base/.md5sum
@@ -1 +1 @@
-0c42eca8f9e4efd56d2ce8e9249ce4a1  gst-plugins-base-1.4.4.tar.xz
+357165af625c0ca353ab47c5d843920e  gst-plugins-base-1.4.5.tar.xz
diff --git a/gst-plugins-base/Pkgfile b/gst-plugins-base/Pkgfile
index 23578356d..37fe8e66b 100644
--- a/gst-plugins-base/Pkgfile
+++ b/gst-plugins-base/Pkgfile
@@ -2,10 +2,11 @@
 # URL: http://gstreamer.freedesktop.org/modules/gst-plugins-base.html
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Packager: Matt Housh, jaeger at morpheus dot net
-# Depends on: alsa-lib cdparanoia gstreamer libtheora libvisual orc pango util-linux xorg-libxv
+# Depends on: alsa-lib gstreamer pango util-linux xorg-libxv
+# Optional: cdparanoia libtheora libvisual orc
 
 name=gst-plugins-base
-version=1.4.4
+version=1.4.5
 release=1
 source=(http://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz)
 
@@ -15,7 +16,6 @@ build() {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/man \
-		--enable-orc \
 		--disable-debug \
 		--disable-nls \
 		--disable-dependency-tracking \
@@ -25,5 +25,6 @@ build() {
 
 	make
 	make DESTDIR=$PKG install
+
 	rm -r $PKG/usr/share/gtk-doc
 }
diff --git a/gstreamer/.footprint b/gstreamer/.footprint
index 0d60313ff..18666e124 100644
--- a/gstreamer/.footprint
+++ b/gstreamer/.footprint
@@ -124,25 +124,25 @@ drwxr-xr-x	root/root	usr/lib/gstreamer-1.0/
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstcoreelements.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstcoreelements.so
 -rwxr-xr-x	root/root	usr/lib/libgstbase-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstbase-1.0.so -> libgstbase-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstbase-1.0.so.0 -> libgstbase-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstbase-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstbase-1.0.so -> libgstbase-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstbase-1.0.so.0 -> libgstbase-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstbase-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstcheck-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstcheck-1.0.so -> libgstcheck-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstcheck-1.0.so.0 -> libgstcheck-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstcheck-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstcheck-1.0.so -> libgstcheck-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstcheck-1.0.so.0 -> libgstcheck-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstcheck-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstcontroller-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstcontroller-1.0.so -> libgstcontroller-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstcontroller-1.0.so.0 -> libgstcontroller-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstcontroller-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstcontroller-1.0.so -> libgstcontroller-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstcontroller-1.0.so.0 -> libgstcontroller-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstcontroller-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstnet-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstnet-1.0.so -> libgstnet-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstnet-1.0.so.0 -> libgstnet-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstnet-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstnet-1.0.so -> libgstnet-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstnet-1.0.so.0 -> libgstnet-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstnet-1.0.so.0.405.0
 -rwxr-xr-x	root/root	usr/lib/libgstreamer-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgstreamer-1.0.so -> libgstreamer-1.0.so.0.404.0
-lrwxrwxrwx	root/root	usr/lib/libgstreamer-1.0.so.0 -> libgstreamer-1.0.so.0.404.0
--rwxr-xr-x	root/root	usr/lib/libgstreamer-1.0.so.0.404.0
+lrwxrwxrwx	root/root	usr/lib/libgstreamer-1.0.so -> libgstreamer-1.0.so.0.405.0
+lrwxrwxrwx	root/root	usr/lib/libgstreamer-1.0.so.0 -> libgstreamer-1.0.so.0.405.0
+-rwxr-xr-x	root/root	usr/lib/libgstreamer-1.0.so.0.405.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gstreamer-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gstreamer-base-1.0.pc
diff --git a/gstreamer/.md5sum b/gstreamer/.md5sum
index 85635b015..c8eb6debe 100644
--- a/gstreamer/.md5sum
+++ b/gstreamer/.md5sum
@@ -1 +1 @@
-98f4a6d45a28dd195144baef0244ba38  gstreamer-1.4.4.tar.xz
+88a9289c64a4950ebb4f544980234289  gstreamer-1.4.5.tar.xz
diff --git a/gstreamer/Pkgfile b/gstreamer/Pkgfile
index 0397b99ed..81849aea5 100644
--- a/gstreamer/Pkgfile
+++ b/gstreamer/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: gobject-introspection libxml2
 
 name=gstreamer
-version=1.4.4
+version=1.4.5
 release=1
 source=(http://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz)
 
@@ -24,5 +24,6 @@ build() {
   
 	make
 	make DESTDIR=$PKG install
+
 	rm -r $PKG/usr/share/gtk-doc
 }
diff --git a/gtk3/.footprint b/gtk3/.footprint
index aa082eac9..3fee0287f 100644
--- a/gtk3/.footprint
+++ b/gtk3/.footprint
@@ -432,13 +432,13 @@ lrwxrwxrwx	root/root	usr/lib/libgailutil-3.so -> libgailutil-3.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libgailutil-3.so.0 -> libgailutil-3.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libgailutil-3.so.0.0.0
 -rw-r--r--	root/root	usr/lib/libgdk-3.la
-lrwxrwxrwx	root/root	usr/lib/libgdk-3.so -> libgdk-3.so.0.1600.5
-lrwxrwxrwx	root/root	usr/lib/libgdk-3.so.0 -> libgdk-3.so.0.1600.5
--rwxr-xr-x	root/root	usr/lib/libgdk-3.so.0.1600.5
+lrwxrwxrwx	root/root	usr/lib/libgdk-3.so -> libgdk-3.so.0.1600.6
+lrwxrwxrwx	root/root	usr/lib/libgdk-3.so.0 -> libgdk-3.so.0.1600.6
+-rwxr-xr-x	root/root	usr/lib/libgdk-3.so.0.1600.6
 -rw-r--r--	root/root	usr/lib/libgtk-3.la
-lrwxrwxrwx	root/root	usr/lib/libgtk-3.so -> libgtk-3.so.0.1600.5
-lrwxrwxrwx	root/root	usr/lib/libgtk-3.so.0 -> libgtk-3.so.0.1600.5
--rwxr-xr-x	root/root	usr/lib/libgtk-3.so.0.1600.5
+lrwxrwxrwx	root/root	usr/lib/libgtk-3.so -> libgtk-3.so.0.1600.6
+lrwxrwxrwx	root/root	usr/lib/libgtk-3.so.0 -> libgtk-3.so.0.1600.6
+-rwxr-xr-x	root/root	usr/lib/libgtk-3.so.0.1600.6
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gail-3.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gdk-3.0.pc
diff --git a/gtk3/.md5sum b/gtk3/.md5sum
index 8f6299d59..0f5fd8b6c 100644
--- a/gtk3/.md5sum
+++ b/gtk3/.md5sum
@@ -1 +1 @@
-6d2c59c2b3b557d8ae9ac83a69b070fe  gtk+-3.16.5.tar.xz
+fc59e5c8b5a4585b60623dd708df400b  gtk+-3.16.6.tar.xz
diff --git a/gtk3/Pkgfile b/gtk3/Pkgfile
index 4c38569a7..e9ca46dcd 100644
--- a/gtk3/Pkgfile
+++ b/gtk3/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: gdk-pixbuf, pango, at-spi2-atk, libepoxy
 
 name=gtk3
-version=3.16.5
+version=3.16.6
 release=1
 source=(http://download.gnome.org/sources/gtk+/${version:0:4}/gtk+-$version.tar.xz)
 
diff --git a/mdadm/.md5sum b/mdadm/.md5sum
index 004cfff2a..9d1b67858 100644
--- a/mdadm/.md5sum
+++ b/mdadm/.md5sum
@@ -1 +1 @@
-44698d351501cac6a89072dc877eb220  mdadm-3.3.2.tar.xz
+dabd5ce70f3fff340cad7c18e4a062ab  mdadm-3.3.3.tar.xz
diff --git a/mdadm/Pkgfile b/mdadm/Pkgfile
index e60ca351d..af511e01b 100644
--- a/mdadm/Pkgfile
+++ b/mdadm/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=mdadm
-version=3.3.2
+version=3.3.3
 release=1
 source=(http://www.kernel.org/pub/linux/utils/raid/$name/$name-$version.tar.xz)
 
diff --git a/mysql-python/mysql-python-setup.diff b/mysql-python/mysql-python-setup.diff
deleted file mode 100644
index 2d43183ba..000000000
--- a/mysql-python/mysql-python-setup.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru MySQL-python-1.2.3.orig/setup.py MySQL-python-1.2.3/setup.py
---- MySQL-python-1.2.3.orig/setup.py	2010-06-17 15:05:12.954472025 +0200
-+++ MySQL-python-1.2.3/setup.py	2010-04-27 10:00:04.000000000 +0200
-@@ -2,6 +2,8 @@
- 
- import os
- import sys
-+from ez_setup import use_setuptools
-+use_setuptools()
- from setuptools import setup, Extension
- 
- if not hasattr(sys, "hexversion") or sys.hexversion < 0x02030000:
diff --git a/openbox/.footprint b/openbox/.footprint
index 3af05c3f7..0847b6586 100644
--- a/openbox/.footprint
+++ b/openbox/.footprint
@@ -18,40 +18,40 @@ drwxr-xr-x	root/root	usr/etc/xdg/openbox/
 -rw-r--r--	root/root	usr/etc/xdg/openbox/rc.xsd
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/openbox/
-drwxr-xr-x	root/root	usr/include/openbox/3.5/
-drwxr-xr-x	root/root	usr/include/openbox/3.5/obrender/
--rw-r--r--	root/root	usr/include/openbox/3.5/obrender/color.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obrender/font.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obrender/geom.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obrender/gradient.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obrender/image.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obrender/instance.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obrender/mask.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obrender/render.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obrender/theme.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obrender/version.h
-drwxr-xr-x	root/root	usr/include/openbox/3.5/obt/
--rw-r--r--	root/root	usr/include/openbox/3.5/obt/display.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obt/keyboard.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obt/link.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obt/paths.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obt/prop.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obt/signal.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obt/util.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obt/version.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obt/xml.h
--rw-r--r--	root/root	usr/include/openbox/3.5/obt/xqueue.h
+drwxr-xr-x	root/root	usr/include/openbox/3.6/
+drwxr-xr-x	root/root	usr/include/openbox/3.6/obrender/
+-rw-r--r--	root/root	usr/include/openbox/3.6/obrender/color.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obrender/font.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obrender/geom.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obrender/gradient.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obrender/image.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obrender/instance.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obrender/mask.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obrender/render.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obrender/theme.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obrender/version.h
+drwxr-xr-x	root/root	usr/include/openbox/3.6/obt/
+-rw-r--r--	root/root	usr/include/openbox/3.6/obt/display.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obt/keyboard.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obt/link.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obt/paths.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obt/prop.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obt/signal.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obt/util.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obt/version.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obt/xml.h
+-rw-r--r--	root/root	usr/include/openbox/3.6/obt/xqueue.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libobrender.a
 -rwxr-xr-x	root/root	usr/lib/libobrender.la
-lrwxrwxrwx	root/root	usr/lib/libobrender.so -> libobrender.so.29.0.1
-lrwxrwxrwx	root/root	usr/lib/libobrender.so.29 -> libobrender.so.29.0.1
--rwxr-xr-x	root/root	usr/lib/libobrender.so.29.0.1
+lrwxrwxrwx	root/root	usr/lib/libobrender.so -> libobrender.so.32.0.0
+lrwxrwxrwx	root/root	usr/lib/libobrender.so.32 -> libobrender.so.32.0.0
+-rwxr-xr-x	root/root	usr/lib/libobrender.so.32.0.0
 -rw-r--r--	root/root	usr/lib/libobt.a
 -rwxr-xr-x	root/root	usr/lib/libobt.la
-lrwxrwxrwx	root/root	usr/lib/libobt.so -> libobt.so.2.0.1
-lrwxrwxrwx	root/root	usr/lib/libobt.so.2 -> libobt.so.2.0.1
--rwxr-xr-x	root/root	usr/lib/libobt.so.2.0.1
+lrwxrwxrwx	root/root	usr/lib/libobt.so -> libobt.so.2.0.2
+lrwxrwxrwx	root/root	usr/lib/libobt.so.2 -> libobt.so.2.0.2
+-rwxr-xr-x	root/root	usr/lib/libobt.so.2.0.2
 drwxr-xr-x	root/root	usr/lib/openbox/
 -rwxr-xr-x	root/root	usr/lib/openbox/openbox-autostart
 -rwxr-xr-x	root/root	usr/lib/openbox/openbox-xdg-autostart
diff --git a/openbox/.md5sum b/openbox/.md5sum
index f8670bcbd..2417c9785 100644
--- a/openbox/.md5sum
+++ b/openbox/.md5sum
@@ -1 +1 @@
-93df606606053b7e8578a5c116afb8ec  openbox-3.5.2.tar.gz
+b72794996c6a3ad94634727b95f9d204  openbox-3.6.1.tar.gz
diff --git a/openbox/Pkgfile b/openbox/Pkgfile
index e91b5ae52..b9d68e650 100644
--- a/openbox/Pkgfile
+++ b/openbox/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: xorg-libxinerama, xorg-libxrandr, xorg-libsm, glib, libxml2, pango
 
 name=openbox
-version=3.5.2
+version=3.6.1
 release=1
 source=(http://openbox.org/dist/openbox/openbox-$version.tar.gz)
 
diff --git a/samhain/.md5sum b/samhain/.md5sum
index 6b5a7d805..a8bcac54e 100644
--- a/samhain/.md5sum
+++ b/samhain/.md5sum
@@ -1 +1 @@
-c6d1225d538e0c8e772d2190dc18f709  samhain_signed-3.1.6.tar.gz
+2144383cc5452b9b80c7e4e4c991ad4a  samhain_signed-4.0.0.tar.gz
diff --git a/samhain/Pkgfile b/samhain/Pkgfile
index ba4fd9bbc..6db3aed3f 100644
--- a/samhain/Pkgfile
+++ b/samhain/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=samhain
-version=3.1.6
+version=4.0.0
 release=1
 source=(http://la-samhna.de/archive/${name}_signed-$version.tar.gz)
 
diff --git a/tdb/.footprint b/tdb/.footprint
index 861ce89df..3a30912e4 100644
--- a/tdb/.footprint
+++ b/tdb/.footprint
@@ -7,13 +7,14 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/tdb.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libtdb.so -> libtdb.so.1.3.6
-lrwxrwxrwx	root/root	usr/lib/libtdb.so.1 -> libtdb.so.1.3.6
--rwxr-xr-x	root/root	usr/lib/libtdb.so.1.3.6
+lrwxrwxrwx	root/root	usr/lib/libtdb.so -> libtdb.so.1.3.7
+lrwxrwxrwx	root/root	usr/lib/libtdb.so.1 -> libtdb.so.1.3.7
+-rwxr-xr-x	root/root	usr/lib/libtdb.so.1.3.7
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/tdb.pc
 drwxr-xr-x	root/root	usr/lib/python2.7/
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/_tdb_text.py
 -rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/tdb.so
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man8/
diff --git a/tdb/.md5sum b/tdb/.md5sum
index 8e80b74f3..6c89990e9 100644
--- a/tdb/.md5sum
+++ b/tdb/.md5sum
@@ -1,2 +1,2 @@
-d4df2bcebbcd18463408b5a1ccb5b71b  tdb-1.3.6.tar.gz
-99a9286363f9dd26b46d089860a07c83  tdb-man-1.3.6.tar.xz
+e3741a19c427255acd1e92c5e09d9df7  tdb-1.3.7.tar.gz
+7a0fec2c094e7de2ede37322b8201b66  tdb-man-1.3.7.tar.xz
diff --git a/tdb/Pkgfile b/tdb/Pkgfile
index 913fa832e..2f1c7f826 100644
--- a/tdb/Pkgfile
+++ b/tdb/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  attr python
 
 name=tdb
-version=1.3.6
+version=1.3.7
 release=1
 source=(http://www.samba.org/ftp/$name/$name-$version.tar.gz
         $name-man-$version.tar.xz)
diff --git a/tdb/tdb-man-1.3.6.tar.xz b/tdb/tdb-man-1.3.6.tar.xz
deleted file mode 100644
index 8e1e7b301..000000000
--- a/tdb/tdb-man-1.3.6.tar.xz
+++ /dev/null
diff --git a/tdb/tdb-man-1.3.7.tar.xz b/tdb/tdb-man-1.3.7.tar.xz
new file mode 100644
index 000000000..aafa43258
--- /dev/null
+++ b/tdb/tdb-man-1.3.7.tar.xz