git: update to 1.12.1

Signed-off-by: Peter Wagner <redacted>

diff --git a/net/git/Makefile b/net/git/Makefile
index ac271ab98a87886156f9597365719dd5173689c4..e6ce1092d71dbe1815aaa6ac6824c8c7e38b226b 100644 (file)
--- 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/300-configure_for_crosscompiling b/net/git/patches/100-configure_for_crosscompiling.patch
similarity index 89%
rename from net/git/patches/300-configure_for_crosscompiling
rename to net/git/patches/100-configure_for_crosscompiling.patch
index 8a8ce289d93987d34908a606e8cd6362813bd74b..e93f71b4d0bb46287922fd3b8c01061c876f18e1 100644 (file)
--- a/net/git/patches/300-configure_for_crosscompiling
+++ b/net/git/patches/100-configure_for_crosscompiling.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -867,7 +867,8 @@ AC_RUN_IFELSE(
+@@ -869,7 +869,8 @@ AC_RUN_IFELSE(
                FILE *f = fopen(".", "r");
                return f && fread(&c, 1, 1, f)]])],
        [ac_cv_fread_reads_directories=no],
@@ -10,7 +10,7 @@
  ])
  if test $ac_cv_fread_reads_directories = yes; then
        FREAD_READS_DIRECTORIES=UnfortunatelyYes
-@@ -901,7 +902,8 @@ AC_RUN_IFELSE(
+@@ -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],
@@ -20,7 +20,7 @@
  ])
  if test $ac_cv_snprintf_returns_bogus = yes; then
        SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
-@@ -924,7 +926,8 @@ yippeeyeswehaveit
+@@ -926,7 +928,8 @@ yippeeyeswehaveit
  #endif
  ]),
        [ac_cv_sane_mode_bits=yes],

diff --git a/net/git/patches/200-disable_fasthash.patch b/net/git/patches/200-disable_fasthash.patch
deleted file mode 100644 (file)
index 91f255f..0000000
--- a/net/git/patches/200-disable_fasthash.patch
+++ /dev/null
@@ -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/400-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch
similarity index 92%
rename from net/git/patches/400-imapsend_without_curl.patch
rename to net/git/patches/200-imapsend_without_curl.patch
index 06d32a9d510972d50eba52ef8d0672281265e6a3..83791f28061a72f641a179c6ec21a58f6965ed97 100644 (file)
--- a/net/git/patches/400-imapsend_without_curl.patch
+++ b/net/git/patches/200-imapsend_without_curl.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -1117,7 +1117,7 @@ else
+@@ -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"