From: Peter Wagner Date: Sun, 26 Mar 2017 22:44:58 +0000 (+0200) Subject: git: update to 2.12.2 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e90b775740020786244cae69ff41c649f928d9d1;p=feed%2Fpackages.git git: update to 2.12.2 Signed-off-by: Peter Wagner --- diff --git a/net/git/Makefile b/net/git/Makefile index e6ce1092d7..b52f283ca3 100644 --- a/net/git/Makefile +++ b/net/git/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=git -PKG_VERSION:=2.12.1 +PKG_VERSION:=2.12.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/scm/git/ -PKG_HASH:=db11674364b764e101966d829a2e271c9b9d2a8bd4d8ecb4221a1dcdc9a3ada2 +PKG_HASH:=d21a9e23506e618d561fb25a8a7bd6134f927b86147930103487117a7a678c4a PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch index 83791f2806..d53a7a5666 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 -@@ -1125,7 +1125,7 @@ else +@@ -1123,7 +1123,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"