revert enrichment

Reviewed-on: #337

patches/certbot/02-rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/certbot/03-rm-timer.sh

@@ -0,0 +1 @@
+../_common/rm-timer.sh

patches/certbot/04-updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/conmon/01-rm-systemd-deps.sh

@@ -0,0 +1 @@
+../_common/rm-systemd-deps.sh

patches/dnscrypt-proxy/01-rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/dnscrypt-proxy/02-rm-socket.sh

@@ -0,0 +1 @@
+../_common/rm-socket.sh

patches/dnscrypt-proxy/03-add-source.pl

@@ -0,0 +1 @@
+../_common/add-source.pl

patches/dnscrypt-proxy/04-add-install.pl

@@ -0,0 +1,44 @@
+#!/usr/bin/perl
+
+# add-package.pl
+# Appends the contents of PACKAGE_APPEND env variable to the end of the package function.
+# Can be configured to target a different function with PACKAGE_BLOCK.
+# \n in PACKAGE_APPEND are interpreted as newlines.
+# Setting PACKAGE_NO_NEWLINE will disable appending any additional newlines before
+# the append_var.
+
+use strict;
+use warnings;
+
+if (@ARGV == 0 || ! $ENV{'PACKAGE_APPEND'}) {
+    die("Usage: $0 <package repo>\n");
+}
+
+# Process entire file instead of line by line.
+undef $/;
+
+for (@ARGV) {
+    my $file_name = $_ . "/PKGBUILD";
+
+    open(my $input, '<', $file_name) or die("Could not open file '$file_name' $!\n");
+    my $content = <$input>;
+    close($input);
+
+    my $package_block = $ENV{'PACKAGE_BLOCK'} // 'package';
+    my $append_var = $ENV{'PACKAGE_APPEND'};
+    my $extra_newline = $ENV{'PACKAGE_NO_NEWLINE'} ? "" : "\n";
+    $append_var =~ s/\\n/\n/g; # change \n to actual newlines
+
+    if ($content =~ /(
+${package_block}\s*\(\)\s*\{)/) {
+        $content =~ s/(
+${package_block}\s*\(\)\s*\{[\s\S]*?
+)(\})/$1${extra_newline}${append_var}\n}/;
+    } else {
+        die("Function '${package_block}' not found in '$file_name'.\n");
+    }
+
+    open($input, ">", $file_name) or die("Could not write to file '$file_name' $!\n");
+    print $input $content;
+    close($input);
+}

patches/dnscrypt-proxy/06-updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/dnscrypt-proxy/env.txt

@@ -0,0 +1,4 @@
+SOURCES=  tmpfiles.d\n  sysusers.d
+SOURCES_NO_NEWLINE=yes
+PACKAGE_APPEND=  # sysusers.d\n  install -vDm 644 "$srcdir/sysusers.d" "$pkgdir/usr/lib/sysusers.d/${pkgname}.conf"\n  # tmpfiles.d\n  install -vDm 644 "$srcdir/tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/${pkgname}.conf"
+PACKAGE_NO_NEWLINE=yes

patches/dotnet-core/01-systemd-to-udev.sh

@@ -0,0 +1 @@
+../_common/systemd-to-udev.sh

patches/dotnet-core/02-dotnet-things.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -e "s/arch-/artix-/g" \
+            -i "${arg}/PKGBUILD" && \
+        sed -E 's|(build\(\).*$)|\1\n  export DOTNET_CLI_TELEMETRY_OPTOUT=1|' \
+            -i "${arg}/PKGBUILD"
+    done
+fi
+

patches/dpkg/01-insert-config-options.pl

@@ -0,0 +1 @@
+../_common/insert-config-options.pl

patches/dpkg/02-updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/dpkg/03-install-origin-file.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -e "s/ archlinux / artixlinux /" \
+            -i "${arg}/PKGBUILD"
+        sed -E 's|(\s+install -vDm644 "\$srcdir/origin\.)(archlinux)(" "\$pkgdir/etc/dpkg/origins/)(archlinux)"|\1\2\3\4"\n\1artixlinux\3artixlinux"|' \
+            -i "${arg}/PKGBUILD"
+    done
+fi

patches/dpkg/env.txt

@@ -0,0 +1,2 @@
+OPTION_VAR=source
+CONFIG_OPTIONS=origin.artixlinux

