From 1673e33b202fd95eb704ab30ae10715455893faa Mon Sep 17 00:00:00 2001 From: Peter Wagner Date: Wed, 30 May 2018 01:07:15 +0200 Subject: [PATCH] git: update to 2.17.1 Fixes CVE-2018-11233 and CVE-2018-11235 Signed-off-by: Peter Wagner --- net/git/Makefile | 5 +++-- net/git/patches/200-imapsend_without_curl.patch | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/net/git/Makefile b/net/git/Makefile index 2c8bc98cde..e398247024 100644 --- a/net/git/Makefile +++ b/net/git/Makefile @@ -8,16 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=git -PKG_VERSION:=2.16.3 +PKG_VERSION:=2.17.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/scm/git/ -PKG_HASH:=d65d99e9e5b081c1f14ea018973806e942a2eb7d0da2ebc01bd2525adee62d48 +PKG_HASH:=79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=autoreconf +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch index 3d3a92e5d5..9f6f7a5627 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 -@@ -1234,7 +1234,7 @@ else +@@ -1238,7 +1238,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" -- 2.30.2