Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge older staging (finished on Hydra)
- Loading branch information
Showing
14 changed files
with
87 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 13 additions & 32 deletions
45
pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,47 +1,28 @@ | ||
From 9a4396ddaedaf59ebee16d69900884e990b79cdd Mon Sep 17 00:00:00 2001 | ||
From: Florian Klink <flokli@flokli.de> | ||
Date: Fri, 17 Nov 2017 13:21:37 +0100 | ||
Subject: [PATCH] git-send-email: honor $PATH | ||
|
||
This will search $PATH for a sendmail binary, instead of the (previously | ||
fixed) list of paths. | ||
|
||
Signed-off-by: Florian Klink <flokli@flokli.de> | ||
--- | ||
Documentation/git-send-email.txt | 5 ++--- | ||
git-send-email.perl | 3 ++- | ||
2 files changed, 4 insertions(+), 4 deletions(-) | ||
|
||
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt | ||
index bac9014ac..b9b1f2c41 100644 | ||
index 8060ea35c..c81067a19 100644 | ||
--- a/Documentation/git-send-email.txt | ||
+++ b/Documentation/git-send-email.txt | ||
@@ -203,9 +203,8 @@ a password is obtained using 'git-credential'. | ||
@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'. | ||
specify a full pathname of a sendmail-like program instead; | ||
the program must support the `-i` option. Default value can | ||
be specified by the `sendemail.smtpServer` configuration | ||
- option; the built-in default is `/usr/sbin/sendmail` or | ||
- `/usr/lib/sendmail` if such program is available, or | ||
- `localhost` otherwise. | ||
+ option; the built-in default is to search in $PATH if such program is | ||
+ available, or `localhost` otherwise. | ||
|
||
- option; the built-in default is to search for `sendmail` in | ||
- `/usr/sbin`, `/usr/lib` and $PATH if such program is | ||
+ option; the built-in default is to search in $PATH if such program is | ||
available, falling back to `localhost` otherwise. | ||
|
||
--smtp-server-port=<port>:: | ||
Specifies a port different from the default port (SMTP | ||
diff --git a/git-send-email.perl b/git-send-email.perl | ||
index 2208dcc21..8e357aeab 100755 | ||
index edcc6d346..8e357aeab 100755 | ||
--- a/git-send-email.perl | ||
+++ b/git-send-email.perl | ||
@@ -885,7 +885,8 @@ if (defined $initial_reply_to) { | ||
@@ -885,8 +885,7 @@ if (defined $initial_reply_to) { | ||
} | ||
|
||
if (!defined $smtp_server) { | ||
- foreach (qw( /usr/sbin/sendmail /usr/lib/sendmail )) { | ||
- my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail ); | ||
- push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH}; | ||
+ my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH}; | ||
+ foreach (@sendmail_paths) { | ||
foreach (@sendmail_paths) { | ||
if (-x $_) { | ||
$smtp_server = $_; | ||
last; | ||
-- | ||
2.15.0 | ||
|
22 changes: 11 additions & 11 deletions
22
pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters