git: bump version to 2.26.2

https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.24.1.txt https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.25.0.txt https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.25.1.txt https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.25.2.txt https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.26.0.txt https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.26.1.txt https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.26.2.txt
Freetz · May 16, 2020 · 394b6e8 · 394b6e8
1 parent dbde9d1
commit 394b6e8
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -115,7 +115,7 @@ Latest changes:
     * freetype 2.5.5
     * fuse 2.9.7
     * gdb 7.9.1
-    * git 2.24.0
+    * git 2.26.2
     * gmp 6.1.2
     * gnu-make 4.2.1
     * gnutls 3.5.19

diff --git a/make/git/Config.in b/make/git/Config.in
@@ -1,5 +1,5 @@
 config FREETZ_PACKAGE_GIT
-	bool "git 2.24.0"
+	bool "git 2.26.2"
 	select FREETZ_BUSYBOX_START_STOP_DAEMON
 	select FREETZ_LIB_libpthread
 	select FREETZ_LIB_libcurl

diff --git a/make/git/git.mk b/make/git/git.mk
@@ -1,6 +1,6 @@
-$(call PKG_INIT_BIN, 2.24.0)
+$(call PKG_INIT_BIN, 2.26.2)
 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.xz
-$(PKG)_SOURCE_SHA256:=9f71d61973626d8b28c4cdf8e2484b4bf13870ed643fed982d68b2cfd754371b
+$(PKG)_SOURCE_SHA256:=6d65132471df9e531807cb2746f8be317e22a343b9385bbe11c9ce7f0d2fc848
 $(PKG)_SITE:=@KERNEL/software/scm/git
 
 # files to be moved from /usr/lib/git-core to /usr/bin
@@ -29,6 +29,16 @@ $(PKG)_CONFIGURE_ENV += ac_cv_c_c99_format=yes
 $(PKG)_CONFIGURE_ENV += ac_cv_fread_reads_directories=no
 $(PKG)_CONFIGURE_ENV += ac_cv_snprintf_returns_bogus=no
 
+# Makefile option ICONV_OMITS_BOM exists since years but gets tested/set by configure only since 2.25.0
+# Note the proper semantic of the option is:
+#  iconv implementation does not write a byte-order mark (BOM)
+#  when writing UTF-16 or UTF-32 and always writes in big-endian format.
+#
+# This is true for big-endian uClibc (tested with ac_cv_iconv_omits_bom.c from target-tester).
+# The value is unknown for little endian boxes and for libiconv (used by uClibc-0.9.28 based boxes),
+# set it to "no" for these boxes as this is what we "did" so far by not setting ICONV_OMITS_BOM.
+$(PKG)_CONFIGURE_ENV += ac_cv_iconv_omits_bom=$(if $(FREETZ_TARGET_ARCH_BE),yes,no)
+
 $(PKG)_CONFIGURE_OPTIONS += --with-gitconfig=/tmp/flash/gitconfig
 $(PKG)_CONFIGURE_OPTIONS += --enable-pthreads
 $(PKG)_CONFIGURE_OPTIONS += --with-curl

diff --git a/make/git/patches/010-missing_NO_INSTALL_HARDLINKS.patch b/make/git/patches/010-missing_NO_INSTALL_HARDLINKS.patch
@@ -1,14 +1,14 @@
 --- Makefile
 +++ Makefile
-@@ -2140,6 +2140,7 @@
+@@ -2149,6 +2149,7 @@
 
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
 +	test -z "$(NO_INSTALL_HARDLINKS)" && \
  	ln $< $@ 2>/dev/null || \
  	ln -s $< $@ 2>/dev/null || \
  	cp $< $@
-@@ -2463,6 +2464,7 @@
+@@ -2472,6 +2473,7 @@
 
  $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
  	$(QUIET_LNCP)$(RM) $@ && \

diff --git a/make/git/patches/030-no_rpath.patch b/make/git/patches/030-no_rpath.patch
@@ -18,7 +18,7 @@
    for ac_prog in gar ar
 --- Makefile
 +++ Makefile
