From 46d91345c25e2451853d7846d6764135f2a53cdc Mon Sep 17 00:00:00 2001
From: "Daniel F. Dickinson" <cshored@thecshore.com>
Date: Thu, 2 Aug 2018 17:36:42 -0400
Subject: [PATCH] gitolite: Update to 3.6.8

Update to newest release.  We also drop a now unnecesary patch.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
---
 net/gitolite/Makefile                         |  7 ++---
 .../patches/100-fix-missing-hooks-dir.patch   | 27 -------------------
 2 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 net/gitolite/patches/100-fix-missing-hooks-dir.patch

diff --git a/net/gitolite/Makefile b/net/gitolite/Makefile
index c6fd4a5bb5..5a0139c292 100644
--- a/net/gitolite/Makefile
+++ b/net/gitolite/Makefile
@@ -8,14 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gitolite
-PKG_VERSION:=3.6.6
+PKG_VERSION:=3.6.8
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz
-PKG_MIRROR_HASH:=b2d96c36682391f45c63b21a91fbe77a969a7b362417c851dd0091a06fcc74d9
+PKG_MIRROR_HASH:=652d3b3f8ed93b8ef56153337465cc7260974e5cd2653e949da1bb97a8421ea0
+
 PKG_SOURCE_URL:=https://github.com/sitaramc/gitolite.git
-PKG_SOURCE_VERSION:=908f8c6f3b8ef5b95829be7155be2557e71f4579
+PKG_SOURCE_VERSION:=e126e97a4d5575821f89ae80dac402b017db94aa
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
diff --git a/net/gitolite/patches/100-fix-missing-hooks-dir.patch b/net/gitolite/patches/100-fix-missing-hooks-dir.patch
deleted file mode 100644
index 6f7ee53ac6..0000000000
--- a/net/gitolite/patches/100-fix-missing-hooks-dir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d0409ae1164030913801d37ce5425ed93529c69d Mon Sep 17 00:00:00 2001
-From: Daniel Dickinson <gitolite@daniel.thecshore.com>
-Date: Fri, 1 Jul 2016 00:37:23 -0400
-Subject: [PATCH] Conf::Store: Fix missing hooks dir for symlink
-
-At least when doing 'gitolite setup -pk user.pub', the
-symlinking of hooks fails because the hooks directory
-does not exist.  Make sure we create it if it's missing.
----
- src/lib/Gitolite/Conf/Store.pm | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/Gitolite/Conf/Store.pm b/src/lib/Gitolite/Conf/Store.pm
-index 5568b3f..aac90d4 100644
---- a/src/lib/Gitolite/Conf/Store.pm
-+++ b/src/lib/Gitolite/Conf/Store.pm
-@@ -363,6 +363,7 @@ sub store_common {
-             chmod 0755, "$rc{GL_ADMIN_BASE}/hooks/gitolite-admin/post-update";
-             $hook_reset++;
-         }
-+	_mkdir("$repo.git/hooks");
- 
-         # propagate user-defined (custom) hooks to all repos
-         ln_sf( "$rc{LOCAL_CODE}/hooks/common", "*", "$repo.git/hooks" ) if $rc{LOCAL_CODE};
--- 
-2.7.4
-
-- 
2.30.2