Mon Aug 20 00:02:06 UTC 2012

32 files changed, 470 insertions, 44 deletions

diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD
index e3c68122d..2237fc3a7 100644
--- a/community/fcgiwrap/PKGBUILD
+++ b/community/fcgiwrap/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57830 2011-11-03 10:18:16Z lfleischer $
+# $Id: PKGBUILD 75304 2012-08-18 12:28:57Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Aaron Bull Schaefer <aaron@elasticdog.com>
 # Contributor: Ron Huang <ronhuang+aur at gmail dot com>
@@ -6,7 +6,7 @@
 pkgname=fcgiwrap
 pkgver=1.0.3
 _gitrev='2e301c8'
-pkgrel=2
+pkgrel=3
 pkgdesc='A simple server for running CGI applications over FastCGI.'
 arch=('i686' 'x86_64')
 url='http://nginx.localdomain.pl/wiki/FcgiWrap'
@@ -16,10 +16,12 @@ backup=('etc/conf.d/fcgiwrap')
 source=("https://github.com/downloads/gnosek/fcgiwrap/${pkgname}-${pkgver}.tar.gz"
         'fcgiwrap.conf.d'
         'fcgiwrap.rc.d'
+        'fcgiwrap.service'
         'LICENSE')
 md5sums=('be73d90df7c4442084463e2815fc213d'
          '9fbb5b0e861ffea74e655143a4c1a8f9'
          '71ea12f43aebca39f73ff2e0b684f361'
+         'fda6e50f609ede7c599caac8a7bb127a'
          '5aee62c27b4308f25ab32f05da387366')
 
 build() {
@@ -37,4 +39,6 @@ package() {
   install -Dm0644 ../fcgiwrap.conf.d "${pkgdir}/etc/conf.d/${pkgname}"
   install -Dm0755 ../fcgiwrap.rc.d "${pkgdir}/etc/rc.d/${pkgname}"
   install -Dm0644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  install -Dm0644 "${srcdir}/fcgiwrap.service" "${pkgdir}/usr/lib/systemd/system/fcgiwrap.service"
 }
diff --git a/community/fcgiwrap/fcgiwrap.service b/community/fcgiwrap/fcgiwrap.service
new file mode 100644
index 000000000..f59f18db2
--- /dev/null
+++ b/community/fcgiwrap/fcgiwrap.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Simple server for running CGI applications over FastCGI
+After=syslog.target network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+Restart=on-abort
+PIDFile=/var/run/fcgiwrap.pid
+ExecStart=/usr/bin/spawn-fcgi -a 127.0.0.1 -p 9001 -u http -g http -- /usr/sbin/fcgiwrap
+ExecStop=/usr/bin/kill -15 $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD
index c2001c2dc..a5f0f490c 100644
--- a/community/ngircd/PKGBUILD
+++ b/community/ngircd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72683 2012-06-19 13:44:28Z kkeen $
+# $Id: PKGBUILD 75302 2012-08-18 11:54:08Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ngircd
 pkgver=19.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Next Generation IRC Daemon"
 arch=('x86_64' 'i686')
 backup=(etc/ngircd.conf)
@@ -13,9 +13,11 @@ url="http://ngircd.barton.de/"
 license=('GPL')
 depends=('openssl' 'libident')
 source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz"
-        ngircd.sh)
+        ngircd.sh
+        ngircd.service)
 sha256sums=('bf1d5bc7554863e295d3175483f5bb01ccb0acf06a64ba9bb222150b808cf34d'
-            'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5')
+            'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5'
+            '13ffad9647ef42d1a9c8f01f6208bef9dfe9e0f86dce9a01f72711d813d720a0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -34,6 +36,7 @@ package() {
 
   make DESTDIR="$pkgdir" install
   install -Dm 755 ../ngircd.sh "$pkgdir/etc/rc.d/ngircd"
