[arch-commits] Commit in procps-ng/trunk (PKGBUILD install sysctl.conf)

[Gaetan Bisson]

    Date: Friday, September 13, 2013 @ 19:45:41
  Author: bisson
Revision: 194333

deprecate sysctl.conf; inform users of systemd's switch to /etc/sysctl.d/; switch to sourceforge URL

Added:
  procps-ng/trunk/install
Modified:
  procps-ng/trunk/PKGBUILD
Deleted:
  procps-ng/trunk/sysctl.conf

-------------+
 PKGBUILD    |   24 ++++++++----------------
 install     |   14 ++++++++++++++
 sysctl.conf |   38 --------------------------------------
 3 files changed, 22 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-13 16:44:02 UTC (rev 194332)
+++ PKGBUILD	2013-09-13 17:45:41 UTC (rev 194333)
@@ -4,33 +4,26 @@
 
 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')
+install=install
 
-prepare() {
-	cd "${srcdir}/procps-procps"
-	echo ${pkgver} > .tarball-version
-	./autogen.sh
-}
-
 build() {
-	cd "${srcdir}/procps-procps"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
 		--prefix=/usr \
 		--exec-prefix=/ \
@@ -43,9 +36,8 @@
 }
 
 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"

Added: install
===================================================================
--- install	                        (rev 0)
+++ install	2013-09-13 17:45:41 UTC (rev 194333)
@@ -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
+}

Deleted: sysctl.conf
===================================================================
--- sysctl.conf	2013-09-13 16:44:02 UTC (rev 194332)
+++ sysctl.conf	2013-09-13 17:45:41 UTC (rev 194333)
@@ -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