Merge branch 'master' of ssh://gparabola/srv/git/abslibre

5 files changed, 76 insertions, 15 deletions

diff --git a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
new file mode 100755
index 000000000..a9b7a2423
--- /dev/null
+++ b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
@@ -0,0 +1,29 @@
+From 55bd14c586f0f64b8ee5515161be1aa1098d3226 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Tue, 3 Jul 2012 22:28:05 -0400
+Subject: [initscripts][PATCH] remove /run/nologin before leaving rc.multi
+To: arch-projects@archlinux.org
+
+systemd-186 writes this file when running systemd-tmpfiles, but
+initscripts never removes it. This disallows all non-root logins.
+
+Reported-by: Dan McGee <dan@archlinux.org>
+Signed-off-by: Dave Reisner <dreisner@archlinux.org>
+---
+ rc.multi | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/rc.multi b/rc.multi
+index daf2372..7d4acaa 100755
+--- a/rc.multi
++++ b/rc.multi
+@@ -31,4 +31,6 @@ run_hook multi_end
+ 
+ bootlogd_stop
+ 
++rm -f /run/nologin
++
+ # vim: set ts=2 sw=2 noet:
+-- 
+1.7.11.1
+
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index e58947f8d..1f68a6356 100644..100755
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -1,33 +1,37 @@
-# $Id: PKGBUILD 144989 2011-12-13 15:25:38Z tomegun $
+# $Id: PKGBUILD 167943 2012-10-03 23:12:35Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2012.05.2
-pkgrel=2
+pkgver=2012.10.5
+pkgrel=1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('any')
 url="https://parabolagnulinux.org"
 license=('GPL2')
 groups=('base')
-backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
-depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=182' 'udev<=183' 'iproute2'
-         'ncurses' 'kbd' 'findutils' 'sysvinit')
-optdepends=('bridge-utils: Network bridging support'
-            'dhcpcd: DHCP network configuration'
-            'net-tools: legacy network support'
-            'wireless_tools: Wireless networking')
+provides=('initscripts-systemd')
+conflicts=('initscripts-systemd')
+replaces=('initscripts-systemd')
+backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
+depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit-tools')
+optdepends=('dhcpcd: DHCP network configuration'
+            'bridge-utils: Legacy network bridging support'
+            'net-tools: Legacy network support'
+            'wireless_tools: Legacy wireless networking'
+            'sysvinit: Legacy init support')
 makedepends=(asciidoc)
 install=initscripts.install
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
-        'wireless.conf.d')
-md5sums=('2b845c1c6660b32720aa12aa5f9649be'
-         '027576534885b8d5dded9be546057b12')
+source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"{,.sig})
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
+
   make DESTDIR=${pkgdir} install
-  install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
+md5sums=('16039aeb4c996194d9466a8c66a06f5a'
+         '522804c7981c32c3c779964844d64377')
+md5sums=('3be94446496bda58051141e0d3863a7b'
+         '3f03d3a5c7d8b7e1ddebb13334441440')
diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install
index 963713bee..557faafe4 100644..100755
--- a/libre/initscripts/initscripts.install
+++ b/libre/initscripts/initscripts.install
@@ -16,4 +16,11 @@ post_upgrade() {
     echo "If using non-bash-compatible shell, please set LANG in /etc/locale.conf,"
     echo "as LOCALE in /etc/rc.conf no longer works."
   fi
+  if [ "$(vercmp $2 2012.08.1)" -lt 0 ]; then
+    echo "----"
+    echo "> initscripts now ships a compatibility layer to make systemd use MODULES and"
+    echo "> DAEMONS from rc.conf; and run rc.local and rc.local.shutdown on boot and"
+    echo "> shutdown, respectively. Refer to arch-modules-load(8) and arch-daemons(8)."
+    echo "----"
+  fi
 }
diff --git a/libre/initscripts/split-hwclock-calls.diff b/libre/initscripts/split-hwclock-calls.diff
new file mode 100644
index 000000000..c0a6a4fd6
--- /dev/null
+++ b/libre/initscripts/split-hwclock-calls.diff
@@ -0,0 +1,21 @@
+diff --git a/rc.sysinit b/rc.sysinit
+index eb49e2b..8f9727b 100755
+--- a/rc.sysinit
++++ b/rc.sysinit
+@@ -34,7 +34,6 @@ bootlogd -p /run/bootlogd.pid
+ 
+ run_hook sysinit_start
+ 
+-HWCLOCK_PARAMS="--systz"
+ case $HARDWARECLOCK in
+ 	"") ;;
+ 	UTC) HWCLOCK_PARAMS+=" --utc --noadjfile";;
+@@ -54,7 +53,7 @@ if [[ $HWCLOCK_PARAMS ]]; then
+ 
+ 	[[ $TIMEZONE ]] && export TZ=$TIMEZONE
+ 
+-	hwclock $HWCLOCK_PARAMS && stat_done || stat_fail
++	{ hwclock $HWCLOCK_PARAMS && hwclock --systz; } && stat_done || stat_fail
+ 
+ 	unset TZ
+ fi
diff --git a/libre/initscripts/wireless.conf.d b/libre/initscripts/wireless.conf.d
index 47540ef40..47540ef40 100644..100755
--- a/libre/initscripts/wireless.conf.d
+++ b/libre/initscripts/wireless.conf.d