##// END OF EJS Templates
dependencies: bumped GIT to 2.19.1 release
marcink -
r584:9a864b66 default
parent child Browse files
Show More
@@ -0,0 +1,26 b''
1 diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
2 --- a/Documentation/git-send-email.txt
3 +++ b/Documentation/git-send-email.txt
4 @@ -208,8 +208,7 @@ a password is obtained using 'git-credential'.
5 specify a full pathname of a sendmail-like program instead;
6 the program must support the `-i` option. Default value can
7 be specified by the `sendemail.smtpServer` configuration
8 - option; the built-in default is to search for `sendmail` in
9 - `/usr/sbin`, `/usr/lib` and $PATH if such program is
10 + option; the built-in default is to search in $PATH if such program is
11 available, falling back to `localhost` otherwise.
12
13 --smtp-server-port=<port>::
14 diff --git a/git-send-email.perl b/git-send-email.perl
15 --- a/git-send-email.perl
16 +++ b/git-send-email.perl
17 @@ -944,8 +944,7 @@ if (defined $reply_to) {
18 }
19
20 if (!defined $smtp_server) {
21 - my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail );
22 - push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH};
23 + my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH};
24 foreach (@sendmail_paths) {
25 if (-x $_) {
26 $smtp_server = $_;
@@ -0,0 +1,12 b''
1 diff --git a/t/test-lib.sh b/t/test-lib.sh
2 --- a/t/test-lib.sh
3 +++ b/t/test-lib.sh
4 @@ -923,7 +923,7 @@
5 then
6 GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) ||
7 error "Cannot run git from $GIT_TEST_INSTALLED."
8 - PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH
9 + PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH
10 GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
11 else # normal case, use ../bin-wrappers only unless $with_dashes:
12 git_bin_dir="$GIT_BUILD_DIR/bin-wrappers"
@@ -1,17 +1,19 b''
1 self: super: {
1 self: super: {
2 # bump GIT version
2 # bump GIT version
3 git = super.lib.overrideDerivation super.git (oldAttrs: {
3 git = super.lib.overrideDerivation super.git (oldAttrs: {
4 name = "git-2.17.2";
4 name = "git-2.19.1";
5 src = self.fetchurl {
5 src = self.fetchurl {
6 url = "https://www.kernel.org/pub/software/scm/git/git-2.17.2.tar.xz";
6 url = "https://www.kernel.org/pub/software/scm/git/git-2.19.1.tar.xz";
7 sha256 = "1ghljlxmyqphx13qspy382cpl2pbkbwbhqm7w7z57r9mkhswx668";
7 sha256 = "1dfv43lmdnxz42504jc89sihbv1d4d6kgqcz3c5ji140kfm5cl1l";
8 };
8 };
9
9
10 # patches come from: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/git
10 patches = [
11 patches = [
11 ./patches/git/docbook2texi.patch
12 ./patches/git/docbook2texi.patch
12 ./patches/git/symlinks-in-bin.patch
13 ./patches/git/git-sh-i18n.patch
13 ./patches/git/git-sh-i18n.patch
14 ./patches/git/ssh-path.patch
14 ./patches/git/ssh-path.patch
15 ./patches/git/git-send-email-honor-PATH.patch
16 ./patches/git/installCheck-path.patch
15 ];
17 ];
16
18
17 });
19 });
@@ -2,29 +2,29 b' This patch does two things: (1) use the '
2 and (2) make sure `gitman.info' isn't produced since it's broken (duplicate
2 and (2) make sure `gitman.info' isn't produced since it's broken (duplicate
3 node names).
3 node names).
4
4
5 diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile
5 diff --git a/Documentation/Makefile b/Documentation/Makefile
6 --- git-1.8.4-orig/Documentation/Makefile 2013-08-23 21:38:43.000000000 +0200
6 --- a/Documentation/Makefile
7 +++ git-1.8.4/Documentation/Makefile 2013-09-30 14:48:51.532890378 +0200
7 +++ b/Documentation/Makefile
8 @@ -101,7 +101,7 @@
8 @@ -122,7 +122,7 @@
9
9
10 MAKEINFO = makeinfo
10 MAKEINFO = makeinfo
11 INSTALL_INFO = install-info
11 INSTALL_INFO = install-info
12 -DOCBOOK2X_TEXI = docbook2x-texi
12 -DOCBOOK2X_TEXI = docbook2x-texi
13 +DOCBOOK2X_TEXI = docbook2texi
13 +DOCBOOK2X_TEXI = docbook2texi
14 DBLATEX = dblatex
14 DBLATEX = dblatex
15 ifndef PERL_PATH
15 ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
16 PERL_PATH = /usr/bin/perl
16 DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty
17 @@ -205,7 +205,7 @@
17 @@ -240,7 +240,7 @@
18 man5: $(DOC_MAN5)
18 man5: $(DOC_MAN5)
19 man7: $(DOC_MAN7)
19 man7: $(DOC_MAN7)
20
20
21 -info: git.info gitman.info
21 -info: git.info gitman.info
22 +info: git.info
22 +info: git.info
23
23
24 pdf: user-manual.pdf
24 pdf: user-manual.pdf
25
25
26 @@ -221,10 +221,9 @@
26 @@ -256,10 +256,9 @@
27
27
28 install-info: info
28 install-info: info
29 $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
29 $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
30 - $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir)
30 - $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir)
General Comments 0
You need to be logged in to leave comments. Login now