diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a0c60c3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/dist-git-*.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index a72aec0..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/dist-git.spec b/dist-git.spec new file mode 100644 index 0000000..b9bec9d --- /dev/null +++ b/dist-git.spec @@ -0,0 +1,349 @@ +%global selinux_variants mls targeted +%global modulename dist_git +%global installdir /var/lib/dist-git + +Name: dist-git +Version: 1.20 +Release: 2%{?dist} +Summary: Package source version control system + +# upload.cgi uses 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 +# cd dist-git +# tito build --tgz +Source0: %{name}-%{version}.tar.gz +BuildArch: noarch + +BuildRequires: systemd + +Requires: httpd +Requires: perl(Sys::Syslog) +Requires: (dist-git-selinux if selinux-policy-targeted) +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 + +BuildRequires: python3-devel +BuildRequires: python3-pytest +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. + + +%package selinux +Summary: SELinux support for dist-git + +BuildRequires: checkpolicy +BuildRequires: hardlink + +Requires: %name = %version-%release +BuildRequires: selinux-policy-devel +%{?selinux_requires} + + +%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 +%if 0%{?rhel} && 0%{?rhel} < 10 +# ------------------------------------------------------------------------------ +# Users and Groups +# ------------------------------------------------------------------------------ +getent group packager > /dev/null || \ + groupadd -r packager +exit 0 +%endif + +%check +%pytest -vv . + + +%install +# ------------------------------------------------------------------------------ +# /usr/share/ ........... scripts +# ------------------------------------------------------------------------------ +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 +mkdir -p %{buildroot}%{_unitdir} + +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 +# ------------------------------------------------------------------------------ +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}%{installdir}/web/ + +%if 0%{?rhel} && 0%{?rhel} < 8 + 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 +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 +# ------------------------------------------------------------------------------ +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 - + +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 -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 + for selinuxvariant in %{selinux_variants} + do + /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || : + done +fi + +%systemd_postun dist-git.socket + + +%files +# ------------------------------------------------------------------------------ +# Docs +# ------------------------------------------------------------------------------ +%license LICENSE +%doc README.md + +# ------------------------------------------------------------------------------ +# /etc/ .......... config files +# ------------------------------------------------------------------------------ +%dir %{_sysconfdir}/dist-git +%config(noreplace) %{_sysconfdir}/dist-git/dist-git.conf +%dir %{_sysconfdir}/httpd/conf.d/dist-git +%config(noreplace) %{_sysconfdir}/httpd/conf.d/dist-git/* +%config(noreplace) %{_sysconfdir}/httpd/conf.d/dist-git.conf + +%{_unitdir}/dist-git@.service +%{_unitdir}/dist-git.socket +%{_unitdir}/dist-git-gc.service +%{_unitdir}/dist-git-gc.timer + +# ------------------------------------------------------------------------------ +# /var/lib/ ...... dynamic persistent files +# ------------------------------------------------------------------------------ + +# non-standard-dir-perm: +# - git repositories and their contents must have w permission for their creators +%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/* +%{_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 + +%{_sysusersdir}/dist-git.conf + +%files selinux +%doc selinux/* +%{_datadir}/selinux/*/%{modulename}.pp + + +%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 + +* 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 + +* 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 +- use pytest instead of nose test + +* 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 + +* 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 +- tests added and documented + +* 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 + +* 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 +- 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 + +* 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 + +* 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) + +* 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/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 diff --git a/sources b/sources new file mode 100644 index 0000000..02a6f8a --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (dist-git-1.20.tar.gz) = f68aa733a2d0e0faa8973ced5260a1c5b0f6892c5ebfca977ac17ca3bfbda33225d866bb1c16abe761452d17594399a75815a49f5d941dd2e0c5404a69a1f3be