community/inetutils-syslogd: modernize

- Fix license
- Split $pkgname-openrc
- Fix indentation
- Use modern style
- Enable check

2 files changed, 113 insertions, 44 deletions

diff --git a/community/inetutils-syslogd/APKBUILD b/community/inetutils-syslogd/APKBUILD
index 28691ef40e..e007e9df5c 100644
--- a/community/inetutils-syslogd/APKBUILD
+++ b/community/inetutils-syslogd/APKBUILD
@@ -3,38 +3,36 @@
 pkgname=inetutils-syslogd
 _pkgname=inetutils
 pkgver=1.9.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A small syslogd for logging to multiple files"
 url="https://www.gnu.org/software/inetutils/"
 arch="all"
-license="GPL-3.0"
+license="GPL-3.0-or-later"
 depends_dev="readline-dev ncurses-dev"
 makedepends="$depends_dev"
 install="$pkgname.post-install $pkgname.post-deinstall"
-subpackages="$pkgname-doc"
-options="!check"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="https://ftp.gnu.org/gnu/inetutils/${_pkgname}-${pkgver}.tar.gz
 	$pkgname.initd
 	$pkgname.confd
 	syslog.conf
 	$pkgname.logrotate
 	$pkgname.setup
+	disable-ci-tests.patch
 	"
 
-_builddir="$srcdir"/$_pkgname-$pkgver
+builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$_builddir"
-
-        ./configure \
-                --build=$CBUILD \
-                --host=$CHOST \
-                --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libexec=/usr/sbin \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info \
-                --localstatedir=/var \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
 		--without-wrap --without-pam \
 		--disable-ftp --disable-ftpd \
 		--disable-telnet --disable-telnetd \
@@ -47,53 +45,38 @@ build() {
 		--disable-ping --disable-ping6 \
 		--disable-logger --enable-syslogd \
 		--disable-inetd --disable-whois --disable-dnsdomainname \
-		--disable-uucpd --disable-ifconfig --disable-traceroute \
-		|| return 1
-        make || return 1
+		--disable-uucpd --disable-ifconfig --disable-traceroute
+	make
 }
 
 check() {
-	cd "$srcdir/${_pkgname}-${pkgver}"
 	make check
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="${pkgdir}" install || return 1
-	#binary installed to /usr/sbin not bin
+	make DESTDIR="${pkgdir}" install
+	# binary installed to /usr/sbin not bin
 	rm -rf "$pkgdir"/usr/bin \
-		"$pkgdir"/usr/lib/charset.alias \
-		|| return 1
+		"$pkgdir"/usr/lib/charset.alias
 
 	#install init script & config defaults
-        install -m755 -D "$srcdir"/$pkgname.initd \
-                "$pkgdir"/etc/init.d/$pkgname || return 1
-        install -m644 -D "$srcdir"/$pkgname.confd \
-                "$pkgdir"/etc/conf.d/$pkgname || return 1
+	install -m755 -D "$srcdir"/$pkgname.initd \
+		"$pkgdir"/etc/init.d/$pkgname
+	install -m644 -D "$srcdir"/$pkgname.confd \
+		"$pkgdir"/etc/conf.d/$pkgname
 	install -m644 -D "$srcdir"/syslog.conf \
-                "$pkgdir"/etc/syslog.conf || return 1
+		"$pkgdir"/etc/syslog.conf
 	install -m644 -D "$srcdir"/inetutils-syslogd.logrotate \
-                "$pkgdir"/etc/logrotate.d/inetutils-syslogd || return 1
+		"$pkgdir"/etc/logrotate.d/inetutils-syslogd
 	install -m755 -D "$srcdir"/inetutils-syslogd.setup \
-                "$pkgdir"/sbin/setup-inetutils-syslogd || return 1
+		"$pkgdir"/sbin/setup-inetutils-syslogd
 	mkdir -p "$pkgdir/usr/share/apk-tools/$pkgname"
 }
 
