From 2510072a369a1a9a26dffb921670dd8676491e1e Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Wed, 6 May 2015 14:47:50 +0200 Subject: [PATCH 01/64] selinux subpackage --- .gitignore | 1 + dist-git.spec | 93 +++++++++++++++++++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 85 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 13d0dbf..6ec5802 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /dist-git-0.10.tar.gz +/dist-git-0.11.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 300fc48..dc95701 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -1,5 +1,10 @@ +%global selinux_variants mls targeted +%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0) +%global modulename dist_git + + Name: dist-git -Version: 0.10 +Version: 0.11 Release: 1%{?dist} Summary: Package source version control system @@ -22,7 +27,6 @@ Requires: gitolite3 Requires: perl(Sys::Syslog) Requires: git-daemon Requires: python-requests -Requires: /usr/sbin/semanage Requires: mod_ssl Requires: fedmsg Requires: cronie @@ -33,15 +37,51 @@ Dist Git is a remote Git repository specifically designed to hold RPM package sources. +%package selinux +Summary: SELinux support for dist-git + +BuildRequires: checkpolicy +BuildRequires: policycoreutils +BuildRequires: selinux-policy-devel +BuildRequires: hardlink + +Requires: %name = %version-%release +%if "%{_selinux_policy_version}" != "" +Requires: selinux-policy >= %{selinux_policyver} +%endif +Requires(post): /usr/sbin/semodule, /sbin/restorecon +Requires(postun): /usr/sbin/semodule, /sbin/restorecon + + +%description selinux +Dist Git is a remote Git repository specifically designed to hold RPM +package sources. + +This package includes SELinux support. + + %prep %setup -q %build - +# ------------------------------------------------------------------------------ +# SELinux +# ------------------------------------------------------------------------------ +cd selinux +for selinuxvariant in %{selinux_variants} +do + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile + mv %{modulename}.pp %{modulename}.pp.${selinuxvariant} + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean +done +cd - %pre +# ------------------------------------------------------------------------------ +# Users and Groups +# ------------------------------------------------------------------------------ getent group packager > /dev/null || \ groupadd -r packager @@ -53,9 +93,7 @@ getent passwd gen-acls > /dev/null || \ -d %{_sharedstatedir}/dist-git/git gen-acls - %install - # ------------------------------------------------------------------------------ # /usr/share/ .... static files # ------------------------------------------------------------------------------ @@ -63,7 +101,6 @@ install -d %{buildroot}%{_datadir}/dist-git cp -a scripts/dist-git/* %{buildroot}%{_datadir}/dist-git/ - # ------------------------------------------------------------------------------ # /etc/ .......... config files # ------------------------------------------------------------------------------ @@ -80,7 +117,6 @@ cp -a configs/httpd/dist-git/* %{buildroot}%{_sysconfdir}/httpd/conf.d/dist-git/ cp -a configs/cron/* %{buildroot}%{_sysconfdir}/cron.d/dist-git/ cp -a configs/systemd/* %{buildroot}%{_unitdir}/ - # ------------------------------------------------------------------------------ # /var/lib/ ...... dynamic persistent files # ------------------------------------------------------------------------------ @@ -114,11 +150,43 @@ ln -f -s %{_sharedstatedir}/dist-git/gitolite \ ln -f -s %{_sharedstatedir}/dist-git/git/rpms \ %{buildroot}%{_sharedstatedir}/dist-git/git/repositories +# ------------------------------------------------------------------------------ +# SELinux +# ------------------------------------------------------------------------------ +cd selinux +for selinuxvariant in %{selinux_variants} +do + install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} + install -p -m 644 %{modulename}.pp.${selinuxvariant} \ + %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp +done +cd - +/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux + + +%post selinux +for selinuxvariant in %{selinux_variants} +do + /usr/sbin/semodule -s ${selinuxvariant} -i \ + %{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || : +done +%{_sbindir}/restorecon -Rv %{_sharedstatedir}/dist-git || : + + +%postun selinux +if [ $1 -eq 0 ] ; then + for selinuxvariant in %{selinux_variants} + do + /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || : + done +fi %files - +# ------------------------------------------------------------------------------ +# Docs +# ------------------------------------------------------------------------------ %license LICENSE %doc README.md @@ -128,7 +196,6 @@ ln -f -s %{_sharedstatedir}/dist-git/git/rpms \ %dir %{_datadir}/dist-git %attr (755, -, -) %{_datadir}/dist-git/* - # ------------------------------------------------------------------------------ # /etc/ .......... config files # ------------------------------------------------------------------------------ @@ -145,7 +212,6 @@ ln -f -s %{_sharedstatedir}/dist-git/git/rpms \ %{_unitdir}/dist-git@.service %{_unitdir}/dist-git.socket - # ------------------------------------------------------------------------------ # /var/lib/ ...... dynamic persistent files # ------------------------------------------------------------------------------ @@ -186,8 +252,15 @@ ln -f -s %{_sharedstatedir}/dist-git/git/rpms \ %{_sharedstatedir}/dist-git/git/.gitolite.rc +%files selinux +%defattr(-,root,root,0755) +%doc selinux/* +%{_datadir}/selinux/*/%{modulename}.pp + %changelog +* Tue May 05 2015 Adam Samalik 0.11-1 +- SELinux subpackage * Mon Apr 27 2015 Adam Samalik 0.10-1 - perl require and files update (asamalik@redhat.com) diff --git a/sources b/sources index 7cf4883..f778c0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58f5139035bf9ec7ca7814d6a53017dc dist-git-0.10.tar.gz +1c82ae7de4beec883efa1b11c5518eac dist-git-0.11.tar.gz From 16f8a5c755853fc896d84e6d0a8541f156f5183c Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Wed, 6 May 2015 14:50:29 +0200 Subject: [PATCH 02/64] selinux subpackage --- .gitignore | 1 + dist-git.spec | 93 +++++++++++++++++++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 85 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 13d0dbf..6ec5802 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /dist-git-0.10.tar.gz +/dist-git-0.11.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 300fc48..dc95701 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -1,5 +1,10 @@ +%global selinux_variants mls targeted +%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0) +%global modulename dist_git + + Name: dist-git -Version: 0.10 +Version: 0.11 Release: 1%{?dist} Summary: Package source version control system @@ -22,7 +27,6 @@ Requires: gitolite3 Requires: perl(Sys::Syslog) Requires: git-daemon Requires: python-requests -Requires: /usr/sbin/semanage Requires: mod_ssl Requires: fedmsg Requires: cronie @@ -33,15 +37,51 @@ Dist Git is a remote Git repository specifically designed to hold RPM package sources. +%package selinux +Summary: SELinux support for dist-git + +BuildRequires: checkpolicy +BuildRequires: policycoreutils +BuildRequires: selinux-policy-devel +BuildRequires: hardlink + +Requires: %name = %version-%release +%if "%{_selinux_policy_version}" != "" +Requires: selinux-policy >= %{selinux_policyver} +%endif +Requires(post): /usr/sbin/semodule, /sbin/restorecon +Requires(postun): /usr/sbin/semodule, /sbin/restorecon + + +%description selinux +Dist Git is a remote Git repository specifically designed to hold RPM +package sources. + +This package includes SELinux support. + + %prep %setup -q %build - +# ------------------------------------------------------------------------------ +# SELinux +# ------------------------------------------------------------------------------ +cd selinux +for selinuxvariant in %{selinux_variants} +do + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile + mv %{modulename}.pp %{modulename}.pp.${selinuxvariant} + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean +done +cd - %pre +# ------------------------------------------------------------------------------ +# Users and Groups +# ------------------------------------------------------------------------------ getent group packager > /dev/null || \ groupadd -r packager @@ -53,9 +93,7 @@ getent passwd gen-acls > /dev/null || \ -d %{_sharedstatedir}/dist-git/git gen-acls - %install - # ------------------------------------------------------------------------------ # /usr/share/ .... static files # ------------------------------------------------------------------------------ @@ -63,7 +101,6 @@ install -d %{buildroot}%{_datadir}/dist-git cp -a scripts/dist-git/* %{buildroot}%{_datadir}/dist-git/ - # ------------------------------------------------------------------------------ # /etc/ .......... config files # ------------------------------------------------------------------------------ @@ -80,7 +117,6 @@ cp -a configs/httpd/dist-git/* %{buildroot}%{_sysconfdir}/httpd/conf.d/dist-git/ cp -a configs/cron/* %{buildroot}%{_sysconfdir}/cron.d/dist-git/ cp -a configs/systemd/* %{buildroot}%{_unitdir}/ - # ------------------------------------------------------------------------------ # /var/lib/ ...... dynamic persistent files # ------------------------------------------------------------------------------ @@ -114,11 +150,43 @@ ln -f -s %{_sharedstatedir}/dist-git/gitolite \ ln -f -s %{_sharedstatedir}/dist-git/git/rpms \ %{buildroot}%{_sharedstatedir}/dist-git/git/repositories +# ------------------------------------------------------------------------------ +# SELinux +# ------------------------------------------------------------------------------ +cd selinux +for selinuxvariant in %{selinux_variants} +do + install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} + install -p -m 644 %{modulename}.pp.${selinuxvariant} \ + %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp +done +cd - +/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux + + +%post selinux +for selinuxvariant in %{selinux_variants} +do + /usr/sbin/semodule -s ${selinuxvariant} -i \ + %{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || : +done +%{_sbindir}/restorecon -Rv %{_sharedstatedir}/dist-git || : + + +%postun selinux +if [ $1 -eq 0 ] ; then + for selinuxvariant in %{selinux_variants} + do + /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || : + done +fi %files - +# ------------------------------------------------------------------------------ +# Docs +# ------------------------------------------------------------------------------ %license LICENSE %doc README.md @@ -128,7 +196,6 @@ ln -f -s %{_sharedstatedir}/dist-git/git/rpms \ %dir %{_datadir}/dist-git %attr (755, -, -) %{_datadir}/dist-git/* - # ------------------------------------------------------------------------------ # /etc/ .......... config files # ------------------------------------------------------------------------------ @@ -145,7 +212,6 @@ ln -f -s %{_sharedstatedir}/dist-git/git/rpms \ %{_unitdir}/dist-git@.service %{_unitdir}/dist-git.socket - # ------------------------------------------------------------------------------ # /var/lib/ ...... dynamic persistent files # ------------------------------------------------------------------------------ @@ -186,8 +252,15 @@ ln -f -s %{_sharedstatedir}/dist-git/git/rpms \ %{_sharedstatedir}/dist-git/git/.gitolite.rc +%files selinux +%defattr(-,root,root,0755) +%doc selinux/* +%{_datadir}/selinux/*/%{modulename}.pp + %changelog +* Tue May 05 2015 Adam Samalik 0.11-1 +- SELinux subpackage * Mon Apr 27 2015 Adam Samalik 0.10-1 - perl require and files update (asamalik@redhat.com) diff --git a/sources b/sources index 7cf4883..f778c0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58f5139035bf9ec7ca7814d6a53017dc dist-git-0.10.tar.gz +1c82ae7de4beec883efa1b11c5518eac dist-git-0.11.tar.gz From 1e5ebd85e0e94a7a379f69141a26b543e5d44883 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 04:07:57 +0000 Subject: [PATCH 03/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index dc95701..bacd46f 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -5,7 +5,7 @@ Name: dist-git Version: 0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system Group: Applications/Productivity @@ -259,6 +259,9 @@ fi %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue May 05 2015 Adam Samalik 0.11-1 - SELinux subpackage * Mon Apr 27 2015 Adam Samalik 0.10-1 From e03bf8b6ac0d5eed4e6ec071c0f0eff36d84349e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 18:46:43 +0000 Subject: [PATCH 04/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index bacd46f..df812e6 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -5,7 +5,7 @@ Name: dist-git Version: 0.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package source version control system Group: Applications/Productivity @@ -259,6 +259,9 @@ fi %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From ed8c1f34f8360a63109f92beffb23872f234856b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:05:50 +0200 Subject: [PATCH 05/64] Mandatory Perl build-requires added --- dist-git.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dist-git.spec b/dist-git.spec index df812e6..cee0f68 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -20,6 +20,7 @@ URL: https://github.com/release-engineering/dist-git Source0: %{name}-%{version}.tar.gz BuildArch: noarch +BuildRequires: perl-generators BuildRequires: systemd Requires: httpd From 96a5fb59fc095112b951ece42e701c5dfcfb8edc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 08:26:04 +0000 Subject: [PATCH 06/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index cee0f68..002e3c1 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -5,7 +5,7 @@ Name: dist-git Version: 0.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Package source version control system Group: Applications/Productivity @@ -260,6 +260,9 @@ fi %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 0.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 1c763ae390735e3b16305c2f6613a4a9350bd308 Mon Sep 17 00:00:00 2001 From: clime Date: Wed, 12 Apr 2017 17:04:09 +0200 Subject: [PATCH 07/64] New version released. --- .gitignore | 1 + dist-git.spec | 179 ++++++++++++++++++++------------------------------ sources | 2 +- 3 files changed, 72 insertions(+), 110 deletions(-) diff --git a/.gitignore b/.gitignore index 6ec5802..b8158fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /dist-git-0.10.tar.gz /dist-git-0.11.tar.gz +/dist-git-1.0.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 002e3c1..b4444fc 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -1,17 +1,15 @@ %global selinux_variants mls targeted -%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0) +%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null)} %global modulename dist_git - +%global installdir /var/lib/dist-git Name: dist-git -Version: 0.11 -Release: 4%{?dist} +Version: 1.0 +Release: 1%{?dist} Summary: Package source version control system -Group: Applications/Productivity - -# upload.cgi uses GPLv1 and pkgdb_sync_git_branches.py uses GPLv2+ -License: MIT and GPLv1 and GPLv2+ +# upload.cgi uses GPLv1 +License: MIT and GPLv1 URL: https://github.com/release-engineering/dist-git # Source is created by # git clone https://github.com/release-engineering/dist-git.git @@ -20,17 +18,17 @@ URL: https://github.com/release-engineering/dist-git Source0: %{name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: perl-generators BuildRequires: systemd Requires: httpd -Requires: gitolite3 Requires: perl(Sys::Syslog) +Requires: git Requires: git-daemon Requires: python-requests +Requires: python-configparser Requires: mod_ssl Requires: fedmsg -Requires: cronie +Requires: crudini Requires(pre): shadow-utils %description @@ -42,13 +40,14 @@ package sources. Summary: SELinux support for dist-git BuildRequires: checkpolicy +BuildRequires: /usr/share/selinux/devel/policyhelp BuildRequires: policycoreutils BuildRequires: selinux-policy-devel BuildRequires: hardlink Requires: %name = %version-%release %if "%{_selinux_policy_version}" != "" -Requires: selinux-policy >= %{selinux_policyver} +Requires: selinux-policy >= %{selinux_policy_version} %endif Requires(post): /usr/sbin/semodule, /sbin/restorecon Requires(postun): /usr/sbin/semodule, /sbin/restorecon @@ -85,71 +84,39 @@ cd - # ------------------------------------------------------------------------------ getent group packager > /dev/null || \ groupadd -r packager - -getent group gen-acls > /dev/null || \ - groupadd -r gen-acls - -getent passwd gen-acls > /dev/null || \ - useradd -r -g gen-acls -G packager -s /bin/bash \ - -d %{_sharedstatedir}/dist-git/git gen-acls +exit 0 %install # ------------------------------------------------------------------------------ -# /usr/share/ .... static files +# /usr/share/ ........... scripts # ------------------------------------------------------------------------------ -install -d %{buildroot}%{_datadir}/dist-git - +install -d %{buildroot}%{_datadir}/dist-git/ cp -a scripts/dist-git/* %{buildroot}%{_datadir}/dist-git/ # ------------------------------------------------------------------------------ # /etc/ .......... config files # ------------------------------------------------------------------------------ install -d %{buildroot}%{_sysconfdir}/dist-git +cp -a configs/dist-git/dist-git.conf %{buildroot}%{_sysconfdir}/dist-git/ install -d %{buildroot}%{_sysconfdir}/httpd/conf.d/dist-git -install -d %{buildroot}%{_sysconfdir}/cron.d/dist-git mkdir -p %{buildroot}%{_unitdir} -cp -a configs/dist-git/dist-git.conf %{buildroot}%{_sysconfdir}/dist-git/ -cp -a configs/gitolite/gitolite.rc %{buildroot}%{_sysconfdir}/dist-git/ -cp -a configs/httpd/dist-git.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/ -cp -a configs/httpd/ssl.conf.example %{buildroot}%{_sysconfdir}/httpd/conf.d/ +cp -a configs/httpd/dist-git.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/ cp -a configs/httpd/dist-git/* %{buildroot}%{_sysconfdir}/httpd/conf.d/dist-git/ -cp -a configs/cron/* %{buildroot}%{_sysconfdir}/cron.d/dist-git/ cp -a configs/systemd/* %{buildroot}%{_unitdir}/ # ------------------------------------------------------------------------------ # /var/lib/ ...... dynamic persistent files # ------------------------------------------------------------------------------ -install -d %{buildroot}%{_sharedstatedir}/dist-git -install -d %{buildroot}%{_sharedstatedir}/dist-git/git -install -d %{buildroot}%{_sharedstatedir}/dist-git/git/rpms -install -d %{buildroot}%{_sharedstatedir}/dist-git/gitolite -install -d %{buildroot}%{_sharedstatedir}/dist-git/gitolite/conf -install -d %{buildroot}%{_sharedstatedir}/dist-git/gitolite/logs -install -d %{buildroot}%{_sharedstatedir}/dist-git/gitolite/local -install -d %{buildroot}%{_sharedstatedir}/dist-git/gitolite/local/VREF -install -d %{buildroot}%{_sharedstatedir}/dist-git/cache -install -d %{buildroot}%{_sharedstatedir}/dist-git/cache/lookaside -install -d %{buildroot}%{_sharedstatedir}/dist-git/cache/lookaside/pkgs -install -d %{buildroot}%{_sharedstatedir}/dist-git/web -install -d %{buildroot}%{_sharedstatedir}/dist-git/gitolite -install -d %{buildroot}%{_sharedstatedir}/dist-git/gitolite/hooks -install -d %{buildroot}%{_sharedstatedir}/dist-git/gitolite/hooks/common +install -d %{buildroot}%{installdir} +install -d %{buildroot}%{installdir}/git +install -d %{buildroot}%{installdir}/cache +install -d %{buildroot}%{installdir}/cache/lookaside +install -d %{buildroot}%{installdir}/cache/lookaside/pkgs +install -d %{buildroot}%{installdir}/web -cp -a scripts/httpd/upload.cgi %{buildroot}%{_sharedstatedir}/dist-git/web/ - -cp -a scripts/git/hooks/update-block-push-origin \ - %{buildroot}%{_sharedstatedir}/dist-git/gitolite/local/VREF/update-block-push-origin - -ln -f -s %{_sysconfdir}/dist-git/gitolite.rc \ - %{buildroot}%{_sharedstatedir}/dist-git/git/.gitolite.rc - -ln -f -s %{_sharedstatedir}/dist-git/gitolite \ - %{buildroot}%{_sharedstatedir}/dist-git/git/.gitolite - -ln -f -s %{_sharedstatedir}/dist-git/git/rpms \ - %{buildroot}%{_sharedstatedir}/dist-git/git/repositories +cp -a scripts/httpd/upload.cgi %{buildroot}%{installdir}/web/ # ------------------------------------------------------------------------------ # SELinux @@ -165,15 +132,22 @@ cd - /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux - %post selinux for selinuxvariant in %{selinux_variants} do /usr/sbin/semodule -s ${selinuxvariant} -i \ %{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || : done -%{_sbindir}/restorecon -Rv %{_sharedstatedir}/dist-git || : +%{_sbindir}/restorecon -v %{installdir}/cache || : +%{_sbindir}/restorecon -v %{installdir}/cache/lookaside || : +%{_sbindir}/restorecon -v %{installdir}/cache/lookaside/pkgs || : +%{_sbindir}/restorecon -v %{installdir}/git || : +%{_sbindir}/restorecon -Rv %{installdir}/web/ || : +%systemd_post dist-git.socket + +%preun +%systemd_preun dist-git.socket %postun selinux if [ $1 -eq 0 ] ; then @@ -183,6 +157,8 @@ if [ $1 -eq 0 ] ; then done fi +%systemd_postun dist-git.socket + %files # ------------------------------------------------------------------------------ @@ -191,25 +167,15 @@ fi %license LICENSE %doc README.md -# ------------------------------------------------------------------------------ -# /usr/share/ .... static files -# ------------------------------------------------------------------------------ -%dir %{_datadir}/dist-git -%attr (755, -, -) %{_datadir}/dist-git/* - # ------------------------------------------------------------------------------ # /etc/ .......... config files # ------------------------------------------------------------------------------ %dir %{_sysconfdir}/dist-git %config(noreplace) %{_sysconfdir}/dist-git/dist-git.conf -%config(noreplace) %{_sysconfdir}/dist-git/gitolite.rc -%config(noreplace) %{_sysconfdir}/httpd/conf.d/dist-git.conf -%config %{_sysconfdir}/httpd/conf.d/ssl.conf.example %dir %{_sysconfdir}/httpd/conf.d/dist-git %config(noreplace) %{_sysconfdir}/httpd/conf.d/dist-git/* -%dir %{_sysconfdir}/cron.d/dist-git -%config(noreplace) %{_sysconfdir}/cron.d/dist-git/cgit_pkg_list.cron -%config(noreplace) %{_sysconfdir}/cron.d/dist-git/dist_git_sync.cron +%config(noreplace) %{_sysconfdir}/httpd/conf.d/dist-git.conf + %{_unitdir}/dist-git@.service %{_unitdir}/dist-git.socket @@ -219,38 +185,20 @@ fi # non-standard-dir-perm: # - git repositories and their contents must have w permission for their creators -%dir %{_sharedstatedir}/dist-git -%dir %{_sharedstatedir}/dist-git/git -%attr (2775, -, packager) %{_sharedstatedir}/dist-git/git/rpms -%dir %{_sharedstatedir}/dist-git/gitolite -%attr (755, gen-acls, gen-acls) %{_sharedstatedir}/dist-git/gitolite/conf -# non-standard-dir-perm: -# - write access needed into log directory for gitolite -%attr (775, gen-acls, packager) %{_sharedstatedir}/dist-git/gitolite/logs -%dir %{_sharedstatedir}/dist-git/gitolite/local -# non-standard-dir-perm: -# - write access needed for gitolite admin groups -%attr (775, gen-acls, packager) %{_sharedstatedir}/dist-git/gitolite/local/VREF -# non-standard-executable-perm: -# - write access needed for gitolite admin groups -# - exec permission needed for execution by git (it's a git hook script) -%attr (775, gen-acls, packager) %{_sharedstatedir}/dist-git/gitolite/local/VREF/update-block-push-origin -# non-standard-dir-perm: -# - write access needed for gitolite admin groups -%attr (770, -, packager) %{_sharedstatedir}/dist-git/gitolite/hooks -# script-without-shebang: -# zero-length: -# - initial empty file required by gitolite with the correct perms -%dir %{_sharedstatedir}/dist-git/gitolite/hooks/common -%ghost %attr (775, gen-acls, packager) %{_sharedstatedir}/dist-git/gitolite/hooks/common/update -%dir %{_sharedstatedir}/dist-git/web -%attr (755, apache, apache) %{_sharedstatedir}/dist-git/web/upload.cgi -%dir %{_sharedstatedir}/dist-git/cache -%dir %{_sharedstatedir}/dist-git/cache/lookaside -%attr (755, apache, apache) %{_sharedstatedir}/dist-git/cache/lookaside/pkgs -%{_sharedstatedir}/dist-git/git/repositories -%{_sharedstatedir}/dist-git/git/.gitolite -%{_sharedstatedir}/dist-git/git/.gitolite.rc +%dir %{installdir} +%attr (2775, -, packager) %{installdir}/git +%dir %{installdir}/web +%attr (755, apache, apache) %{installdir}/web/upload.cgi +%dir %{installdir}/cache +%dir %{installdir}/cache/lookaside +%attr (2775, apache, apache) %{installdir}/cache/lookaside/pkgs + +# ------------------------------------------------------------------------------ +# /usr/share ...... executable files +# ------------------------------------------------------------------------------ + +%dir %{_datadir}/dist-git +%attr (775, -, -) %{_datadir}/dist-git/* %files selinux @@ -260,17 +208,29 @@ fi %changelog -* Fri Feb 10 2017 Fedora Release Engineering - 0.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Mon Apr 10 2017 clime 1.0-1 +- big redo of the package +- gitolite dropped from the package (but can be installed additionally) +- pkgdb integration dropped +- upload.cgi updated from FedoraInfra state +- git repos are stored one level higher in fs hiearchy (default: /var/lib/dist-git/git/) +- dist-git.conf completely new +- updated setup_git_package, mkbranch, mkbranch_branching +- updated SELinux policy +- configurable paths to cache dir and git repos +* Wed Aug 05 2015 Adam Samalik 0.13-1 +- optional cgit_pkg_list.sh parameter (asamalik@redhat.com) +- change mv to cp + rm (asamalik@redhat.com) +- update config to not be Fedora specific (asamalik@redhat.com) +- Change: lookaside dir perms + cgit_pkg_list.sh (asamalik@redhat.com) -* Wed Feb 03 2016 Fedora Release Engineering - 0.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Mon Jul 20 2015 Adam Samalik 0.12-1 +- config update (asamalik@redhat.com) +- Upload files to new and old paths + remove email (asamalik@redhat.com) * Tue May 05 2015 Adam Samalik 0.11-1 - SELinux subpackage + * Mon Apr 27 2015 Adam Samalik 0.10-1 - perl require and files update (asamalik@redhat.com) @@ -298,6 +258,7 @@ fi * Fri Apr 10 2015 Adam Samalik 0.4-1 - spec and config fix - systemd services + * Tue Mar 31 2015 Adam Samalik 0.3-1 - alpha package (asamalik@redhat.com) diff --git a/sources b/sources index f778c0d..58de20d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c82ae7de4beec883efa1b11c5518eac dist-git-0.11.tar.gz +SHA512 (dist-git-1.0.tar.gz) = e8d814bf656a924735cd22591d38f0ab6969e46a57905021047bc61999340626363e7848424404630b67def1c4e4a3220f2d7a64f97ec999026c8d115267efd6 From cf82c79213d3fec3a440bf1165f29e53b0354446 Mon Sep 17 00:00:00 2001 From: clime Date: Wed, 3 May 2017 10:13:03 +0200 Subject: [PATCH 08/64] new release with bugfixes --- .gitignore | 1 + dist-git.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b8158fa..30204aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /dist-git-0.10.tar.gz /dist-git-0.11.tar.gz /dist-git-1.0.tar.gz +/dist-git-1.1.tar.gz diff --git a/dist-git.spec b/dist-git.spec index b4444fc..d5c7baf 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.0 +Version: 1.1 Release: 1%{?dist} Summary: Package source version control system @@ -208,6 +208,10 @@ fi %changelog +* Wed May 03 2017 clime 1.1-1 +- fix default config value for email +- fix name/email switch + * Mon Apr 10 2017 clime 1.0-1 - big redo of the package - gitolite dropped from the package (but can be installed additionally) diff --git a/sources b/sources index 58de20d..25fa2ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.0.tar.gz) = e8d814bf656a924735cd22591d38f0ab6969e46a57905021047bc61999340626363e7848424404630b67def1c4e4a3220f2d7a64f97ec999026c8d115267efd6 +SHA512 (dist-git-1.1.tar.gz) = d5c97c514471e75f5c7ea02699c9381d4d8041ed0dba20a5791a1ff07a0290d3d661311f846e230778ca59c4e82de2f1fa6245615b680d156914474675d08480 From ce1ae26653d8b72fb094357abd1939d8f9f4d3b4 Mon Sep 17 00:00:00 2001 From: clime Date: Fri, 26 May 2017 16:43:11 +0200 Subject: [PATCH 09/64] new release 1.2 --- .gitignore | 1 + dist-git.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 30204aa..f77403e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /dist-git-0.11.tar.gz /dist-git-1.0.tar.gz /dist-git-1.1.tar.gz +/dist-git-1.2.tar.gz diff --git a/dist-git.spec b/dist-git.spec index d5c7baf..4c224de 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.1 +Version: 1.2 Release: 1%{?dist} Summary: Package source version control system @@ -29,8 +29,13 @@ Requires: python-configparser Requires: mod_ssl Requires: fedmsg Requires: crudini +Requires: moreutils Requires(pre): shadow-utils +%if 0%{?fedora} +Suggests: python-grokmirror +%endif + %description Dist Git is a remote Git repository specifically designed to hold RPM package sources. @@ -208,6 +213,10 @@ fi %changelog +* Fri May 26 2017 clime 1.2-1 +- remove mail git hook +- grokmirror support + * Wed May 03 2017 clime 1.1-1 - fix default config value for email - fix name/email switch diff --git a/sources b/sources index 25fa2ea..339de01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.1.tar.gz) = d5c97c514471e75f5c7ea02699c9381d4d8041ed0dba20a5791a1ff07a0290d3d661311f846e230778ca59c4e82de2f1fa6245615b680d156914474675d08480 +SHA512 (dist-git-1.2.tar.gz) = 0850e6955f875b942ca4e2802b750b2d4ccc349a51deae97fb0cfe21c41f5b01dfce4c1cf3fcd56c16062d57b0ccb75e3fa2f901c98a843bc3bf14141f427a03 From e9aea254359d85abc792a2368d61a2f044ee1149 Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 26 Jun 2017 21:35:55 +0200 Subject: [PATCH 10/64] new release --- .gitignore | 1 + dist-git.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f77403e..6eeec0e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /dist-git-1.0.tar.gz /dist-git-1.1.tar.gz /dist-git-1.2.tar.gz +/dist-git-1.3.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 4c224de..8a34dd9 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.2 +Version: 1.3 Release: 1%{?dist} Summary: Package source version control system @@ -213,6 +213,10 @@ fi %changelog +* Mon Jun 26 2017 clime 1.3-1 +- translate '/' to '-' in package name for mailinglist hook + (graybrandon@gmail.com) + * Fri May 26 2017 clime 1.2-1 - remove mail git hook - grokmirror support diff --git a/sources b/sources index 339de01..9537816 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.2.tar.gz) = 0850e6955f875b942ca4e2802b750b2d4ccc349a51deae97fb0cfe21c41f5b01dfce4c1cf3fcd56c16062d57b0ccb75e3fa2f901c98a843bc3bf14141f427a03 +SHA512 (dist-git-1.3.tar.gz) = 327141c89f0446e493037add8970a951fbd9944e57e2808f59f21d2d77603e3712f37d092c75a7a1f328daef9a47433db6621261366b5c2cd75b37a35c115587 From e293fb2e44712dd223a2e36c436d02845462efce Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 25 Jul 2017 15:32:33 +0200 Subject: [PATCH 11/64] 1.4 release --- .gitignore | 1 + dist-git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6eeec0e..06fbcc7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /dist-git-1.1.tar.gz /dist-git-1.2.tar.gz /dist-git-1.3.tar.gz +/dist-git-1.4.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 8a34dd9..f21ac7d 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.3 +Version: 1.4 Release: 1%{?dist} Summary: Package source version control system @@ -213,6 +213,9 @@ fi %changelog +* Tue Jul 25 2017 clime 1.4-1 +- disable md5 uploading by default + * Mon Jun 26 2017 clime 1.3-1 - translate '/' to '-' in package name for mailinglist hook (graybrandon@gmail.com) diff --git a/sources b/sources index 9537816..3ed05f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.3.tar.gz) = 327141c89f0446e493037add8970a951fbd9944e57e2808f59f21d2d77603e3712f37d092c75a7a1f328daef9a47433db6621261366b5c2cd75b37a35c115587 +SHA512 (dist-git-1.4.tar.gz) = df32ece5c31fe0cff67783cad7fdba05e0fec038c909f28d1d5e017226621ae66bb512d1d7f8a41b3edbd4bcc1285f7e5eb4aa0abb30c25e2735984c0fa9c15b From 41c0cffd1aad3692807b93cfb1c0c981f175656d Mon Sep 17 00:00:00 2001 From: clime Date: Tue, 25 Jul 2017 15:37:50 +0200 Subject: [PATCH 12/64] 1.4 release --- .gitignore | 1 + dist-git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6eeec0e..06fbcc7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /dist-git-1.1.tar.gz /dist-git-1.2.tar.gz /dist-git-1.3.tar.gz +/dist-git-1.4.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 8a34dd9..f21ac7d 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.3 +Version: 1.4 Release: 1%{?dist} Summary: Package source version control system @@ -213,6 +213,9 @@ fi %changelog +* Tue Jul 25 2017 clime 1.4-1 +- disable md5 uploading by default + * Mon Jun 26 2017 clime 1.3-1 - translate '/' to '-' in package name for mailinglist hook (graybrandon@gmail.com) diff --git a/sources b/sources index 9537816..3ed05f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.3.tar.gz) = 327141c89f0446e493037add8970a951fbd9944e57e2808f59f21d2d77603e3712f37d092c75a7a1f328daef9a47433db6621261366b5c2cd75b37a35c115587 +SHA512 (dist-git-1.4.tar.gz) = df32ece5c31fe0cff67783cad7fdba05e0fec038c909f28d1d5e017226621ae66bb512d1d7f8a41b3edbd4bcc1285f7e5eb4aa0abb30c25e2735984c0fa9c15b From 7814286f64a855a1ed694e7e751b78a45bbc6edd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 06:16:31 +0000 Subject: [PATCH 13/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index f21ac7d..4e0a4e2 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -5,7 +5,7 @@ Name: dist-git Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -213,6 +213,9 @@ fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Jul 25 2017 clime 1.4-1 - disable md5 uploading by default From a3866124b71acaa1251f4cda9408ce263e952692 Mon Sep 17 00:00:00 2001 From: clime Date: Thu, 26 Oct 2017 17:42:14 +0200 Subject: [PATCH 14/64] add ensure_gitrepo_namespaced patch --- dist-git.spec | 9 ++++++-- ensure_gitrepo_namespaced.patch | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 ensure_gitrepo_namespaced.patch diff --git a/dist-git.spec b/dist-git.spec index 4e0a4e2..6e9b9e8 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -5,7 +5,7 @@ Name: dist-git Version: 1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -18,6 +18,8 @@ URL: https://github.com/release-engineering/dist-git Source0: %{name}-%{version}.tar.gz BuildArch: noarch +Patch0: ensure_gitrepo_namespaced.patch + BuildRequires: systemd Requires: httpd @@ -67,7 +69,7 @@ This package includes SELinux support. %prep %setup -q - +%patch0 -p1 %build # ------------------------------------------------------------------------------ @@ -213,6 +215,9 @@ fi %changelog +* Thu Oct 26 2017 clime - 1.4-3 +- add ensure_gitrepo_namespaced patch + * Wed Jul 26 2017 Fedora Release Engineering - 1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/ensure_gitrepo_namespaced.patch b/ensure_gitrepo_namespaced.patch new file mode 100644 index 0000000..e440166 --- /dev/null +++ b/ensure_gitrepo_namespaced.patch @@ -0,0 +1,39 @@ +From 15ec38ca2cb761ca02eb75d6a31565f894bf2f00 Mon Sep 17 00:00:00 2001 +From: clime +Date: Thu, 26 Oct 2017 17:06:04 +0200 +Subject: [PATCH] patch for Fedora + +--- + scripts/httpd/upload.cgi | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/scripts/httpd/upload.cgi b/scripts/httpd/upload.cgi +index 1de12a3..78f3ba9 100644 +--- a/scripts/httpd/upload.cgi ++++ b/scripts/httpd/upload.cgi +@@ -91,6 +91,13 @@ def makedirs(dir_, username, mode=02755): + send_error(str(e)) + + ++def ensure_namespaced(name): ++ name_parts = name.split('/') ++ if len(name_parts) == 1: ++ return 'rpms/'+name ++ return name ++ ++ + def main(): + config = ConfigParser() + config.read('/etc/dist-git/dist-git.conf') +@@ -165,7 +172,7 @@ def main(): + msgpath = os.path.join(name, filename, hash_type, checksum, filename) + + # first test if the module really exists +- git_dir = os.path.join(config['dist-git']['gitroot_dir'], '%s.git' % name) ++ git_dir = os.path.join(config['dist-git']['gitroot_dir'], '%s.git' % ensure_namespaced(name)) + if not os.path.isdir(git_dir): + sys.stderr.write('[username=%s] Unknown module: %s' % (username, name)) + send_error('Module "%s" does not exist!' % name, +-- +2.9.5 + From e977cffe8d2d0714b9a15d07c0438ed310cb6dc1 Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 18 Dec 2017 06:04:37 +0100 Subject: [PATCH 15/64] new release --- .gitignore | 1 + dist-git.spec | 16 +++++++++------- sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 06fbcc7..9788944 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /dist-git-1.2.tar.gz /dist-git-1.3.tar.gz /dist-git-1.4.tar.gz +/dist-git-1.5.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 6e9b9e8..10105e0 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -1,11 +1,10 @@ %global selinux_variants mls targeted -%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null)} %global modulename dist_git %global installdir /var/lib/dist-git Name: dist-git -Version: 1.4 -Release: 3%{?dist} +Version: 1.5 +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -47,14 +46,13 @@ package sources. Summary: SELinux support for dist-git BuildRequires: checkpolicy -BuildRequires: /usr/share/selinux/devel/policyhelp BuildRequires: policycoreutils BuildRequires: selinux-policy-devel BuildRequires: hardlink Requires: %name = %version-%release %if "%{_selinux_policy_version}" != "" -Requires: selinux-policy >= %{selinux_policy_version} +Requires: selinux-policy >= %{_selinux_policy_version} %endif Requires(post): /usr/sbin/semodule, /sbin/restorecon Requires(postun): /usr/sbin/semodule, /sbin/restorecon @@ -215,10 +213,14 @@ fi %changelog -* Thu Oct 26 2017 clime - 1.4-3 +* Mon Dec 18 2017 clime 1.5-1 +- make selinux policy build on f27+ +- add optional map SELinux permission for httpd_t + +* Thu Oct 26 2017 clime 1.4-3 - add ensure_gitrepo_namespaced patch -* Wed Jul 26 2017 Fedora Release Engineering - 1.4-2 +* Wed Jul 26 2017 Fedora Release Engineering 1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild * Tue Jul 25 2017 clime 1.4-1 diff --git a/sources b/sources index 3ed05f3..1badd0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.4.tar.gz) = df32ece5c31fe0cff67783cad7fdba05e0fec038c909f28d1d5e017226621ae66bb512d1d7f8a41b3edbd4bcc1285f7e5eb4aa0abb30c25e2735984c0fa9c15b +SHA512 (dist-git-1.5.tar.gz) = d5278ecfb498c0da0965932a1ed3e9e4893763d6dcf07c1732dbfdcf5ab2d5ba8b60fde8ebe723fd5157ec920abf9171c5a26739800e7ab1eb692b592f39b1f1 From ccd05ffe0841a15c8ec64c79f03f915574484b89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 06:55:38 +0000 Subject: [PATCH 16/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 10105e0..bcdd247 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -213,6 +213,9 @@ fi %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Dec 18 2017 clime 1.5-1 - make selinux policy build on f27+ - add optional map SELinux permission for httpd_t From 7a9b8c653b0fb504a55cfcd5103e24d771bca088 Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 19 Feb 2018 12:16:56 +0100 Subject: [PATCH 17/64] release 1.6 --- .gitignore | 1 + dist-git.spec | 44 ++++++++++++++++++++------------- ensure_gitrepo_namespaced.patch | 39 ----------------------------- sources | 2 +- 4 files changed, 29 insertions(+), 57 deletions(-) delete mode 100644 ensure_gitrepo_namespaced.patch diff --git a/.gitignore b/.gitignore index 9788944..90236d9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /dist-git-1.3.tar.gz /dist-git-1.4.tar.gz /dist-git-1.5.tar.gz +/dist-git-1.6.tar.gz diff --git a/dist-git.spec b/dist-git.spec index bcdd247..a4fd36f 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,8 +3,8 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.5 -Release: 2%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -17,24 +17,34 @@ URL: https://github.com/release-engineering/dist-git Source0: %{name}-%{version}.tar.gz BuildArch: noarch -Patch0: ensure_gitrepo_namespaced.patch - BuildRequires: systemd Requires: httpd Requires: perl(Sys::Syslog) +Requires: dist-git-selinux Requires: git Requires: git-daemon -Requires: python-requests -Requires: python-configparser Requires: mod_ssl Requires: fedmsg Requires: crudini Requires: moreutils Requires(pre): shadow-utils -%if 0%{?fedora} -Suggests: python-grokmirror +%if 0%{?rhel} && 0%{?rhel} < 8 +Requires: python-requests +Requires: python-configparser +Requires: python-grokmirror + +%else +Requires: python2-requests +Requires: python2-configparser + +%if 0%{?fedora} < 28 +Recommends: python-grokmirror +%else +Recommends: python2-grokmirror +%endif + %endif %description @@ -67,7 +77,7 @@ This package includes SELinux support. %prep %setup -q -%patch0 -p1 + %build # ------------------------------------------------------------------------------ @@ -213,19 +223,18 @@ fi %changelog -* Wed Feb 07 2018 Fedora Release Engineering - 1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Mon Feb 19 2018 clime 1.6-1 +- add 'fedmsgs', 'old_paths', and 'default_namespace' config options +- remove domain_read_all_domains_state SELinux rule +- require dist-git-selinux +- give optional map permission to git_system_t on git_user_content_t +- update requires to work for all environments +- make the package completely distribution-agnostic * Mon Dec 18 2017 clime 1.5-1 - make selinux policy build on f27+ - add optional map SELinux permission for httpd_t -* Thu Oct 26 2017 clime 1.4-3 -- add ensure_gitrepo_namespaced patch - -* Wed Jul 26 2017 Fedora Release Engineering 1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - * Tue Jul 25 2017 clime 1.4-1 - disable md5 uploading by default @@ -251,6 +260,7 @@ fi - updated setup_git_package, mkbranch, mkbranch_branching - updated SELinux policy - configurable paths to cache dir and git repos + * Wed Aug 05 2015 Adam Samalik 0.13-1 - optional cgit_pkg_list.sh parameter (asamalik@redhat.com) - change mv to cp + rm (asamalik@redhat.com) diff --git a/ensure_gitrepo_namespaced.patch b/ensure_gitrepo_namespaced.patch deleted file mode 100644 index e440166..0000000 --- a/ensure_gitrepo_namespaced.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 15ec38ca2cb761ca02eb75d6a31565f894bf2f00 Mon Sep 17 00:00:00 2001 -From: clime -Date: Thu, 26 Oct 2017 17:06:04 +0200 -Subject: [PATCH] patch for Fedora - ---- - scripts/httpd/upload.cgi | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/scripts/httpd/upload.cgi b/scripts/httpd/upload.cgi -index 1de12a3..78f3ba9 100644 ---- a/scripts/httpd/upload.cgi -+++ b/scripts/httpd/upload.cgi -@@ -91,6 +91,13 @@ def makedirs(dir_, username, mode=02755): - send_error(str(e)) - - -+def ensure_namespaced(name): -+ name_parts = name.split('/') -+ if len(name_parts) == 1: -+ return 'rpms/'+name -+ return name -+ -+ - def main(): - config = ConfigParser() - config.read('/etc/dist-git/dist-git.conf') -@@ -165,7 +172,7 @@ def main(): - msgpath = os.path.join(name, filename, hash_type, checksum, filename) - - # first test if the module really exists -- git_dir = os.path.join(config['dist-git']['gitroot_dir'], '%s.git' % name) -+ git_dir = os.path.join(config['dist-git']['gitroot_dir'], '%s.git' % ensure_namespaced(name)) - if not os.path.isdir(git_dir): - sys.stderr.write('[username=%s] Unknown module: %s' % (username, name)) - send_error('Module "%s" does not exist!' % name, --- -2.9.5 - diff --git a/sources b/sources index 1badd0e..0d65f87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.5.tar.gz) = d5278ecfb498c0da0965932a1ed3e9e4893763d6dcf07c1732dbfdcf5ab2d5ba8b60fde8ebe723fd5157ec920abf9171c5a26739800e7ab1eb692b592f39b1f1 +SHA512 (dist-git-1.6.tar.gz) = 1923a83c0affe184b27d8cf3eca01d04b06a01410ca5c89e9d1efb14fc2e84324cb861bd306aec7ed6386d03bba1d2e116c6549ed15d3455f0ba18b4dec43c51 From c90517210dfa788e40af3345cfb3fbc667639100 Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 26 Feb 2018 15:13:43 +0100 Subject: [PATCH 18/64] new release 1.7 --- .gitignore | 1 + dist-git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 90236d9..bce92c2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /dist-git-1.4.tar.gz /dist-git-1.5.tar.gz /dist-git-1.6.tar.gz +/dist-git-1.7.tar.gz diff --git a/dist-git.spec b/dist-git.spec index a4fd36f..808f542 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,7 +3,7 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.6 +Version: 1.7 Release: 1%{?dist} Summary: Package source version control system @@ -223,6 +223,9 @@ fi %changelog +* Mon Feb 26 2018 clime 1.7-1 +- move 'fedmsgs', 'old_paths', 'nomd5' options to optional upload section + * Mon Feb 19 2018 clime 1.6-1 - add 'fedmsgs', 'old_paths', and 'default_namespace' config options - remove domain_read_all_domains_state SELinux rule diff --git a/sources b/sources index 0d65f87..06c47de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.6.tar.gz) = 1923a83c0affe184b27d8cf3eca01d04b06a01410ca5c89e9d1efb14fc2e84324cb861bd306aec7ed6386d03bba1d2e116c6549ed15d3455f0ba18b4dec43c51 +SHA512 (dist-git-1.7.tar.gz) = 1cecf5f423f781d3d2f87ab27cf6a80d4170b04f5f64bc52c90531a46d29a10bb78d39bb4143b80a6e8156f80ce41ef7b187c41949c772a96dc9926c4e7aadf8 From 8182791fb20865093ea9f9082d03e4724dac09c6 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:38:58 -0500 Subject: [PATCH 19/64] Remove needless use of %defattr --- dist-git.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 808f542..960d3bb 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -217,7 +217,6 @@ fi %files selinux -%defattr(-,root,root,0755) %doc selinux/* %{_datadir}/selinux/*/%{modulename}.pp From cd9268106d149d8197aadffa21d7bb86b3a54bf6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:55:34 +0000 Subject: [PATCH 20/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 960d3bb..3eb0797 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -222,6 +222,9 @@ fi %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Feb 26 2018 clime 1.7-1 - move 'fedmsgs', 'old_paths', 'nomd5' options to optional upload section From cf39b3805a39b5201c42ea80415daa730a6c20ed Mon Sep 17 00:00:00 2001 From: clime Date: Tue, 14 Aug 2018 23:38:00 +0200 Subject: [PATCH 21/64] new release --- .gitignore | 1 + dist-git.spec | 16 +++------------- sources | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index bce92c2..cf62ffc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /dist-git-1.5.tar.gz /dist-git-1.6.tar.gz /dist-git-1.7.tar.gz +/dist-git-1.8.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 3eb0797..08db1ff 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,8 +3,8 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.7 -Release: 2%{?dist} +Version: 1.8 +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -34,17 +34,10 @@ Requires(pre): shadow-utils Requires: python-requests Requires: python-configparser Requires: python-grokmirror - %else Requires: python2-requests Requires: python2-configparser - -%if 0%{?fedora} < 28 -Recommends: python-grokmirror -%else -Recommends: python2-grokmirror -%endif - +Recommends: python3-grokmirror %endif %description @@ -222,9 +215,6 @@ fi %changelog -* Thu Jul 12 2018 Fedora Release Engineering - 1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - * Mon Feb 26 2018 clime 1.7-1 - move 'fedmsgs', 'old_paths', 'nomd5' options to optional upload section diff --git a/sources b/sources index 06c47de..40f26a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.7.tar.gz) = 1cecf5f423f781d3d2f87ab27cf6a80d4170b04f5f64bc52c90531a46d29a10bb78d39bb4143b80a6e8156f80ce41ef7b187c41949c772a96dc9926c4e7aadf8 +SHA512 (dist-git-1.8.tar.gz) = 0e2bba1dfcd4523cf34a8ef8bd0a3bacdb7e785103dbf87a1c25cb60f2e493557d7c144a19f7cd65d66c5053d99914165679910a7432135c6e0cd3cef518507e From f4fb5c5b198ef5caa0dd639675dda69c8aa09339 Mon Sep 17 00:00:00 2001 From: clime Date: Fri, 23 Nov 2018 09:05:23 +0100 Subject: [PATCH 22/64] version 1.9 --- .gitignore | 1 + dist-git.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cf62ffc..53c5065 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /dist-git-1.6.tar.gz /dist-git-1.7.tar.gz /dist-git-1.8.tar.gz +/dist-git-1.9.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 08db1ff..96560f1 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,7 +3,7 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.8 +Version: 1.9 Release: 1%{?dist} Summary: Package source version control system @@ -215,6 +215,18 @@ fi %changelog +* Fri Nov 23 2018 clime 1.9-1 +- do not create sources file when creating a repo +- set umask 0002 in all available dist-git scripts +- Use REMOTE_USER as fallback for GSS_NAME +- add support for setting mtime for an uploaded file + +* Tue Aug 14 2018 clime 1.8-1 +- add disable group check option +- add lookaside_dir option +- deprecate cache_dir +- fix python-grokmirror dep + * Mon Feb 26 2018 clime 1.7-1 - move 'fedmsgs', 'old_paths', 'nomd5' options to optional upload section diff --git a/sources b/sources index 40f26a9..d1a4e53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.8.tar.gz) = 0e2bba1dfcd4523cf34a8ef8bd0a3bacdb7e785103dbf87a1c25cb60f2e493557d7c144a19f7cd65d66c5053d99914165679910a7432135c6e0cd3cef518507e +SHA512 (dist-git-1.9.tar.gz) = a8a474c926fb3379e83414bfdeaab7f6b79c4fcad0380ef3a205fc9f69afd799ae5afec11f3aaa15af9c67fc699537bfb26231f5fdcc5031c6d79ef3d47a5bc7 From 014929eb4bee636c5e1ffa4e3d9d371c51c73868 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 17:17:40 +0000 Subject: [PATCH 23/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 96560f1..89136ee 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -215,6 +215,9 @@ fi %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Nov 23 2018 clime 1.9-1 - do not create sources file when creating a repo - set umask 0002 in all available dist-git scripts From 4e2cd85f258dc2717a9fb68c3e99152b6d7a058c Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 11 Mar 2019 22:58:15 +0100 Subject: [PATCH 24/64] new release 1.10 --- .gitignore | 1 + dist-git.spec | 20 +++++++++++++------- sources | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 53c5065..0eed943 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /dist-git-1.7.tar.gz /dist-git-1.8.tar.gz /dist-git-1.9.tar.gz +/dist-git-1.10.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 89136ee..387e1f7 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,8 +3,8 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.9 -Release: 2%{?dist} +Version: 1.10 +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -25,7 +25,6 @@ Requires: dist-git-selinux Requires: git Requires: git-daemon Requires: mod_ssl -Requires: fedmsg Requires: crudini Requires: moreutils Requires(pre): shadow-utils @@ -34,10 +33,12 @@ Requires(pre): shadow-utils Requires: python-requests Requires: python-configparser Requires: python-grokmirror +Requires: fedmsg %else -Requires: python2-requests -Requires: python2-configparser +Requires: python3-requests +Requires: python3-configparser Recommends: python3-grokmirror +Requires: python3-fedmsg %endif %description @@ -126,6 +127,10 @@ install -d %{buildroot}%{installdir}/web cp -a scripts/httpd/upload.cgi %{buildroot}%{installdir}/web/ +%if 0%{?rhel} && 0%{?rhel} < 8 + sed -i '1 s|#.*|#!/usr/bin/python2|' %{buildroot}%{installdir}/web/upload.cgi +%endif + # ------------------------------------------------------------------------------ # SELinux # ------------------------------------------------------------------------------ @@ -215,8 +220,9 @@ fi %changelog -* Thu Jan 31 2019 Fedora Release Engineering - 1.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Mon Mar 11 2019 clime 1.10-1 +- python3 support +- fix post-receive hook in case post.receive.d is empty * Fri Nov 23 2018 clime 1.9-1 - do not create sources file when creating a repo diff --git a/sources b/sources index d1a4e53..355aded 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.9.tar.gz) = a8a474c926fb3379e83414bfdeaab7f6b79c4fcad0380ef3a205fc9f69afd799ae5afec11f3aaa15af9c67fc699537bfb26231f5fdcc5031c6d79ef3d47a5bc7 +SHA512 (dist-git-1.10.tar.gz) = ca3dd038e85c75dcbf30f82f326ec4a61a4fff9e3f27143f4ec3ca4fd77a3ba4661dde317e625f3e42d0ca0e6abfc5a3995e78678eeb8dcca95168c8de1a2bd4 From 1667d71cdcc489beae060a5b9a96752ce2aeef9a Mon Sep 17 00:00:00 2001 From: clime Date: Tue, 30 Apr 2019 19:07:00 +0200 Subject: [PATCH 25/64] new release 1.11 --- .gitignore | 1 + dist-git.spec | 17 ++++++++++++++--- sources | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0eed943..804f869 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /dist-git-1.8.tar.gz /dist-git-1.9.tar.gz /dist-git-1.10.tar.gz +/dist-git-1.11.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 387e1f7..e449fe4 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,7 +3,7 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.10 +Version: 1.11 Release: 1%{?dist} Summary: Package source version control system @@ -36,7 +36,6 @@ Requires: python-grokmirror Requires: fedmsg %else Requires: python3-requests -Requires: python3-configparser Recommends: python3-grokmirror Requires: python3-fedmsg %endif @@ -131,6 +130,14 @@ cp -a scripts/httpd/upload.cgi %{buildroot}%{installdir}/web/ sed -i '1 s|#.*|#!/usr/bin/python2|' %{buildroot}%{installdir}/web/upload.cgi %endif +# ------------------------------------------------------------------------------ +# /usr/bin/ ...... links to executable files +# ------------------------------------------------------------------------------ +install -d %{buildroot}%{_bindir} +ln -s %{_datadir}/dist-git/setup_git_package %{buildroot}%{_bindir}/setup_git_package +ln -s %{_datadir}/dist-git/mkbranch %{buildroot}%{_bindir}/mkbranch +ln -s %{_datadir}/dist-git/mkbranch_branching %{buildroot}%{_bindir}/mkbranch_branching + # ------------------------------------------------------------------------------ # SELinux # ------------------------------------------------------------------------------ @@ -217,9 +224,13 @@ fi %files selinux %doc selinux/* %{_datadir}/selinux/*/%{modulename}.pp - +%{_bindir}/* %changelog +* Tue Apr 30 2019 clime 1.11-1 +- remove python3-configparser require +- move scripts to bindir + * Mon Mar 11 2019 clime 1.10-1 - python3 support - fix post-receive hook in case post.receive.d is empty diff --git a/sources b/sources index 355aded..2179611 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.10.tar.gz) = ca3dd038e85c75dcbf30f82f326ec4a61a4fff9e3f27143f4ec3ca4fd77a3ba4661dde317e625f3e42d0ca0e6abfc5a3995e78678eeb8dcca95168c8de1a2bd4 +SHA512 (dist-git-1.11.tar.gz) = 7aacb6a7bbb2940a2381486e22ed7b5cb201915c0ca2ecc7d8f86350239bcb2d9f8b9c920c75c55b73e350d855d2a4c8417bd9403f726520136e73cf4f2946b8 From af765f612a33091b40dfeeb4771fdcf4b181ee7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 28 May 2019 17:01:29 +0200 Subject: [PATCH 26/64] new release 1.12 --- .gitignore | 1 + dist-git.spec | 70 ++++++--------------------------------------------- sources | 2 +- 3 files changed, 10 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 804f869..6fe5561 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /dist-git-1.9.tar.gz /dist-git-1.10.tar.gz /dist-git-1.11.tar.gz +/dist-git-1.12.tar.gz diff --git a/dist-git.spec b/dist-git.spec index e449fe4..fc57f0c 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,7 +3,7 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.11 +Version: 1.12 Release: 1%{?dist} Summary: Package source version control system @@ -137,6 +137,7 @@ install -d %{buildroot}%{_bindir} ln -s %{_datadir}/dist-git/setup_git_package %{buildroot}%{_bindir}/setup_git_package ln -s %{_datadir}/dist-git/mkbranch %{buildroot}%{_bindir}/mkbranch ln -s %{_datadir}/dist-git/mkbranch_branching %{buildroot}%{_bindir}/mkbranch_branching +ln -s %{_datadir}/dist-git/remove_unused_sources %{buildroot}%{_bindir}/remove_unused_sources # ------------------------------------------------------------------------------ # SELinux @@ -150,7 +151,7 @@ do done cd - -/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux +hardlink -cv %{buildroot}%{_datadir}/selinux %post selinux for selinuxvariant in %{selinux_variants} @@ -227,6 +228,11 @@ fi %{_bindir}/* %changelog +* Tue May 28 2019 Miroslav Suchy - 1.12-1 +- remove old changelog entries +- do not specify full path for hardlink [RHBZ#1714637] +- add script for removing unused source tarballs in lookaside cache + * Tue Apr 30 2019 clime 1.11-1 - remove python3-configparser require - move scripts to bindir @@ -276,63 +282,3 @@ fi * Wed May 03 2017 clime 1.1-1 - fix default config value for email - fix name/email switch - -* Mon Apr 10 2017 clime 1.0-1 -- big redo of the package -- gitolite dropped from the package (but can be installed additionally) -- pkgdb integration dropped -- upload.cgi updated from FedoraInfra state -- git repos are stored one level higher in fs hiearchy (default: /var/lib/dist-git/git/) -- dist-git.conf completely new -- updated setup_git_package, mkbranch, mkbranch_branching -- updated SELinux policy -- configurable paths to cache dir and git repos - -* Wed Aug 05 2015 Adam Samalik 0.13-1 -- optional cgit_pkg_list.sh parameter (asamalik@redhat.com) -- change mv to cp + rm (asamalik@redhat.com) -- update config to not be Fedora specific (asamalik@redhat.com) -- Change: lookaside dir perms + cgit_pkg_list.sh (asamalik@redhat.com) - -* Mon Jul 20 2015 Adam Samalik 0.12-1 -- config update (asamalik@redhat.com) -- Upload files to new and old paths + remove email (asamalik@redhat.com) - -* Tue May 05 2015 Adam Samalik 0.11-1 -- SELinux subpackage - -* Mon Apr 27 2015 Adam Samalik 0.10-1 -- perl require and files update (asamalik@redhat.com) - -* Thu Apr 23 2015 Adam Samalik 0.9-1 -- update hook update (asamalik@redhat.com) - -* Thu Apr 23 2015 Adam Samalik 0.8-1 -- review update (asamalik@redhat.com) - -* Wed Apr 22 2015 Adam Samalik 0.7-1 -- git hooks permissions (asamalik@redhat.com) -- noreplace configs (asamalik@redhat.com) -- fixes after rpmlint (asamalik@redhat.com) - -* Wed Apr 22 2015 Adam Samalik 0.6-1 -- license + description (asamalik@redhat.com) -- cron files fix (asamalik@redhat.com) - -* Wed Apr 15 2015 Adam Samalik 0.5-1 -- git hook: update-block-push-origin (asamalik@redhat.com) -- lookaside-upload config comments (asamalik@redhat.com) -- gen-acls user fix (asamalik@redhat.com) -- ssl httpd configs as examples (asamalik@redhat.com) - -* Fri Apr 10 2015 Adam Samalik 0.4-1 -- spec and config fix -- systemd services - -* Tue Mar 31 2015 Adam Samalik 0.3-1 -- alpha package (asamalik@redhat.com) - -* Mon Mar 30 2015 Adam Samalik 0.2-1 -- new package built with tito - - diff --git a/sources b/sources index 2179611..0ee05fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.11.tar.gz) = 7aacb6a7bbb2940a2381486e22ed7b5cb201915c0ca2ecc7d8f86350239bcb2d9f8b9c920c75c55b73e350d855d2a4c8417bd9403f726520136e73cf4f2946b8 +SHA512 (dist-git-1.12.tar.gz) = 65bdb74180553e529374be60b33c2e31113ca2b403138f64f98d19252fb0284555c4305610819a9687327a80470e5b70d5d08277bc3c1972b123f5503bc3d429 From 855c7080c1ed3e9d1b98e25d7ef140c7a3a44b36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 22:04:16 +0000 Subject: [PATCH 27/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index fc57f0c..113067e 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -228,6 +228,9 @@ fi %{_bindir}/* %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue May 28 2019 Miroslav Suchy - 1.12-1 - remove old changelog entries - do not specify full path for hardlink [RHBZ#1714637] From ea465ac89c79df59ad819eeac3f40c513105e724 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 15:55:38 +0000 Subject: [PATCH 28/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 113067e..265e612 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -228,6 +228,9 @@ fi %{_bindir}/* %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 7e802847cb90c092fe0722b28af9401c51b4fe61 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Thu, 19 Mar 2020 10:44:24 +0100 Subject: [PATCH 29/64] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From d1b92f1e6a5dd78a87c696ce39d529ab0502b39a Mon Sep 17 00:00:00 2001 From: clime Date: Thu, 19 Mar 2020 12:05:47 +0100 Subject: [PATCH 30/64] remove rebuild changelog entries and fix release --- dist-git.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dist-git.spec b/dist-git.spec index 265e612..fc57f0c 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.12 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -228,12 +228,6 @@ fi %{_bindir}/* %changelog -* Tue Jan 28 2020 Fedora Release Engineering - 1.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Tue May 28 2019 Miroslav Suchy - 1.12-1 - remove old changelog entries - do not specify full path for hardlink [RHBZ#1714637] From e7d57666edc9e3380fc5032639d6e8c16e9c928f Mon Sep 17 00:00:00 2001 From: clime Date: Thu, 21 May 2020 09:06:01 +0200 Subject: [PATCH 31/64] new release 1.13 --- .gitignore | 1 + dist-git.spec | 41 +++++++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 6fe5561..f0c8431 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /dist-git-1.10.tar.gz /dist-git-1.11.tar.gz /dist-git-1.12.tar.gz +/dist-git-1.13.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 265e612..1977674 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,8 +3,8 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.12 -Release: 3%{?dist} +Version: 1.13 +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -26,7 +26,6 @@ Requires: git Requires: git-daemon Requires: mod_ssl Requires: crudini -Requires: moreutils Requires(pre): shadow-utils %if 0%{?rhel} && 0%{?rhel} < 8 @@ -34,14 +33,29 @@ Requires: python-requests Requires: python-configparser Requires: python-grokmirror Requires: fedmsg +BuildRequires: python-nose +BuildRequires: python-nose-parameterized +BuildRequires: python-requests +BuildRequires: python-configparser + +# temporary because global Requires doesn't work right now, see the comment below +Requires: moreutils + %else Requires: python3-requests Recommends: python3-grokmirror -Requires: python3-fedmsg +Recommends: python3-fedmsg +BuildRequires: python3-nose +BuildRequires: python3-parameterized +BuildRequires: python3-requests + +# this should be Requires but see https://bugzilla.redhat.com/show_bug.cgi?id=1833810 +Recommends: moreutils + %endif %description -Dist Git is a remote Git repository specifically designed to hold RPM +DistGit is a Git repository specifically designed to hold RPM package sources. @@ -95,6 +109,14 @@ getent group packager > /dev/null || \ exit 0 +%check +%if 0%{?rhel} && 0%{?rhel} < 8 +nosetests . +%else +nosetests-3 . +%endif + + %install # ------------------------------------------------------------------------------ # /usr/share/ ........... scripts @@ -228,11 +250,10 @@ fi %{_bindir}/* %changelog -* Tue Jan 28 2020 Fedora Release Engineering - 1.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Thu May 21 2020 clime - 1.13-1 +- fedmsg made an optional (recommnended) dependency +- slight refactoring of upload.cgi script +- tests added and documented * Tue May 28 2019 Miroslav Suchy - 1.12-1 - remove old changelog entries diff --git a/sources b/sources index 0ee05fc..989789e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.12.tar.gz) = 65bdb74180553e529374be60b33c2e31113ca2b403138f64f98d19252fb0284555c4305610819a9687327a80470e5b70d5d08277bc3c1972b123f5503bc3d429 +SHA512 (dist-git-1.13.tar.gz) = c9118ab7b25a69261794af537da913f653efd6b1c1c771cb0dd80dea626515ab91fb44cc99de51bfdfe85bb34feb0e7a63e4615a4977a780b8ccbf684c3e1a77 From 7321978e0809f31effa244a19e766b2f9b33b7e2 Mon Sep 17 00:00:00 2001 From: clime Date: Thu, 21 May 2020 11:21:16 +0200 Subject: [PATCH 32/64] version bump --- .gitignore | 1 + dist-git.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f0c8431..bf5355b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /dist-git-1.11.tar.gz /dist-git-1.12.tar.gz /dist-git-1.13.tar.gz +/dist-git-1.14.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 1977674..548e101 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,7 +3,7 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.13 +Version: 1.14 Release: 1%{?dist} Summary: Package source version control system @@ -110,11 +110,11 @@ exit 0 %check -%if 0%{?rhel} && 0%{?rhel} < 8 -nosetests . -%else -nosetests-3 . -%endif +#%if 0%{?rhel} && 0%{?rhel} < 8 +#nosetests . +#%else +#nosetests-3 . +#%endif %install @@ -250,6 +250,10 @@ fi %{_bindir}/* %changelog +* Thu May 21 2020 clime - 1.14-1 +- disable unit tests temporarily as they do not pass + with network disabled during build + * Thu May 21 2020 clime - 1.13-1 - fedmsg made an optional (recommnended) dependency - slight refactoring of upload.cgi script diff --git a/sources b/sources index 989789e..74464b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.13.tar.gz) = c9118ab7b25a69261794af537da913f653efd6b1c1c771cb0dd80dea626515ab91fb44cc99de51bfdfe85bb34feb0e7a63e4615a4977a780b8ccbf684c3e1a77 +SHA512 (dist-git-1.14.tar.gz) = d5790d4bdfb3b1a729611a8f600f6034d7c39ef010c3ce4a1a7e1041ed08a30e723f691a3a3d96c532430f8ab46a2e9fc534361c5d2e1b2bfc8369ffa9765eac From cbeee0c927c1862fd14a6f08ca38f8df04ca09af Mon Sep 17 00:00:00 2001 From: clime Date: Fri, 12 Jun 2020 00:15:39 +0200 Subject: [PATCH 33/64] new release 1.15 --- .gitignore | 1 + dist-git.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index bf5355b..82aa739 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /dist-git-1.12.tar.gz /dist-git-1.13.tar.gz /dist-git-1.14.tar.gz +/dist-git-1.15.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 548e101..d2d9306 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,7 +3,7 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.14 +Version: 1.15 Release: 1%{?dist} Summary: Package source version control system @@ -45,6 +45,7 @@ Requires: moreutils Requires: python3-requests Recommends: python3-grokmirror Recommends: python3-fedmsg +Suggests: fedora-messaging BuildRequires: python3-nose BuildRequires: python3-parameterized BuildRequires: python3-requests @@ -110,11 +111,11 @@ exit 0 %check -#%if 0%{?rhel} && 0%{?rhel} < 8 -#nosetests . -#%else -#nosetests-3 . -#%endif +%if 0%{?rhel} && 0%{?rhel} < 8 +nosetests . +%else +nosetests-3 . +%endif %install @@ -250,6 +251,9 @@ fi %{_bindir}/* %changelog +* Fri Jun 12 2020 clime - 1.15-1 +- added support for fedora-messaging + * Thu May 21 2020 clime - 1.14-1 - disable unit tests temporarily as they do not pass with network disabled during build diff --git a/sources b/sources index 74464b8..42b9f0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.14.tar.gz) = d5790d4bdfb3b1a729611a8f600f6034d7c39ef010c3ce4a1a7e1041ed08a30e723f691a3a3d96c532430f8ab46a2e9fc534361c5d2e1b2bfc8369ffa9765eac +SHA512 (dist-git-1.15.tar.gz) = 005def569bf512fad536a7711980c00560662fef19a85c165495948353e91b2d7ac42a4a8994b5ae75baf1c39e609bc5693554408ca343e24b68df4f56a8fef0 From 9632421744ac42da2df3343ad7aebf8b5f5c00ff Mon Sep 17 00:00:00 2001 From: clime Date: Fri, 12 Jun 2020 00:48:20 +0200 Subject: [PATCH 34/64] disable tests as they are not executed properly for epel8 --- dist-git.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dist-git.spec b/dist-git.spec index d2d9306..6ab9a14 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -111,11 +111,11 @@ exit 0 %check -%if 0%{?rhel} && 0%{?rhel} < 8 -nosetests . -%else -nosetests-3 . -%endif +#%if 0%{?rhel} && 0%{?rhel} < 8 +#nosetests . +#%else +#nosetests-3 . +#%endif %install @@ -251,6 +251,9 @@ fi %{_bindir}/* %changelog +* Fri Jun 12 2020 clime - 1.15-2 +- disable tests as they are not executed properly for epel8 builds + * Fri Jun 12 2020 clime - 1.15-1 - added support for fedora-messaging From a5f5c8933aac5aff8e5dd42e6f17bf994e0370e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 15:27:21 +0000 Subject: [PATCH 35/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index d2d9306..3fd4074 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -251,6 +251,9 @@ fi %{_bindir}/* %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jun 12 2020 clime - 1.15-1 - added support for fedora-messaging From 9005717fd75e8ef29684e487609a00b4de03703b Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 16:56:15 +0000 Subject: [PATCH 36/64] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 2be82267d6303f97f9d9aa2c965eeb4a1e6c8c7e Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 5 Oct 2020 06:00:47 +0200 Subject: [PATCH 37/64] new release 1.16 --- .gitignore | 1 + dist-git.spec | 22 +++++++++++++++++----- sources | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 82aa739..71b035a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /dist-git-1.13.tar.gz /dist-git-1.14.tar.gz /dist-git-1.15.tar.gz +/dist-git-1.16.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 3fd4074..1116ce6 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,8 +3,8 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.15 -Release: 2%{?dist} +Version: 1.16 +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -21,7 +21,11 @@ BuildRequires: systemd Requires: httpd Requires: perl(Sys::Syslog) +%if 0%{?fedora} || 0%{?rhel} > 7 +Requires: (dist-git-selinux if selinux-policy-targeted) +%else Requires: dist-git-selinux +%endif Requires: git Requires: git-daemon Requires: mod_ssl @@ -44,7 +48,7 @@ Requires: moreutils %else Requires: python3-requests Recommends: python3-grokmirror -Recommends: python3-fedmsg +Suggests: python3-fedmsg Suggests: fedora-messaging BuildRequires: python3-nose BuildRequires: python3-parameterized @@ -161,6 +165,7 @@ ln -s %{_datadir}/dist-git/setup_git_package %{buildroot}%{_bindir}/setup_git_pa ln -s %{_datadir}/dist-git/mkbranch %{buildroot}%{_bindir}/mkbranch ln -s %{_datadir}/dist-git/mkbranch_branching %{buildroot}%{_bindir}/mkbranch_branching ln -s %{_datadir}/dist-git/remove_unused_sources %{buildroot}%{_bindir}/remove_unused_sources +mv %{buildroot}%{_datadir}/dist-git/dist-git-gc %{buildroot}%{_bindir}/dist-git-gc # ------------------------------------------------------------------------------ # SELinux @@ -222,6 +227,8 @@ fi %{_unitdir}/dist-git@.service %{_unitdir}/dist-git.socket +%{_unitdir}/dist-git-gc.service +%{_unitdir}/dist-git-gc.timer # ------------------------------------------------------------------------------ # /var/lib/ ...... dynamic persistent files @@ -251,8 +258,13 @@ fi %{_bindir}/* %changelog -* Mon Jul 27 2020 Fedora Release Engineering - 1.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Mon Oct 5 2020 clime - 1.16-1 +- fixed exceptions for fedora-messaging +- fixed topic for fedora-messaging (to git.lookaside.new) +- spec tweak not to require distgit-selinux in containers +- only Suggests fedmsg +- garbage collection (git gc) script and systemd timer + for its periodic run added * Fri Jun 12 2020 clime - 1.15-1 - added support for fedora-messaging diff --git a/sources b/sources index 42b9f0c..d06935c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.15.tar.gz) = 005def569bf512fad536a7711980c00560662fef19a85c165495948353e91b2d7ac42a4a8994b5ae75baf1c39e609bc5693554408ca343e24b68df4f56a8fef0 +SHA512 (dist-git-1.16.tar.gz) = eabea892357ca9fbe63fef19e6439ff6f91c6b20f1c31a5dd567bf405b9024b06c2e199e5ff2594969958e92d413e4f400e0df462a9c865e955eb51915db599f From 8a135c4c474e76b8a6c6cbed7aa99c073dcafce4 Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 5 Oct 2020 06:13:45 +0200 Subject: [PATCH 38/64] - always require selinux-policy-targeted right now --- dist-git.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dist-git.spec b/dist-git.spec index 1116ce6..582eae2 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -21,11 +21,7 @@ BuildRequires: systemd Requires: httpd Requires: perl(Sys::Syslog) -%if 0%{?fedora} || 0%{?rhel} > 7 -Requires: (dist-git-selinux if selinux-policy-targeted) -%else Requires: dist-git-selinux -%endif Requires: git Requires: git-daemon Requires: mod_ssl From 1bf2557b698d0290307bc656a3fe7bc7e9cc2896 Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 5 Oct 2020 06:33:59 +0200 Subject: [PATCH 39/64] bump release because of koji error ** ** Dependency tokens must begin with alpha-numeric, '_' or '/': Requires: (dist-git-selinux if selinux-policy-targeted)" means (when I want to build a package in koji) --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 582eae2..02b652e 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -254,6 +254,9 @@ fi %{_bindir}/* %changelog +* Mon Oct 5 2020 clime - 1.16-2 +- use simpler dist-git-selinux require due to build-system problem + * Mon Oct 5 2020 clime - 1.16-1 - fixed exceptions for fedora-messaging - fixed topic for fedora-messaging (to git.lookaside.new) From 1eadbf42ac587f28df4961198be390bf78e4d194 Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 5 Oct 2020 07:01:28 +0200 Subject: [PATCH 40/64] add back package.cfg --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..7e5a05b --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground From 7f2daee1fbe65656e7de2f24d1a6b1d1b98f4097 Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 5 Oct 2020 15:22:23 +0200 Subject: [PATCH 41/64] back to release 1.16 --- dist-git.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 02b652e..3bed10d 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -21,7 +21,11 @@ BuildRequires: systemd Requires: httpd Requires: perl(Sys::Syslog) +%if 0%{?fedora} || 0%{?rhel} > 7 +Requires: (dist-git-selinux if selinux-policy-targeted) +%else Requires: dist-git-selinux +%endif Requires: git Requires: git-daemon Requires: mod_ssl @@ -254,6 +258,9 @@ fi %{_bindir}/* %changelog +* Mon Oct 5 2020 clime - 1.16-3 +- return back 1.16-1 state + * Mon Oct 5 2020 clime - 1.16-2 - use simpler dist-git-selinux require due to build-system problem From 23bd6418fc5de023af28c677deaad302d0cc33af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 03:28:25 +0000 Subject: [PATCH 42/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 3bed10d..439ba50 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -258,6 +258,9 @@ fi %{_bindir}/* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Oct 5 2020 clime - 1.16-3 - return back 1.16-1 state From 1646d18dbbae9923372577eceb9493064bb4f938 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 20:51:08 +0000 Subject: [PATCH 43/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 439ba50..cac4b8b 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -258,6 +258,9 @@ fi %{_bindir}/* %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.16-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 6b2ffc66459af6dea8ebf41632b8ce2b42014e2f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 00:44:24 +0000 Subject: [PATCH 44/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index cac4b8b..80f0708 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -258,6 +258,9 @@ fi %{_bindir}/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.16-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.16-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f01e1d10bc440de8612c2f7b907814c2f5a3b588 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 28 Jan 2022 08:20:31 -0800 Subject: [PATCH 45/64] Remove package.cfg; Part of epel8-playground decommission --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 7e5a05b..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground From 2a8a3bfed5b106c895747e6913573a35ccb3d266 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 00:32:33 +0000 Subject: [PATCH 46/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 80f0708..d0b15f1 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.16 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -258,6 +258,9 @@ fi %{_bindir}/* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.16-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.16-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 71747fb54dd04a6e117c1749e5e92404a3b8e552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Jan 2023 18:20:21 +0100 Subject: [PATCH 47/64] Update dist-git to 1.17-1 --- .gitignore | 1 + dist-git.spec | 40 +++++++++++++++++----------------------- sources | 2 +- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 71b035a..8328957 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /dist-git-1.14.tar.gz /dist-git-1.15.tar.gz /dist-git-1.16.tar.gz +/dist-git-1.17.tar.gz diff --git a/dist-git.spec b/dist-git.spec index d0b15f1..58b0e32 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,12 +3,12 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.16 -Release: 7%{?dist} +Version: 1.17 +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 -License: MIT and GPLv1 +License: MIT AND GPL-1.0-only URL: https://github.com/release-engineering/dist-git # Source is created by # git clone https://github.com/release-engineering/dist-git.git @@ -50,7 +50,11 @@ Requires: python3-requests Recommends: python3-grokmirror Suggests: python3-fedmsg Suggests: fedora-messaging +%if 0%{?rhel} == 8 BuildRequires: python3-nose +%else +BuildRequires: python3-pytest +%endif BuildRequires: python3-parameterized BuildRequires: python3-requests @@ -115,10 +119,14 @@ exit 0 %check -%if 0%{?rhel} && 0%{?rhel} < 8 -nosetests . +%if 0%{?rhel} && 0%{?rhel} <= 8 +%if 0%{?rhel} < 8 +nosetests -v . %else -nosetests-3 . +nosetests-3 -v . +%endif +%else +pytest -vv . %endif @@ -258,23 +266,9 @@ fi %{_bindir}/* %changelog -* Thu Jul 21 2022 Fedora Release Engineering - 1.16-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.16-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.16-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.16-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Oct 5 2020 clime - 1.16-3 -- return back 1.16-1 state - -* Mon Oct 5 2020 clime - 1.16-2 -- use simpler dist-git-selinux require due to build-system problem +* Wed Jan 04 2023 Miroslav Suchý 1.17-1 +- use spdx license +- use pytest instead of nose test * Mon Oct 5 2020 clime - 1.16-1 - fixed exceptions for fedora-messaging diff --git a/sources b/sources index d06935c..7ef4dd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.16.tar.gz) = eabea892357ca9fbe63fef19e6439ff6f91c6b20f1c31a5dd567bf405b9024b06c2e199e5ff2594969958e92d413e4f400e0df462a9c865e955eb51915db599f +SHA512 (dist-git-1.17.tar.gz) = ed6288f1e0aed0779766ee685ea7563a95f4a99c50d671895e3cf45262dc9c6e06ed0967b905c03ccbf93bad4b8000a85096914d57849a21bf9573ff61951826 From 5b688911db89fbda91b6d69dc7c65012bbc8a516 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 01:28:55 +0000 Subject: [PATCH 48/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 58b0e32..b7c2cb8 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -266,6 +266,9 @@ fi %{_bindir}/* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 04 2023 Miroslav Suchý 1.17-1 - use spdx license - use pytest instead of nose test From e358939573a91e2f27e2ce2bf90c1abb94f9d583 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 17:32:52 +0000 Subject: [PATCH 49/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index b7c2cb8..4d62687 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -266,6 +266,9 @@ fi %{_bindir}/* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 9c44231b566dc53c8238499fddf00cf1ad94ef6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 5 Oct 2023 12:03:13 +0200 Subject: [PATCH 50/64] setup packit pull-from-upstream automation --- packit.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 packit.yaml diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..0b8d165 --- /dev/null +++ b/packit.yaml @@ -0,0 +1,24 @@ +upstream_project_url: https://github.com/release-engineering/dist-git +upstream_tag_template: dist-git-{version}-1 +issue_repository: https://github.com/release-engineering/dist-git +copy_upstream_release_description: false + +jobs: +- job: pull_from_upstream + trigger: release + dist_git_branches: + - rawhide + - epel9 + +- job: koji_build + trigger: commit + allowed_committers: ['packit'] + dist_git_branches: + - fedora-all + - epel9 + +- job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-all + - epel9 From 4e34d01487c94c9406fa2c7eccd8c9607c765502 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 17:14:36 +0000 Subject: [PATCH 51/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 4d62687..3a592de 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.17 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -266,6 +266,9 @@ fi %{_bindir}/* %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.17-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.17-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9dead15c6672bc0c7db2ff9adcbe79e31288b9ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 09:31:20 +0000 Subject: [PATCH 52/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 3a592de..2aa0b74 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.17 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -266,6 +266,9 @@ fi %{_bindir}/* %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.17-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.17-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a8f24dd11ff8441d7b9b5a160ecda6b25e9b8547 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 21:03:49 +0000 Subject: [PATCH 53/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 2aa0b74..b24d4f3 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.17 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -266,6 +266,9 @@ fi %{_bindir}/* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.17-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 1.17-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From eb755f5368dc8ffb2ee2cd86c91ac64126209a0b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 27 Sep 2024 21:19:04 +0200 Subject: [PATCH 54/64] Update dist-git to 1.18-1 --- .gitignore | 1 + dist-git.spec | 67 +++++++++++++++++++-------------------------------- sources | 2 +- 3 files changed, 27 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 8328957..87b41e3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /dist-git-1.15.tar.gz /dist-git-1.16.tar.gz /dist-git-1.17.tar.gz +/dist-git-1.18.tar.gz diff --git a/dist-git.spec b/dist-git.spec index b24d4f3..3229023 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,8 +3,8 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.17 -Release: 6%{?dist} +Version: 1.18 +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -21,31 +21,13 @@ BuildRequires: systemd Requires: httpd Requires: perl(Sys::Syslog) -%if 0%{?fedora} || 0%{?rhel} > 7 Requires: (dist-git-selinux if selinux-policy-targeted) -%else -Requires: dist-git-selinux -%endif Requires: git Requires: git-daemon Requires: mod_ssl Requires: crudini Requires(pre): shadow-utils -%if 0%{?rhel} && 0%{?rhel} < 8 -Requires: python-requests -Requires: python-configparser -Requires: python-grokmirror -Requires: fedmsg -BuildRequires: python-nose -BuildRequires: python-nose-parameterized -BuildRequires: python-requests -BuildRequires: python-configparser - -# temporary because global Requires doesn't work right now, see the comment below -Requires: moreutils - -%else Requires: python3-requests Recommends: python3-grokmirror Suggests: python3-fedmsg @@ -61,8 +43,13 @@ BuildRequires: python3-requests # this should be Requires but see https://bugzilla.redhat.com/show_bug.cgi?id=1833810 Recommends: moreutils +%if 0%{?fedora} && 0%{?fedora} >= 41 +# The `cgi` module was removed from the Python 3.13 standard library +BuildRequires: python3-legacy-cgi +Requires: python3-legacy-cgi %endif + %description DistGit is a Git repository specifically designed to hold RPM package sources. @@ -72,16 +59,11 @@ package sources. Summary: SELinux support for dist-git BuildRequires: checkpolicy -BuildRequires: policycoreutils -BuildRequires: selinux-policy-devel BuildRequires: hardlink Requires: %name = %version-%release -%if "%{_selinux_policy_version}" != "" -Requires: selinux-policy >= %{_selinux_policy_version} -%endif -Requires(post): /usr/sbin/semodule, /sbin/restorecon -Requires(postun): /usr/sbin/semodule, /sbin/restorecon +BuildRequires: selinux-policy-devel +%{?selinux_requires} %description selinux @@ -258,28 +240,29 @@ fi %dir %{_datadir}/dist-git %attr (775, -, -) %{_datadir}/dist-git/* +%{_bindir}/dist-git-gc +# TODO: move _datadir executables to _libexecdir, and drop these symlinks +%{_bindir}/mkbranch +%{_bindir}/mkbranch_branching +%{_bindir}/remove_unused_sources +%{_bindir}/setup_git_package %files selinux %doc selinux/* %{_datadir}/selinux/*/%{modulename}.pp -%{_bindir}/* + %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 1.17-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 1.17-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.17-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild +* Fri Sep 27 2024 Pavel Raiskup 1.18-1 +- replace test on _selinux_policy_version by macro that does it all +- handle situation when _selinux_policy_version is not defined +- silence pylint +- remove rhel7 specific code +- Move %%_bindir symlinks out from dist-git-selinux +- Depend on python3-legacy-cgi for F41+ +- licensing: update the project's COPYING file +- dist-git: move the code into sub-directory * Wed Jan 04 2023 Miroslav Suchý 1.17-1 - use spdx license diff --git a/sources b/sources index 7ef4dd9..812f1eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.17.tar.gz) = ed6288f1e0aed0779766ee685ea7563a95f4a99c50d671895e3cf45262dc9c6e06ed0967b905c03ccbf93bad4b8000a85096914d57849a21bf9573ff61951826 +SHA512 (dist-git-1.18.tar.gz) = f3c4caa189589d9211fe37703d9eee0b7f03705536d598a955280ef4477095eeb1323c96c550f0b2a951b74c99fcd51b496c47e291c8658192c097d8bae0872d From a2512af8cb00aa72936f19a9cc3e1bfd29b14b04 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 27 Sep 2024 21:19:45 +0200 Subject: [PATCH 55/64] Cleanup .gitignore --- .gitignore | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 87b41e3..a0c60c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1 @@ -/dist-git-0.10.tar.gz -/dist-git-0.11.tar.gz -/dist-git-1.0.tar.gz -/dist-git-1.1.tar.gz -/dist-git-1.2.tar.gz -/dist-git-1.3.tar.gz -/dist-git-1.4.tar.gz -/dist-git-1.5.tar.gz -/dist-git-1.6.tar.gz -/dist-git-1.7.tar.gz -/dist-git-1.8.tar.gz -/dist-git-1.9.tar.gz -/dist-git-1.10.tar.gz -/dist-git-1.11.tar.gz -/dist-git-1.12.tar.gz -/dist-git-1.13.tar.gz -/dist-git-1.14.tar.gz -/dist-git-1.15.tar.gz -/dist-git-1.16.tar.gz -/dist-git-1.17.tar.gz -/dist-git-1.18.tar.gz +/dist-git-*.tar.gz From 0bdcf24ac3675e2e42254306af4bab5d02ca17b5 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 27 Sep 2024 21:28:10 +0200 Subject: [PATCH 56/64] Update dist-git to 1.18-1 --- dist-git.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/dist-git.spec b/dist-git.spec index 80f2608..3229023 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -276,9 +276,6 @@ fi - garbage collection (git gc) script and systemd timer for its periodic run added -* Fri Jun 12 2020 clime - 1.15-2 -- disable tests as they are not executed properly for epel8 builds - * Fri Jun 12 2020 clime - 1.15-1 - added support for fedora-messaging From 766a8a42b5a26cf575bf530e30d3f6b7702c6899 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 15:51:13 +0000 Subject: [PATCH 57/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 3229023..fdcce5e 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -254,6 +254,9 @@ fi %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Sep 27 2024 Pavel Raiskup 1.18-1 - replace test on _selinux_policy_version by macro that does it all - handle situation when _selinux_policy_version is not defined From 337ca362b5b1113585a4f0fa21185e92ef2fcb0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 14:36:25 +0100 Subject: [PATCH 58/64] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- dist-git.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dist-git.spec b/dist-git.spec index fdcce5e..adbd02f 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -26,7 +26,6 @@ Requires: git Requires: git-daemon Requires: mod_ssl Requires: crudini -Requires(pre): shadow-utils Requires: python3-requests Recommends: python3-grokmirror @@ -76,6 +75,11 @@ This package includes SELinux support. %prep %setup -q +# Create a sysusers.d config file +cat >dist-git.sysusers.conf < /dev/null || \ - groupadd -r packager -exit 0 %check @@ -171,6 +168,8 @@ cd - hardlink -cv %{buildroot}%{_datadir}/selinux +install -m0644 -D dist-git.sysusers.conf %{buildroot}%{_sysusersdir}/dist-git.conf + %post selinux for selinuxvariant in %{selinux_variants} do @@ -246,6 +245,7 @@ fi %{_bindir}/mkbranch_branching %{_bindir}/remove_unused_sources %{_bindir}/setup_git_package +%{_sysusersdir}/dist-git.conf %files selinux @@ -254,6 +254,9 @@ fi %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.18-3 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Thu Jan 16 2025 Fedora Release Engineering - 1.18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0f86dd65aa58901f8adc49d4e6bfe7dbe286ab65 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:19:48 +0000 Subject: [PATCH 59/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index adbd02f..a2231bd 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -254,6 +254,9 @@ fi %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.18-3 - Add sysusers.d config file to allow rpm to create users/groups automatically From 7adbe05035eb4b544c3017b1179998f68bfe67f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 06:01:14 +0000 Subject: [PATCH 60/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index a2231bd..4c47f7c 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -254,6 +254,9 @@ fi %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 1.18-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 420f5b354ed5b167786c03185f1beba0b1db296b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 10:02:03 +0000 Subject: [PATCH 61/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 4c47f7c..6ac2459 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.18 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -254,6 +254,9 @@ fi %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.18-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jan 16 2026 Fedora Release Engineering - 1.18-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From a99d965050d40f9502b0a1748e82492f86ca0490 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 13 Feb 2026 10:44:55 +0100 Subject: [PATCH 62/64] Update dist-git to 1.19-1 --- dist-git.spec | 60 +++++++++++++++++++-------------------------------- sources | 2 +- 2 files changed, 23 insertions(+), 39 deletions(-) diff --git a/dist-git.spec b/dist-git.spec index 6ac2459..9ee160f 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,8 +3,8 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.18 -Release: 6%{?dist} +Version: 1.19 +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -26,17 +26,17 @@ Requires: git Requires: git-daemon Requires: mod_ssl Requires: crudini +%if 0%{?rhel} && 0%{?rhel} < 10 +Requires(pre): shadow-utils +%endif Requires: python3-requests Recommends: python3-grokmirror Suggests: python3-fedmsg Suggests: fedora-messaging -%if 0%{?rhel} == 8 -BuildRequires: python3-nose -%else + +BuildRequires: python3-devel BuildRequires: python3-pytest -%endif -BuildRequires: python3-parameterized BuildRequires: python3-requests # this should be Requires but see https://bugzilla.redhat.com/show_bug.cgi?id=1833810 @@ -75,11 +75,6 @@ This package includes SELinux support. %prep %setup -q -# Create a sysusers.d config file -cat >dist-git.sysusers.conf < /dev/null || \ + groupadd -r packager +exit 0 +%endif %check -%if 0%{?rhel} && 0%{?rhel} <= 8 -%if 0%{?rhel} < 8 -nosetests -v . -%else -nosetests-3 -v . -%endif -%else -pytest -vv . -%endif +%pytest -vv . %install @@ -128,6 +123,8 @@ cp -a configs/httpd/dist-git.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/ cp -a configs/httpd/dist-git/* %{buildroot}%{_sysconfdir}/httpd/conf.d/dist-git/ cp -a configs/systemd/* %{buildroot}%{_unitdir}/ +install -m0644 -D configs/sysusers.d/dist-git.conf %{buildroot}%{_sysusersdir}/dist-git.conf + # ------------------------------------------------------------------------------ # /var/lib/ ...... dynamic persistent files # ------------------------------------------------------------------------------ @@ -168,8 +165,6 @@ cd - hardlink -cv %{buildroot}%{_datadir}/selinux -install -m0644 -D dist-git.sysusers.conf %{buildroot}%{_sysusersdir}/dist-git.conf - %post selinux for selinuxvariant in %{selinux_variants} do @@ -245,8 +240,8 @@ fi %{_bindir}/mkbranch_branching %{_bindir}/remove_unused_sources %{_bindir}/setup_git_package -%{_sysusersdir}/dist-git.conf +%{_sysusersdir}/dist-git.conf %files selinux %doc selinux/* @@ -254,21 +249,10 @@ fi %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 1.18-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jan 16 2026 Fedora Release Engineering - 1.18-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 1.18-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.18-3 +* Fri Feb 13 2026 Pavel Raiskup 1.19-1 +- Avoid using parameterized and nose - Add sysusers.d config file to allow rpm to create users/groups automatically -* Thu Jan 16 2025 Fedora Release Engineering - 1.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Fri Sep 27 2024 Pavel Raiskup 1.18-1 - replace test on _selinux_policy_version by macro that does it all - handle situation when _selinux_policy_version is not defined diff --git a/sources b/sources index 812f1eb..f8fb236 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.18.tar.gz) = f3c4caa189589d9211fe37703d9eee0b7f03705536d598a955280ef4477095eeb1323c96c550f0b2a951b74c99fcd51b496c47e291c8658192c097d8bae0872d +SHA512 (dist-git-1.19.tar.gz) = bd249d206a73a9869fe30bfe4a992927e8983dc8497f82546ca18b0b771b22780e585198bb1b1e885936cc74b5bc00264491a33bd870d8050276ef34a5f20b5b From 861bf008477d72cc65fd50368934ada690d9b3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 7 Jul 2026 12:43:51 +0200 Subject: [PATCH 63/64] Update dist-git to 1.20-1 --- dist-git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dist-git.spec b/dist-git.spec index 9ee160f..531c3b6 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,7 +3,7 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.19 +Version: 1.20 Release: 1%{?dist} Summary: Package source version control system @@ -249,6 +249,9 @@ fi %changelog +* Tue Jul 07 2026 Miroslav Suchý 1.20-1 +- Fix tests for Python 3.15: replace removed CGIHTTPRequestHandler + * Fri Feb 13 2026 Pavel Raiskup 1.19-1 - Avoid using parameterized and nose - Add sysusers.d config file to allow rpm to create users/groups automatically diff --git a/sources b/sources index f8fb236..02a6f8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.19.tar.gz) = bd249d206a73a9869fe30bfe4a992927e8983dc8497f82546ca18b0b771b22780e585198bb1b1e885936cc74b5bc00264491a33bd870d8050276ef34a5f20b5b +SHA512 (dist-git-1.20.tar.gz) = f68aa733a2d0e0faa8973ced5260a1c5b0f6892c5ebfca977ac17ca3bfbda33225d866bb1c16abe761452d17594399a75815a49f5d941dd2e0c5404a69a1f3be From 8207b771687523438068e36f94cb9f64f75016b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 15 Jul 2026 21:49:49 +0000 Subject: [PATCH 64/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 531c3b6..b9bec9d 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -249,6 +249,9 @@ fi %changelog +* Wed Jul 15 2026 Fedora Release Engineering - 1.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Tue Jul 07 2026 Miroslav Suchý 1.20-1 - Fix tests for Python 3.15: replace removed CGIHTTPRequestHandler