--- rpms/smeserver-git/contribs10/smeserver-git.spec 2020/12/20 15:41:33 1.1 +++ rpms/smeserver-git/contribs10/smeserver-git.spec 2023/03/25 03:08:42 1.11 @@ -1,23 +1,30 @@ %define name smeserver-git %define version 1.2.0 -%define release 2 +%define release 10 Summary: Centralised Git repositories with setup and configuration through SME Server admin panels. Name: %{name} Version: %{version} Release: %{release}%{?dist} Distribution: SME Server License: GNU GPL version 2 -URL: http://www.through-ip.com +URL: https://wiki.koozali.org/Git Group: SMEserver/addon Source: smeserver-git-%{version}.tar.gz Packager: Marco Hess BuildArchitectures: noarch BuildRoot: /var/tmp/%{name}-%{version} BuildRequires: e-smith-devtools -Requires: e-smith-release >= 9.0 +Requires: e-smith-release >= 10.0 +Requires: e-smith-apache >= 2.6.0-19 Requires: git AutoReqProv: no Patch1: smeserver-git-1.2.0.bz10464-warn-on-missing-files.patch +Patch2: smeserver-git-1.2.0-Set-debugging-disabled.patch +Patch3: smeserver-git-1.2.0-Add-Update-event-to-createlinks.patch +Patch4: smeserver-git-1.2.0-locale-2021-08-22.patch +Patch5: smeserver-git-1.2.0-bz12048-httpd24.patch +Patch6: smeserver-git-1.2.0-bz11665-debug.patch +Patch7: smeserver-git-1.2.0-bz12163.patch %description smeserver-git enables centralised git repositories on an SME server and enables @@ -26,13 +33,39 @@ managed through a server-manager panel t to the repositories based on the existing SME users and groups. The package installs and enables the git server on the current host like in host.com/git. Repositories are then available as https://host.com/git/gitrepo.git. +Originally brought by Marco Hess http://www.through-ip.com %changelog +* Fri Mar 24 2023 Jean-Philippe Pialasse 1.2.0-10.sme +- fix not allowing dot in repo name [SME: 12163] + +* Fri Mar 24 2023 Jean-Philippe Pialasse 1.2.0-9.sme +- fix debug loglevel [SME: 11665] + +* Fri Jul 22 2022 Jean-Philippe Pialasse 1.2.0-8.sme +- update to httpd 2.4 syntax [SME: 12048] + fix Argument for 'Require all' must be 'granted' or 'denied' + +* Sun Aug 22 2021 Terry Fage 1.2.0-5.sme +- apply locale 2021-08-22.patch + +* Fri Mar 26 2021 Brian Read 1.2.0-4.sme +- Add Update event to createlinks [SME: 11286 ] + +* Sun Dec 20 2020 BogusDateBot +- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, +- by assuming the date is correct and changing the weekday. +- Sun May 21 2013 --> Sun May 19 2013 or Tue May 21 2013 or Sun May 26 2013 or .... + +* Sun Dec 20 2020 Brian Read 1.2.0-3.sme +- Initial import to SME10 tree [SME: 11286] +- Set-debugging-disabled + * Tue Nov 28 2017 Jean-Philipe Pialasse 1.2.0-2.sme -- fix smeserver-git prevents httpd.conf template expansion [SME: 10464] +- Add Update event to createlinks smeserver-git prevents httpd.conf template expansion [SME: 10464] - now if gitweb is enabled but smeserver-gitweb is not installed a warning is issued -instead of an error and template consider it disabled. Same thing if gitweb_theme is enabled -but smeserver-gitweb-theme is missing. + instead of an error and template consider it disabled. Same thing if gitweb_theme is enabled + but smeserver-gitweb-theme is missing. * Tue Nov 28 2017 Jean-Philipe Pialasse 1.2.0-0.sme - new sources with unix formated line returns @@ -47,19 +80,19 @@ but smeserver-gitweb-theme is missing. - 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] +- Add Update event to createlinks 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] +- Add Update event to createlinks 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 Update event to createlinks 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] +- Add Update event to createlinks 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 @@ -91,16 +124,19 @@ but smeserver-gitweb-theme is missing. - 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 + Sun May 21 2013 --> Sun May 19 2013 or Tue May 21 2013 or Sun May 26 2013 or .... - 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 + Sun May 21 2013 --> Sun May 19 2013 or Tue May 21 2013 or Sun May 26 2013 or .... - 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 + Sun May 21 2013 --> Sun May 19 2013 or Tue May 21 2013 or Sun May 26 2013 or .... - 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 @@ -123,7 +159,12 @@ but smeserver-gitweb-theme is missing. %prep %setup %patch1 -p1 - +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 mkdir -p root/home/e-smith/files/git/ %build @@ -153,7 +194,7 @@ if [ $1 -eq 1 ] ; then /etc/e-smith/events/actions/navigation-conf fi chown admin:www /home/e-smith/files/git -/etc/rc7.d/S86httpd-e-smith sighup +#/etc/rc7.d/S86httpd-e-smith sighup # fixing needed permissions # fixing previous mess