--- rpms/smeserver-git/contribs8/smeserver-git.spec 2016/06/10 14:58:00 1.6 +++ rpms/smeserver-git/contribs8/smeserver-git.spec 2016/06/24 10:29:30 1.13 @@ -1,6 +1,6 @@ %define name smeserver-git %define version 1.0.0 -%define release 44 +%define release 51 Summary: Centralised Git repositories with setup and configuration through SME Server admin panels. Name: %{name} Version: %{version} @@ -13,6 +13,8 @@ Source: smeserver-git-%{version}.tar.gz Patch0: smeserver-git-1.0.0-locale-2016-03-09.patch Patch1: smeserver-git-1.0.0-fix_missing_group_modify_event_check.patch Patch2: smeserver-git-1.0.0-rewriterules_for_dot_git.patch +Patch3: smeserver-git-1.0.0-LocationMatch.patch +Patch4: smeserver-git-1.0.0-db_permissions.patch Packager: Marco Hess BuildArchitectures: noarch BuildRoot: /var/tmp/%{name}-%{version} @@ -30,6 +32,25 @@ 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.0.0-51.sme +- remove wrong migrate fragment [SME: 9619] + +* Wed Jun 22 2016 Jean-Philipe Pialasse 1.0.0-50.sme +- fix missing ; in migrate fragment 80git to revert db permissions [SME: 9619] + +* Wed Jun 22 2016 Jean-Philipe Pialasse 1.0.0-49.sme +- fix too permissive permissions on db accounts networks and git [SME: 9615] [SME: 9616] +- ported from SME9 + +* Sat Jun 11 2016 Jean-Philipe Pialasse 1.0.0-47.sme +- commented out back the rewrite rule on HEAD etc to allow CLI git + +* Sat Jun 11 2016 Jean-Philipe Pialasse 1.0.0-46.sme +- 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 +- bump to 46 to fix typo + * Fri Jun 10 2016 Jean-Philipe Pialasse 1.0.0-44.sme - fix allow to see .git short url with gitweb [SME: 9202] @@ -40,14 +61,14 @@ host.com/git. Repositories are then avai * Wed Mar 09 2016 JP Pialasse 1.0.0-42.sme - apply locale 2016-03-09 patch -* Tue Feb 2 2015 Marco Hess 1.0.0-40 +* Mon Feb 2 2015 Marco Hess 1.0.0-40 - Fixups of 1.1 incompatibilities with older apache. - Allow adjustment of gitweb static path for git 1.7 vs. git 1.8 -* Tue Feb 2 2015 Marco Hess 1.0.0-40 +* Mon Feb 2 2015 Marco Hess 1.0.0-40 - Fixup of GitWeb CSS/JS files under 'static' in this version. -* Tue Feb 2 2015 Marco Hess 1.0.0-38 +* Mon Feb 2 2015 Marco Hess 1.0.0-38 - Backport changes from 1.1. * Fri May 30 2014 Marco Hess 1.0.0-37 @@ -65,16 +86,16 @@ host.com/git. Repositories are then avai - git version 1.8 has shifted the location of some executables. Modified the scripts to test on these locations so we generate the right paths. -* Sun May 21 2013 Marco Hess 1.0.0-33 +* Tue May 21 2013 Marco Hess 1.0.0-33 - Set permissions on git repository databaase for GitWeb access also on upgrade install. -* Sun May 21 2013 Marco Hess 1.0.0-32 +* Tue May 21 2013 Marco Hess 1.0.0-32 - Fixed a problem in the repository delete script where File::Path is needed to reference rmtree. - Also cleanup the entry from the database so that repositories of the same name can be created again. -* Sun May 21 2013 Marco Hess 1.0.0-31 +* Tue May 21 2013 Marco Hess 1.0.0-31 - Changed the repository-delete script to ensure the SME Git database permissions are Ok for use by GitWeb after a delete. - Ensure that on 64-bit systems we use /usr/lib64/httpd/modules/pwauth @@ -100,6 +121,8 @@ mkdir -p root/home/e-smith/files/git/ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build perl createlinks @@ -127,11 +150,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