-md5sums="04852c26c47cc8c6b825f2b74f191f52  inetutils-1.9.4.tar.gz
-4a5ed84baf026fe2e686b9e915d140e3  inetutils-syslogd.initd
-edf3f502d9f2bf49c5da8cb37a927d06  inetutils-syslogd.confd
-9c9998ff341c48322ffdc8f48fa018cf  syslog.conf
-842e971153c19cb328db2cc6e22a7baf  inetutils-syslogd.logrotate
-82d3bf51747654410b2dbd4075e940b4  inetutils-syslogd.setup"
-sha256sums="be8f75eff936b8e41b112462db51adf689715658a1b09e0d6b05d11ec92cc616  inetutils-1.9.4.tar.gz
-a0bc678a83103ee412c6c57a5f5e0bc4c66f579f7e839f71aac99d329719c80f  inetutils-syslogd.initd
-86105f0a0105f50275f7381b5d7fe603b8d854a0e6753c2f06f6d0c234562948  inetutils-syslogd.confd
-0b3f080466437a068d1627a00a5abdf494fdefa2e17821b993462d0310e60cc3  syslog.conf
-f2afe7dad8cd933fbd213b20f09127096f8798698874b2ead2d47a6509f95f6c  inetutils-syslogd.logrotate
-f293c6221c89f6d3eb4a557fe68ca66cc92696c95b48182821aa5aa61f9a2c8f  inetutils-syslogd.setup"
 sha512sums="8074eb230c64d8fb0f3a20825b9329e5648b81941bb3441c5ffe2661c428f93fe2bac222d5334e75ef182083124c4bc5d7ebf8090ed667e4ae33b9aaacbc6dcb  inetutils-1.9.4.tar.gz
 75d5681d08a391956e0f0510eadb20c3ba74de4026f76ea0a54c3e34bb53655ff6cbe3087c0953343fdef3b05864a4dc7d9d12ed26836f8986859868f0076c79  inetutils-syslogd.initd
 82968692b4fe79706aacaeb1021b343288dc4f1d86925481796dac1f743a8269976ce86bf446cd0c16d246b918e5822e312660b201407eb7031a17cb398c9513  inetutils-syslogd.confd
 d9c61aee1a3f2c7cf7b06dfda08599c08f1f618ba092e60adff11e9cbe5be847544780eaa9e4bb54a70c5e5bc243fed3d6ff8111878f073b41629db4245b135c  syslog.conf
 ffe2b1fd6b9d4dc9e378f0c857be318ec86e48aee17ede865656bdf9a5da3d2f3a8ffe788cd62794132839577ab6ce1ce7fe3a964bc21e0f8b698827a9ee5817  inetutils-syslogd.logrotate
