mirror of
https://github.com/openwrt/packages.git
synced 2026-01-10 11:44:48 +00:00
git: update to 2.45.2
- Replace one patch with configure vars override - Refresh other patches Signed-off-by: Aleksey Vasilenko <aleksey.vasilenko@gmail.com>
This commit is contained in:
committed by
Rosen Penev
parent
6101b30834
commit
9da221c6f7
@@ -8,12 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=git
|
||||
PKG_VERSION:=2.44.0
|
||||
PKG_VERSION:=2.45.2
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=@KERNEL/software/scm/git/
|
||||
PKG_HASH:=e358738dcb5b5ea340ce900a0015c03ae86e804e7ff64e47aa4631ddee681de3
|
||||
PKG_HASH:=51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb
|
||||
|
||||
PKG_LICENSE:=GPL-2.0-or-later
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
@@ -102,6 +102,11 @@ MAKE_FLAGS := \
|
||||
CONFIGURE_ARGS += \
|
||||
--without-iconv \
|
||||
|
||||
CONFIGURE_VARS += \
|
||||
ac_cv_fread_reads_directories=yes \
|
||||
ac_cv_snprintf_returns_bogus=yes \
|
||||
ac_cv_sane_mode_bits=no
|
||||
|
||||
define Build/Configure
|
||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||
configure
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -964,7 +964,8 @@ AC_RUN_IFELSE(
|
||||
FILE *f = fopen(".", "r");
|
||||
return f != NULL;]])],
|
||||
[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
|
||||
@@ -998,7 +999,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
|
||||
@@ -1021,7 +1023,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=
|
||||
@@ -1,11 +1,11 @@
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1636,7 +1636,7 @@ else
|
||||
endif
|
||||
@@ -1642,7 +1642,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"
|
||||
ifeq "$(curl_check)" "072200"
|
||||
- USE_CURL_FOR_IMAP_SEND = YesPlease
|
||||
+# USE_CURL_FOR_IMAP_SEND = YesPlease
|
||||
endif
|
||||
ifdef USE_CURL_FOR_IMAP_SEND
|
||||
endif
|
||||
ifdef USE_CURL_FOR_IMAP_SEND
|
||||
BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
|
||||
|
||||
@@ -14,7 +14,7 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
|
||||
|
||||
--- a/imap-send.c
|
||||
+++ b/imap-send.c
|
||||
@@ -278,8 +278,10 @@ static int ssl_socket_connect(struct ima
|
||||
@@ -261,8 +261,10 @@ static int ssl_socket_connect(struct ima
|
||||
int ret;
|
||||
X509 *cert;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user