Browse Source

git: update to 2.14.0

Signed-off-by: Peter Wagner <tripolar@gmx.at>
lilik-openwrt-22.03
Peter Wagner 7 years ago
parent
commit
61f48f8df8
3 changed files with 7 additions and 7 deletions
  1. +2
    -2
      net/git/Makefile
  2. +4
    -4
      net/git/patches/100-configure_for_crosscompiling.patch
  3. +1
    -1
      net/git/patches/200-imapsend_without_curl.patch

+ 2
- 2
net/git/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=git PKG_NAME:=git
PKG_VERSION:=2.13.3
PKG_VERSION:=2.14.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/software/scm/git/ PKG_SOURCE_URL:=@KERNEL/software/scm/git/
PKG_HASH:=91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62
PKG_HASH:=f93e6e6a307d2e953cccafd9f4003c62992628fa508d07586476c953c1655975
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1


+ 4
- 4
net/git/patches/100-configure_for_crosscompiling.patch View File

@ -1,8 +1,8 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -869,7 +869,8 @@ AC_RUN_IFELSE(
@@ -926,7 +926,8 @@ AC_RUN_IFELSE(
FILE *f = fopen(".", "r"); FILE *f = fopen(".", "r");
return f && fread(&c, 1, 1, f)]])],
return f)]])],
[ac_cv_fread_reads_directories=no], [ac_cv_fread_reads_directories=no],
- [ac_cv_fread_reads_directories=yes]) - [ac_cv_fread_reads_directories=yes])
+ [ac_cv_fread_reads_directories=yes], + [ac_cv_fread_reads_directories=yes],
@ -10,7 +10,7 @@
]) ])
if test $ac_cv_fread_reads_directories = yes; then if test $ac_cv_fread_reads_directories = yes; then
FREAD_READS_DIRECTORIES=UnfortunatelyYes FREAD_READS_DIRECTORIES=UnfortunatelyYes
@@ -903,7 +904,8 @@ AC_RUN_IFELSE(
@@ -960,7 +961,8 @@ AC_RUN_IFELSE(
if (snprintf(buf, 3, "%s", "12345") != 5 if (snprintf(buf, 3, "%s", "12345") != 5
|| strcmp(buf, "12")) return 1]])], || strcmp(buf, "12")) return 1]])],
[ac_cv_snprintf_returns_bogus=no], [ac_cv_snprintf_returns_bogus=no],
@ -20,7 +20,7 @@
]) ])
if test $ac_cv_snprintf_returns_bogus = yes; then if test $ac_cv_snprintf_returns_bogus = yes; then
SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
@@ -926,7 +928,8 @@ yippeeyeswehaveit
@@ -983,7 +985,8 @@ yippeeyeswehaveit
#endif #endif
]), ]),
[ac_cv_sane_mode_bits=yes], [ac_cv_sane_mode_bits=yes],


+ 1
- 1
net/git/patches/200-imapsend_without_curl.patch View File

@ -1,6 +1,6 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -1137,7 +1137,7 @@ else
@@ -1197,7 +1197,7 @@ else
endif endif
curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) 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" ifeq "$(curl_check)" "072200"


Loading…
Cancel
Save