Tue May 21 00:28:39 PDT 2013

12 files changed, 62 insertions, 110 deletions

diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD
index fbb494374..6a6040f5b 100644
--- a/core/gpm/PKGBUILD
+++ b/core/gpm/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 182863 2013-04-15 21:02:26Z eric $
+# $Id: PKGBUILD 186057 2013-05-20 18:53:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gpm
 pkgver=1.20.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A mouse server for the console and xterm"
 arch=('i686' 'x86_64')
 url="http://www.nico.schottelius.org/software/gpm/"
 license=('GPL')
-depends=('ncurses' 'bash')
+depends=('bash')
 options=('!makeflags')
 install=gpm.install
 source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \
         gpm.sh gpm.service)
 sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369'
           '88fe5ff10916c68a87abc8418a56eb0073f69fa9'
-          '20b92360f0ad38a2032fcae37bdbd01b31e43f77')
+          'f9bde96eb9c78da9f225bcf40822647f6592cf23')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make
 }
 
diff --git a/core/gpm/gpm.service b/core/gpm/gpm.service
index 59e837d80..510ee9f85 100644
--- a/core/gpm/gpm.service
+++ b/core/gpm/gpm.service
@@ -3,7 +3,7 @@ Description=Virtual console mouse server
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2
+ExecStart=/usr/bin/gpm -m /dev/input/mice -t imps2
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD
index b283a923c..f673403bb 100644
--- a/core/man-db/PKGBUILD
+++ b/core/man-db/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 166836 2012-09-19 19:45:35Z andyrtr $
+# $Id: PKGBUILD 186047 2013-05-20 18:28:50Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
 
 pkgname=man-db
 pkgver=2.6.3
-pkgrel=1
+pkgrel=3
 pkgdesc="A utility for reading man pages"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/man-db/"
 license=('GPL' 'LGPL')
 groups=('base')
-depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline')
-optdepends=('less' 'gzip')
+depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline' 'less')
+optdepends=('gzip')
 backup=('etc/man_db.conf'
-	'etc/cron.daily/man-db')
+	    'etc/cron.daily/man-db')
 conflicts=('man')
 provides=('man')
 replaces=('man')
@@ -22,21 +22,26 @@ source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig
         convert-mans man-db.cron.daily)
 options=('!libtool')
 md5sums=('a593a095599ae97bcacf8d038659a146'
-         '64975c20b1a6453f9b860ff7f916bcf1'
+         'SKIP'
          '2b7662a7d5b33fe91f9f3e034361a2f6'
-         'd30c39ae47560304471b5461719e0f03')
+         '934fd047fecb915038bf4bf844ea609c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
+  ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+	--with-db=gdbm \
+	--disable-setuid \
+	--enable-mandirs=GNU \
 	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"
   make
 }
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make check
+  make -k check
 }
 
 package() {
diff --git a/core/man-db/man-db.cron.daily b/core/man-db/man-db.cron.daily
index 53e66e1e9..9b4abd894 100755
--- a/core/man-db/man-db.cron.daily
+++ b/core/man-db/man-db.cron.daily
@@ -12,7 +12,7 @@ IONICE_PRIORITY=7
 UPDATEMANDB="/usr/bin/mandb --quiet"
 
 # Update the "whatis" database
-#/usr/sbin/makewhatis -u -w
+#/usr/bin/makewhatis -u -w
 
 # taken from Debian
 # man-db cron daily
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index dac70e5d1..5697f8099 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180812 2013-03-26 12:05:13Z bisson $
+# $Id: PKGBUILD 186025 2013-05-20 14:49:38Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=6.2p1
+pkgver=6.2p2
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -15,31 +15,28 @@ depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X')
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
-        'sshd.close-sessions'
         'sshdgenkeys.service'
         'sshd@.service'
         'sshd.service'
         'sshd.socket'
-        'sshd.confd'
-        'sshd.pam'
-        'sshd')
-sha1sums=('8824708c617cc781b2bb29fa20bd905fd3d2a43d'
-          '954bf1660aa32620c37034320877f4511b767ccb'
+        'sshd.pam')
+sha1sums=('c2b4909eba6f5ec6f9f75866c202db47f3b501ba'
           '6df5be396f8c593bb511a249a1453294d18a01a6'
-          'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-          'f9af4a442b804ab661cec0edb25dd76dee16d8d2'
+          '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
+          '2d87de52a6b2f764180f9f67cb9747392784b4a5'
           'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
-          'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-          'd93dca5ebda4610ff7647187f8928a3de28703f3'
-          '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')
+          'd93dca5ebda4610ff7647187f8928a3de28703f3')
 
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
+
+install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	./configure \
 		--prefix=/usr \
+		--sbindir=/usr/bin \
 		--libexecdir=/usr/lib/ssh \
 		--sysconfdir=/etc/ssh \
 		--with-ldns \
@@ -69,20 +66,14 @@ package() {
 
 	make DESTDIR="${pkgdir}" install
 
-	rm "${pkgdir}"/usr/share/man/man1/slogin.1
-	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-
+	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1
 	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
 
 	install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
 	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 -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
-	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
 	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
-	install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
 
 	install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
 	install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
diff --git a/core/openssh/install b/core/openssh/install
new file mode 100644
index 000000000..6f0cd3703
--- /dev/null
+++ b/core/openssh/install
@@ -0,0 +1,10 @@
+post_upgrade() {
+	if [[ $(vercmp $2 6.2p2) = -1 ]]; then
+		cat <<EOF
+
+==> The sshd daemon has been moved to /usr/bin alongside all binaries.
+==> Please update this path in your scripts if applicable.
+
+EOF
+	fi
+}
diff --git a/core/openssh/sshd b/core/openssh/sshd
deleted file mode 100755
index d60804e84..000000000
--- a/core/openssh/sshd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PIDFILE=/run/sshd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
-	PID=
-	rm $PIDFILE 2>/dev/null
-fi
-
-case "$1" in
-	start)
-		stat_busy 'Starting Secure Shell Daemon'
-		/usr/bin/ssh-keygen -A
-		[[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			add_daemon sshd
-			stat_done
-		fi
-		;;
-	stop)
-		stat_busy 'Stopping Secure Shell Daemon'
-		[[ ! -z $PID ]] && kill $PID &> /dev/null
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			rm_daemon sshd
-			stat_done
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/core/openssh/sshd.close-sessions b/core/openssh/sshd.close-sessions
deleted file mode 100644
index be2a709fc..000000000
--- a/core/openssh/sshd.close-sessions
+++ /dev/null
@@ -1,17 +0,0 @@
-# Close sshd sessions before shutting down the network; see FS#17389.
-
-sshd_close_sessions () {
-	if ck_daemon sshd; then
-		return
-	fi
-	/etc/rc.d/sshd stop
-	stat_busy "Stopping Secure Shell Sessions"
-	for i in $(pgrep sshd); do
-		if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
-			kill $i
-		fi
-	done &>/dev/null
-	stat_done
-}
-
-add_hook shutdown_start sshd_close_sessions
diff --git a/core/openssh/sshd.confd b/core/openssh/sshd.confd
deleted file mode 100644
index 5ce7c0079..000000000
--- a/core/openssh/sshd.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=""
diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service
index 633164e5d..349bde59d 100644
--- a/core/openssh/sshd.service
+++ b/core/openssh/sshd.service
@@ -4,7 +4,7 @@ Wants=sshdgenkeys.service
 After=sshdgenkeys.service
 
 [Service]
-ExecStart=/usr/sbin/sshd -D
+ExecStart=/usr/bin/sshd -D
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=always
diff --git a/core/openssh/sshd@.service b/core/openssh/sshd@.service
index 2fd9b0814..7ce3d37ba 100644
--- a/core/openssh/sshd@.service
+++ b/core/openssh/sshd@.service
@@ -3,6 +3,6 @@ Description=OpenSSH Per-Connection Daemon
 After=sshdgenkeys.service
 
 [Service]
-ExecStart=-/usr/sbin/sshd -i
+ExecStart=-/usr/bin/sshd -i
 StandardInput=socket
 StandardError=syslog
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index 2f6c71ab3..16e781fab 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180917 2013-03-28 02:20:12Z bisson $
+# $Id: PKGBUILD 186026 2013-05-20 14:49:45Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=procps-ng
 pkgver=3.3.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Utilities for monitoring your system and its processes'
 url='http://gitorious.org/procps'
 license=('GPL' 'LGPL')
@@ -23,11 +23,22 @@ replaces=('procps')
 
 options=('!libtool')
 
-build() {
+prepare() {
 	cd "${srcdir}/procps-procps"
 	echo ${pkgver} > .tarball-version
 	./autogen.sh
-	./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib
+}
+
+build() {
+	cd "${srcdir}/procps-procps"
+	./configure \
+		--prefix=/usr \
+		--exec-prefix=/ \
+		--sysconfdir=/etc \
+		--libdir=/usr/lib \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--disable-static
 	make
 }
 
@@ -37,6 +48,6 @@ package() {
 	install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf"
 
 	# provided by util-linux
-	rm "${pkgdir}/bin/kill"
+	rm "${pkgdir}/usr/bin/kill"
 	rm "${pkgdir}/usr/share/man/man1/kill.1"
 }