git: update to 2.2.2

Signed-off-by: Peter Wagner <tripolar@gmx.at>

diff --git a/net/git/Makefile b/net/git/Makefile
index 03bd8e7d10c62cefc9f2e3b18086e4e44eb10b5c..1be8a01f78eb6427c0b84c36bedf6ba41c75c0ad 100644 (file)
--- a/net/git/Makefile
+++ b/net/git/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=git
-PKG_VERSION:=2.2.1
+PKG_VERSION:=2.2.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/scm/git/
-PKG_MD5SUM:=43e01f9d96ba8c11611e0eef0d9f9f28
+PKG_MD5SUM:=f694e8c911a6f7cfd7aec7b99454ed1f
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

diff --git a/net/git/patches/100-convert_builtin.patch b/net/git/patches/100-convert_builtin.patch
index e7ded54dac3b54c1b1307363e1e478f216c6c5f8..7cc0dfbca4800adf1c8ebf8bb6102fcc017ae958 100644 (file)
--- a/net/git/patches/100-convert_builtin.patch
+++ b/net/git/patches/100-convert_builtin.patch
@@ -40,7 +40,7 @@
        ifdef OPENSSLDIR
                BASIC_CFLAGS += -I$(OPENSSLDIR)/include
                OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
-@@ -1895,10 +1892,6 @@ endif
+@@ -1901,10 +1898,6 @@ endif
  git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
  
@@ -51,7 +51,7 @@
  git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
                $(LIBS) $(CURL_LIBCURL)
-@@ -2216,24 +2209,22 @@ endif
+@@ -2222,24 +2215,22 @@ endif
        bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
        execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
        { test "$$bindir/" = "$$execdir/" || \