commit 2690fd9eecc0b164cf15a60d4792929c0a9a7d06
parent 9be7653a3a1a8a2865fa40aaef6cbf8b3258be8f
Author: Peter Wagner <tripolar@gmx.at>
Date: Tue, 21 Mar 2017 23:31:54 +0100
git: update to 1.12.1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
Diffstat:
6 files changed, 45 insertions(+), 57 deletions(-)
diff --git a/net/git/Makefile b/net/git/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=git
-PKG_VERSION:=2.11.1
+PKG_VERSION:=2.12.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/software/scm/git/
-PKG_HASH:=c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415
+PKG_HASH:=db11674364b764e101966d829a2e271c9b9d2a8bd4d8ecb4221a1dcdc9a3ada2
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
@@ -0,0 +1,32 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -869,7 +869,8 @@ AC_RUN_IFELSE(
+ FILE *f = fopen(".", "r");
+ return f && fread(&c, 1, 1, f)]])],
+ [ac_cv_fread_reads_directories=no],
+- [ac_cv_fread_reads_directories=yes])
++ [ac_cv_fread_reads_directories=yes],
++ [ac_cv_fread_reads_directories=no])
+ ])
+ if test $ac_cv_fread_reads_directories = yes; then
+ FREAD_READS_DIRECTORIES=UnfortunatelyYes
+@@ -903,7 +904,8 @@ AC_RUN_IFELSE(
+ if (snprintf(buf, 3, "%s", "12345") != 5
+ || strcmp(buf, "12")) return 1]])],
+ [ac_cv_snprintf_returns_bogus=no],
+- [ac_cv_snprintf_returns_bogus=yes])
++ [ac_cv_snprintf_returns_bogus=yes],
++ [ac_cv_snprintf_returns_bogus=no])
+ ])
+ if test $ac_cv_snprintf_returns_bogus = yes; then
+ SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
+@@ -926,7 +928,8 @@ yippeeyeswehaveit
+ #endif
+ ]),
+ [ac_cv_sane_mode_bits=yes],
+- [ac_cv_sane_mode_bits=no])
++ [ac_cv_sane_mode_bits=no],
++ [ac_cv_sane_mode_bits=yes])
+ ])
+ if test $ac_cv_sane_mode_bits = yes; then
+ NEEDS_MODE_TRANSLATION=
diff --git a/net/git/patches/200-disable_fasthash.patch b/net/git/patches/200-disable_fasthash.patch
@@ -1,12 +0,0 @@
---- a/config.mak.uname
-+++ b/config.mak.uname
-@@ -17,9 +17,6 @@ endif
- # because maintaining the nesting to match is a pain. If
- # we had "elif" things would have been much nicer...
-
--ifeq ($(uname_M),x86_64)
-- XDL_FAST_HASH = YesPlease
--endif
- ifeq ($(uname_S),OSF1)
- # Need this for u_short definitions et al
- BASIC_CFLAGS += -D_OSF_SOURCE
diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1125,7 +1125,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"
+- USE_CURL_FOR_IMAP_SEND = YesPlease
++# USE_CURL_FOR_IMAP_SEND = YesPlease
+ endif
+ ifdef USE_CURL_FOR_IMAP_SEND
+ BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
diff --git a/net/git/patches/300-configure_for_crosscompiling b/net/git/patches/300-configure_for_crosscompiling
@@ -1,32 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -867,7 +867,8 @@ AC_RUN_IFELSE(
- FILE *f = fopen(".", "r");
- return f && fread(&c, 1, 1, f)]])],
- [ac_cv_fread_reads_directories=no],
-- [ac_cv_fread_reads_directories=yes])
-+ [ac_cv_fread_reads_directories=yes],
-+ [ac_cv_fread_reads_directories=no])
- ])
- if test $ac_cv_fread_reads_directories = yes; then
- FREAD_READS_DIRECTORIES=UnfortunatelyYes
-@@ -901,7 +902,8 @@ AC_RUN_IFELSE(
- if (snprintf(buf, 3, "%s", "12345") != 5
- || strcmp(buf, "12")) return 1]])],
- [ac_cv_snprintf_returns_bogus=no],
-- [ac_cv_snprintf_returns_bogus=yes])
-+ [ac_cv_snprintf_returns_bogus=yes],
-+ [ac_cv_snprintf_returns_bogus=no])
- ])
- if test $ac_cv_snprintf_returns_bogus = yes; then
- SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
-@@ -924,7 +926,8 @@ yippeeyeswehaveit
- #endif
- ]),
- [ac_cv_sane_mode_bits=yes],
-- [ac_cv_sane_mode_bits=no])
-+ [ac_cv_sane_mode_bits=no],
-+ [ac_cv_sane_mode_bits=yes])
- ])
- if test $ac_cv_sane_mode_bits = yes; then
- NEEDS_MODE_TRANSLATION=
diff --git a/net/git/patches/400-imapsend_without_curl.patch b/net/git/patches/400-imapsend_without_curl.patch
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1117,7 +1117,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"
-- USE_CURL_FOR_IMAP_SEND = YesPlease
-+# USE_CURL_FOR_IMAP_SEND = YesPlease
- endif
- ifdef USE_CURL_FOR_IMAP_SEND
- BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
