diff options
| author | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2023-12-06 03:28:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-06 03:28:15 +0100 |
| commit | ba75066821491104c5104fd3b9503fb76d18ecf5 (patch) | |
| tree | 7014158c30b9768b976e3116bb5957ca20da2ead /pkgs/servers/mail | |
| parent | 87ec25bf5358b6c4732af61ce6713dc0b643daa8 (diff) | |
| parent | f41aba37396530c3fca935343069bf29b4564df3 (diff) | |
| download | nixlib-ba75066821491104c5104fd3b9503fb76d18ecf5.tar nixlib-ba75066821491104c5104fd3b9503fb76d18ecf5.tar.gz nixlib-ba75066821491104c5104fd3b9503fb76d18ecf5.tar.bz2 nixlib-ba75066821491104c5104fd3b9503fb76d18ecf5.tar.lz nixlib-ba75066821491104c5104fd3b9503fb76d18ecf5.tar.xz nixlib-ba75066821491104c5104fd3b9503fb76d18ecf5.tar.zst nixlib-ba75066821491104c5104fd3b9503fb76d18ecf5.zip | |
Merge pull request #271362 from pbsds/rm-dead-patches
treewide: remove unreferenced patch files
Diffstat (limited to 'pkgs/servers/mail')
| -rw-r--r-- | pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch b/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch deleted file mode 100644 index bac048892fe8..000000000000 --- a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 60abf3ee8864980a95b32e2d6cf60e26b49654c0 Mon Sep 17 00:00:00 2001 -From: joachim schiele <js@lastlog.de> -Date: Wed, 7 Jun 2017 22:15:39 +0200 -Subject: [PATCH 2/2] Adding --siteconfigpath to not be forced to use global /etc/spamasassin configuration directory but to provide an alternative location. - ---- - sa-update.raw | 5 +++++ - lib/Mail/SpamAssassin/PerMsgStatus.pm | 2 + - 2 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/sa-update.raw b/sa-update.raw -index bb7396d..39f681f 100755 ---- a/sa-update.raw -+++ b/sa-update.raw -@@ -196,6 +196,7 @@ GetOptions( - 'gpgkeyfile=s' => \$opt{'gpgkeyfile'}, - 'channelfile=s' => \$opt{'channelfile'}, - 'updatedir=s' => \$opt{'updatedir'}, -+ 'siteconfigpath=s' => \$opt{'siteconfigpath'}, - 'gpg!' => \$GPG_ENABLED, - - '4' => sub { $opt{'force_pf'} = 'inet' }, -@@ -267,6 +268,9 @@ else { - $opt{'updatedir'} = $SA->sed_path('__local_state_dir__/__version__'); - } - -+if (defined $opt{'siteconfigpath'}) { -+ $LOCAL_RULES_DIR = untaint_file_path($opt{'siteconfigpath'}); -+} - - # check only disabled gpg - # https://issues.apache.org/SpamAssassin/show_bug.cgi?id=5854 -@@ -1808,7 +1812,7 @@ Options: - --updatedir path Directory to place updates, defaults to the - SpamAssassin site rules directory - (default: @@LOCAL_STATE_DIR@@/@@VERSION@@) -+ --siteconfigpath=path Path for site configs - --refreshmirrors Force the MIRRORED.BY file to be updated - -D, --debug [area=n,...] Print debugging messages - -v, --verbose Be verbose, like print updated channel names; --- - -2.12.2 - |