--- rpms/smeserver-git/contribs9/smeserver-git.spec 2016/03/09 08:36:20 1.3 +++ rpms/smeserver-git/contribs9/smeserver-git.spec 2016/06/24 10:27:11 1.8 @@ -1,6 +1,6 @@ %define name smeserver-git %define version 1.1.0 -%define release 2 +%define release 7 Summary: Centralised Git repositories with setup and configuration through SME Server admin panels. Name: %{name} Version: %{version} @@ -18,6 +18,10 @@ Requires: e-smith-release >= 9.0 Requires: git AutoReqProv: no Patch1: smeserver-git-1.1.0-fix_missing_group_modify_event_check.patch +Patch2: smeserver-git-1.1.0-rewriterules_for_dot_git.patch +Patch3: smeserver-git-1.1.0-LocationMatch.patch +Patch4: smeserver-git-1.1.0-db_permissions.patch + %description smeserver-git enables centralised git repositories on an SME server and enables @@ -28,6 +32,24 @@ installs and enables the git server on t host.com/git. Repositories are then available as https://host.com/git/gitrepo.git. %changelog +* Fri Jun 24 2016 Jean-Philipe Pialasse 1.1.0-7.sme +- removing fragment migrate as it should not be used for that [SME: 9619] + +* Wed Jun 22 2016 Jean-Philipe Pialasse 1.1.0-6.sme +- fix missing ; in migrate fragment 80git to revert db permissions [SME: 9619] + +* Wed Jun 22 2016 Jean-Philipe Pialasse 1.1.0-5.sme +- fix too permissive permissions on db accounts networks and git [SME: 9615] [SME: 9616] + +* Sat Jun 11 2016 Jean-Philipe Pialasse 1.1.0-4.sme +- commented out back the rewrite rule on HEAD etc to allow CLI git +- fix auth not asked with Location after RewriteRule [SME: 9202] +- add trailing slash to root git url if omited +- only using git/repo.git or git/gitweb.cgi/repo.git will ask for auth + +* Fri Jun 10 2016 Jean-Philipe Pialasse 1.1.0-3.sme +- fix allow to see .git short url with gitweb [SME: 9202] + * Wed Mar 09 2016 JP Pialasse 1.1.0-2.sme - apply locale 2016-03-09 patch @@ -90,6 +112,10 @@ host.com/git. Repositories are then avai %prep %setup %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + mkdir -p root/home/e-smith/files/git/ %build perl createlinks @@ -117,11 +143,15 @@ if [ $1 -eq 1 ] ; then /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf /etc/e-smith/events/actions/navigation-conf fi -echo " - Ensuring git repositories configuration database has the right permissions ..." -chmod 664 /home/e-smith/db/git chown admin:www /home/e-smith/files/git /etc/rc7.d/S86httpd-e-smith sighup -echo "---------------------------------------------------------" + +# fixing needed permissions +chown root:www /home/e-smith/db/git +# fixing previous mess +chmod 640 /home/e-smnth/db/git +chmod 640 /home/e-smith/db/accounts +chmod 640 /home/e-smith/db/networks %postun if [ $1 -eq 0 ] ; then