diff --git a/git/build.sh b/git/build.sh index e379951..30192d9 100755 --- a/git/build.sh +++ b/git/build.sh @@ -6,13 +6,13 @@ ########################################################### # Check the following 4 variables before running the script topdir=git -version=2.8.3 +version=2.11.0 pkgver=1 source[0]=https://www.kernel.org/pub/software/scm/git/$topdir-$version.tar.gz source[1]=https://www.kernel.org/pub/software/scm/git/$topdir-manpages-$version.tar.gz # If there are no patches, simply comment this patch[0]=git-1.8.1.5-inet_addrstrlen.patch -patch[1]=git-2.6.3-stdint_h.patch +patch[1]=git-2.11.0-stdint_h.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions @@ -33,6 +33,7 @@ prep() setdir source cat << EOF > config.mak CC=$CC +SHELL=$prefix/bin/bash PERL_PATH=$prefix/bin/perl SHELL_PATH=$prefix/bin/bash ICONVDIR=$prefix diff --git a/git/meta/ChangeLog b/git/meta/ChangeLog index 25c11a2..f5e6ad1 100644 --- a/git/meta/ChangeLog +++ b/git/meta/ChangeLog @@ -1,5 +1,8 @@ CHANGELOG --------- +* Tue Dec 20 2016 Tom G. Christensen - 2.11.0-1 +- Update to 2.11.0 + * Tue May 24 2016 Tom G. Christensen - 2.8.3-1 - Update to 2.8.3 - Drop upstreamed patches diff --git a/git/src/git-2.11.0-stdint_h.patch b/git/src/git-2.11.0-stdint_h.patch new file mode 100644 index 0000000..1411eee --- /dev/null +++ b/git/src/git-2.11.0-stdint_h.patch @@ -0,0 +1,11 @@ +--- git-2.11.0/compat/regex/regex.c.stdint_h 2016-11-29 22:06:51.000000000 +0100 ++++ git-2.11.0/compat/regex/regex.c 2016-12-20 22:58:12.054712000 +0100 +@@ -60,7 +60,7 @@ + GNU regex allows. Include it before , which correctly + #undefs RE_DUP_MAX and sets it to the right value. */ + #include +-#include ++#include + + #ifdef GAWK + #undef alloca diff --git a/git/src/git-2.6.3-stdint_h.patch b/git/src/git-2.6.3-stdint_h.patch deleted file mode 100644 index 44ff964..0000000 --- a/git/src/git-2.6.3-stdint_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- git-2.6.3/compat/regex/regcomp.c.no_stdint-h 2015-11-05 22:31:55.000000000 +0100 -+++ git-2.6.3/compat/regex/regcomp.c 2015-11-11 18:24:26.206399000 +0100 -@@ -18,7 +18,7 @@ - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA. */ - --#include -+#include - - static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern, - size_t length, reg_syntax_t syntax);