From 1a64deeb894dc95e2645a75771732c6cc53a79ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 4 Oct 2023 01:35:06 +0200 Subject: Squash changes containing private information There were a lot of changes since the previous commit, but a lot of them contained personnal information about users. All thos changes got stashed into a single commit (history is kept in a different place) and private information was moved in a separate private repository --- pkgs/rrsync_sudo/default.nix | 8 -------- pkgs/rrsync_sudo/sudo.patch | 20 -------------------- 2 files changed, 28 deletions(-) delete mode 100644 pkgs/rrsync_sudo/default.nix delete mode 100644 pkgs/rrsync_sudo/sudo.patch (limited to 'pkgs/rrsync_sudo') diff --git a/pkgs/rrsync_sudo/default.nix b/pkgs/rrsync_sudo/default.nix deleted file mode 100644 index 7a47320..0000000 --- a/pkgs/rrsync_sudo/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ rrsync }: - -rrsync.overrideAttrs(old: { - patches = old.patches or [] ++ [ ./sudo.patch ]; - postPatch = old.postPatch + '' - substituteInPlace support/rrsync --replace /usr/bin/sudo /run/wrappers/bin/sudo - ''; -}) diff --git a/pkgs/rrsync_sudo/sudo.patch b/pkgs/rrsync_sudo/sudo.patch deleted file mode 100644 index 6de9cc9..0000000 --- a/pkgs/rrsync_sudo/sudo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/support/rrsync 2015-09-14 01:23:54.000000000 +0200 -+++ b/support/rrsync 2020-02-08 13:55:14.302163313 +0100 -@@ -48,7 +48,7 @@ - - my $command = $ENV{SSH_ORIGINAL_COMMAND}; - die "$0: Not invoked via sshd\n$Usage" unless defined $command; --die "$0: SSH_ORIGINAL_COMMAND='$command' is not rsync\n" unless $command =~ s/^rsync\s+//; -+die "$0: SSH_ORIGINAL_COMMAND='$command' is not rsync\n" unless $command =~ s/^sudo rsync\s+//; - die "$0: --server option is not first\n" unless $command =~ /^--server\s/; - our $am_sender = $command =~ /^--server\s+--sender\s/; # Restrictive on purpose! - die "$0 sending to read-only server not allowed\n" if $only eq 'r' && !$am_sender; -@@ -227,7 +227,7 @@ - } - - # Note: This assumes that the rsync protocol will not be maliciously hijacked. --exec(RSYNC, @opts, @args) or die "exec(rsync @opts @args) failed: $? $!"; -+exec("/usr/bin/sudo", RSYNC, @opts, @args) or die "exec(sudo rsync @opts @args) failed: $? $!"; - - sub check_arg - { -- cgit v1.2.3