From 2690fd9eecc0b164cf15a60d4792929c0a9a7d06 Mon Sep 17 00:00:00 2001 From: Peter Wagner Date: Tue, 21 Mar 2017 23:31:54 +0100 Subject: git: update to 1.12.1 Signed-off-by: Peter Wagner --- .../patches/100-configure_for_crosscompiling.patch | 32 ++++++++++++++++++++++ net/git/patches/200-disable_fasthash.patch | 12 -------- net/git/patches/200-imapsend_without_curl.patch | 11 ++++++++ net/git/patches/300-configure_for_crosscompiling | 32 ---------------------- net/git/patches/400-imapsend_without_curl.patch | 11 -------- 5 files changed, 43 insertions(+), 55 deletions(-) create mode 100644 net/git/patches/100-configure_for_crosscompiling.patch delete mode 100644 net/git/patches/200-disable_fasthash.patch create mode 100644 net/git/patches/200-imapsend_without_curl.patch delete mode 100644 net/git/patches/300-configure_for_crosscompiling delete mode 100644 net/git/patches/400-imapsend_without_curl.patch (limited to 'net/git/patches') diff --git a/net/git/patches/100-configure_for_crosscompiling.patch b/net/git/patches/100-configure_for_crosscompiling.patch new file mode 100644 index 000000000..e93f71b4d --- /dev/null +++ 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 deleted file mode 100644 index 91f255f80..000000000 --- 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/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch new file mode 100644 index 000000000..83791f280 --- /dev/null +++ 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 deleted file mode 100644 index 8a8ce289d..000000000 --- a/net/git/patches/300-configure_for_crosscompiling +++ /dev/null @@ -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 deleted file mode 100644 index 06d32a9d5..000000000 --- a/net/git/patches/400-imapsend_without_curl.patch +++ /dev/null @@ -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 -- cgit v1.2.3