From d081eb279e9b55290e8f81900113341b57f64aac Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Tue, 11 May 2021 21:55:05 +0200
Subject: [PATCH] runit: use git.sr.ht/~grimler/runit for source

Runit there has been converted to use autoconf and automake, and some
additional patches from other distros has been added.

Not a lot of functional changes for now.  Package size has been
decreased by ~80 % by moving common code to a shared library.
---
 packages/runit/Makefile.patch | 14 --------------
 packages/runit/build.sh       | 17 +++++++----------
 packages/runit/compiler.patch | 10 ----------
 packages/runit/linker.patch   |  7 -------
 4 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 packages/runit/Makefile.patch
 delete mode 100644 packages/runit/compiler.patch
 delete mode 100644 packages/runit/linker.patch

diff --git a/packages/runit/Makefile.patch b/packages/runit/Makefile.patch
deleted file mode 100644
index ce0ea8b31c..0000000000
--- a/packages/runit/Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../src.orig/runit-2.1.2/src/Makefile	2020-06-10 13:15:17.927086588 +0200
-+++ ./runit-2.1.2/src/Makefile	2020-06-10 13:39:52.277171576 +0200
-@@ -232,9 +232,8 @@
- hassgprm.h: choose compile hassgprm.h1 hassgprm.h2 load trysgprm.c
- 	./choose cl trysgprm hassgprm.h1 hassgprm.h2 > hassgprm.h
- 
--hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \
--tryshsgr.c warn-shsgr
--	./chkshsgr || ( cat warn-shsgr; exit 1 )
-+hasshsgr.h: choose compile hasshsgr.h1 hasshsgr.h2 load \
-+tryshsgr.c
- 	./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
- 
- haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c
diff --git a/packages/runit/build.sh b/packages/runit/build.sh
index 3ba565c822..d209cd6944 100644
--- a/packages/runit/build.sh
+++ b/packages/runit/build.sh
@@ -1,17 +1,14 @@
 TERMUX_PKG_HOMEPAGE=http://smarden.org/runit
 TERMUX_PKG_DESCRIPTION="Tools to provide service supervision and to manage services"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
-TERMUX_PKG_LICENSE_FILE="runit-2.1.2/package/COPYING"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 TERMUX_PKG_VERSION=2.1.2
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SRCURL=http://smarden.org/runit/runit-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18
-TERMUX_PKG_EXTRA_MAKE_ARGS="-C runit-${TERMUX_PKG_VERSION}/src"
-TERMUX_PKG_BUILD_IN_SRC=true
+TERMUX_PKG_REVISION=2
+_COMMIT=d24ac1333e34a73c5349030aef1c64c5cc1318cc
+TERMUX_PKG_SRCURL=https://git.sr.ht/~grimler/runit/archive/$_COMMIT.tar.gz
+TERMUX_PKG_SHA256=f6d14f4107ba106bbfef15fd9f71ea3b70c1154169fc7efadd868cceb376b35f
+TERMUX_PKG_RM_AFTER_INSTALL="bin/runit-init share/man/man8/runit-init.8"
 
-termux_step_make_install() {
-	install -Dm755 runit-${TERMUX_PKG_VERSION}/src/{chpst,runit,runsv,runsvchdir,runsvdir,sv,svlogd,utmpset} $TERMUX_PREFIX/bin/
-	mkdir -p $TERMUX_PREFIX/share/man/man8
-	install -Dm644 runit-${TERMUX_PKG_VERSION}/man/{chpst,runit,runsv,runsvchdir,runsvdir,sv,svlogd,utmpset}.8 $TERMUX_PREFIX/share/man/man8/
+termux_step_pre_configure() {
+	autoreconf -vfi
 }
diff --git a/packages/runit/compiler.patch b/packages/runit/compiler.patch
deleted file mode 100644
index 3d41d39db3..0000000000
--- a/packages/runit/compiler.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../src.orig/runit-2.1.2/src/conf-cc	2020-06-10 13:15:17.927086588 +0200
-+++ ./runit-2.1.2/src/conf-cc	2020-06-10 13:27:28.210306192 +0200
-@@ -1,5 +1,5 @@
--gcc -O2 -Wall
-+${CC} ${CPPFLAGS} ${CFLAGS}
- 
--gcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
-+${CC} -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings ${CPPFLAGS} ${CFLAGS}
- 
- This will be used to compile .c files.
diff --git a/packages/runit/linker.patch b/packages/runit/linker.patch
deleted file mode 100644
index 3bf142f1c7..0000000000
--- a/packages/runit/linker.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- ../src.orig/runit-2.1.2/src/conf-ld	2020-06-10 13:15:17.927086588 +0200
-+++ ./runit-2.1.2/src/conf-ld	2020-06-10 13:33:42.302118866 +0200
-@@ -1,3 +1,3 @@
--gcc -s
-+${CC} ${LDFLAGS} -s
- 
- This will be used to link .o files into an executable.