msmtp: build fixes and update to 1.8.30 (#425312)
This commit is contained in:
		
						commit
						26b1f88f43
					
				| @ -1,17 +1,17 @@ | ||||
| diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq
 | ||||
| index bcb384e..dbaf1b5 100755
 | ||||
| index 28d0754..3eaac58 100755
 | ||||
| --- a/scripts/msmtpq/msmtpq
 | ||||
| +++ b/scripts/msmtpq/msmtpq
 | ||||
| @@ -92,6 +92,8 @@ if [ ! -v MSMTPQ_LOG ] ; then
 | ||||
|    fi | ||||
| @@ -182,6 +182,8 @@ if [ -n "$MSMTPQ_LOG" ] ; then
 | ||||
|    unset msmptq_log_dir | ||||
|  fi | ||||
|  [ -d "$(dirname "$MSMTPQ_LOG")" ] || mkdir -p "$(dirname "$MSMTPQ_LOG")" | ||||
| +
 | ||||
| +JOURNAL=@journal@
 | ||||
|  ## ====================================================================================== | ||||
|   | ||||
|  ## msmtpq can use the following environment variables : | ||||
| @@ -144,6 +146,7 @@ on_exit() {                          # unlock the queue on exit if the lock was
 | ||||
| +JOURNAL=@journal@
 | ||||
| +
 | ||||
|  umask 077                            # set secure permissions on created directories and files | ||||
|   | ||||
|  declare -i CNT                       # a count of mail(s) currently in the queue | ||||
| @@ -214,6 +216,7 @@ on_exit() {                          # unlock the queue on exit if the lock was
 | ||||
|  ## display msg to user, as well | ||||
|  ## | ||||
|  log() { | ||||
| @ -19,7 +19,7 @@ index bcb384e..dbaf1b5 100755 | ||||
|    local ARG RC PFX | ||||
|    PFX="$('date' +'%Y %d %b %H:%M:%S')" | ||||
|                                       # time stamp prefix - "2008 13 Mar 03:59:45 " | ||||
| @@ -161,10 +164,19 @@ log() {
 | ||||
| @@ -233,10 +236,19 @@ log() {
 | ||||
|      done | ||||
|    fi | ||||
|   | ||||
| @ -9,6 +9,7 @@ | ||||
|   bash, | ||||
|   coreutils, | ||||
|   gnugrep, | ||||
|   gnused, | ||||
|   gnutls, | ||||
|   gsasl, | ||||
|   libidn2, | ||||
| @ -20,6 +21,8 @@ | ||||
|   withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, | ||||
|   systemd, | ||||
|   withScripts ? true, | ||||
|   withLibnotify ? true, | ||||
|   libnotify, | ||||
|   gitUpdater, | ||||
|   binlore, | ||||
|   msmtp, | ||||
| @ -28,13 +31,13 @@ | ||||
| let | ||||
|   inherit (lib) getBin getExe optionals; | ||||
| 
 | ||||
|   version = "1.8.26"; | ||||
|   version = "1.8.30"; | ||||
| 
 | ||||
|   src = fetchFromGitHub { | ||||
|     owner = "marlam"; | ||||
|     repo = "msmtp"; | ||||
|     rev = "msmtp-${version}"; | ||||
|     hash = "sha256-MV3fzjjyr7qZw/BbKgsSObX+cxDDivI+0ZlulrPFiWM="; | ||||
|     hash = "sha256-aM2qId08zvT9LbncCQYHsklbvHVtcZJgr91JTjwpQ/0="; | ||||
|   }; | ||||
| 
 | ||||
|   meta = with lib; { | ||||
| @ -112,13 +115,17 @@ let | ||||
|       msmtpq = { | ||||
|         scripts = [ "bin/msmtpq" ]; | ||||
|         interpreter = getExe bash; | ||||
|         inputs = [ | ||||
|           binaries | ||||
|           coreutils | ||||
|           gnugrep | ||||
|           netcat-gnu | ||||
|           which | ||||
|         ] ++ optionals withSystemd [ systemd ]; | ||||
|         inputs = | ||||
|           [ | ||||
|             binaries | ||||
|             coreutils | ||||
|             gnugrep | ||||
|             gnused | ||||
|             netcat-gnu | ||||
|             which | ||||
|           ] | ||||
|           ++ optionals withSystemd [ systemd ] | ||||
|           ++ optionals withLibnotify [ libnotify ]; | ||||
|         execer = | ||||
|           [ | ||||
|             "cannot:${getBin binaries}/bin/msmtp" | ||||
| @ -126,9 +133,15 @@ let | ||||
|           ] | ||||
|           ++ optionals withSystemd [ | ||||
|             "cannot:${getBin systemd}/bin/systemd-cat" | ||||
|           ] | ||||
|           ++ optionals withLibnotify [ | ||||
|             "cannot:${getBin libnotify}/bin/notify-send" | ||||
|           ]; | ||||
|         fix."$MSMTP" = [ "msmtp" ]; | ||||
|         fake.external = [ "ping" ] ++ optionals (!withSystemd) [ "systemd-cat" ]; | ||||
|         fake.external = | ||||
|           [ "ping" ] | ||||
|           ++ optionals (!withSystemd) [ "systemd-cat" ] | ||||
|           ++ optionals (!withLibnotify) [ "notify-send" ]; | ||||
|         keep.source = [ "~/.msmtpqrc" ]; | ||||
|       }; | ||||
| 
 | ||||
| @ -13304,10 +13304,6 @@ with pkgs; | ||||
| 
 | ||||
|   taxi-cli = with python3Packages; toPythonApplication taxi; | ||||
| 
 | ||||
|   msmtp = callPackage ../applications/networking/msmtp { | ||||
|     autoreconfHook = buildPackages.autoreconfHook269; | ||||
|   }; | ||||
| 
 | ||||
|   imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { | ||||
|     lua = lua5; | ||||
|   }; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Sandro
						Sandro