From 53d25102ccb01907c6320d5f0066a71209514134 Mon Sep 17 00:00:00 2001
From: Komeil Parseh <komeilparseh@disroot.org>
Date: Mon, 28 Jul 2025 21:29:05 +0330
Subject: [PATCH] 66: update to 0.8.2.1.

---
 srcpkgs/66-init                          |  1 +
 srcpkgs/66/INSTALL.msg                   |  5 ----
 srcpkgs/66/patches/shutdown_posixsh.diff | 27 -----------------
 srcpkgs/66/template                      | 38 +++++++++++-------------
 4 files changed, 18 insertions(+), 53 deletions(-)
 create mode 120000 srcpkgs/66-init
 delete mode 100644 srcpkgs/66/INSTALL.msg
 delete mode 100644 srcpkgs/66/patches/shutdown_posixsh.diff

diff --git a/srcpkgs/66-init b/srcpkgs/66-init
new file mode 120000
index 00000000000..d1cbcfa5404
--- /dev/null
+++ b/srcpkgs/66-init
@@ -0,0 +1 @@
+66
\ No newline at end of file
diff --git a/srcpkgs/66/INSTALL.msg b/srcpkgs/66/INSTALL.msg
deleted file mode 100644
index cc530a3ed81..00000000000
--- a/srcpkgs/66/INSTALL.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-CAUTION: package revision 0.6.1.1_2 changes the default system-dir
-from /var/lib/66 to /etc/66/lib. The change requires user intervention.
-Users who upgrade from an earlier version should re-create all trees 
-and re-enable services in them. That should be done before rebooting/halting
-the system.
diff --git a/srcpkgs/66/patches/shutdown_posixsh.diff b/srcpkgs/66/patches/shutdown_posixsh.diff
deleted file mode 100644
index c8998351929..00000000000
--- a/srcpkgs/66/patches/shutdown_posixsh.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/skel/shutdown b/skel/shutdown
-index 0f59623855bc8e8ad260eeeb57a090f88b26b5d1..b39f0f0decb9b8e27c65ba59b3891482f326a876 100755
---- a/skel/shutdown
-+++ b/skel/shutdown
-@@ -28,18 +28,18 @@ Time must be one of these formats: [ now | [+]mins | hh:mm ] where:
-     mins or +mins : relative time; triggers the shutdown sequence after mins minutes.
-     hh:mm : absolute time; triggers the shutdown sequence when the time hh:mm occurs.
- 
--See also 66-shutdown program to more features.
-+See also 66-shutdown program for more features.
- EOF
- exit 111
- }
- 
- die() {
--    printf "${PROG}:fatal: options must be set first\n" >&1
-+    printf "%s:fatal: options must be set first\n" "${PROG}" >&1
-     usage
- }
- 
--[ -z ${1} ] && die
-+[ -z "${1}" ] && die
- 
--[ ${1:0:1} != '-' ] && die
-+[ "${1%%"${1#?}"}" != '-' ] && die
- 
- 66-shutdown "${@}"
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index 89677d00713..58404ce14a9 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,7 +1,7 @@
 # Template file for '66'
 pkgname=66
-version=0.6.2.0
-revision=4
+version=0.8.2.1
+revision=1
 build_style=configure
 configure_args="--prefix=/usr
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -10,35 +10,31 @@ configure_args="--prefix=/usr
  --with-s6-log-user=_s6log
  --with-system-dir=/etc/66/lib"
 hostmakedepends="pkg-config lowdown"
-makedepends="oblibs-devel skalibs-devel execline-devel s6-devel s6-rc-devel"
-depends="s6-rc"
+makedepends="oblibs-devel skalibs-devel execline-devel s6-devel"
+depends="s6"
 short_desc="Small tools built around s6 and s6-rc programs"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="http://web.obarun.org/software/"
-changelog="https://git.obarun.org/Obarun/66/-/raw/master/doc/upgrade.md"
-distfiles="https://git.obarun.org/Obarun/66/-/archive/v${version}/66-v${version}.tar.bz2"
-checksum=f63600e9f8e53211e421707aae7f98d2fa9d1b0d0b4b39162cf180df12b99c28
-patch_args="-Np1"
-
-conf_files="/etc/66/init.conf"
-
-system_accounts="_s6log"
-
-make_dirs="/var/log/66 0750 _s6log _s6log"
-
-pre_configure() {
-
-	# Clean the default $PATH for service scripts
-	vsed -i "s@PATH=/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin@PATH=/usr/bin:/usr/sbin@" \
-	 "${wrksrc}/skel/init.conf"
-}
+changelog="https://git.obarun.org/Obarun/66/-/raw/master/doc/66-upgrade.md"
+distfiles="https://git.obarun.org/Obarun/66/-/archive/${version}/66-${version}.tar.bz2"
+checksum=89e45665e44e0d20d623283448ed52cd1377ce04e84081a6a831b36ac5a18d51
 
 post_install() {
 	vdoc README.md
 	vlicense LICENSE
 }
 
+66-init_package() {
+	short_desc+=" - init system"
+	depends="${sourcepkg}-${version}_${revision}"
+	conflicts="s6-linux-init s6-rc runit-void"
+	pkg_install() {
+		vmove usr/bin/init
+		vmove etc/66
+	}
+}
+
 66-doc_package() {
 	short_desc+=" - documentation"
 	depends="${sourcepkg}-${version}_${revision}"