patches/dropbear/rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/dropbear/updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/fwupd/env.txt

@@ -1 +1 @@
-CONFIG_OPTIONS=-D systemd=disabled\n    -D elogind=enabled
+CONFIG_OPTIONS=-D systemd=disabled

patches/gkrellm/gkrellm-rm-systemd.sh

@@ -6,9 +6,6 @@ if [ "$#" -eq 0 ]; then
 else
     for arg in "$@"
     do
-        sed -e 's|gkrellm.service\s*)|)|' \
-            -e "s|'[a-f0-9]\{64\}'\s*)|)|" \
-            -i "${arg}/PKGBUILD"
-        sed -i '/gkrellm\.service/d' "${arg}/PKGBUILD"
+        sed -i '/systemd/d' "${arg}/PKGBUILD"
     done
 fi

patches/gnome-keyring/env.txt

@@ -0,0 +1 @@
+CONFIG_OPTIONS=-D systemd=disabled

patches/go-ethereum/01-rm-service.sh

@@ -8,9 +8,7 @@ if [ "$#" -eq 0 ]; then
 else
 	for arg in "$@"
 	do
-		sed -e "s/'geth-user.service'//g" \
-		    -e "s/'806ab43221f0c203e663a78afced694786a5adb033f06fab07d07904384d7645'//g" \
+		sed -e "s/'geth-user.service'//" \
 		    -i "${arg}/PKGBUILD"
-		# TODO: remove the newline and trailing whitespace after
 	done
 fi

patches/go-ethereum/03-updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/godot/01-arch-to-artix.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -i 's/arch_linux/artix_linux/g' "${arg}/PKGBUILD"
+    done
+fi

patches/grub/01-arch-to-artix.sh

@@ -7,6 +7,9 @@ else
     for arg in "$@"
     do
         sed -i 's/Arch/Artix/' "${arg}/grub.default"
+        sed -i 's/Arch/Artix/' "${arg}/sbat.csv"
+        sed -i 's/arch/artix/' "${arg}/sbat.csv"
+        sed -i 's|https://archlinux.org/packages/core/x86_64/grub/|https://gitea.artixlinux.org/packages/grub/|' "${arg}/sbat.csv"
         line_number=$(grep -n "_package_grub-common_and_bios" "${arg}/PKGBUILD" | tail -1 | cut -d : -f 1)
         line_number=$((line_number+1))
         UPDATE_GRUB='

patches/iio-sensor-proxy/01-rm-systemd-deps.sh

@@ -0,0 +1 @@
+../_common/rm-systemd-deps.sh

patches/iio-sensor-proxy/02-disable-services.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -i "s|-Dsystemdsystemunitdir=/usr/lib/systemd/system|-Dsystemdsystemunitdir=''|" "${arg}/PKGBUILD"
+    done
+fi

patches/lib32-polkit/lib32-polkit.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 
 for i in $@; do
-	sed -e '/redhat/a\    -D session_tracking=elogind'
+	sed -e '/cross-file/a\    -D session_tracking=elogind' \
+	    -e '/systemd/d' \
+	    -e '/makedepends/a\  libelogind' \
 	    -i "$i"/PKGBUILD
 done

patches/libutempter/libutempter.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+for i in $@ ; do
+	sed -e 's,systemd,elogind,' \
+		-i $i/PKGBUILD
+done

patches/mailman3/01-rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/mailman3/02-rm-timer.sh

@@ -0,0 +1 @@
+../_common/rm-timer.sh

patches/mailman3/03-updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/mailman3/04-rm-service-install.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -e '/services and timer/d' \
+	    -e '/{service,timer}/d' \
+	    -i "${arg}/PKGBUILD"
+
+    done
+fi

patches/mpd/01-d-systemd.sh

@@ -0,0 +1 @@
+../_common/d-systemd.sh

patches/mpd/env.txt

@@ -0,0 +1 @@
+CONFIG_OPTIONS=-D systemd=disabled

patches/mutter/systemd-libs-to-libelogind.sh

@@ -0,0 +1 @@
+../_common/systemd-libs-to-libelogind.sh

patches/niri/d-systemd.sh

@@ -0,0 +1 @@
+../_common/d-systemd.sh

patches/open-iscsi/systemd-to-udev.sh