-@@ -1330,7 +1330,7 @@
+@@ -1339,7 +1339,7 @@
 
  ifdef LIBPCREDIR
  	BASIC_CFLAGS += -I$(LIBPCREDIR)/include
@@ -27,7 +27,7 @@
  endif
 
  ifdef HAVE_ALLOCA_H
-@@ -1350,7 +1350,7 @@
+@@ -1359,7 +1359,7 @@
  	ifdef CURLDIR
  		# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
  		BASIC_CFLAGS += -I$(CURLDIR)/include
@@ -36,7 +36,7 @@
  	else
  		CURL_LIBCURL =
  	endif
-@@ -1388,7 +1388,7 @@
+@@ -1397,7 +1397,7 @@
  	ifndef NO_EXPAT
  		ifdef EXPATDIR
  			BASIC_CFLAGS += -I$(EXPATDIR)/include
@@ -45,7 +45,7 @@
  		else
  			EXPAT_LIBEXPAT = -lexpat
  		endif
-@@ -1401,7 +1401,7 @@
+@@ -1410,7 +1410,7 @@
 
  ifdef ZLIB_PATH
  	BASIC_CFLAGS += -I$(ZLIB_PATH)/include
@@ -54,7 +54,7 @@
  endif
  EXTLIBS += -lz
 
-@@ -1409,7 +1409,7 @@
+@@ -1418,7 +1418,7 @@
  	OPENSSL_LIBSSL = -lssl
  	ifdef OPENSSLDIR
  		BASIC_CFLAGS += -I$(OPENSSLDIR)/include
@@ -63,7 +63,7 @@
  	else
  		OPENSSL_LINK =
  	endif
-@@ -1436,7 +1436,7 @@
+@@ -1445,7 +1445,7 @@
  	ifdef NEEDS_LIBICONV
  		ifdef ICONVDIR
  			BASIC_CFLAGS += -I$(ICONVDIR)/include

diff --git a/make/git/patches/050-dont-overwrite-patched-configure.patch b/make/git/patches/050-dont-overwrite-patched-configure.patch
@@ -1,6 +1,6 @@
 --- Makefile
 +++ Makefile
-@@ -2305,7 +2305,7 @@
+@@ -2314,7 +2314,7 @@
  		   autoconf -o configure configure.ac+ && \
  		   $(RM) configure.ac+
 

diff --git a/make/target-tester/src/ac_cv_iconv_omits_bom.c b/make/target-tester/src/ac_cv_iconv_omits_bom.c
@@ -0,0 +1,25 @@
+/*
+ * Usage: ./ac_cv_iconv_omits_bom && echo "no" || echo "yes"
+ */
+
+#include <stdio.h>
+
+#include <iconv.h>
+
+typedef char *iconv_ibp;
+
+int main() {
+	int v;
+	iconv_t conv;
+	char in[] = "a"; iconv_ibp pin = in;
+	char out[20] = ""; char *pout = out;
+	size_t isz = sizeof in;
+	size_t osz = sizeof out;
+
+	conv = iconv_open("UTF-16", "UTF-8");
+	iconv(conv, &pin, &isz, &pout, &osz);
+	iconv_close(conv);
+	fprintf(stderr, "%s\n", out);
+	v = (unsigned char)(out[0]) + (unsigned char)(out[1]);
+	return (v != (0xfe + 0xff));
+}
diff --git a/make/target-tester/target-tester.mk b/make/target-tester/target-tester.mk
@@ -9,6 +9,7 @@ $(PKG)_BINARIES:= \
 	ac_cv_func_mmap_fixed_mapped \
 	ac_cv_func_printf_unix98 \
 	ac_cv_func_vsnprintf_c99 \
+	ac_cv_iconv_omits_bom \
 	ac_cv_lbl_unaligned_fail \
 	ac_cv_libnet_endianess \
 	bash_cv_dup2_broken \