simplify pcr/sysvinit

2 files changed, 44 insertions, 74 deletions

diff --git a/pcr/sysvinit/0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch b/pcr/sysvinit/0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch
deleted file mode 100644
index 4a7392f1e..000000000
--- a/pcr/sysvinit/0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 251ed68a591cd869b4d5d15bcb7da1f24a865550 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com>
-Date: Tue, 5 Nov 2013 08:15:59 +0100
-Subject: [PATCH] do not build sulogin on archlinux, it is provided by
- util-linux
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Mattias Andrée <maandree@operamail.com>
----
- src/Makefile | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/Makefile b/src/Makefile
-index 9e80533..1998d39 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -37,6 +37,13 @@ MAN1	+= utmpdump.1 wall.1
- MAN8	+= sulogin.8 bootlogd.8
- endif
- 
-+ifeq ($(DISTRO),archlinux)
-+SBIN	+= bootlogd
-+USRBIN	+= utmpdump wall
-+MAN1	+= utmpdump.1 wall.1
-+MAN8	+= bootlogd.8
-+endif
-+
- ifeq ($(DISTRO),Debian)
- CPPFLAGS+= -DACCTON_OFF
- SBIN	+= sulogin bootlogd
--- 
-1.8.4.2
-
diff --git a/pcr/sysvinit/PKGBUILD b/pcr/sysvinit/PKGBUILD
index f2f74c646..af61c4dec 100644
--- a/pcr/sysvinit/PKGBUILD
+++ b/pcr/sysvinit/PKGBUILD
@@ -1,62 +1,67 @@
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Maintainer (Manjaro): artoo <artoo@manjaro.org>
 # Contributor (Manjaro): Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer (Arch Linux): Eric Belanger <eric@archlinux.org>
 
 pkgname=sysvinit
 pkgver=2.88
-pkgrel=16.1
+pkgrel=16.2
 pkgdesc='Linux System V Init'
-url='http://savannah.nongnu.org/projects/sysvinit'
+url='http://www.nongnu.org/sysvinit/'
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
 depends=('glibc')
 conflicts=('systemd-sysvcompat')
 
 source=("http://download.savannah.gnu.org/releases/sysvinit/sysvinit-${pkgver}dsf.tar.bz2"
-        "0001-simplify-writelog.patch" "0002-remove-ansi-escape-codes-from-log-file.patch"
-	"0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch")
+        "0001-simplify-writelog.patch"
+        "0002-remove-ansi-escape-codes-from-log-file.patch")
 sha256sums=('60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519'
             '8126d09a35bdb9137bb19dc31b58cf1e829137fba34f7dcde7598018e1736826'
-            '90d38e4351ef9d77088661b411eb2b20eda435676e1e407f3d959ca2064d5c1e'
-	    '43fed9d36b92f15bcdbde6ba2a2784a57115562795942c09dd33ff37a51cb138')
+            '90d38e4351ef9d77088661b411eb2b20eda435676e1e407f3d959ca2064d5c1e')
 
-build()
-{
+prepare() {
     cd "$srcdir/$pkgname-${pkgver}dsf"
+
+    # FS#30005
     patch -p1 -d "src" -i "$srcdir/0001-simplify-writelog.patch"
     patch -p1 -d "src" -i "$srcdir/0002-remove-ansi-escape-codes-from-log-file.patch"
-    patch -p1          -i "$srcdir/0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch"
-
-    # Patch for Arch's Linux filesystem hierarchy
-    if [ "$(grep 'execv("/sbin/mount", args);' < src/killall5.c | wc -l)" = 1 ]; then
-        sed -i 's:execv("/bin/mount", args);::' src/killall5.c
-    fi
-    sed -i 's|/bin:/sbin:/usr/bin:/usr/sbin|/usr/bin|' src/initscript.sample src/init.h src/shutdown.c
-    sed -i 's|/sbin:/usr/sbin:/bin:/usr/bin|/usr/bin|' src/initscript.sample src/init.h src/shutdown.c
-    sed -i 's|/bin:/usr/bin:/sbin:/usr/sbin|/usr/bin|' src/initscript.sample src/init.h src/shutdown.c
-    sed -i 's:/sbin/:/bin/:g'    contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} src/initscript.sample
-    sed -i 's:/bin/:/usr/bin/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} src/initscript.sample
-    sed -i 's:/usr/usr/:/usr/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} src/initscript.sample
-
-    make DISTRO=archlinux
 }
 
-package()
-{
+build() {
     cd "$srcdir/$pkgname-${pkgver}dsf"
-    mkdir -p "$pkgdir/__temp__"
-    make DISTRO=archlinux ROOT="$pkgdir/__temp__" install
-    cd "$pkgdir/__temp__"
-    rm -r bin usr/bin usr/share/man/man?/{mesg,utmpdump,wall,last,pidof}.? usr/share/man/man1
-    find . | while read file; do
-        if [ -d "$file" ]; then
-            mkdir -p ".$file"
-        else
-            cp "$file" ".$file"
-        fi
-    done
-    cd ..
-    rm -r "__temp__"
-    mv "$pkgdir/sbin" "$pkgdir/usr/bin"
+    make
 }
 
+package() {
+    cd "$srcdir/$pkgname-${pkgver}dsf"
+
+    mkdir -p "$pkgdir/usr/bin"
+    ln -s usr/bin "$pkgdir/bin"
+    ln -s usr/bin "$pkgdir/sbin"
+    make ROOT="$pkgdir" install
+    rm "$pkgdir/bin" "$pkgdir/sbin"
+
+    local rmprogs=(
+        # provided by util-linux
+        last
+        lastb
+        mesg
+        mountpoint
+        sulogin
+        utmpdump
+        wall
+        # provided by procps-ng
+        pidof
+    )
+    cd "$pkgdir"
+    local prog
+    for prog in "${rmprogs[@]}"; do
+        rm usr/bin/"$prog" usr/share/man/man?/"$prog".?
+    done
+
+    # old Arch Linux sysvinit would have split out fstab-decode,
+    # killall5, and bootlogd into a separate sysvinit-tools package.
+    # Unfortunately, because sysvinit-tools provided pidof, procps-ng
+    # still conflicts=(sysvinit-tools).
+}