9 files changed, 90 insertions, 33 deletions
diff --git a/testing/iw/PKGBUILD b/testing/iw/PKGBUILD
new file mode 100644
index 000000000..1e7cbe073
--- /dev/null
+++ b/testing/iw/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 165785 2012-08-29 23:06:26Z thomas $
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+
+pkgname=iw
+pkgver=3.6
+pkgrel=1
+pkgdesc="nl80211 based CLI configuration utility for wireless devices"
+arch=("i686" "x86_64")
+url="http://wireless.kernel.org/en/users/Documentation/iw"
+license=("GPL")
+depends=("libnl")
+makedepends=("linux-api-headers")
+source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha256sums=('df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/testing/libedit/PKGBUILD b/testing/libedit/PKGBUILD
new file mode 100644
index 000000000..c7a5b6ac9
--- /dev/null
+++ b/testing/libedit/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 165760 2012-08-29 13:07:56Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Roman Cheplyaka <roma@ro-che.info>
+
+pkgname=libedit
+pkgver=20120601_3.0
+pkgrel=1
+pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions'
+url='http://www.thrysoee.dk/editline/'
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('ncurses')
+options=('!libtool')
+source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
+sha1sums=('18ec27120f6abb222754e9f283d000fec0dcfc08')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver/_/-}"
+	./configure --prefix=/usr --enable-widec --enable-static=no
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver/_/-}"
+	make prefix="${pkgdir}"/usr install
+
+	cp "${pkgdir}"/usr/share/man/man3/editline.3 "${pkgdir}"/usr/share/man/man3/el.3
+	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE
+}
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
index dd9ad59bf..1748d58cc 100644
--- a/testing/openssh/PKGBUILD
+++ b/testing/openssh/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 161935 2012-06-16 17:16:33Z dreisner $
+# $Id: PKGBUILD 165684 2012-08-29 05:14:58Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=6.0p1
-pkgrel=3
+pkgver=6.1p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
+makedepends=('linux-headers')
 depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X')
@@ -19,20 +20,18 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
         'sshd@.service'
         'sshd.service'
         'sshd.socket'
-        'tmpfiles.d'
         'sshd.confd'
         'sshd.pam'
         'sshd')
-sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422'
+sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
           '954bf1660aa32620c37034320877f4511b767ccb'
           '6c71de2c2ca9622aa8e863acd94b135555e11125'
           'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-          '83a257b8f6a62237383262cb0e2583e5609ddac0'
+          'f27617eeb694f4edd474638adf16733d8a793d85'
           'a30fb5fda6d0143345bae47684edaffb8d0a92a7'
-          'b5cf44205e8f4365c00bfbee110d7c0e563627aa'
           'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
           '659e3ee95c269014783ff8b318c6f50bf7496fbd'
-          'ed36e3a522f619ff6b13e253526596e4cca11e9f')
+          '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
 
@@ -60,13 +59,14 @@ build() {
 check() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	# The connect.sh test must be run by a user with a decent login shell;
-	# chroot builds use nobody with /bin/false.
-	make tests || true
+	make tests ||
+	grep $USER /etc/passwd | grep -q /bin/false
+	# connect.sh fails when run with stupid login shell
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	make DESTDIR="${pkgdir}" install
 
 	rm "${pkgdir}"/usr/share/man/man1/slogin.1
@@ -78,7 +78,6 @@ package() {
 	install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service
 	install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service
 	install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket
-	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf
 
 	install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
 	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
diff --git a/testing/openssh/sshd b/testing/openssh/sshd
index 4bf4780f5..d60804e84 100755
--- a/testing/openssh/sshd
+++ b/testing/openssh/sshd
@@ -15,7 +15,6 @@ case "$1" in
 	start)
 		stat_busy 'Starting Secure Shell Daemon'
 		/usr/bin/ssh-keygen -A
-		[[ -d /var/empty ]] || mkdir -p /var/empty
 		[[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
 		if [[ $? -gt 0 ]]; then
 			stat_fail
diff --git a/testing/openssh/sshd.service b/testing/openssh/sshd.service
index 7c8f88372..4a5910873 100644
--- a/testing/openssh/sshd.service
+++ b/testing/openssh/sshd.service
@@ -12,8 +12,5 @@ Restart=always
 WantedBy=multi-user.target
 Also=sshdgenkeys.service
 
-# Note that this is the service file for running a single SSH server for all
-# incoming connections, suitable only for systems with a large amount of SSH
-# traffic. In almost all other cases it is a better idea to use sshd.socket +
-# sshd@.service (i.e. the on-demand spawning version for one instance per
-# connection).
+# This service file runs an SSH daemon that forks for each incoming connection.
+# If you prefer to spawn on-demand daemons, use sshd.socket and sshd@.service.
diff --git a/testing/openssh/sshd@.service b/testing/openssh/sshd@.service
new file mode 100644
index 000000000..2fd9b0814
--- /dev/null
+++ b/testing/openssh/sshd@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=OpenSSH Per-Connection Daemon
+After=sshdgenkeys.service
+
+[Service]
+ExecStart=-/usr/sbin/sshd -i
+StandardInput=socket
+StandardError=syslog
diff --git a/testing/spamassassin/PKGBUILD b/testing/spamassassin/PKGBUILD
index a6b0dbb0b..18a912f3a 100644
--- a/testing/spamassassin/PKGBUILD
+++ b/testing/spamassassin/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 165370 2012-08-16 16:16:07Z bluewind $
-# Maintainer: Dale Blount <dale@archlinux.org>
+# $Id: PKGBUILD 165766 2012-08-29 13:17:22Z bluewind $
+# Maintainer: Florian Pritz <bluewind@xinu.at>
+# Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.3.2
-pkgrel=4
+pkgrel=6
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -56,5 +57,5 @@ package() {
 
   install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd"
   install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd"
-  install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.serivce"
+  install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service"
 }
diff --git a/testing/spamassassin/spamassassin.install b/testing/spamassassin/spamassassin.install
index fae0264b2..e43453e97 100644
--- a/testing/spamassassin/spamassassin.install
+++ b/testing/spamassassin/spamassassin.install
@@ -4,7 +4,7 @@ post_install() {
 
 post_upgrade() {
   # Compile rules, if rules have previously been compiled, and it's possible
-  if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]
+  if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then
     echo "Detected compiled rules, running sa-compile..."
     sa-compile > /dev/null 2>&1
 fi
diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD
index b3642550e..962c304bc 100644
--- a/testing/upower/PKGBUILD
+++ b/testing/upower/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 164296 2012-07-29 23:15:56Z tomegun $
+# $Id: PKGBUILD 165781 2012-08-29 21:43:32Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.17
-pkgrel=2
+pkgver=0.9.18
+pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64')
 url="http://upower.freedesktop.org"
 license=('GPL')
-depends=('systemd-tools' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
+depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
+makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd')
 options=('!libtool')
 source=($url/releases/$pkgname-$pkgver.tar.xz)
+md5sums=('bfaaa1e7f8479fca5594406b3c36dff9')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -20,10 +21,9 @@ build() {
   sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
 
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/upower \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --disable-static
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname \
+    --disable-static
   make
 }
 
@@ -31,4 +31,3 @@ package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('9ef7fc8ec438542f014f3a34552822aa')