Light cleanup of the repos

srcpkgs/booster-evolution/template

@@ -1,7 +1,7 @@
 # Template file for 'booster-evolution'
 pkgname=booster-evolution
 version=0.11
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/anatol/booster
 hostmakedepends="git ruby-ronn"
@@ -10,7 +10,7 @@ maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
 license="MIT"
 homepage="https://github.com/anatol/booster"
 conf_files="/etc/booster.yaml"
-distfiles="https://github.com/anatol/booster/archive/${version}.tar.gz"
+#distfiles="https://github.com/anatol/booster/archive/${version}.tar.gz"
 checksum=2f111b1729143c38ec287e5567ae9f57e0fb8118cc11afa22657da8ac9b0105a
 replaces="booster"
 alternatives="
@@ -23,6 +23,11 @@ _build_component() {
 }
 
 do_build() {
+
+        git clone https://github.com/anatol/booster.git --branch=wip
+        mv booster/* .
+        rm -rf booster
+
 	( cd generator && _build_component )
 	( cd init && CGO_ENABLED=0 _build_component )
 

srcpkgs/busybox-full/template

@@ -1,31 +0,0 @@
-# Template file for 'busybox'
-pkgname=busybox-full
-version=1.35.0
-revision=0
-short_desc="Swiss Army Knife of Embedded Linux - Full (not my software)"
-maintainer="Johnathon Li <jliwin98@danwin1210.de>"
-license="GPL-2.0-only"
-homepage="https://www.busybox.net"
-makedepends="curl"
-conflicts="busybox>=0 busybox-huge>=0 busybox-core>=0"
-
-_alternatives_core="
- ash:ash:/usr/bin/busybox
- awk:awk:/usr/bin/busybox
- hostname:hostname:/usr/bin/busybox
- sh:sh:/usr/bin/busybox
- vi:vi:/usr/bin/busybox
- logger:logger:/usr/bin/busybox"
-
-_alternatives="
- ${_alternatives_core}
- ntpd:ntpd:/usr/bin/busybox
- ntpd:ntpd:/etc/sv/busybox-ntpd"
-
-alternatives="${_alternatives}"
-register_shell="/usr/bin/ash"
-
-do_install() {
-	curl -Lo busybox https://busybox.net/downloads/binaries/${version}-$(uname -m)-linux-${XBPS_TARGET_LIBC}/busybox
-	vbin busybox
-}

srcpkgs/dhcpcd/files/dhcpcd-eth0/run

@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-[ -r conf ] && . ./conf
-exec dhcpcd -B eth0

srcpkgs/dhcpcd/files/dhcpcd/run

@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-[ -r conf ] && . ./conf
-exec dhcpcd -B

srcpkgs/dhcpcd/patches/Linux-Improve-learning-IPv6-address-flags.patch

@@ -1,62 +0,0 @@
-From 45e441ada6d3ea4355d623cf12d9a559a5c2afde Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Tue, 23 May 2023 22:14:57 +0100
-Subject: [PATCH] Linux: Improve learning IPv6 address flags
-
-Rather than matching addresses during netlink message processing,
-extract the local, address and flag parts.
-Once done, then match local and address to the address we are
-looking for and if equal apply the flags.
-
-Fixes #201 and maybe #149.
----
- src/if-linux.c | 24 +++++++++++++++++-------
- 1 file changed, 17 insertions(+), 7 deletions(-)
-
-diff --git a/src/if-linux.c b/src/if-linux.c
-index f2f609ed..212ed5df 100644
---- a/src/if-linux.c
-+++ b/src/if-linux.c
-@@ -1996,7 +1996,8 @@ _if_addrflags6(__unused struct dhcpcd_ctx *ctx,
- 	size_t len;
- 	struct rtattr *rta;
- 	struct ifaddrmsg *ifa;
--	bool matches_addr = false;
-+	struct in6_addr *local = NULL, *address = NULL;
-+	uint32_t *flags = NULL;
- 
- 	ifa = NLMSG_DATA(nlm);
- 	if (ifa->ifa_index != ia->ifa_ifindex || ifa->ifa_family != AF_INET6)
-@@ -2007,17 +2008,26 @@ _if_addrflags6(__unused struct dhcpcd_ctx *ctx,
- 	for (; RTA_OK(rta, len); rta = RTA_NEXT(rta, len)) {
- 		switch (rta->rta_type) {
- 		case IFA_ADDRESS:
--			if (IN6_ARE_ADDR_EQUAL(&ia->ifa_addr, (struct in6_addr *)RTA_DATA(rta)))
--				ia->ifa_found = matches_addr = true;
--			else
--				matches_addr = false;
-+			address = (struct in6_addr *)RTA_DATA(rta);
-+			break;
-+		case IFA_LOCAL:
-+			local = (struct in6_addr *)RTA_DATA(rta);
- 			break;
- 		case IFA_FLAGS:
--			if (matches_addr)
--				memcpy(&ia->ifa_flags, RTA_DATA(rta), sizeof(ia->ifa_flags));
-+			flags = (uint32_t *)RTA_DATA(rta);
- 			break;
- 		}
- 	}
-+
-+	if (local) {
-+	       if (IN6_ARE_ADDR_EQUAL(&ia->ifa_addr, local))
-+			ia->ifa_found = true;
-+	} else if (address) {
-+	       if (IN6_ARE_ADDR_EQUAL(&ia->ifa_addr, address))
-+			ia->ifa_found = true;
-+	}
-+	if (flags && ia->ifa_found)
-+		memcpy(&ia->ifa_flags, flags, sizeof(ia->ifa_flags));
- 	return 0;
- }
- 

srcpkgs/dhcpcd/patches/privsep-ppc-build.patch

@@ -1,24 +0,0 @@
-From 76ec6a63705e1c3591b4da94c10047a79f0f49db Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 20 Dec 2020 15:16:08 +0100
-Subject: [PATCH] fix privsep build on ppc*
-
----
- src/privsep-linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git src/privsep-linux.c src/privsep-linux.c
-index e588ecd..9d335ca 100644
---- a/src/privsep-linux.c
-+++ b/src/privsep-linux.c
-@@ -42,6 +42,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <termios.h>
- 
- #include "common.h"
- #include "if.h"
--- 
-2.29.2
-

srcpkgs/dhcpcd/patches/wpa-hook-stop.patch

@@ -1,10 +0,0 @@
---- a/hooks/10-wpa_supplicant	2014-11-26 16:34:35.000000000 +0100
-+++ b/hooks/10-wpa_supplicant	2014-11-28 11:53:48.929217243 +0100
-@@ -114,6 +114,6 @@ then
- 	case "$reason" in
- 	PREINIT)	wpa_supplicant_start;;
- 	RECONFIGURE)	wpa_supplicant_reconfigure;;
--	DEPARTED)	wpa_supplicant_stop;;
-+	DEPARTED|STOPPED)	wpa_supplicant_stop;;
- 	esac
- fi

srcpkgs/dhcpcd/template

@@ -1,36 +0,0 @@
-# Template file for 'dhcpcd'
-pkgname=dhcpcd
-version=10.0.1
-revision=3
-build_style=configure
-make_check_target=test
-configure_args="
- --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run/dhcpcd
- $(vopt_if privsep --privsepuser=_dhcpcd) $(vopt_enable privsep)"
-hostmakedepends="ntp pkg-config"
-makedepends="eudev-libudev-devel"
-short_desc="RFC2131 compliant DHCP client"
-maintainer="Cameron Nemo <cam@nohom.org>"
-license="BSD-2-Clause"
-homepage="https://roy.marples.name/projects/dhcpcd"
-distfiles="https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/v${version}.tar.gz"
-checksum=2bd3480bc93e6bff530872b8bc80cbcaa821449f7bf6aaf202fa12fb8c2e6f55
-lib32disabled=yes
-conf_files=/etc/dhcpcd.conf
-
-system_accounts="_dhcpcd"
-_dhcpcd_homedir="/var/db/dhcpcd"
-
-build_options="privsep"
-desc_option_privsep="Enable privilege separation mode for the daemon"
-
-post_install() {
-	vsv dhcpcd
-	vsv dhcpcd-eth0
-
-	# Enable controlgroup by default, to make dhcpcd-ui work.
-	vsed -e 's,^#\(controlgroup.*\),\1,' -i ${DESTDIR}/etc/dhcpcd.conf
-
-	# License
-	vlicense LICENSE
-}

srcpkgs/runit-void-apparmor

@@ -1 +0,0 @@
-runit-void

srcpkgs/runit-void/INSTALL

@@ -1,26 +0,0 @@
-case "${ACTION}" in
-post)
-	# Enable default services:
-	#	- agetty-tty[1-4] (default)
-	#	- udevd (default)
-	#	- sulogin (single)
-	mkdir -p etc/runit/runsvdir/single
-	ln -sf /etc/sv/sulogin etc/runit/runsvdir/single
-
-	mkdir -p etc/runit/runsvdir/default
-	if [ ! -e etc/runit/runsvdir/current ]; then
-		ln -sf default etc/runit/runsvdir/current
-	fi
-	for f in 1 2 3 4 5 6; do
-		[ -e /etc/sv/agetty-tty${f}/down ] || ln -sf /etc/sv/agetty-tty$f etc/runit/runsvdir/default
-	done
-	[ -e etc/sv/udevd/run ] && ln -sf /etc/sv/udevd etc/runit/runsvdir/default
-
-	if [ -d usr/sbin -a ! -L usr/sbin ]; then
-		for f in init shutdown halt reboot poweroff; do
-			ln -sr ../bin/$f usr/sbin/$f
-		done
-	fi
-
-	;;
-esac

srcpkgs/runit-void/files/09-apparmor.sh

@@ -1,27 +0,0 @@
-# vim: set ts=4 sw=4 et:
-
-# AppArmor is not enabled in kernel, silently exit
-[ ! -d /sys/kernel/security/apparmor ] && return
-
-# Load config
-[ -r /etc/default/apparmor ] && . /etc/default/apparmor
-
-# Proceed to load profiles depending on user settings
-msg "Loading AppArmor profiles..."
-
-if [ -n "$APPARMOR" ]; then
-	if [ "$APPARMOR" != "complain" -a "$APPARMOR" != "enforce" ]; then
-		printf '! AppArmor set to %s - ignoring profiles\n' "$APPARMOR"
-		return
-	fi
-
-	[ "$APPARMOR" = "complain" ] && AACOMPLAIN="-C"
-
-	if [ -d /etc/apparmor.d -a -x /usr/bin/apparmor_parser ]; then
-		apparmor_parser -a $AACOMPLAIN $(find /etc/apparmor.d -maxdepth 1 -type f ! -name '*.new-*_*')
-	else
-		printf '! AppArmor installation problem - ensure you have installed apparmor package\n'
-	fi
-else
-	printf '! AppArmor disabled - ignoring profiles\n'
-fi

srcpkgs/runit-void/files/apparmor

@@ -1,7 +0,0 @@
-# AppArmor configuration
-
-# Possible options:
-# - disable
-# - complain
-# - enforce
-APPARMOR=complain

srcpkgs/runit-void/files/hostname

@@ -1 +0,0 @@
-void-live

srcpkgs/runit-void/files/locale.conf

@@ -1,2 +0,0 @@
-LANG=en_US.UTF-8
-LC_COLLATE=C

srcpkgs/runit-void/runit-void-apparmor.INSTALL

@@ -1,13 +0,0 @@
-case "$ACTION" in
-pre)
-  # Fix incorrect path in /etc/default
-  if [ -e /etc/default/apparmor/rc.apparmor ]; then
-    mv /etc/default/apparmor/rc.apparmor /etc/default/rc.apparmor
-    rm -rf /etc/default/apparmor
-    mv /etc/default/rc.apparmor /etc/default/apparmor
-  fi
-  if [ -d /etc/default/apparmor ]; then
-    rm -rf /etc/default/apparmor
-  fi
-	;;
-esac

srcpkgs/runit-void/template

@@ -1,54 +0,0 @@
-# Template file for 'runit-void'
-pkgname=runit-void
-version=20230413
-revision=1
-build_style=gnu-makefile
-short_desc="Void / Evolution Linux runit scripts (partially patched by Tracker-Friendly)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="CC0-1.0"
-homepage="https://github.com/void-linux/void-runit"
-distfiles="https://github.com/void-linux/void-runit/archive/refs/tags/${version}.tar.gz"
-checksum=1049555eb27c370ec482ab576382ff951c2c33da6e8f5d165b3733c4a6d157cb
-
-depends="virtual?awk procps-ng runit"
-conf_files="
- /etc/hostname
- /etc/locale.conf
- /etc/rc.conf
- /etc/rc.local
- /etc/rc.shutdown
- /etc/sv/agetty-console/conf
- /etc/sv/agetty-serial/conf
- /etc/sv/agetty-hvc0/conf
- /etc/sv/agetty-hvsi0/conf"
-
-make_dirs="
- /etc/zzz.d/suspend 0755 root root
- /etc/zzz.d/resume 0755 root root"
-
-post_install() {
-	vmkdir usr/bin
-	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
-	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/locale.conf
-	vinstall ${FILESDIR}/apparmor 644 /etc/default/
-	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/
-	vmkdir usr/lib
-	# Enable services at post-install time instead.
-	rm -f ${DESTDIR}/etc/runit/runsvdir/current
-	rm -rf ${DESTDIR}/etc/runit/runsvdir/default
-	rm -rf ${DESTDIR}/etc/runit/runsvdir/single
-	ln -s runit-init ${DESTDIR}/usr/bin/init
-        rm -rfv ${DESTDIR}/etc/sv/agetty-tty1/conf
-}
-
-runit-void-apparmor_package() {
-	short_desc+=" - AppArmor initialization"
-	depends="${sourcepkg}-${version}_${revision}"
-	conf_files="/etc/default/apparmor"
-	pkg_install() {
-		vmove etc/default/apparmor
-		vmove etc/runit/core-services/09-apparmor.sh
-        	rm -rfv ${DESTDIR}/etc/sv/agetty-tty1/conf
-	}
-}