msmtp: 1.8.20 -> 1.8.22
This commit is contained in:
parent
8afc4ed0a8
commit
8e35fb01ab
|
@ -24,13 +24,13 @@
|
|||
let
|
||||
inherit (lib) getBin getExe optionals;
|
||||
|
||||
version = "1.8.20";
|
||||
version = "1.8.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marlam";
|
||||
repo = "msmtp-mirror";
|
||||
rev = "msmtp-${version}";
|
||||
hash = "sha256-RcQZ7Vm8UjJJoogkmUmZ+/2fz7C4AcVYY/kTOlfz7+I=";
|
||||
hash = "sha256-Jt/uvGBrYYr6ua6LVPiP0nuRiIkxBJASdgHBNHivzxQ=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,31 +1,35 @@
|
|||
commit 35cab741af069571cf4c55e0ce1ae96617d5778c
|
||||
Author: Peter Hoeg <peter@hoeg.com>
|
||||
Date: Fri Aug 12 10:52:22 2022 +0800
|
||||
|
||||
nixify
|
||||
|
||||
diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq
|
||||
index 1b39fc6..4baa19b 100755
|
||||
index d8b4039..1ab89f8 100755
|
||||
--- a/scripts/msmtpq/msmtpq
|
||||
+++ b/scripts/msmtpq/msmtpq
|
||||
@@ -70,8 +70,8 @@ MSMTP=msmtp
|
||||
@@ -71,7 +71,7 @@ fi
|
||||
## ( chmod 0700 msmtp.queue )
|
||||
##
|
||||
## the queue dir - modify this to reflect where you'd like it to be (no quotes !!)
|
||||
-Q=~/.msmtp.queue
|
||||
-[ -d "$Q" ] || mkdir -m 0700 "$Q" || \
|
||||
## the queue dir - export this variable to reflect where you'd like it to be (no quotes !!)
|
||||
-Q=${Q:-~/.msmtp.queue}
|
||||
+Q=${MSMTP_QUEUE:-~/.msmtp.queue}
|
||||
+[ -d "$Q" ] || mkdir -m 0700 -p "$Q" || \
|
||||
[ -d "$Q" ] || mkdir -m 0700 -p "$Q" || \
|
||||
err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit
|
||||
##
|
||||
## set the queue log file var to the location of the msmtp queue log file
|
||||
@@ -84,7 +84,10 @@ Q=~/.msmtp.queue
|
||||
## (doing so would be inadvisable under most conditions, however)
|
||||
@@ -85,8 +85,10 @@ Q=${Q:-~/.msmtp.queue}
|
||||
##
|
||||
## the queue log file - modify (or comment out) to taste (but no quotes !!)
|
||||
-LOG=~/log/msmtp.queue.log
|
||||
## the queue log file - export this variable to change where logs are stored (but no quotes !!)
|
||||
## Set it to "" (empty string) to disable logging.
|
||||
-[ -v LOG ] || LOG=~/log/msmtp.queue.log
|
||||
+LOG=${MSMTP_LOG:-~/log/msmtp.queue.log}
|
||||
+[ -d "$(dirname "$LOG")" ] || mkdir -p "$(dirname "$LOG")"
|
||||
[ -d "$(dirname "$LOG")" ] || mkdir -p "$(dirname "$LOG")"
|
||||
+
|
||||
+JOURNAL=@journal@
|
||||
## ======================================================================================
|
||||
|
||||
## msmtpq can use the following environment variables :
|
||||
@@ -138,6 +141,7 @@ on_exit() { # unlock the queue on exit if the lock was
|
||||
@@ -139,6 +141,7 @@ on_exit() { # unlock the queue on exit if the lock was
|
||||
## display msg to user, as well
|
||||
##
|
||||
log() {
|
||||
|
@ -33,14 +37,14 @@ index 1b39fc6..4baa19b 100755
|
|||
local ARG RC PFX
|
||||
PFX="$('date' +'%Y %d %b %H:%M:%S')"
|
||||
# time stamp prefix - "2008 13 Mar 03:59:45 "
|
||||
@@ -155,10 +159,19 @@ log() {
|
||||
@@ -156,10 +159,19 @@ log() {
|
||||
done
|
||||
fi
|
||||
|
||||
+ if [ "$JOURNAL" == "Y" ]; then
|
||||
+ for ARG ; do
|
||||
+ [ -n "$ARG" ] && \
|
||||
+ echo "$ARG" | systemd-cat -t $NAME -p info
|
||||
+ if [ "$JOURNAL" = "Y" ]; then
|
||||
+ for ARG; do
|
||||
+ [ -n "$ARG" ] &&
|
||||
+ echo "$ARG" | systemd-cat -t "$NAME" -p info
|
||||
+ done
|
||||
+ fi
|
||||
+
|
||||
|
@ -48,8 +52,8 @@ index 1b39fc6..4baa19b 100755
|
|||
[ -n "$LKD" ] && lock_queue -u # unlock here (if locked)
|
||||
[ -n "$LOG" ] && \
|
||||
echo " exit code = $RC" >> "$LOG" # logging ok ; send exit code to log
|
||||
+ [ "$JOURNAL" == "Y" ] && \
|
||||
+ echo "exit code= $RC" | systemd-cat -t $NAME -p emerg
|
||||
+ [ "$JOURNAL" = "Y" ] && \
|
||||
+ echo "exit code= $RC" | systemd-cat -t "$NAME" -p emerg
|
||||
exit "$RC" # exit w/return code
|
||||
fi
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue