diff --git a/net/git/Makefile b/net/git/Makefile index 25275d13c..1879c4987 100644 --- a/net/git/Makefile +++ b/net/git/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=git -PKG_VERSION:=2.15.1 +PKG_VERSION:=2.16.1 PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/scm/git/ -PKG_HASH:=999c90fd7d45066992cdb87dda35bdff6dfc1d01496118ea718dfb866da4045c +PKG_HASH:=cfad4337f2fdbfc1e2c8abce5e17e1dd4e1718a34ac2cbe3238fbe2426f2ea19 PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 diff --git a/net/git/patches/100-configure_for_crosscompiling.patch b/net/git/patches/100-configure_for_crosscompiling.patch index b077c55c2..eb8d4f733 100644 --- a/net/git/patches/100-configure_for_crosscompiling.patch +++ b/net/git/patches/100-configure_for_crosscompiling.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -926,7 +926,8 @@ AC_RUN_IFELSE( +@@ -925,7 +925,8 @@ AC_RUN_IFELSE( FILE *f = fopen(".", "r"); return f)]])], [ac_cv_fread_reads_directories=no], @@ -10,7 +10,7 @@ ]) if test $ac_cv_fread_reads_directories = yes; then FREAD_READS_DIRECTORIES=UnfortunatelyYes -@@ -960,7 +961,8 @@ AC_RUN_IFELSE( +@@ -959,7 +960,8 @@ AC_RUN_IFELSE( if (snprintf(buf, 3, "%s", "12345") != 5 || strcmp(buf, "12")) return 1]])], [ac_cv_snprintf_returns_bogus=no], @@ -20,7 +20,7 @@ ]) if test $ac_cv_snprintf_returns_bogus = yes; then SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes -@@ -983,7 +985,8 @@ yippeeyeswehaveit +@@ -982,7 +984,8 @@ yippeeyeswehaveit #endif ]), [ac_cv_sane_mode_bits=yes], diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch index 1b9c47815..3d3a92e5d 100644 --- a/net/git/patches/200-imapsend_without_curl.patch +++ b/net/git/patches/200-imapsend_without_curl.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -1197,7 +1197,7 @@ else +@@ -1234,7 +1234,7 @@ else endif curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "072200"