diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2019-11-24 15:49:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 15:49:42 +0200 |
| commit | c6a8853c0d31541899db4e3b4a75092db3bbee54 (patch) | |
| tree | 20f558eaa46e46a0e9b172acba610b0346f7092c /net | |
| parent | b25543c3f35ccb6009343b5d7ae485506c1d1099 (diff) | |
| parent | 887b4e90e6ad42c3c474fdcc6c340c7dbec9984e (diff) | |
Merge pull request #10519 from BKPepe/git
git: Update to version 2.24.0
Diffstat (limited to 'net')
| -rw-r--r-- | net/git/Makefile | 4 | ||||
| -rw-r--r-- | net/git/patches/200-imapsend_without_curl.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/git/Makefile b/net/git/Makefile index 725a965ae..d982af4b3 100644 --- a/net/git/Makefile +++ b/net/git/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=git -PKG_VERSION:=2.23.0 +PKG_VERSION:=2.24.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/scm/git/ -PKG_HASH:=234fa05b6839e92dc300b2dd78c92ec9c0c8d439f65e1d430a7034f60af16067 +PKG_HASH:=9f71d61973626d8b28c4cdf8e2484b4bf13870ed643fed982d68b2cfd754371b PKG_INSTALL:=1 PKG_FIXUP:=autoreconf diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch index c13336ef0..e38301136 100644 --- a/net/git/patches/200-imapsend_without_curl.patch +++ b/net/git/patches/200-imapsend_without_curl.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -1365,7 +1365,7 @@ endif +@@ -1378,7 +1378,7 @@ endif 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" |