-a3c54be2c2154adec3b5d8cf68e43f274eb42ac2e02f3ea39235a11f333d1cc88ea2d0af93daf5095c8de7dfbbc147c53d97bbfce3944f50858ee97907270bf7  inetutils-syslogd.setup"
+a3c54be2c2154adec3b5d8cf68e43f274eb42ac2e02f3ea39235a11f333d1cc88ea2d0af93daf5095c8de7dfbbc147c53d97bbfce3944f50858ee97907270bf7  inetutils-syslogd.setup
+27fc3dfa31a55647c08ed14768fa32ad91fd0208f03e6a9d3360c3b830f742fa0533c0b1baab6248364278b7b4601aed2c2048f959aa02880413b0db471bc838  disable-ci-tests.patch"
diff --git a/community/inetutils-syslogd/disable-ci-tests.patch b/community/inetutils-syslogd/disable-ci-tests.patch
new file mode 100644
index 0000000000..e80505b476
--- /dev/null
+++ b/community/inetutils-syslogd/disable-ci-tests.patch
@@ -0,0 +1,86 @@
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 601eb30..2ddcfa1 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -110,8 +110,6 @@ noinst_PROGRAMS = identify$(EXEEXT) $(am__EXEEXT_2)
+ check_PROGRAMS = localhost$(EXEEXT) readutmp$(EXEEXT) \
+ 	waitdaemon$(EXEEXT) $(am__EXEEXT_1)
+ @ENABLE_inetd_TRUE@am__append_1 = addrpeek tcpget
+-@ENABLE_libls_TRUE@am__append_2 = ls
+-@ENABLE_libls_TRUE@am__append_3 = libls.sh
+ @ENABLE_ping_TRUE@am__append_4 = ping-localhost.sh
+ @ENABLE_traceroute_TRUE@am__append_5 = traceroute-localhost.sh
+ @ENABLE_inetd_TRUE@@ENABLE_tftp_TRUE@@ENABLE_tftpd_TRUE@am__append_6 = tftp.sh
+@@ -241,7 +239,6 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ @ENABLE_inetd_TRUE@am__EXEEXT_1 = addrpeek$(EXEEXT) tcpget$(EXEEXT)
+-@ENABLE_libls_TRUE@am__EXEEXT_2 = ls$(EXEEXT)
+ PROGRAMS = $(noinst_PROGRAMS)
+ addrpeek_SOURCES = addrpeek.c
+ addrpeek_OBJECTS = addrpeek.$(OBJEXT)
+@@ -257,8 +254,6 @@ localhost_LDADD = $(LDADD)
+ localhost_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ ls_SOURCES = ls.c
+ ls_OBJECTS = ls.$(OBJEXT)
+-@ENABLE_libls_TRUE@ls_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-@ENABLE_libls_TRUE@	$(am__DEPENDENCIES_1)
+ readutmp_SOURCES = readutmp.c
+ readutmp_OBJECTS = readutmp.$(OBJEXT)
+ readutmp_LDADD = $(LDADD)
+@@ -271,7 +266,7 @@ waitdaemon_SOURCES = waitdaemon.c
+ waitdaemon_OBJECTS = waitdaemon.$(OBJEXT)
+ waitdaemon_LDADD = $(LDADD)
+ waitdaemon_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__dist_check_SCRIPTS_DIST = utmp.sh libls.sh ping-localhost.sh \
++am__dist_check_SCRIPTS_DIST = utmp.sh ping-localhost.sh \
+ 	traceroute-localhost.sh tftp.sh syslogd.sh ftp-parser.sh \
+ 	ftp-localhost.sh inetd.sh telnet-localhost.sh hostname.sh \
+ 	dnsdomainname.sh ifconfig.sh
+@@ -1147,7 +1142,6 @@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+ LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
+ LIBIDN = @LIBIDN@
+ LIBINTL = @LIBINTL@
+-LIBLS = @LIBLS@
+ LIBMULTITHREAD = @LIBMULTITHREAD@
+ LIBNCURSES = @LIBNCURSES@
+ LIBOBJS = @LIBOBJS@
+@@ -1477,7 +1471,6 @@ enable_ftpd = @enable_ftpd@
+ enable_hostname = @enable_hostname@
+ enable_ifconfig = @enable_ifconfig@
+ enable_inetd = @enable_inetd@
+-enable_libls = @enable_libls@
+ enable_logger = @enable_logger@
+ enable_ping = @enable_ping@
+ enable_ping6 = @enable_ping6@
+@@ -1533,7 +1526,6 @@ iu_INCLUDES = @iu_INCLUDES@
+ iu_LIBRARIES = @iu_LIBRARIES@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libls_BUILD = @libls_BUILD@
+ lispdir = @lispdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+@@ -1620,7 +1612,6 @@ dist_check_SCRIPTS = utmp.sh $(am__append_3) $(am__append_4) \
+ 	$(am__append_5) $(am__append_6) $(am__append_7) \
+ 	$(am__append_8) $(am__append_9) $(am__append_10) \
+ 	$(am__append_11) $(am__append_12) $(am__append_13)
+-@ENABLE_libls_TRUE@ls_LDADD = $(LIBLS) $(iu_LIBRARIES)
+ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
+ EXTRA_DIST = tools.sh.in ifconfig_modes.sh
+ BUILT_SOURCES = tools.sh
+@@ -1945,13 +1936,6 @@ utmp.sh.log: utmp.sh
+ 	--log-file $$b.log --trs-file $$b.trs \
+ 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-libls.sh.log: libls.sh
+-	@p='libls.sh'; \
+-	b='libls.sh'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ ping-localhost.sh.log: ping-localhost.sh
+ 	@p='ping-localhost.sh'; \
+ 	b='ping-localhost.sh'; \
+