From 46d91345c25e2451853d7846d6764135f2a53cdc Mon Sep 17 00:00:00 2001 From: "Daniel F. Dickinson" Date: Thu, 2 Aug 2018 17:36:42 -0400 Subject: [PATCH 1/3] gitolite: Update to 3.6.8 Update to newest release. We also drop a now unnecesary patch. Signed-off-by: Daniel F. Dickinson --- 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 c6fd4a5bb..5a0139c29 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 6f7ee53ac..000000000 --- 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 -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 - From f27c3ae565b79eedfdc3cab62a28d19a4adf991d Mon Sep 17 00:00:00 2001 From: "Daniel F. Dickinson" Date: Thu, 2 Aug 2018 17:53:32 -0400 Subject: [PATCH 2/3] gitolite: Permit SSH login for gitolite user (git) The user defined in order to own and admin gitolite directories needs to not be expired else logins such SSH access will not be allowed for that user. So we unexpire user git by default. Signed-off-by: Daniel F. Dickinson --- net/gitolite/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/gitolite/Makefile b/net/gitolite/Makefile index 5a0139c29..358bc590d 100644 --- a/net/gitolite/Makefile +++ b/net/gitolite/Makefile @@ -42,6 +42,7 @@ endef define Package/gitolite/postinst sed -i -e 's,/var/run/git,/srv/git,' $${IPKG_INSTROOT}/etc/passwd sed -i -e 's,git:\(.*\):/bin/false,git:\1:/bin/ash,' $${IPKG_INSTROOT}/etc/passwd +sed -i -e 's,git:x:0:\(.*\)$$,git:x:99999:\1,' $${IPKG_INSTROOT}/etc/shadow endef define Build/Configure From 99eac722c26b0c4ec84f119fc48b5b735ff9a10f Mon Sep 17 00:00:00 2001 From: "Daniel F. Dickinson" Date: Thu, 2 Aug 2018 20:16:23 -0400 Subject: [PATCH 3/3] gitolite: Point to installation guide for OpenWrt In the description point to installation guide on OpenWrt Wiki to make it easier for new users to find and to understand how to use gitolite on OpenWrt. Signed-off-by: Daniel F. Dickinson --- net/gitolite/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/gitolite/Makefile b/net/gitolite/Makefile index 358bc590d..42ada2e6c 100644 --- a/net/gitolite/Makefile +++ b/net/gitolite/Makefile @@ -37,6 +37,7 @@ define Package/gitolite/description Gitolite is a system for managing access to git repositories. Note you will need to make sure dropbear does not interfere with OpenSSH as gitolite depends on feature not in dropbear (to my knowledge). + See https://openwrt.org/docs/guide-user/services/gitolite for a guide on installation. endef define Package/gitolite/postinst