add cups

.gitea/workflows/require-approvals.yml

@@ -1,26 +0,0 @@
-name: Required Approvals
-
-on:
-  pull_request:
-    branches: [ master ]
-  pull_request_review:
-    branches: [ master ]
-
-permissions:
-  checks: write
-  pull-requests: read
-
-jobs:
-  required-approvals:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check required approvals
-        uses: https://gitea.artixlinux.org/corysanin/configurable-required-approvals@v1
-        with:
-          requirements: |
-            - patterns:
-                - "patches/_common/*"
-                - ".gitea/**/*"
-              requiredApprovals: 1
-          github-token: ${{ secrets.ACCESS_TOKEN }}

patches/_common/rm-service.sh

@@ -11,4 +11,4 @@ else
     do
         sed -i '/\.service/d' "${arg}/PKGBUILD"
     done
-fi
+fi

patches/alsa-ucm-conf/updpkgsums.sh

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

patches/alsa-utils/systemd-to-udev.sh

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

patches/alsa-utils/unitdir.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-for i in $@; do
-    sed -e '/unitdir/ s|/usr/lib/systemd/system|no|' \
-        -e '/udevsystem/ s|udev|systemd|' \
-        -i ${i}/PKGBUILD
-done

patches/anubis/rm-service.sh

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

patches/certbot/02-rm-service.sh

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

patches/certbot/03-rm-timer.sh

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

patches/certbot/04-updpkgsums.sh

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

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

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

patches/cups/03-disable-systemd.sh

@@ -6,9 +6,7 @@ if [ "$#" -eq 0 ]; then
 else
     for arg in "$@"
     do
-        sed -e "s|'etc/conf.d/smartd'||" \
+        sed -e "s|./configure|./configure --disable-systemd|" \
             -i "${arg}/PKGBUILD"
-        sed -i '/etc\/conf.d\/smartd/d' "${arg}/PKGBUILD"
     done
-fi
-
+fi

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

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

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

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

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

@@ -1,44 +0,0 @@
-#!/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/05-d-systemd-(to-remove-install).sh

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

patches/dnscrypt-proxy/06-updpkgsums.sh

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

patches/dnscrypt-proxy/env.txt

@@ -1,4 +0,0 @@
-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

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

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

@@ -1,15 +0,0 @@
-#!/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

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

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

@@ -1,14 +0,0 @@
-#!/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

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

patches/dropbear/rm-service.sh

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

patches/dropbear/updpkgsums.sh

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

patches/fwupd/env.txt

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

patches/gkrellm/gkrellm-rm-systemd.sh

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

patches/glycin/let-tests-fail.sh

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

patches/gnome-keyring/env.txt

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

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

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

patches/go-ethereum/03-updpkgsums.sh

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

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

@@ -1,11 +0,0 @@
-#!/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,9 +7,6 @@ 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

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

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

@@ -1,11 +0,0 @@
-#!/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-libnm/rm-systemd-deps.sh

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

patches/lib32-polkit/lib32-polkit.sh

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

patches/libinput/0001-libinput.sh

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

patches/libqb/d-systemd.sh

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

patches/libutempter/libutempter.sh

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

patches/libvirt/d-systemd.sh

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

patches/lighttpd/rm-service.sh

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

patches/lighttpd/rm-socket.sh

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

patches/llvm-julia/01-git-dir.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -e 's|git+https://github.com/JuliaLang/llvm-project|llvm-project-j::git+https://github.com/JuliaLang/llvm-project|' \
+            -e 's|llvm-project/llvm|llvm-project-j/llvm|' -i "${arg}/PKGBUILD"
+    done
+fi

patches/mailman3/01-rm-service.sh

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

patches/mailman3/02-rm-timer.sh

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

patches/mailman3/03-updpkgsums.sh

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

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

@@ -1,14 +0,0 @@
-#!/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/mako/0001-dbus-provider.sh

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

patches/mako/rm-service.sh

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

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

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

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

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

patches/modemmanager/systemd-to-elogind.sh

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

patches/modemmanager/z-config-flags.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-for i in $@; do
-  sed -e '/gtk_doc/a\    -D systemd_journal=false' \
-    -e '/gtk_doc/a\    -D systemdsystemunitdir=no' \
-    -i ${i}/PKGBUILD
-done

patches/mpd/env.txt

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

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

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

patches/nftables/01-rm-nftables-service.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# rm-nftables-service.sh
-# replace nftables.service with empty string in PKGBUILD files
-
-if [ "$#" -eq 0 ]; then
-    echo "Usage: $0 <package repo>"
-    exit 1
-else
-    for arg in "$@"
-    do
-        sed -e "s/'nftables.service'//" \
-            -i "${arg}/PKGBUILD"
-    done
-fi

patches/nftables/02-rm-service.sh

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

patches/nftables/03-rm-systemd-comment.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# rm-systemd-comment.sh
-# removes any commented line that contains "systemd" in the PKGBUILD file
-
-if [ "$#" -eq 0 ]; then
-    echo "Usage: $0 <package repo>"
-    exit 1
-else
-    for arg in "$@"
-    do
-        sed -e "/^\s*#.*systemd/d" \
-            -i "${arg}/PKGBUILD"
-    done
-fi

patches/nftables/04-updpkgsums.sh

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

patches/niri/d-systemd.sh

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

patches/nlohmann-json/rm-blocks.pl

@@ -0,0 +1 @@
+../_common/rm-blocks.pl

patches/ntp/rm-service.sh

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

patches/ntp/updpkgsums.sh

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

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

@@ -1,14 +0,0 @@
-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/openresolv/rm-systemd-deps.sh

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

patches/opensips/opensips.sh

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

patches/opensips/rm-service.sh

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

patches/opensips/updpkgsums.sh

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

patches/opensnitch/rm-service.sh

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

patches/opensnitch/skip-systemd-install.pl

@@ -1 +0,0 @@
-../_common/skip-systemd-install.pl

patches/opensnitch/updpkgsums.sh

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

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

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

patches/passim/02-add-source.pl

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

patches/passim/03-updpkgsums.sh

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

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

@@ -1,28 +0,0 @@
-#!/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

@@ -1,13 +0,0 @@
-#!/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

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

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

@@ -0,0 +1,22 @@
+#!/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

@@ -1,15 +0,0 @@
-#!/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

@@ -1,16 +0,0 @@
-#!/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/03-rm-service.sh

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

patches/rabbitmq/04-updpkgsums.sh

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

patches/sfml/systemd-to-udev.sh

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

patches/spotifyd/rm-service.sh

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

patches/sshuttle/rm-service.sh

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

patches/sshuttle/skip-systemd-install.pl

@@ -1 +0,0 @@
-../_common/skip-systemd-install.pl

patches/sshuttle/updpkgsums.sh

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

patches/sssd/sssd.sh

@@ -1,9 +0,0 @@
-#!/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/steam/rm-systemd-deps.sh

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

patches/tailscale/rm-service.sh

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

patches/umurmur/rm-service.sh

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