+  install -Dm 755 ../ngircd.service "$pkgdir/usr/lib/systemd/system/ngircd.service"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/ngircd/ngircd.service b/community/ngircd/ngircd.service
new file mode 100644
index 000000000..b5bab060b
--- /dev/null
+++ b/community/ngircd/ngircd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Next Generation IRC Daemon
+After=network.target
+
+[Service]
+# don't daemonize to simplify stuff
+ExecStart=/usr/sbin/ngircd -n
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD
index 98584e1ce..ef13c23d1 100644
--- a/community/ntop/PKGBUILD
+++ b/community/ntop/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75281 2012-08-17 18:35:49Z lfleischer $
+# $Id: PKGBUILD 75300 2012-08-18 10:30:18Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD
index 27c2d5890..22cf19d4f 100644
--- a/community/openttd/PKGBUILD
+++ b/community/openttd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 71703 2012-06-01 13:23:48Z lcarlier $
+# $Id: PKGBUILD 75307 2012-08-18 21:49:24Z lcarlier $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=openttd
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc='An engine for running Transport Tycoon Deluxe.'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ install=openttd.install
 optdepends=('openttd-opengfx: free graphics' 
             'openttd-opensfx: free soundset')
 source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
-md5sums=('66b54e0293594aab90085db113cc2dd3')
+sha256sums=('57b105ab03d0275e190107fd1d54255f0c25d8b24d41d15ed2702534bab31f95')
 
 build() {
   cd ${pkgname}-${pkgver} 
diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD
index 4296079e6..1e6d9d7b4 100644
--- a/community/redshift/PKGBUILD
+++ b/community/redshift/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75276 2012-08-17 13:33:29Z lfleischer $
+# $Id: PKGBUILD 75297 2012-08-18 10:08:06Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Geoffrey Teale <tealeg@stop-squark>
 # Contributor: Mark, Huo Mian <markhuomian[at]gmail[dot]com>
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 1fd617dbe..ad155e96e 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160917 2012-06-07 00:05:24Z dreisner $
+# $Id: PKGBUILD 165413 2012-08-18 13:27:49Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.62
+pkgver=2.63
 pkgrel=1
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
@@ -18,7 +18,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
         'dnsmasq.confd'
         'rc.dnsmasq'
         'dnsmasq.service')
-md5sums=('f47e5cb8f5bac6343f24b2dbe317ab40'
+md5sums=('43e771997615ebcd8f6c6ffa60c3e40b'
          '66479e99123faeab83ebaed709ef95b5'
          '819fbdf6440d710616e6df5f8ca9cdba'
          '631d8349acbed1b01d4e11d9f42fdb7d')
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index d9a9b139e..034a01a0e 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157331 2012-04-27 05:07:31Z allan $
+# $Id: PKGBUILD 165406 2012-08-18 05:25:03Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdb
-pkgver=7.4.1
+pkgver=7.5
 pkgrel=1
 pkgdesc="The GNU Debugger"
 arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@ backup=('etc/gdb/gdbinit')
 options=('!libtool')
 install=gdb.install
 source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('8854d34691087ec127d934692639855f'
-         'a3d48626efc9e7d802f0734ca39a7878')
+md5sums=('24a6779a9fe0260667710de1b082ef61'
+         'c1d42158075135b539ecba166987bc15')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD
index dbc7432ca..4221491b7 100644
--- a/extra/postgresql-old-upgrade/PKGBUILD
+++ b/extra/postgresql-old-upgrade/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 160728 2012-06-04 17:55:37Z dan $
+# $Id: PKGBUILD 165415 2012-08-18 15:08:12Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=postgresql-old-upgrade
-pkgver=9.0.8
+pkgver=9.0.9
 _majorver=${pkgver%.*}
 pkgrel=1
 pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade"
@@ -37,5 +37,5 @@ package() {
   rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/"
 }
 
-md5sums=('0e830b0f6538e04b788c3208060256ef')
-sha256sums=('a2981ba8a64b396e2111fee5a9216275e49a2e79e839152a5e4367afd44c0bc2')
+md5sums=('284303098b161240fd13df7c251822a5')
+sha256sums=('87417d181a0f534fa96ba1d315a62b721f5bc22b7bb70af3f674bc1a68a5da8a')
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 11f78dfab..7104ed19c 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules')
 pkgver=4.1.18
-pkgrel=6.1
+pkgrel=6.2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 79c0d0b02..8e239915d 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-source'
          'virtualbox-libre-parabola-source')
 pkgver=4.1.18
-pkgrel=5.2
+pkgrel=5.4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -257,7 +257,7 @@ package_virtualbox-libre-parabola-source() {
 
 md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          '5f85710e0b8606de967716ded7b2d351'
-         '7e14fbec3aa6904b1015ae82b5a7b097'
+         'bf5d1eeeec20a042e8af34cd61a9e11b'
          'a1ff1d1b4423556887e48a32978226a6'
          '4ff559f2bea335d59c4012048983ca91'
          '97e193f050574dd272a38e5ee5ebe62b'
diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild
index 350d0c6ad..27519950f 100644
--- a/libre/virtualbox-libre/vboxbuild
+++ b/libre/virtualbox-libre/vboxbuild
@@ -35,7 +35,7 @@ if [[ -f /proc/modules ]]; then
 fi
 
 if (( ${#MODLIST[*]} )); then
-  stat_busy "Unloading VirtualBox kernel modules"
+  stat_busy "Unloading VirtualBox kernel libre modules"
   modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
 fi
 
@@ -44,7 +44,7 @@ for kdir in /usr/lib/modules/[2-3]*; do
     # found a stale kernel
     mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*)
     if (( ${#mods[@]} )); then
-      stat_busy "Removing all old VirtualBox kernel modules"
+      stat_busy "Removing all old VirtualBox kernel libre modules"
       if rm -f "${mods[@]}" &&
           rmdir -p --ignore-fail-on-non-empty "$kdir/extramodules" 2>/dev/null; then
         stat_done
@@ -64,12 +64,12 @@ for kernver; do
   export KERN_DIR=/usr/lib/modules/$kernver/build
   export MODULE_DIR=/usr/lib/modules/$kernver/extramodules
   if [[ ! -d $KERN_DIR ]]; then
-    printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
+    printf "error: \`%s' does not appear to be a valid kernel libre build directory.\n" \
         "$KERN_DIR"
     continue
   fi
 
-  stat_busy "Recompiling VirtualBox kernel modules ($kernver)"
+  stat_busy "Recompiling VirtualBox kernel libre modules ($kernver)"
     if ! $BUILDVBOXDRV \
       --save-module-symvers /tmp/vboxdrv-Module.symvers \
       --no-print-directory install >> $LOG 2>&1; then
@@ -90,6 +90,6 @@ for kernver; do
 done
 
 if (( ${#MODLIST[*]} )); then
-  stat_busy "Reloading VirtualBox kernel modules"
+  stat_busy "Reloading VirtualBox kernel libre modules"
   modprobe -a "${MODLIST[@]}" && stat_done || stat_fail
 fi
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index 6991a49d7..9599a3a49 100644
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -1,6 +1,7 @@
 diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
 --- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:22:13.636083176 +0000
 +++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:48:58.915541368 +0000
+@@ -67,38 +67,34 @@
  
  /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */
  QString g_QStrHintLinuxNoMemory = QApplication::tr(
@@ -20,7 +21,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
 -  "recompiles the vboxdrv kernel module if necessary."
 +  "libre module by executing<br/><br/>"
 +  "  <font color=blue>'pacman -S virtualbox-libre-modules'</font><br/><br/>"
-+  "as root. If you don't use our stock kernel, install virtualbox-libre-source and "
++  "as root. If you don't use our stock kernel libre, install virtualbox-libre-source and "
 +  "execute dkms install vboxhost/4.1.18 ."
    );
  
@@ -40,7 +41,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
 -  "may correct this. Make sure that you do not mix the "
 -  "OSE version and the PUEL version of VirtualBox."
 +  "The VirtualBox kernel libre modules do not match this version of "
-+  "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
++  "VirtualBox. Reload the modules or if you don't use our stock kernel libre execute<br/><br/> "
 +  "  <font color=blue>'dkms install vboxhost/4.1.18'</font><br/><br/>"
    );
  
@@ -50,16 +51,38 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
    );
  
  /* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+@@ -590,7 +586,7 @@
+             case VERR_VM_DRIVER_NOT_INSTALLED:
+             case VERR_VM_DRIVER_LOAD_ERROR:
+                 msgText += QApplication::tr (
+-                        "<b>Cannot access the kernel driver!</b><br/><br/>");
++                        "<b>Cannot access the kernel libre driver!</b><br/><br/>");
+ # ifdef RT_OS_LINUX
+                 msgText += g_QStrHintLinuxNoDriver;
+ # else
+@@ -603,7 +599,7 @@
+                 break;
+ # endif
+             case VERR_VM_DRIVER_NOT_ACCESSIBLE:
+-                msgText += QApplication::tr ("Kernel driver not accessible");
++                msgText += QApplication::tr ("Kernel libre driver not accessible");
+                 break;
+             case VERR_VM_DRIVER_VERSION_MISMATCH:
+ # ifdef RT_OS_LINUX
 diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
 --- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:22:13.549415814 +0000
 +++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:56:50.735874087 +0000
-@@ -32,17 +32,18 @@
+@@ -30,19 +30,20 @@
+     SHUTDOWN="true"
+ elif ! lsmod|grep -q vboxdrv; then
      cat << EOF
- WARNING: The vboxdrv kernel module is not loaded. Either there is no module
-          available for the current kernel (`uname -r`) or it failed to
+-WARNING: The vboxdrv kernel module is not loaded. Either there is no module
+-         available for the current kernel (`uname -r`) or it failed to
 -         load. Please recompile the kernel module and install it by
++WARNING: The vboxdrv kernel libre module is not loaded. Either there is no module
++         available for the current kernel libre (`uname -r`) or it failed to
 +         load. Please reinstall the kernel libre module virtualbox-libre-modules or
-+         if you don't use our stock kernel compile the modules with
++         if you don't use our stock kernel libre compile the modules with
  
 -           sudo /etc/init.d/vboxdrv setup
 +           sudo dkms install vboxhost/4.1.18
@@ -76,3 +99,14 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-
  
           and if that is not successful, try to re-install the package.
  
+@@ -52,9 +53,8 @@
+ 
+ if [ -f /etc/vbox/module_not_compiled ]; then
+     cat << EOF
+-WARNING: The compilation of the vboxdrv.ko kernel module failed during the
++WARNING: The compilation of the vboxdrv.ko kernel libre module failed during the
+          installation for some reason. Starting a VM will not be possible.
+-         Please consult the User Manual for build instructions.
+ EOF
+ fi
+ 
\ No newline at end of file
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
index 6913fe2ed..b6d804eb7 100644
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ b/libre/virtualbox-libre/virtualbox-libre.install
@@ -30,8 +30,8 @@ post_upgrade() {
   post_install "$1"
   if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
     cat << EOF
-===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
-===> Use virtualbox-source package if you don't use our stock linux package.
+===> Starting with virtualbox-libre version 4.1.6-1, kernel libre modules handling is done by virtualbox-libre-modules.
+===> Use virtualbox-libre-source package if you don't use our stock linux-libre package.
 EOF
     fi
 }
diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD
index 6132159e8..381a7ba04 100644
--- a/multilib/wine/PKGBUILD
+++ b/multilib/wine/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 74632 2012-07-31 20:08:23Z svenstaro $
+# $Id: PKGBUILD 75305 2012-08-18 14:33:35Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=wine
-pkgver=1.5.10
+pkgver=1.5.11
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('7bf0345d31e23111ab6ae69e153bc961')
+md5sums=('930485c8df59edcf0a6e3fd87cca8b39')
 
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
@@ -91,7 +91,7 @@ build() {
 
   # These additional CFLAGS solve FS#27662
   export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
-  export CXXFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
+  export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
 
   if [[ $CARCH == x86_64 ]]; then
     msg2 "Building Wine-64..."
@@ -123,8 +123,8 @@ build() {
     --with-x \
     "${_wine32opts[@]}"
 
-  # These additional CFLAGS solve FS#27560
-  make CFLAGS+="-mstackrealign" CXXFLAGS+="-mstackrealign"
+  # These additional CFLAGS solve FS#27560 and FS#23277
+  make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2"
 }
 
 package() {
diff --git a/testing/gnutls/PKGBUILD b/testing/gnutls/PKGBUILD
new file mode 100644
index 000000000..e6517853f
--- /dev/null
+++ b/testing/gnutls/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 165411 2012-08-18 10:15:13Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnutls
+pkgver=3.1.0
+pkgrel=1
+pkgdesc="A library which provides a secure layer over a reliable transport layer"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+url="http://www.gnu.org/software/gnutls/"
+install=gnutls.install
+options=('!libtool' '!zipman')
+depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
+makedepends=('valgrind' 'strace')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('db88d8fc44e44be4a0a14b24aa204bbf'
+         'c3fa5f3bda5ebe7f37cc997717bb8476')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+	--with-zlib \
+	--disable-static \
+	--disable-guile \
+	--disable-valgrind-tests
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -k check # passes all  || /bin/true
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  
+  # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
+  # gzip -9 all files in infodir and manpages manually
+  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
+  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
+}
diff --git a/testing/gnutls/gnutls.install b/testing/gnutls/gnutls.install
new file mode 100644
index 000000000..e8c8e1798
--- /dev/null
+++ b/testing/gnutls/gnutls.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/inetutils/PKGBUILD b/testing/inetutils/PKGBUILD
new file mode 100644
index 000000000..88f001a8a
--- /dev/null
+++ b/testing/inetutils/PKGBUILD
@@ -0,0 +1,72 @@
+# $Id: PKGBUILD 165418 2012-08-18 22:30:35Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=inetutils
+pkgver=1.9.1
+pkgrel=3
+pkgdesc="A collection of common network programs"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/inetutils/"
+license=('GPL3')
+groups=('base')
+depends=('readline' 'ncurses' 'pam')
+backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
+        'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
+options=('!emptydirs')
+install=inetutils.install
+source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \
+        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \
+        ftpd.service dnsdomainname)
+sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
+          'ff0aad9946a38915580b094dadf67e790e8a2f87'
+          '84dc802b5e57b5e04c847572225a3b9612017155'
+          '68a590083b45997dfdb80e666b2de762f494ba74'
+          'bfad98a4a62f1fff8779f076c6019ed07f9111af'
+          '27d99b910eec0fc26bd79ccc2c1de26608330298'
+          '81f10b3b688e3952f793b35bcef63b5bf257a92b'
+          '81f4a8da823cf0bb14284fc71ee6108849691eda'
+          '1c5ff1b6166c7401ef0956ce6eab30450ff95eaf'
+          'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h
+  ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \
+    --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \
+    --without-wrap --with-pam \
+    --enable-ftp --enable-ftpd \
+    --enable-telnet --enable-telnetd \
+    --enable-talk --enable-talkd \
+    --enable-rlogin --enable-rlogind \
+    --enable-rsh --enable-rshd \
+    --enable-rcp --enable-hostname \
+    --disable-rexec --disable-rexecd \
+    --disable-tftp --disable-tftpd \
+    --disable-ping --disable-ping6 \
+    --disable-logger --disable-syslogd \
+    --disable-inetd --disable-whois \
+    --disable-uucpd --disable-ifconfig --disable-traceroute
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -d "${pkgdir}/bin"
+  ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
+  install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
+  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
+  install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd"
+  install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd"
+  install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
+  install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
+  install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
+  install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh"
+  install -D -m644 "${srcdir}/ftpd.service" "${pkgdir}/usr/lib/systemd/system/ftpd.service"
+}
diff --git a/testing/inetutils/dnsdomainname b/testing/inetutils/dnsdomainname
new file mode 100644
index 000000000..a1b8a8c31
--- /dev/null
+++ b/testing/inetutils/dnsdomainname
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/hostname -d "$@"
diff --git a/testing/inetutils/ftpd.conf b/testing/inetutils/ftpd.conf
new file mode 100644
index 000000000..f660f0035
--- /dev/null
+++ b/testing/inetutils/ftpd.conf
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to ftpd
+#
+FTPD_ARGS=""
diff --git a/testing/inetutils/ftpd.rc b/testing/inetutils/ftpd.rc
new file mode 100644
index 000000000..3d0d34421
--- /dev/null
+++ b/testing/inetutils/ftpd.rc
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/ftpd
+
+PID=$(pidof -o %PPID /usr/sbin/ftpd)
+case "$1" in
+  start)
+    stat_busy "Starting ftpd"
+    [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon ftpd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping ftpd"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon ftpd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/testing/inetutils/ftpd.service b/testing/inetutils/ftpd.service
new file mode 100644
index 000000000..985eb9756
--- /dev/null
+++ b/testing/inetutils/ftpd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=FTPD Daemon
+
+[Service]
+ExecStart=/usr/sbin/ftpd -D
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/testing/inetutils/inetutils.install b/testing/inetutils/inetutils.install
new file mode 100644
index 000000000..b338fa498
--- /dev/null
+++ b/testing/inetutils/inetutils.install
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(inetutils.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/inetutils/rlogin.xinetd b/testing/inetutils/rlogin.xinetd
new file mode 100644
index 000000000..5c72f86df
--- /dev/null
+++ b/testing/inetutils/rlogin.xinetd
@@ -0,0 +1,10 @@
+service login
+{
+        flags                   = REUSE
+        socket_type             = stream
+        wait                    = no
+        user                    = root
+        server                  = /usr/sbin/rlogind
+        log_on_failure          += USERID
+        disable                 = yes
+}
diff --git a/testing/inetutils/rsh.xinetd b/testing/inetutils/rsh.xinetd
new file mode 100644
index 000000000..a13738c31
--- /dev/null
+++ b/testing/inetutils/rsh.xinetd
@@ -0,0 +1,10 @@
+service shell
+{
+        flags                   = REUSE
+        socket_type             = stream
+        wait                    = no
+        user                    = root
+        server                  = /usr/sbin/rshd
+        log_on_failure          += USERID
+        disable                 = yes
+}
diff --git a/testing/inetutils/talk.xinetd b/testing/inetutils/talk.xinetd
new file mode 100644
index 000000000..6abef359c
--- /dev/null
+++ b/testing/inetutils/talk.xinetd
@@ -0,0 +1,10 @@
+service ntalk
+{
+	flags			= REUSE
+	socket_type		= dgram
+	wait			= yes
+	user			= root
+	server			= /usr/sbin/talkd
+	log_on_failure		+= USERID
+	disable			= yes
+}
diff --git a/testing/inetutils/telnet.xinetd b/testing/inetutils/telnet.xinetd
new file mode 100644
index 000000000..bd3a5e4b1
--- /dev/null
+++ b/testing/inetutils/telnet.xinetd
@@ -0,0 +1,10 @@
+service telnet
+{
+	flags			= REUSE
+	socket_type		= stream
+	wait			= no
+	user			= root
+	server			= /usr/sbin/telnetd
+	log_on_failure		+= USERID
+	disable			= yes
+}
diff --git a/testing/timidity++/PKGBUILD b/testing/timidity++/PKGBUILD
new file mode 100644
index 000000000..cec8e8a35
--- /dev/null
+++ b/testing/timidity++/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 165420 2012-08-18 23:03:32Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=timidity++
+pkgver=2.14.0
+pkgrel=3
+pkgdesc="A MIDI to WAVE converter and player"
+arch=('i686' 'x86_64')
+url="http://timidity.sourceforge.net"
+license=('GPL')
+depends=('libao' 'libvorbis' 'jack' 'ncurses')
+makedepends=('xaw3d>=1.6' 'gtk2' 'tk' 'libxaw')
+optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \
+            'xaw3d: for using the Xaw interface')
+backup=('etc/timidity++/timidity.cfg')
+source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz \
+        timidity.cfg timidity++.sh timidity.service)
+sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b'
+          '660b3afbb720d26e8f008034cee66dd8da082d6e'
+          '9f3e732a7ca1e97119a76df62ecf154df04d4f77'
+          'f0351b9eb8928d3d82c380107654a7dbe7cd2d54')
+
+build() {
+  cd "${srcdir}/TiMidity++-${pkgver}"
+  ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \
+    --enable-server --enable-alsaseq --enable-spectrogram --enable-network --enable-xft \
+    --enable-audio=alsa,oss,ao,vorbis,flac,jack \
+    --enable-dynamic=ncurses,tcltk,vt100,xaw,gtk
+  make
+}
+
+package() {
+  cd "${srcdir}/TiMidity++-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg"
+  install -D -m755 ../timidity++.sh "${pkgdir}/etc/rc.d/timidity++"
+  install -D -m644 ../timidity.service "${pkgdir}/usr/lib/systemd/system/timidity.service"
+}
diff --git a/testing/timidity++/timidity++.sh b/testing/timidity++/timidity++.sh
new file mode 100644
index 000000000..3fa13cea9
--- /dev/null
+++ b/testing/timidity++/timidity++.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/timidity`
+case "$1" in
+   start)
+     stat_busy "Starting Timidity++ ALSA Daemon"
+     [ -z "$PID" ] && /usr/bin/timidity -iAD > /dev/null
+     if [ $? -gt 0 ]; then
+       stat_fail
+     else
+       echo $PID > /var/run/timidity.pid
+       add_daemon timidity++
+       stat_done
+     fi
+     ;;
+   stop)
+     stat_busy "Stopping Timidity++ ALSA Daemon"
+     [ ! -z "$PID" ]  && kill $PID &> /dev/null
+     if [ $? -gt 0 ]; then
+       stat_fail
+     else
+       rm /var/run/timidity.pid
+       rm_daemon timidity++
+       stat_done
+     fi
+     ;;
+   restart)
+     $0 stop
+     sleep 1
+     $0 start
+     ;;
+   *)
+     echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/testing/timidity++/timidity.cfg b/testing/timidity++/timidity.cfg
new file mode 100644
index 000000000..59bbfa935
--- /dev/null
+++ b/testing/timidity++/timidity.cfg
@@ -0,0 +1,29 @@
+# details on this file and other examples see here:
+# http://www.onicos.com/staff/iz/timidity/dist/cfg/sndfont.cfg
+# http://www.onicos.com/staff/iz/timidity/dist/cfg/
+#----------------------------------------------------------------
+# SoundFont extension configuration
+#
+# soundfont <filename> [order={0|1}] [remove]
+#    <filename> is the path of SoundFont file.
+#    order: 0(preload) or 1(load after GUS).
+#    remove: disable specified soundfont.
+#
+# font exclude <tonebank> [<preset> [<keynote>]]
+# font order {0|1} <tonebank> [<preset> [<keynote>]]
+#    <tonebank>: 0-127
+#
+# font exclude 128 [<drumset> [<key>]]
+# font order {0|1} 128 [<drumset> [<key>]]
+#----------------------------------------------------------------
+
+# change the next line to point to a soundfont you have
+# soundfonts can be found e.g. here: http://www.hammersound.net/
+# soundfont /usr/share/soundfonts/DX7Piano.SF2
+
+# you can do manipulations of the soundfont you load like this:
+# e.g. removing drumset 99
+# font exclude 128 99
+
+# load drum samples after GUS patches
+# font order 1 128
diff --git a/testing/timidity++/timidity.service b/testing/timidity++/timidity.service
new file mode 100644
index 000000000..4d6ceea6a
--- /dev/null
+++ b/testing/timidity++/timidity.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=TiMidity++ Daemon
+After=sound.target
+
+[Service]
+ExecStart=/usr/bin/timidity -iA
+
+[Install]
+WantedBy=multi-user.target