[arch-commits] Commit in initscripts/trunk (2 files)

[Tom Gundersen]

    Date: Friday, July 20, 2012 @ 19:43:38
  Author: tomegun
Revision: 163825

upgpkg: initscripts 2012.07.3-1

upstream release

Modified:
  initscripts/trunk/PKGBUILD
Deleted:
  initscripts/trunk/0001-remove-run-nologin-before-leaving-rc.multi.patch

-------------------------------------------------------+
 0001-remove-run-nologin-before-leaving-rc.multi.patch |   29 ----------------
 PKGBUILD                                              |   20 ++---------
 2 files changed, 5 insertions(+), 44 deletions(-)

Deleted: 0001-remove-run-nologin-before-leaving-rc.multi.patch
===================================================================
--- 0001-remove-run-nologin-before-leaving-rc.multi.patch	2012-07-20 23:07:42 UTC (rev 163824)
+++ 0001-remove-run-nologin-before-leaving-rc.multi.patch	2012-07-20 23:43:38 UTC (rev 163825)
@@ -1,29 +0,0 @@
-From 55bd14c586f0f64b8ee5515161be1aa1098d3226 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner at archlinux.org>
-Date: Tue, 3 Jul 2012 22:28:05 -0400
-Subject: [initscripts][PATCH] remove /run/nologin before leaving rc.multi
-To: arch-projects at 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 at archlinux.org>
-Signed-off-by: Dave Reisner <dreisner at 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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-20 23:07:42 UTC (rev 163824)
+++ PKGBUILD	2012-07-20 23:43:38 UTC (rev 163825)
@@ -4,14 +4,14 @@
 # Contributor: Aaron Griffin <aaron at archlinux.org>
 
 pkgname=initscripts
-pkgver=2012.06.3
-pkgrel=2
+pkgver=2012.07.3
+pkgrel=1
 pkgdesc="System initialization/bootup scripts"
 arch=('any')
 url="http://www.archlinux.org"
 license=('GPL2')
 groups=('base')
-backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
+backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
 depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit')
 optdepends=('bridge-utils: Network bridging support'
             'dhcpcd: DHCP network configuration'
@@ -19,20 +19,10 @@
             'wireless_tools: Wireless networking')
 makedepends=(asciidoc)
 install=initscripts.install
-source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz"
-        0001-remove-run-nologin-before-leaving-rc.multi.patch
-        'wireless.conf.d')
+source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz")
 
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch"
-}
-
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
-md5sums=('34493c768b587ac59c6ee7e14f275c1d'
-         'ba32b9d723c20b38487669fb3c00d3d5'
-         '027576534885b8d5dded9be546057b12')
+md5sums=('41595cf7786fb836b3e510c53d2c426a')