Merge pull request #173 from ataraxialinux/runit

Big changes!
ataraxialinux · Jun 24, 2020 · 27efdce · 27efdce
2 parents 4eb973f + 1834cf7
commit 27efdce
Show file tree

Hide file tree

Showing 555 changed files with 5,045 additions and 8,760 deletions.
diff --git a/build b/build
@@ -279,13 +279,12 @@ build_target() {
 	fi
 
 	packages="netbase selinux-policy tzdata man-pages musl-tools gettext-tiny zlib xz lz4 zstd bzip2 \
-		file ncurses readline m4 bison flex bc gmp mpfr mpc binutils gcc ccache pkgconf \
-		pcre libcap-ng audit libsepol libselinux libsemanage cracklib pam libpwquality attr acl libcap \
-		shadow grep mksh bash slibtool gdbm db expat perl libressl nettle ca-certificates \
-		autoconf automake lzip libarchive lzo kmod libuargp libelf coreutils mawk openbsd-diffutils \
-		ubase sinit netbsd-tools toybox less mandoc checkpolicy policycoreutils dialog pigz iproute2 kbd \
-		make vim util-linux e2fsprogs btrfs-progs dosfstools heimdal hwids gperf eudev openrc ifupdown dhcp \
-		libssh2 nghttp2 curl lua popt rpm neko libnl wireless_tools wpa_supplicant gptfdisk wget nano $LINUX"
+		file ncurses readline m4 bison flex bc gmp mpfr mpc binutils gcc ccache pkgconf pcre libcap-ng audit \
+		libsepol libselinux libsemanage cracklib pam libpwquality attr acl libcap shadow grep mksh bash slibtool \
+		gdbm db expat perl libressl nettle ca-certificates autoconf automake lzip libarchive lzo kmod libuargp libelf \
+		coreutils 9base mawk openbsd-diffutils ubase netbsd-tools toybox less mandoc checkpolicy policycoreutils dialog \
+		pigz iproute2 kbd make nano util-linux e2fsprogs btrfs-progs dosfstools hwids gperf eudev runit sinit run-parts \
+		ifupdown dhcp libssh2 nghttp2 curl lua popt rpm neko libnl wireless_tools wpa_supplicant gptfdisk wget $LINUX"
 
 	neko em -c "$BUILD"/target.config -m "$BUILD"/mask -r "$ROOTFS" -wnd $packages
 }
@@ -452,6 +451,10 @@ case $1 in
 				(
 					if [ "$packages" = "repo" ]; then
 						true
+					elif [ "$packages" = "libhandy" ]; then
+						"$UTILS/check-updates" libhandy
+					elif [ "$packages" = "shaderc" ]; then
+						"$UTILS/check-updates" shaderc
 					#elif [ "$packages" = "linux" ]; then
 					#	"$UTILS/check-updates" linux
 					#elif [ "$packages" = "linux-headers" ]; then

diff --git a/packages/9base/KagamiBuild b/packages/9base/KagamiBuild
@@ -1,16 +1,28 @@
 # Description: A port of various original Plan 9 tools to Unix, based on plan9port.
 # URL:         http://tools.suckless.org/9base
-# Maintainer:  Ben O'Neill <ben@benoneill.xyz>
-# Section:     plan9
+# Maintainer:  protonesso, nagakamira at gmail dot com
+# Priority:    required
+# Section:     base
 
 name=9base
 version=6
-release=2
+release=3
+options=('bootstrap')
 source=("http://dl.suckless.org/tools/$name-$version.tar.gz")
 
 build() {
+	unset CFLAGS CXXFLAGS
+
 	cd $SRC/$name-$version
-	patch -Np1 -i "$STUFF"/9base/dirread.patch lib9/dirread.c
-	make
-	make DESTDIR="$PKG" install
+	patch -Np1 -i "$STUFF"/9base/0001-fix.patch
+
+	if [ "$USEBOOTSTRAP" = "yes" ]; then
+		make CC="$CC"
+	else
+		make
+	fi
+
+	for i in ascii cleanname fortune freq mk pbd primes sam unutf; do
+		install -Dm755 $i/$i "$PKG"/usr/bin/$i
+	done
 }
diff --git a/packages/aircrack-ng/KagamiBuild b/packages/aircrack-ng/KagamiBuild
@@ -10,6 +10,9 @@ release=2
 source=("https://download.aircrack-ng.org/$name-$version.tar.gz")
 
 build() {
+	#gcc10.patch
+	export CFLAGS="$CFLAGS -fcommon"
+
 	cd "$SRC"/$name-$version
 	./autogen.sh
 	./configure $BUILDFLAGS \

diff --git a/packages/alpine/KagamiBuild b/packages/alpine/KagamiBuild
@@ -12,6 +12,7 @@ source=("http://alpine.x10host.com/alpine/release/src/$name-$version.tar.xz")
 build() {
 	cd "$SRC"/$name-$version
 	patch -Np1 -i "$STUFF"/alpine/uclibc-musl.patch
+	patch -Np1 -i "$STUFF"/alpine/alpine-2.22-fno-common.patch
 	autoreconf -fi
 
 	LIBS="-lcrypto" \

diff --git a/packages/alsa-utils/KagamiBuild b/packages/alsa-utils/KagamiBuild
@@ -6,7 +6,7 @@
 
 name=alsa-utils
 version=1.2.3
-release=1
+release=2
 source=("ftp://ftp.alsa-project.org/pub/utils/$name-$version.tar.bz2")
 
 build() {
@@ -27,9 +27,9 @@ build() {
 	make
 	make DESTDIR="$PKG" install
 
-	for initd in alsasound; do
-		install -Dm0755 "$STUFF"/svc/${initd}.initd "$PKG"/etc/init.d/$initd
-		install -Dm0644 "$STUFF"/svc/${initd}.confd "$PKG"/etc/conf.d/$initd
+	for i in alsa; do
+		install -Dm755 "$STUFF"/svc/$i "$PKG"/etc/service/$i/run
+		install -Dm755 "$STUFF"/svc/$i "$PKG"/etc/service/$i/finish
 	done
 
 	install -d "$PKG"/var/lib/alsa

diff --git a/packages/aom/KagamiBuild b/packages/aom/KagamiBuild
@@ -1,7 +1,7 @@
 # Description: Alliance for Open Media video codec
 # URL:         https://aomedia.org/
 # Maintainer:  protonesso, nagakamira at gmail dot com
-# Depends on:  cmake
+# Depends on:  cmake yasm
 # Section:     video
 
 name=aom

diff --git a/packages/apache/KagamiBuild b/packages/apache/KagamiBuild
@@ -6,7 +6,7 @@
 
 name=apache
 version=2.4.43
-release=1
+release=2
 backup=(etc/httpd/conf/httpd.conf
 	etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
 	etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
@@ -41,10 +41,7 @@ build() {
 	make
 	make DESTDIR="$PKG" install
 
-	for initd in httpd; do
-		install -Dm0755 "$STUFF"/svc/${initd}.initd "$PKG"/etc/init.d/$initd
-		install -Dm0644 "$STUFF"/svc/${initd}.confd "$PKG"/etc/conf.d/$initd
-	done
+	install -Dm755 "$STUFF"/svc/httpd "$PKG"/etc/service/httpd/run
 
 	install -D -m644 "$STUFF"/apache/logrotate "$PKG"/etc/logrotate.d/httpd
 

diff --git a/packages/appdata/KagamiBuild b/packages/appdata/KagamiBuild
@@ -0,0 +1,14 @@
+# Description: AppStream data for Ataraxia Linux
+# URL:         https://ataraxialinux.github.io/
+# Maintainer:  protonesso, nagakamira at gmail dot com
+# Section:     misc
+
+name=appdata
+version=93d48b34a91b90dbb506fc3880355c29f1d7af3e
+release=1
+source=("https://github.com/protonesso/appstream-data/archive/$version.tar.gz")
+
+build() {
+	cd "$SRC"/appstream-data-$version
+	./install "$PKG"
+}
diff --git a/packages/aspell-en/KagamiBuild b/packages/aspell-en/KagamiBuild
@@ -5,12 +5,12 @@
 # Section:     text
 
 name=aspell-en
-version=2018.04.16.0
+version=2019.10.06
 release=1
-source=("https://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$version.tar.bz2")
+source=("https://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$version-0.tar.bz2")
 
 build() {
-	cd "$SRC"/aspell6-en-$version
+	cd "$SRC"/aspell6-en-$version-0
 	./configure
 	make
 	make DESTDIR="$PKG" install

diff --git a/packages/audacious-plugins/KagamiBuild b/packages/audacious-plugins/KagamiBuild
@@ -6,7 +6,7 @@
 
 name=audacious-plugins
 version=4.0.4
-release=1
+release=2
 source=("https://distfiles.audacious-media-player.org/$name-$version.tar.bz2")
 
 build() {

diff --git a/packages/audacious/KagamiBuild b/packages/audacious/KagamiBuild
@@ -1,13 +1,13 @@
 # Description: Lightweight, advanced audio player focused on audio quality
 # URL:         https://audacious-media-player.org/
 # Maintainer:  protonesso, nagakamira at gmail dot com
-# Depends on:  libxml2 alsa-lib dbus mpg123 neon gtk2
+# Depends on:  libxml2 alsa-lib dbus mpg123 neon qt5
 # Weak deps:   audacious-plugins
 # Section:     audio
 
 name=audacious
 version=4.0.4
-release=1
+release=2
 source=("https://distfiles.audacious-media-player.org/$name-$version.tar.bz2")
 
 build() {

diff --git a/packages/audit/KagamiBuild b/packages/audit/KagamiBuild
@@ -7,7 +7,7 @@
 
 name=audit
 version=2.8.5
-release=2
+release=3
 backup=('etc/libaudit.conf'
 	'etc/audit/audit-stop.rules'
 	'etc/audit/auditd.conf'
@@ -52,8 +52,5 @@ build() {
 	rm -rf "$PKG"/etc/rc.d
 	rm -rf "$PKG"/etc/sysconfig
 
-	for initd in auditd; do
-		install -Dm0755 "$STUFF"/svc/${initd}.initd "$PKG"/etc/init.d/$initd
-		install -Dm0644 "$STUFF"/svc/${initd}.confd "$PKG"/etc/conf.d/$initd
-	done
+	install -Dm755 "$STUFF"/svc/auditd "$PKG"/etc/service/auditd/run
 }
diff --git a/packages/base-files/KagamiBuild b/packages/base-files/KagamiBuild
@@ -5,7 +5,7 @@
 # Section:     base
 
 name=base-files
-version=0.11
+version=0.12
 release=1
 options=('bootstrap')
 backup=('etc/fstab'
@@ -27,7 +27,7 @@ backup=('etc/fstab'
 build() {
 	cd "$PKG"
 
-	for d in boot dev etc/{skel,profile.d,modprobe.d,sysctl.d,conf.d} home media/{cdrom,flash,usbdisk,floppy,zip} mnt usr var opt srv/http run; do
+	for d in boot dev etc/{skel,profile.d,modprobe.d,sysctl.d,service} home media/{cdrom,flash,usbdisk,floppy,zip} mnt usr var/service opt srv/http run; do
 		install -d -m755 $d
 	done
 

diff --git a/packages/bison/KagamiBuild b/packages/bison/KagamiBuild
@@ -6,7 +6,7 @@
 # Section:     devel
 
 name=bison
-version=3.6.3
+version=3.6.4
 release=1
 options=('bootstrap')
 source=("http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz")

diff --git a/packages/bluez/KagamiBuild b/packages/bluez/KagamiBuild
@@ -6,7 +6,7 @@
 
 name=bluez
 version=5.54
-release=1
+release=2
 backup=('etc/bluetooth/main.conf')
 source=("https://www.kernel.org/pub/linux/bluetooth/$name-$version.tar.xz")
 
@@ -30,5 +30,8 @@ build() {
 	make DESTDIR="$PKG" install
 
 	install -Dm644 src/main.conf "$PKG"/etc/bluetooth/main.conf
-	install -Dm0755 "$STUFF"/svc/bluetooth.initd "$PKG"/etc/init.d/bluetooth
+
+	for i in bluetooth bluetooth-mesh; do
+		install -Dm755 "$STUFF"/svc/$i "$PKG"/etc/service/$i/run
+	done
 }
diff --git a/packages/bmake/KagamiBuild b/packages/bmake/KagamiBuild
@@ -15,4 +15,6 @@ build() {
 
 	./boot-strap --prefix=/usr op=build
 	./boot-strap --install-destdir="$PKG" --prefix=/usr op=install
+
+	chmod -Rv 755 "$PKG"/*
 }
diff --git a/packages/bolt/KagamiBuild b/packages/bolt/KagamiBuild
@@ -5,8 +5,8 @@
 # Section:     admin
 
 name=bolt
-version=0.8
-release=1
+version=0.9
+release=2
 source=("https://gitlab.freedesktop.org/bolt/bolt/-/archive/$version/$name-$version.tar.gz")
 
 build() {
@@ -19,5 +19,7 @@ build() {
 	ninja
 	DESTDIR="$PKG" ninja install
 
-	install -Dm0755 "$STUFF"/svc/boltd.initd "$PKG"/etc/init.d/boltd
+	install -Dm755 "$STUFF"/svc/bolt "$PKG"/etc/service/bolt/run
+
+	install -d -o root -g polkitd -m 750 "$PKG"/usr/share/polkit-1/rules.d
 }
diff --git a/packages/bspwm/KagamiBuild b/packages/bspwm/KagamiBuild
@@ -11,6 +11,8 @@ options=('docs')
 source=("https://github.com/baskerville/bspwm/archive/$version.tar.gz")
 
 build() {
+	export CFLAGS="$CFLAGS -fcommon"
+
 	cd "$SRC"/$name-$version
 	sed -i 's,cp -Pp,cp -p,g' Makefile
 

diff --git a/packages/catfish/KagamiBuild b/packages/catfish/KagamiBuild
@@ -0,0 +1,16 @@
+# Description: Versatile file searching tool
+# URL:         https://git.xfce.org/apps/catfish/about/
+# Maintainer:  protonesso, nagakamira at gmail dot com
+# Depends on:  mlocate python python-distutils-extra pygobject python-pexpect python-pyxdg python-dbus gtk3
+# Section:     xfce
+
+name=catfish
+version=1.4.13
+release=1
+source=("https://archive.xfce.org/src/apps/$name/${version%.*}/$name-$version.tar.bz2")
+
+build() {
+	cd "$SRC"/$name-$version
+	python3 setup.py build
+	python3 setup.py install --prefix=/usr --root="$PKG" --optimize=1
+}
diff --git a/packages/cheese/KagamiBuild b/packages/cheese/KagamiBuild
@@ -6,7 +6,7 @@
 
 name=cheese
 version=3.34.0
-release=1
+release=2
 source=("http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz")
 
 build() {

diff --git a/packages/clang/KagamiBuild b/packages/clang/KagamiBuild
@@ -29,7 +29,6 @@ build() {
 
 	cd "$SRC"/$builddir
 	patch -Np1 -i "$STUFF"/clang/0001-add-musl-triplets.patch
-	patch -Np1 -i "$STUFF"/clang/0001-add-support-for-Ataraxia-Linux.patch
 
 	mv "$SRC"/clang-tools-extra-$version.src tools/extra
 

diff --git a/packages/clisp/KagamiBuild b/packages/clisp/KagamiBuild
@@ -5,7 +5,7 @@
 # Section:     devel
 
 name=clisp
-version=2.49_20181112_df3b9f6fd
+version=2.50_20191103_c26de7873
 release=1
 options=('~emptydirs' '~makeflags')
 source=("https://mirrors.slackware.com/slackware/slackware64-current/source/d/clisp/$name-$version.tar.xz")

diff --git a/packages/cpio/KagamiBuild b/packages/cpio/KagamiBuild
@@ -10,6 +10,8 @@ source=("http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz")
 
 build() {
 	cd "$SRC"/$name-$version
+	patch -Np1 -i "$STUFF"/cpio/cpio-2.12-gcc-10.patch
+
 	./configure $BUILDFLAGS \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \

diff --git a/packages/createrepo_c/KagamiBuild b/packages/createrepo_c/KagamiBuild
@@ -1,7 +1,7 @@
 # Description: A C implementation of createrepo, a tool to create yum repositories
 # URL:         https://github.com/rpm-software-management/createrepo_c
 # Maintainer:  protonesso, nagakamira at gmail dot com
-# Depends on:  cmake ninja bash-completion rpm glib libmodulemd libxml2
+# Depends on:  cmake ninja bash-completion rpm libmodulemd libxml2
 # Section:     devel
 
 name=createrepo_c

diff --git a/packages/cronie/KagamiBuild b/packages/cronie/KagamiBuild
@@ -6,7 +6,7 @@
 
 name=cronie
 version=1.5.5
-release=2
+release=3
 backup=('etc/cron.deny'
 	'etc/pam.d/crond'
 	'etc/cron.d/0hourly'
@@ -38,5 +38,5 @@ build() {
 
 	touch "$PKG"/etc/cron.deny
 	install -Dm644 "$STUFF"/pam.d/crond "$PKG"/etc/pam.d/crond
-	install -Dm0755 "$STUFF"/svc/crond.initd "$PKG"/etc/init.d/crond
+	install -Dm755 "$STUFF"/svc/crond "$PKG"/etc/service/crond/run
 }
diff --git a/packages/cryptsetup/KagamiBuild b/packages/cryptsetup/KagamiBuild
@@ -6,7 +6,7 @@
 
 name=cryptsetup
 version=2.3.3
-release=1
+release=2
 options=('~emptydirs')
 source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${version%.*}/${name}-${version}.tar.xz")
 
@@ -20,10 +20,4 @@ build() {
 		--disable-static
 	make
 	make DESTDIR="$PKG" install
-
-
-	for initd in dmcrypt; do
-		install -Dm0755 "$STUFF"/svc/${initd}.initd "$PKG"/etc/init.d/$initd
-		install -Dm0644 "$STUFF"/svc/${initd}.confd "$PKG"/etc/conf.d/$initd
-	done
 }