@@ -0,0 +1,14 @@
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+			  sed -e "s,systemd-libs,libudev," \
+					  -i ${arg}/PKGBUILD
+        sed -e "s/systemd/udev/" \
+					  -e "/rulesdir/a\    -Dno_systemd=true" \
+            -i "${arg}/PKGBUILD"
+    done
+fi
+

patches/opensips/opensips.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+for i in $@ ; do
+	sed -e 's|tar.gz|tar.gz)|' \
+	    -i $i/PKGBUILD
+done

patches/opensips/rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/opensips/updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/passim/01-rm-systemd-deps.sh

@@ -0,0 +1 @@
+../_common/rm-systemd-deps.sh

patches/passim/02-add-source.pl

@@ -0,0 +1 @@
+../_common/add-source.pl

patches/passim/03-updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/passim/04-add-prepare-function.pl

@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+
+# add-prepare-function.pl
+# Inserts a prepare() function before the build() function in PKGBUILD.
+
+use strict;
+use warnings;
+
+if (@ARGV == 0) {
+    die("Usage: $0 <package repo>\n");
+}
+
+# Process entire file instead of line by line.
+undef $/;
+
+for (@ARGV) {
+    my $file_name = $_ . "/PKGBUILD";
+    open(FILE, $file_name) or die("Cannot open $file_name: $!");
+    my $content = <FILE>;
+    close(FILE);
+
+    # Insert prepare() function before build()
+    if ($content =~ s/^(\s*)build\(\)\s*{/$1\nprepare() {\n  patch -Np1 -d \$pkgname -i ..\/0001-no-systemd.patch\n}\n$1build() {/m) {
+        open(FILE, ">$file_name") or die("Cannot write to $file_name: $!");
+        print FILE $content;
+        close(FILE);
+    }
+}

patches/passim/05-add-sysuser-build-option.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# add sysusersdir option to build options in PKGBUILD
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"; do
+	sed -e "/artix-meson \${pkgname} build/s|$|  -D sysusersdir=/usr/lib/sysusers.d|" \
+	    -i "$arg/PKGBUILD"
+    done
+fi

patches/passim/env.txt

@@ -0,0 +1 @@
+SOURCES=        '0001-no-systemd.patch'

patches/php-legacy/05-add-makedepends-options.pl

@@ -1,22 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-if (@ARGV == 0) {
-    die("Usage: $0 <package repo>\n");
-}
-
-# Process entire file instead of line by line.
-undef $/;
-
-for (@ARGV) {
-    my $file_name = $_ . "/PKGBUILD";
-    open(my $fh, '<', $file_name) or die "Could not open file '$file_name' $!";
-    my $content = <$fh>;
-    close($fh);
-    $content =~ s/(makedepends=\(\s*.*?)(\))/${1} 'argon2'$2/s;
-    open($fh, '>', $file_name) or die "Could not open file '$file_name' $!";
-    print $fh $content;
-    close($fh);
-}

patches/prosody/01.5-fix-parentheses.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# rm-service.sh
+# Indiscriminately removes all lines that contain ".service"
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -e 's/sha256sums=/)\nsha256sums=/' \
+            -i "${arg}/PKGBUILD"
+    done
+fi

patches/rabbitmq/01-rm-systemd-patch.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# rm-systemd-patch.sh
+# Indiscriminately removes all lines that contain
+# "rabbitmq-customize-systemd-service.patch". And removes the patch file.
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -i '/rabbitmq-customize-systemd-service.patch/d' "${arg}/PKGBUILD"
+	rm "rabbitmq-customize-systemd-service.patch"
+    done
+fi

patches/rabbitmq/02-rm-systemd-deps.sh

@@ -0,0 +1 @@
+../_common/rm-systemd-deps.sh

patches/rabbitmq/03-rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/rabbitmq/04-updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/sfml/systemd-to-udev.sh

@@ -0,0 +1 @@
+../_common/systemd-to-udev.sh

patches/spotifyd/rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/sssd/sssd.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for i in $@; do
+    sed -e '/systemd/d' \
+        -e '/journald/d' \
+        -e '/sssd-perms.conf/i\  rm -rf $pkgdir/etc/systemd' \
+        -i "$i"/PKGBUILD
+
+done

patches/tailscale/rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/uwsgi/06-rm-post-instal-msg.sh

@@ -7,5 +7,6 @@ else
     for arg in "$@"
     do
 	rm "${arg}/uwsgi.install"
+        sed -i '/install=uwsgi\.install/Id' "${arg}/PKGBUILD"
     done
 fi

patches/webkit2gtk-4.1/env.txt

@@ -1,2 +1,2 @@
-CONFIG_OPTIONS=-DUSE_SYSTEMD=OFF\n    -DENABLE_JOURNALD_LOG=OFF
+CONFIG_OPTIONS=-D USE_SYSTEMD=OFF\n    -D ENABLE_JOURNALD_LOG=OFF
 OPTION_VAR=cmake_options

patches/webkit2gtk/env.txt

@@ -1,2 +1,2 @@
-CONFIG_OPTIONS=-DUSE_SYSTEMD=OFF\n    -DENABLE_JOURNALD_LOG=OFF
+CONFIG_OPTIONS=-D USE_SYSTEMD=OFF\n    -D ENABLE_JOURNALD_LOG=OFF
 OPTION_VAR=cmake_options

patches/webkitgtk-6.0/env.txt

@@ -1,2 +1,2 @@
-CONFIG_OPTIONS=-DUSE_SYSTEMD=OFF\n    -DENABLE_JOURNALD_LOG=OFF
+CONFIG_OPTIONS=-D USE_SYSTEMD=OFF\n    -D ENABLE_JOURNALD_LOG=OFF
 OPTION_VAR=cmake_options

patches/wine-staging/wine-staging.sh

@@ -5,4 +5,11 @@ for i in "$@"; do
 	    -e '/mingw32-strip/d' \
 	    -e '/depends/i CFLAGS+=" -Wno-error=incompatible-pointer-types -fPIC"' \
 	    -i "$i"/PKGBUILD
+for arg in "$@"
+	    do
+		sed -e '/systemctl/d' \
+		    -e '/post_install/a \   echo "binfmt binary formats will be updated at reboot"' \
+		    -i  $arg/wine.install
+	    done
+
 done

patches/wine/wine.sh

@@ -8,4 +8,11 @@ else
 		-e 's|-ffat-lto-objects|-ffat-lto-objects -fPIC|' \
 	    -i	$arg/PKGBUILD
     done
+    
+    for arg in "$@"
+    do
+	    sed -e '/systemctl/d' \
+	        -e '/post_install/a \   echo "binfmt binary formats will be updated at reboot"' \
+	    -i	$arg/wine.install
+    done
 fi

patches/wpewebkit/env.txt

@@ -1,2 +1,2 @@
-CONFIG_OPTIONS=-DUSE_SYSTEMD=OFF\n    -DENABLE_JOURNALD_LOG=OFF
+CONFIG_OPTIONS=-D USE_SYSTEMD=OFF\n    -D ENABLE_JOURNALD_LOG=OFF
 OPTION_VAR=cmake_options

patches/xf86-video-intel/systemd-libs-to-libudev.sh

@@ -0,0 +1 @@
+../_common/systemd-libs-to-libudev.sh

patches/xmms2/01-rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/xmms2/02-close-sources.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed 's/    sysusers.conf/    sysusers.conf)/' -i "${arg}/PKGBUILD"
+    done
+fi

patches/xmms2/03-updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/zabbix/01-oh-we-are-globbing.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# removes service files that are included via globbing
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -i -E "s/service,|,service//g" "${arg}/PKGBUILD"
+    done
+fi

patches/zabbix/02-dang-you.pl

@@ -0,0 +1,24 @@
+#!/usr/bin/perl
+
+# remove services that are on the SAME LINE as other files
+
+use strict;
+use warnings;
+
+if (@ARGV == 0) {
+    die("Usage: $0 <package repo>\n");
+}
+
+# Process entire file instead of line by line.
+undef $/;
+
+for (@ARGV) {
+    my $file_name = $_ . "/PKGBUILD";
+    open(FILE,$file_name);
+    my $content = <FILE>;
+    close(FILE);
+    $content =~ s/zabbix[^\s]*\.service //g;
+    open(FILE,">$file_name");
+    print FILE $content;
+    close(FILE);
+}

patches/zabbix/03-rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/zabbix/04-updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh