Tue Sep 17 05:07:41 PDT 2013

5 files changed, 29 insertions, 60 deletions

diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 5697f8099..08713020d 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186025 2013-05-20 14:49:38Z bisson $
+# $Id: PKGBUILD 194510 2013-09-17 03:04:46Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=6.2p2
+pkgver=6.3p1
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -20,10 +20,10 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
         'sshd.service'
         'sshd.socket'
         'sshd.pam')
-sha1sums=('c2b4909eba6f5ec6f9f75866c202db47f3b501ba'
+sha1sums=('70845ca79474258cab29dbefae13d93e41a83ccb'
           '6df5be396f8c593bb511a249a1453294d18a01a6'
           '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
-          '2d87de52a6b2f764180f9f67cb9747392784b4a5'
+          'ec49c6beba923e201505f5669cea48cad29014db'
           'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
           'd93dca5ebda4610ff7647187f8928a3de28703f3')
 
@@ -66,7 +66,7 @@ package() {
 
 	make DESTDIR="${pkgdir}" install
 
-	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1
+	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
 	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
 
 	install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service
index 349bde59d..55ed95322 100644
--- a/core/openssh/sshd.service
+++ b/core/openssh/sshd.service
@@ -2,6 +2,7 @@
 Description=OpenSSH Daemon
 Wants=sshdgenkeys.service
 After=sshdgenkeys.service
+After=network.target
 
 [Service]
 ExecStart=/usr/bin/sshd -D
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index c08ca8b5b..748f15b86 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,36 +1,29 @@
-# $Id: PKGBUILD 188912 2013-06-25 10:40:52Z bisson $
+# $Id: PKGBUILD 194509 2013-09-17 03:04:40Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=procps-ng
 pkgver=3.3.8
-pkgrel=2
+pkgrel=3
 pkgdesc='Utilities for monitoring your system and its processes'
 url='http://gitorious.org/procps'
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64')
-groups=('base')
 depends=('ncurses')
-backup=('etc/sysctl.conf')
-source=("${pkgname}-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}"
-        'sysctl.conf')
-sha1sums=('63aed46ba4b5b05698beb25d2aa3eee6779d7f45'
-          'bc4e929a0ddcdcd627e8d15d30abcf185aa33fab')
+source=("http://downloads.sourceforge.net/project/${pkgname}/Production/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('4fa6a373f969989a9e490df5eb49a2df62eca19a')
+
+groups=('base')
 
 conflicts=('procps')
 provides=('procps')
 replaces=('procps')
 
 options=('!libtool')
-
-prepare() {
-	cd "${srcdir}/procps-procps"
-	echo ${pkgver} > .tarball-version
-	./autogen.sh
-}
+install=install
 
 build() {
-	cd "${srcdir}/procps-procps"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
 		--prefix=/usr \
 		--exec-prefix=/ \
@@ -43,9 +36,8 @@ build() {
 }
 
 package() {
-	cd "${srcdir}/procps-procps"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf"
 
 	# provided by util-linux
 	rm "${pkgdir}/usr/bin/kill"
diff --git a/core/procps-ng/install b/core/procps-ng/install
new file mode 100644
index 000000000..2e6546ecc
--- /dev/null
+++ b/core/procps-ng/install
@@ -0,0 +1,14 @@
+post_upgrade() {
+	if [[ $(vercmp $2 3.3.8-3) = -1 ]]; then
+		cat <<EOF
+
+==> The file /etc/sysctl.conf has been removed from this
+==> package, as all its settings are now kernel defaults.
+
+==> If you had customized it, you need to rename it as
+==> /etc/sysctl.d/99-sysctl.conf since from version 207 on
+==> systemd only applies settings from /etc/sysctl.d/* .
+
+EOF
+	fi
+}
diff --git a/core/procps-ng/sysctl.conf b/core/procps-ng/sysctl.conf
deleted file mode 100644
index fae2c6082..000000000
--- a/core/procps-ng/sysctl.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# Configuration file for runtime kernel parameters.
-# See sysctl.conf(5) for more information.
-
-# Have the CD-ROM close when you use it, and open when you are done.
-#dev.cdrom.autoclose = 1
-#dev.cdrom.autoeject = 1
-
-# Protection from the SYN flood attack.
-net.ipv4.tcp_syncookies = 1
-
-# See evil packets in your logs.
-#net.ipv4.conf.all.log_martians = 1
-
-# Never accept redirects or source routes (these are only useful for routers).
-#net.ipv4.conf.all.accept_redirects = 0
-#net.ipv4.conf.all.accept_source_route = 0
-#net.ipv6.conf.all.accept_redirects = 0
-#net.ipv6.conf.all.accept_source_route = 0
-
-# Disable packet forwarding.
-net.ipv4.ip_forward = 0
-net.ipv6.conf.all.forwarding = 0
-
-# Tweak the port range used for outgoing connections.
-#net.ipv4.ip_local_port_range = 32768 61000
-
-# Tweak those values to alter disk syncing and swap behavior.
-#vm.vfs_cache_pressure = 100
-#vm.laptop_mode = 0
-#vm.swappiness = 60
-
-# Tweak how the flow of kernel messages is throttled.
-#kernel.printk_ratelimit_burst = 10
-#kernel.printk_ratelimit = 5
-
-# Reboot 600 seconds after kernel panic or oops.
-#kernel.panic_on_oops = 1
-#kernel.panic = 600