From 66255362ffbd2657bb849cf5918b66a4c58c8a57 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 11 May 2021 11:21:46 +0200 Subject: [PATCH 01/46] Add automeka builddep Signed-off-by: Tomas Hrcka --- fedora-packager.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-packager.spec b/fedora-packager.spec index 1696e48..a22d9c2 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -13,6 +13,7 @@ Source0: https://releases.pagure.org/fedora-packager/fedora-packager-%{ve BuildRequires: python3-devel BuildRequires: make +BuildRequires: automake Requires: koji >= 1.11.0 Requires: bodhi-client Requires: rpm-build rpmdevtools rpmlint From 83022e75546ddd37e25dd591d22b454dd7e35404 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 11 May 2021 11:21:46 +0200 Subject: [PATCH 02/46] Add automeka builddep Signed-off-by: Tomas Hrcka --- fedora-packager.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-packager.spec b/fedora-packager.spec index 1696e48..a22d9c2 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -13,6 +13,7 @@ Source0: https://releases.pagure.org/fedora-packager/fedora-packager-%{ve BuildRequires: python3-devel BuildRequires: make +BuildRequires: automake Requires: koji >= 1.11.0 Requires: bodhi-client Requires: rpm-build rpmdevtools rpmlint From a7fde86069c3595fdaf8b7bcfe22c231f55b48de Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 4 Jun 2021 12:12:49 -0400 Subject: [PATCH 03/46] Make fedora-packager-kerberos subpackage Breaks out the kerberos configs into own subpackage so that users who want to connect to kerberos but not install all the depenencies of `fedora-packager` can do that. Fixes https://pagure.io/fedora-packager/issue/152 Signed-off-by: Dusty Mabe --- fedora-packager.spec | 50 ++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index a22d9c2..fc476ab 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,7 +4,7 @@ Name: fedora-packager Version: 0.6.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for setting up a fedora maintainer environment License: GPLv2+ @@ -21,20 +21,8 @@ Requires: mock curl openssh-clients Requires: redhat-rpm-config Requires: fedpkg >= 1.0 Obsoletes: fedora-cert < 0.6.0.3-4 -# This is the version in which SNI was fixed -%if 0%{?fedora} -Requires: krb5-workstation >= 1.14.3-4 -%else -%if 0%{?rhel} >= 7 -Requires: krb5-workstation >= 1.14.1-24 -%else -# older rhels wont fully work without configuration, but lets make sure they have krb -# we should be able to assume newer RHELs's will have a new enough version -Requires: krb5-workstation -%endif -%endif -Requires: krb5-pkinit Recommends: fedora-packager-yubikey +Recommends: fedora-packager-kerberos BuildArch: noarch @@ -52,6 +40,27 @@ BuildArch: noarch %description yubikey A tool for setting up a yubikey for use in fedora +%package kerberos +Summary: files for connecting via kerberos to Fedora +# This is the version in which SNI was fixed +%if 0%{?fedora} +Requires: krb5-workstation >= 1.14.3-4 +%else +%if 0%{?rhel} >= 7 +Requires: krb5-workstation >= 1.14.1-24 +%else +# older rhels wont fully work without configuration, but lets make sure they have krb +# we should be able to assume newer RHELs's will have a new enough version +Requires: krb5-workstation +%endif +%endif +Requires: krb5-pkinit + +BuildArch: noarch + +%description kerberos +Files for connecting via kerberos to Fedora + %prep %setup -q @@ -71,19 +80,28 @@ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %exclude %{_bindir}/fedora-packager-setup %exclude %{_bindir}/fedoradev-pkgowners %exclude %{_bindir}/fedora-cert +%exclude %{_bindir}/fkinit %exclude %{python3_sitelib}/fedora_cert %config(noreplace) %{_sysconfdir}/koji.conf.d/* -%config %{_sysconfdir}/krb5.conf.d/* -%{_sysconfdir}/pki/ipa/* %files yubikey %license COPYING %{_sbindir}/* +%files kerberos +%license COPYING +%{_bindir}/fkinit +%config %{_sysconfdir}/krb5.conf.d/* +%{_sysconfdir}/pki/ipa/* + %changelog +* Fri Jun 04 2021 Dusty Mabe - 0.6.0.6-2 +- Create subpackage for kerberos configs. +- Fixes https://pagure.io/fedora-packager/issue/152 + * Tue May 11 2021 Tomas Hrcka - 0.6.0.6-1 - Add fkinit (sgallagh) From 168c85614c5bb8c69a9e455b19a85a7eaea057f9 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 4 Jun 2021 12:12:49 -0400 Subject: [PATCH 04/46] Make fedora-packager-kerberos subpackage Breaks out the kerberos configs into own subpackage so that users who want to connect to kerberos but not install all the depenencies of `fedora-packager` can do that. Fixes https://pagure.io/fedora-packager/issue/152 Signed-off-by: Dusty Mabe --- fedora-packager.spec | 50 ++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index a22d9c2..fc476ab 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,7 +4,7 @@ Name: fedora-packager Version: 0.6.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for setting up a fedora maintainer environment License: GPLv2+ @@ -21,20 +21,8 @@ Requires: mock curl openssh-clients Requires: redhat-rpm-config Requires: fedpkg >= 1.0 Obsoletes: fedora-cert < 0.6.0.3-4 -# This is the version in which SNI was fixed -%if 0%{?fedora} -Requires: krb5-workstation >= 1.14.3-4 -%else -%if 0%{?rhel} >= 7 -Requires: krb5-workstation >= 1.14.1-24 -%else -# older rhels wont fully work without configuration, but lets make sure they have krb -# we should be able to assume newer RHELs's will have a new enough version -Requires: krb5-workstation -%endif -%endif -Requires: krb5-pkinit Recommends: fedora-packager-yubikey +Recommends: fedora-packager-kerberos BuildArch: noarch @@ -52,6 +40,27 @@ BuildArch: noarch %description yubikey A tool for setting up a yubikey for use in fedora +%package kerberos +Summary: files for connecting via kerberos to Fedora +# This is the version in which SNI was fixed +%if 0%{?fedora} +Requires: krb5-workstation >= 1.14.3-4 +%else +%if 0%{?rhel} >= 7 +Requires: krb5-workstation >= 1.14.1-24 +%else +# older rhels wont fully work without configuration, but lets make sure they have krb +# we should be able to assume newer RHELs's will have a new enough version +Requires: krb5-workstation +%endif +%endif +Requires: krb5-pkinit + +BuildArch: noarch + +%description kerberos +Files for connecting via kerberos to Fedora + %prep %setup -q @@ -71,19 +80,28 @@ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %exclude %{_bindir}/fedora-packager-setup %exclude %{_bindir}/fedoradev-pkgowners %exclude %{_bindir}/fedora-cert +%exclude %{_bindir}/fkinit %exclude %{python3_sitelib}/fedora_cert %config(noreplace) %{_sysconfdir}/koji.conf.d/* -%config %{_sysconfdir}/krb5.conf.d/* -%{_sysconfdir}/pki/ipa/* %files yubikey %license COPYING %{_sbindir}/* +%files kerberos +%license COPYING +%{_bindir}/fkinit +%config %{_sysconfdir}/krb5.conf.d/* +%{_sysconfdir}/pki/ipa/* + %changelog +* Fri Jun 04 2021 Dusty Mabe - 0.6.0.6-2 +- Create subpackage for kerberos configs. +- Fixes https://pagure.io/fedora-packager/issue/152 + * Tue May 11 2021 Tomas Hrcka - 0.6.0.6-1 - Add fkinit (sgallagh) From 114c2f53f8cc6033e87ae1cba082c5f7c45ef032 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 22:50:11 +0000 Subject: [PATCH 05/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fedora-packager.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index fc476ab..4c66c4e 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,7 +4,7 @@ Name: fedora-packager Version: 0.6.0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for setting up a fedora maintainer environment License: GPLv2+ @@ -98,6 +98,9 @@ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %{_sysconfdir}/pki/ipa/* %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.6.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Dusty Mabe - 0.6.0.6-2 - Create subpackage for kerberos configs. - Fixes https://pagure.io/fedora-packager/issue/152 From e13e65eb6c3da698cefa153c0eb4dc65dd11eb86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 02:52:58 +0000 Subject: [PATCH 06/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fedora-packager.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index 4c66c4e..3804e5d 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,7 +4,7 @@ Name: fedora-packager Version: 0.6.0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools for setting up a fedora maintainer environment License: GPLv2+ @@ -98,6 +98,9 @@ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %{_sysconfdir}/pki/ipa/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.6.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 0.6.0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1533c9d7e5054d3831c18993a08e564504d69f98 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 12 May 2022 16:11:24 -0400 Subject: [PATCH 07/46] Add a switch to fkinit for the staging infra (abompard) Signed-off-by: Mohan Boddu --- .gitignore | 1 + fedora-packager.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6bbf1c6..b4bceff 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ fedora-packager-0.5.1.2.tar.bz2 /fedora-packager-0.6.0.4.tar.bz2 /fedora-packager-0.6.0.5.tar.bz2 /fedora-packager-0.6.0.6.tar.bz2 +/fedora-packager-0.6.0.7.tar.bz2 diff --git a/fedora-packager.spec b/fedora-packager.spec index 3804e5d..a71bbcf 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -3,8 +3,8 @@ %endif Name: fedora-packager -Version: 0.6.0.6 -Release: 4%{?dist} +Version: 0.6.0.7 +Release: 0%{?dist} Summary: Tools for setting up a fedora maintainer environment License: GPLv2+ @@ -98,6 +98,9 @@ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %{_sysconfdir}/pki/ipa/* %changelog +* Thu May 12 2022 Mohan Boddu - 0.6.0.7-0 +- Add a switch to fkinit for the staging infra (abompard) + * Thu Jan 20 2022 Fedora Release Engineering - 0.6.0.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 18a80a4..e754066 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fedora-packager-0.6.0.6.tar.bz2) = 3c8fe305701c4306520a6fc2b9c0a32c1d2cf5d633599838c0595ab441322930cffec4982eb95aefec2aed9eeb37ad1a033455c5f671541b354e18e9a203ee57 +SHA512 (fedora-packager-0.6.0.7.tar.bz2) = 549f8e198e38aa29961ad327dc26c469dd7efb421e385ac7eb73301b10d6d527282f46be571c22b23c64d22753ad0c48251f303b08b28cf7933cbf3cbc254ba0 From ee09fb23041f8391b28a5d7a092db17f9ca5c4a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 03:02:16 +0000 Subject: [PATCH 08/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fedora-packager.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index a71bbcf..a8df813 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,7 +4,7 @@ Name: fedora-packager Version: 0.6.0.7 -Release: 0%{?dist} +Release: 1%{?dist} Summary: Tools for setting up a fedora maintainer environment License: GPLv2+ @@ -98,6 +98,9 @@ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %{_sysconfdir}/pki/ipa/* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.6.0.7-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu May 12 2022 Mohan Boddu - 0.6.0.7-0 - Add a switch to fkinit for the staging infra (abompard) From 91adab39a626cc50733e44451f8eb558b2a1ca7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:18:18 +0000 Subject: [PATCH 09/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fedora-packager.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index a8df813..e18ad2e 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,7 +4,7 @@ Name: fedora-packager Version: 0.6.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for setting up a fedora maintainer environment License: GPLv2+ @@ -98,6 +98,9 @@ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %{_sysconfdir}/pki/ipa/* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.6.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0.6.0.7-1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 20d5b901e08a683e3a6eb4ea56b4b2bbb4a317f4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 29 Apr 2023 12:35:46 -0700 Subject: [PATCH 10/46] Drop the fedora-packager-yubikey subpackage as fas2 is retired. Fixes rhbz#2165100 --- fedora-packager.spec | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index e18ad2e..9bc7753 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,7 +4,7 @@ Name: fedora-packager Version: 0.6.0.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for setting up a fedora maintainer environment License: GPLv2+ @@ -21,7 +21,7 @@ Requires: mock curl openssh-clients Requires: redhat-rpm-config Requires: fedpkg >= 1.0 Obsoletes: fedora-cert < 0.6.0.3-4 -Recommends: fedora-packager-yubikey +Obsoletes: fedora-packager-yubikey < 0.6.0.7-3 Recommends: fedora-packager-kerberos BuildArch: noarch @@ -29,17 +29,6 @@ BuildArch: noarch %description Set of utilities useful for a fedora packager in setting up their environment. -%package yubikey -Summary: tool for setting up a yubikey for use in Fedora -# For fedora-burn-yubikey.py -Requires: python3-yubico -Recommends: ykpers - -BuildArch: noarch - -%description yubikey -A tool for setting up a yubikey for use in fedora - %package kerberos Summary: files for connecting via kerberos to Fedora # This is the version in which SNI was fixed @@ -71,6 +60,8 @@ Files for connecting via kerberos to Fedora %install %make_install sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* +# The fedora-burn-yubikey utility only worked with fas2, which is now retired. +rm -f %{buildroot}/usr/sbin/fedora-burn-yubikey %files %license COPYING @@ -86,11 +77,6 @@ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %config(noreplace) %{_sysconfdir}/koji.conf.d/* - -%files yubikey -%license COPYING -%{_sbindir}/* - %files kerberos %license COPYING %{_bindir}/fkinit @@ -98,6 +84,9 @@ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %{_sysconfdir}/pki/ipa/* %changelog +* Sat Apr 29 2023 Kevin Fenzi - 0.6.0.7-3 +- Drop the fedora-packager-yubikey subpackage as fas2 is retired. Fixes rhbz#2165100 + * Thu Jan 19 2023 Fedora Release Engineering - 0.6.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e2d9878cc3bb78ac12db8350c30a687942d6bd58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 19:32:39 +0000 Subject: [PATCH 11/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fedora-packager.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index 9bc7753..1024ab7 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,7 +4,7 @@ Name: fedora-packager Version: 0.6.0.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools for setting up a fedora maintainer environment License: GPLv2+ @@ -84,6 +84,9 @@ rm -f %{buildroot}/usr/sbin/fedora-burn-yubikey %{_sysconfdir}/pki/ipa/* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.6.0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Apr 29 2023 Kevin Fenzi - 0.6.0.7-3 - Drop the fedora-packager-yubikey subpackage as fas2 is retired. Fixes rhbz#2165100 From 1df1a22674b4bc6b70597e28375a411260da795d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 23 Nov 2023 10:08:23 +0100 Subject: [PATCH 12/46] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 417 ++++++++++++++++++++++++++++++++++++++++++ fedora-packager.spec | 420 +------------------------------------------ 2 files changed, 419 insertions(+), 418 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..7d478ec --- /dev/null +++ b/changelog @@ -0,0 +1,417 @@ +* Wed Jul 19 2023 Fedora Release Engineering - 0.6.0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Apr 29 2023 Kevin Fenzi - 0.6.0.7-3 +- Drop the fedora-packager-yubikey subpackage as fas2 is retired. Fixes rhbz#2165100 + +* Thu Jan 19 2023 Fedora Release Engineering - 0.6.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.6.0.7-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu May 12 2022 Mohan Boddu - 0.6.0.7-0 +- Add a switch to fkinit for the staging infra (abompard) + +* Thu Jan 20 2022 Fedora Release Engineering - 0.6.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 0.6.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Dusty Mabe - 0.6.0.6-2 +- Create subpackage for kerberos configs. +- Fixes https://pagure.io/fedora-packager/issue/152 + +* Tue May 11 2021 Tomas Hrcka - 0.6.0.6-1 +- Add fkinit (sgallagh) + +* Fri May 07 2021 Fabian Arrotin - 0.6.0.5-2 +- minor change to have centos.org alias for kerberos auth to work client side + +* Mon Mar 22 2021 Mohan Boddu - 0.6.0.5-1 +- Update README - fix typo (cheese) +- Add pkgname helper (churchyard) +- remove krb_rdns setting (ktdreyer) +- Fix version and specfile (ryanlerch) +- Add pkinit config and ipa certs (ryanlerch) +- update ipa cert for stg after rebuild (mobrien) + +* Tue Jan 26 2021 Fedora Release Engineering - 0.6.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 0.6.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Mar 31 2020 Mohan Boddu - 0.6.0.4-1 +- Rebase to 0.6.0.4 + * Remove obsolete fedora-packager-setup (tmz) + * Drop mercurial formatting from .gitignore (tmz) + * Fix for rhbz #1412260 (sergio) + * Option for the mode_yubikey_otp must be bytes and not string. (cverna) + +* Tue Jan 28 2020 Fedora Release Engineering - 0.6.0.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 22 2020 Dennis Gilmore - 0.6.0.2-7 +- move fedora-burn-yubikey to a subpackge rhbz#756413 + +* Thu Jul 25 2019 Fedora Release Engineering - 0.6.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 0.6.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Nov 27 2018 Zbigniew Jędrzejewski-Szmek - 0.6.0.2-4 +- Drop obsolete scripts, switch over to python 3 (#1024796) + * fedora-burn-yubikey is python3 compatible + Those old scripts have been removed: + * fedora-hosted is for fedorahosted.org, which doesn't exist anymore + * fedora-packager-setup and fedora-cert download certificates, which + have been replaced by kerberos authentication + * fedoradev-pkgowners talks to pkgdb, which is no more + The fedora-cert python2 package is also removed. + The other scripts are most likely obsolete too, but they are just bash + wrappers around other tools, so they are still packaged. + +* Tue Jul 31 2018 Miro Hrončok - 0.6.0.2-3 +- Do not require packagedb-cli, it's not used anymore (#1024838) + +* Fri Jul 13 2018 Fedora Release Engineering - 0.6.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Apr 01 2018 Patrick Uiterwijk - 0.6.0.2-1 +- Rebase to 0.6.0.2 + +* Thu Mar 01 2018 Iryna Shcherbina - 0.6.0.1-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Feb 07 2018 Fedora Release Engineering - 0.6.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.6.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.6.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Dec 22 2016 Dennis Gilmore - 0.6.0.1-1 +- install and include the new config file names (dennis) +- rename configs and enable fast upload (dennis) +- Configuration files in /etc/koji.conf.d need to end with .conf (puiterwijk) + +* Sun Dec 11 2016 Dennis Gilmore - 0.6.0.0-2 +- fix up krb5-workstation requires + +* Fri Dec 09 2016 Dennis Gilmore - 0.6.0.0-1 +- Make scripts executable in GIT (opensource) +- Update bugzilla owners URL everywhere (opensource) +- Properly except AuthError (opensource) + +* Tue Oct 25 2016 Patrick Uiterwijk - 0.5.10.7-4 +- Added kerberos configuration + +* Tue Jul 19 2016 Fedora Release Engineering - 0.5.10.7-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Sun May 22 2016 Till Maas - 0.5.10.7-2 +- Use %%license +- Update URL +- Add fedora-cert Requires: python-fedora (#1213068) (Mike DePaulo ) +- Add Requires: python-offtrac (#1213075) (Mike DePaulo ) +- Require python-yubico + +* Tue Mar 01 2016 Dennis Gilmore - 0.5.10.7-1 +- 0.5.10.7 release (dennis) +- add stg-koji command and fix up secondary configs (dennis) +- switch to tar-pax so I can make tarballs (dennis) +- Make fedora-packager-setup work with Python 3 (ville.skytta) +- Make fedora-cert work with Python 3 (ville.skytta) +- Python 3 fixes (ville.skytta) + +* Wed Feb 03 2016 Fedora Release Engineering - 0.5.10.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Aug 11 2015 Patrick Uiterwijk - 0.5.10.6-1 +- Reworked yubikey code to use python-yubico rather than subprocess (puiterwijk) +- Use python API to write yubikey (puiterwijk) +- fedora-cert: Fix checking against the CRL (bochecha) +- fedora-cert: Fix typo (bochecha) + +* Wed Jun 17 2015 Fedora Release Engineering - 0.5.10.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Nov 24 2014 Dennis Gilmore - 0.5.10.5-1 +- remove fedora-cvs script as the cvs server no longer exists (dennis) +- Make fas url configurable for fedora-server-ca.cert. (rbean) +- Remove unused imports. (rbean) +- Remove another unused import. (rbean) +- Conditionalize CRL checking for el6. (rbean) +- Remove unused imports. (rbean) +- Add CRL checking to fedora-cert. (rbean) +- fedoradev-pkgowners: Update pkgdb URL (opensource) + +* Sat Jun 07 2014 Fedora Release Engineering - 0.5.10.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Mar 23 2014 Nick Bebout - 0.5.10.4-1 +- fix fedora-burn-yubikey script to add -oserial-api-visible + +* Tue Mar 18 2014 Nick Bebout - 0.5.10.3-1 +- fix fedora-burn-yubikey script to work with slot 2 + +* Thu Dec 05 2013 Denis Gilmore - 0.5.10.2-1 +- update to 0.5.10.2 +- drop sparc support + +* Sat Aug 03 2013 Fedora Release Engineering - 0.5.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 0.5.10.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jan 03 2013 Adam Jackson 0.5.10.1-2 +- Requires: packagedb-cli (which also pulls in python-bugzilla) + +* Mon Dec 03 2012 Nick Bebout - 0.5.10.1-1 +- fix fedora-burn-yubikey to allow specifying what slot to use + +* Fri Aug 03 2012 Dennis Gilmore - 0.5.10.0-1 +- fix up secondary arch configs for newer koji +- clean up message for browser import + +* Thu Jul 19 2012 Fedora Release Engineering - 0.5.9.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.5.9.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 08 2011 Jesse Keating - 0.5.9.6-1 +- Install secondary-arch files correctly + +* Mon Nov 07 2011 Jesse Keating - 0.5.9.5-1 +- Move fedpkg to it's own package, no longer part of fedora-packager + +* Fri Oct 28 2011 Jesse Keating - 0.5.9.4-1 +- Overload curl stuff (jkeating) +- Hardcode fedpkg version requires (jkeating) +- Fix up changelog date (jkeating) + +* Thu Oct 27 2011 Jesse Keating - 0.5.9.3-1 +- Use the new plugin setup with rpkg +- Change fedpkg version number to 1.0 + +* Sat Aug 27 2011 Jussi Lehtola - 0.5.9.2-2 +- Fix operating URL of fedoradev-pkgowners (BZ #575517). + +* Sun May 22 2011 Jesse Keating - 0.5.9.2-1 +- Strip the .py off of fixbranches (jkeating) +- Unconditionally check for new branch style (jkeating) +- Stop setting push.default (#705468) (jkeating) +- Make sure packages are built before lint (#702893) (jkeating) +- Except more build submission errors (#702235) (jkeating) +- Move the fixbranches.py script out of the $PATH (#698646) (jkeating) +- fedpkg: Support branch completion on non-default remotes (tmz) +- fedpkg: Update bash completion for new branch names (tmz) +- Fix retiring a package with a provided message (#701626) (jkeating) +- add arm specific and s390 specific packages so they get sent to the right + place (dennis) +- initial go at using consistent targets across all targets dist-rawhide is + still used for master branch (dennis) +- only pass in a target arch to local builds when specified on the command line + some arches notably x86, arm and sparc dont build for the base arch you end + up with .i386 .arm or .sparc rpms when you really want something else + (dennis) + +* Thu Apr 14 2011 Jesse Keating - 0.5.9.0-1 +- Add a check for new-style branches (jkeating) +- Add a force option (jkeating) +- Add ability to check status of conversion (jkeating) +- Add a dry-run option (jkeating) +- Add a client side script to fix branch data (jkeating) + +* Sat Apr 09 2011 Jesse Keating - 0.5.8.1-1 +- Man page comment syntax fix. (ville.skytta) +- Make sure the bodhi.template file got written out (#683602) (jkeating) +- Wrap the diff in a try (#681789) (jkeating) +- Don't try to upload directories. (#689947) (jkeating) +- Fix tag-request (#684418) (jkeating) + +* Fri Mar 04 2011 Jesse Keating - 0.5.7.0-1 +- If chain has sets, handle them right (#679126) (jkeating) +- Fix "fedpkg help" command (make it work again) (#681242) (hun) +- Always generate a new srpm (#681359) (jkeating) +- Fix up uses of path (ticket #96) (jkeating) +- Clean up hardcoded "origin" (ticket #95) (jkeating) +- Fix obvious error in definition of curl command (pebolle) + +* Wed Feb 23 2011 Jesse Keating - 0.5.6.0-1 +- Fix improper use of strip() (jkeating) +- Improve the way we detect branch data (jkeating) +- Fix clone to work with old/new branch styles (jkeating) +- Add new and old support to switch_branches (jkeating) +- Update the regexes used for finding branches (jkeating) +- Don't use temporary editor files for spec (#677121) (jkeating) +- fedpkg requires rpm-build (#676973) (jkeating) +- Don't error out just from stderr from rpm (jkeating) + +* Wed Feb 09 2011 Jesse Keating - 0.5.5.0-1 +- Re-add 'lint' command hookup into argparse magic (hun) +- Catch errors parsing spec to get name. (#676383) (jkeating) + +* Wed Feb 09 2011 Jesse Keating - 0.5.4.0-1 +- Re-arrange verify-files and slight fixups (jkeating) +- Add "fedpkg verify-files" command (hun) +- Provide feedback about new-ticket. (ticket 91) (jkeating) +- Add the new pull options to bash completion (jkeating) +- Add a --rebase and --no-rebase option to pull (jkeating) +- Update the documentation for a lot of commands (jkeating) +- Handle working from a non-existent path (#675398) (jkeating) +- Fix an traceback when failing to watch a build. (jkeating) +- Handle arches argument for scratch builds (#675285) (jkeating) +- Trim the "- " out of clogs. (#675892) (jkeating) +- Exit with an error when appropriate (jkeating) +- Add build time man page generator (hun) +- Add help text for global --user option (hun) +- Move argparse setup into parse_cmdline function (hun) +- Require python-hashlib on EL5 and 4 (jkeating) +- Catch a traceback when trying to build from local branch (jkeating) + +* Mon Jan 31 2011 Jesse Keating 0.5.3.0-1 +- Catch the case where there is no branch merge point (#622592) (jkeating) +- Fix whitespace (jkeating) +- Add an argument to override the "distribution" (jkeating) +- upload to lookaside cache tgz files (dennis) +- Handle traceback if koji is down or unreachable. (jkeating) +- If we don't have a remote branch, query koji (#619979) (jkeating) +- Add a method to create an anonymous koji session (jkeating) +- Make sure we have sources for mockbuild (#665555) (jwboyer) (jkeating) +- Revert "Make sure we have an srpm when doing a mockbuild (#665555)" (jkeating) +- Regenerate the srpm if spec file is newer (ticket #84) (jkeating) +- Improve cert failure message (Ticket 90) (jkeating) +- Get package name from the specfile. (Ticket 75) (jkeating) +- Handle anonymous clones in clone_with_dirs. (#660183) (ricky) +- Make sure we have an srpm when doing a mockbuild (#665555) (jkeating) +- Catch all errors from watching tasks. (#670305) (jkeating) +- Fix a traceback when koji goes offline (#668889) (jkeating) +- Fix traceback with lint (ticket 89) (jkeating) + +* Wed Jan 05 2011 Dennis Gilmore - 0.5.2.0-1 +- new release see ChangeLog + +* Tue Aug 24 2010 Jesse Keating - 0.5.1.4-1 +- Fix setting push.default when cloning with dirs +- Remove build --test option in bash completion + +* Mon Aug 23 2010 Jesse Keating - 0.5.1.3-1 +- Error check the update call. #625679 +- Use the correct remote when listing revs +- Add the bash completion file +- make fedora-cvs only do anonymous chackouts since cvs is read only now. +- re-fix dist defines. +- Short cut the failure on repeated builds +- Allow passing srpms to the build command +- clone: set repo's push.default to tracking +- pull the username from fedora_cert to pass to bodhi +- Catch double ^c's from build. RHBZ #620465 +- Fix up chain building +- Add missing process call for non-pipe no tty. + +* Thu Aug 12 2010 Dennis Gilmore - 0.5.1.2-1 +- fix rh bz 619733 619879 619935 620254 620465 620595 620648 +- 620653 620750 621148 621808 622291 622716 + +* Fri Jul 30 2010 Dennis Gilmore -0.5.1.0-2 +- split fedpkg out on its own + +* Thu Jul 29 2010 Dennis Gilmore - 0.5.1.0-1 +- wrap fedora-cert in try except +- fedpkg fixes +- require python-kitchen on EL-4 and 5 + +* Wed Jul 28 2010 Dennis Gilmore - 0.5.0.1-1 +- Fix checking for unpushed changes on a branch + +* Wed Jul 28 2010 Dennis Gilmore - 0.5.0-1 +- update to 0.5.0 with the switch to dist-git + +* Thu Jul 08 2010 Dennis Gilmore - 0.4.2.2-1 +- new release with lost of fedpkg fixes + +* Mon Jun 14 2010 Dennis Gilmore - 0.4.2.1-1 +- set devel for F-14 +- point builds to koji.stg +- correctly create a git url for koji + +* Tue Mar 23 2010 Dennis Gilmore - 0.4.2-1 +- update to 0.4.2 +- adds missing fedora_cert. in fedora-packager-setup bz#573941 +- Require python-argparse for fedpkg bz#574206 +- Require make and openssh-clients bz#542209 +- Patch to make cvs checkouts more robust bz#569954 + +* Wed Mar 03 2010 Dennis Gilmore - 0.4.1-1 +- update to 0.4.1 +- adds a missing "import sys" from fedora-cert bz#570370 +- Require GitPython for fedpkg + +* Fri Feb 26 2010 Dennis Gilmore - 0.4.0-1 +- update to 0.4.0 adds fedpkg +- make a fedora_cert python library +- add basic date check for certs + +* Tue Aug 04 2009 Jesse Keating - 0.3.8-1 +- Add fedora-hosted and require offtrac + +* Thu Jul 30 2009 Dennis Gilmore - 0.3.7-1 +- define user_cert in fedora-cvs before refrencing it + +* Tue Jul 28 2009 Dennis Gilmore - 0.3.6-1 +- use anon checkout when a fedora cert doesnt exist bz#514108 +- quote arguments passed onto rpmbuild bz#513269 + +* Fri Jul 24 2009 Fedora Release Engineering - 0.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Jul 13 2009 Dennis Gilmore - 0.3.5-1 +- add new rpmbuild-md5 script to build old style hash srpms +- it is a wrapper around rpmbuild + +* Mon Jul 6 2009 Tom "spot" Callaway - 0.3.4-3 +- add Requires: redhat-rpm-config to be sure fedora packagers are using all available macros + +* Wed Jun 24 2009 Dennis Gilmore - 0.3.4-2 +- minor bump + +* Mon Jun 22 2009 Dennis Gilmore - 0.3.4-1 +- update to 0.3.4 +- bugfix release with some new scripts + +* Mon Mar 02 2009 Dennis Gilmore - 0.3.3-1 +- update to 0.3.3 + +* Tue Feb 24 2009 Fedora Release Engineering - 0.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Aug 18 2008 Dennis Gilmore - 0.3.1-1 +- update to 0.3.1 fedora-cvs allows anonymous checkout +- fix some Requires add cvs curl and wget + +* Sun Mar 30 2008 Dennis Gilmore - 0.3.0-1 +- update to 0.3.0 fedora-cvs uses pyOpenSSL to work out username +- remove Requires on RCS's for fedora-hosted +- rename fedora-packager-setup.sh to fedora-packager-setup + +* Fri Feb 22 2008 Dennis Gilmore - 0.2.0-1 +- new upstream release +- update for fas2 +- fedora-cvs can now check out multiple modules at once +- only require git-core + +* Mon Dec 03 2007 Dennis Gilmore - 0.1.1-1 +- fix typo in description +- update to 0.1.1 fixes typo in fedora-cvs + +* Sun Nov 11 2007 Dennis Gilmore - 0.1-1 +- initial build diff --git a/fedora-packager.spec b/fedora-packager.spec index 1024ab7..70fd71e 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,7 +4,7 @@ Name: fedora-packager Version: 0.6.0.7 -Release: 4%{?dist} +Release: %autorelease Summary: Tools for setting up a fedora maintainer environment License: GPLv2+ @@ -84,420 +84,4 @@ rm -f %{buildroot}/usr/sbin/fedora-burn-yubikey %{_sysconfdir}/pki/ipa/* %changelog -* Wed Jul 19 2023 Fedora Release Engineering - 0.6.0.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Apr 29 2023 Kevin Fenzi - 0.6.0.7-3 -- Drop the fedora-packager-yubikey subpackage as fas2 is retired. Fixes rhbz#2165100 - -* Thu Jan 19 2023 Fedora Release Engineering - 0.6.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 0.6.0.7-1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu May 12 2022 Mohan Boddu - 0.6.0.7-0 -- Add a switch to fkinit for the staging infra (abompard) - -* Thu Jan 20 2022 Fedora Release Engineering - 0.6.0.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.6.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Dusty Mabe - 0.6.0.6-2 -- Create subpackage for kerberos configs. -- Fixes https://pagure.io/fedora-packager/issue/152 - -* Tue May 11 2021 Tomas Hrcka - 0.6.0.6-1 -- Add fkinit (sgallagh) - -* Fri May 07 2021 Fabian Arrotin - 0.6.0.5-2 -- minor change to have centos.org alias for kerberos auth to work client side - -* Mon Mar 22 2021 Mohan Boddu - 0.6.0.5-1 -- Update README - fix typo (cheese) -- Add pkgname helper (churchyard) -- remove krb_rdns setting (ktdreyer) -- Fix version and specfile (ryanlerch) -- Add pkinit config and ipa certs (ryanlerch) -- update ipa cert for stg after rebuild (mobrien) - -* Tue Jan 26 2021 Fedora Release Engineering - 0.6.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.6.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Mar 31 2020 Mohan Boddu - 0.6.0.4-1 -- Rebase to 0.6.0.4 - * Remove obsolete fedora-packager-setup (tmz) - * Drop mercurial formatting from .gitignore (tmz) - * Fix for rhbz #1412260 (sergio) - * Option for the mode_yubikey_otp must be bytes and not string. (cverna) - -* Tue Jan 28 2020 Fedora Release Engineering - 0.6.0.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jan 22 2020 Dennis Gilmore - 0.6.0.2-7 -- move fedora-burn-yubikey to a subpackge rhbz#756413 - -* Thu Jul 25 2019 Fedora Release Engineering - 0.6.0.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 0.6.0.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Nov 27 2018 Zbigniew Jędrzejewski-Szmek - 0.6.0.2-4 -- Drop obsolete scripts, switch over to python 3 (#1024796) - * fedora-burn-yubikey is python3 compatible - Those old scripts have been removed: - * fedora-hosted is for fedorahosted.org, which doesn't exist anymore - * fedora-packager-setup and fedora-cert download certificates, which - have been replaced by kerberos authentication - * fedoradev-pkgowners talks to pkgdb, which is no more - The fedora-cert python2 package is also removed. - The other scripts are most likely obsolete too, but they are just bash - wrappers around other tools, so they are still packaged. - -* Tue Jul 31 2018 Miro Hrončok - 0.6.0.2-3 -- Do not require packagedb-cli, it's not used anymore (#1024838) - -* Fri Jul 13 2018 Fedora Release Engineering - 0.6.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Apr 01 2018 Patrick Uiterwijk - 0.6.0.2-1 -- Rebase to 0.6.0.2 - -* Thu Mar 01 2018 Iryna Shcherbina - 0.6.0.1-5 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Feb 07 2018 Fedora Release Engineering - 0.6.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.6.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.6.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Dec 22 2016 Dennis Gilmore - 0.6.0.1-1 -- install and include the new config file names (dennis) -- rename configs and enable fast upload (dennis) -- Configuration files in /etc/koji.conf.d need to end with .conf (puiterwijk) - -* Sun Dec 11 2016 Dennis Gilmore - 0.6.0.0-2 -- fix up krb5-workstation requires - -* Fri Dec 09 2016 Dennis Gilmore - 0.6.0.0-1 -- Make scripts executable in GIT (opensource) -- Update bugzilla owners URL everywhere (opensource) -- Properly except AuthError (opensource) - -* Tue Oct 25 2016 Patrick Uiterwijk - 0.5.10.7-4 -- Added kerberos configuration - -* Tue Jul 19 2016 Fedora Release Engineering - 0.5.10.7-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Sun May 22 2016 Till Maas - 0.5.10.7-2 -- Use %%license -- Update URL -- Add fedora-cert Requires: python-fedora (#1213068) (Mike DePaulo ) -- Add Requires: python-offtrac (#1213075) (Mike DePaulo ) -- Require python-yubico - -* Tue Mar 01 2016 Dennis Gilmore - 0.5.10.7-1 -- 0.5.10.7 release (dennis) -- add stg-koji command and fix up secondary configs (dennis) -- switch to tar-pax so I can make tarballs (dennis) -- Make fedora-packager-setup work with Python 3 (ville.skytta) -- Make fedora-cert work with Python 3 (ville.skytta) -- Python 3 fixes (ville.skytta) - -* Wed Feb 03 2016 Fedora Release Engineering - 0.5.10.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Aug 11 2015 Patrick Uiterwijk - 0.5.10.6-1 -- Reworked yubikey code to use python-yubico rather than subprocess (puiterwijk) -- Use python API to write yubikey (puiterwijk) -- fedora-cert: Fix checking against the CRL (bochecha) -- fedora-cert: Fix typo (bochecha) - -* Wed Jun 17 2015 Fedora Release Engineering - 0.5.10.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Nov 24 2014 Dennis Gilmore - 0.5.10.5-1 -- remove fedora-cvs script as the cvs server no longer exists (dennis) -- Make fas url configurable for fedora-server-ca.cert. (rbean) -- Remove unused imports. (rbean) -- Remove another unused import. (rbean) -- Conditionalize CRL checking for el6. (rbean) -- Remove unused imports. (rbean) -- Add CRL checking to fedora-cert. (rbean) -- fedoradev-pkgowners: Update pkgdb URL (opensource) - -* Sat Jun 07 2014 Fedora Release Engineering - 0.5.10.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Mar 23 2014 Nick Bebout - 0.5.10.4-1 -- fix fedora-burn-yubikey script to add -oserial-api-visible - -* Tue Mar 18 2014 Nick Bebout - 0.5.10.3-1 -- fix fedora-burn-yubikey script to work with slot 2 - -* Thu Dec 05 2013 Denis Gilmore - 0.5.10.2-1 -- update to 0.5.10.2 -- drop sparc support - -* Sat Aug 03 2013 Fedora Release Engineering - 0.5.10.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 0.5.10.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jan 03 2013 Adam Jackson 0.5.10.1-2 -- Requires: packagedb-cli (which also pulls in python-bugzilla) - -* Mon Dec 03 2012 Nick Bebout - 0.5.10.1-1 -- fix fedora-burn-yubikey to allow specifying what slot to use - -* Fri Aug 03 2012 Dennis Gilmore - 0.5.10.0-1 -- fix up secondary arch configs for newer koji -- clean up message for browser import - -* Thu Jul 19 2012 Fedora Release Engineering - 0.5.9.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0.5.9.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 08 2011 Jesse Keating - 0.5.9.6-1 -- Install secondary-arch files correctly - -* Mon Nov 07 2011 Jesse Keating - 0.5.9.5-1 -- Move fedpkg to it's own package, no longer part of fedora-packager - -* Fri Oct 28 2011 Jesse Keating - 0.5.9.4-1 -- Overload curl stuff (jkeating) -- Hardcode fedpkg version requires (jkeating) -- Fix up changelog date (jkeating) - -* Thu Oct 27 2011 Jesse Keating - 0.5.9.3-1 -- Use the new plugin setup with rpkg -- Change fedpkg version number to 1.0 - -* Sat Aug 27 2011 Jussi Lehtola - 0.5.9.2-2 -- Fix operating URL of fedoradev-pkgowners (BZ #575517). - -* Sun May 22 2011 Jesse Keating - 0.5.9.2-1 -- Strip the .py off of fixbranches (jkeating) -- Unconditionally check for new branch style (jkeating) -- Stop setting push.default (#705468) (jkeating) -- Make sure packages are built before lint (#702893) (jkeating) -- Except more build submission errors (#702235) (jkeating) -- Move the fixbranches.py script out of the $PATH (#698646) (jkeating) -- fedpkg: Support branch completion on non-default remotes (tmz) -- fedpkg: Update bash completion for new branch names (tmz) -- Fix retiring a package with a provided message (#701626) (jkeating) -- add arm specific and s390 specific packages so they get sent to the right - place (dennis) -- initial go at using consistent targets across all targets dist-rawhide is - still used for master branch (dennis) -- only pass in a target arch to local builds when specified on the command line - some arches notably x86, arm and sparc dont build for the base arch you end - up with .i386 .arm or .sparc rpms when you really want something else - (dennis) - -* Thu Apr 14 2011 Jesse Keating - 0.5.9.0-1 -- Add a check for new-style branches (jkeating) -- Add a force option (jkeating) -- Add ability to check status of conversion (jkeating) -- Add a dry-run option (jkeating) -- Add a client side script to fix branch data (jkeating) - -* Sat Apr 09 2011 Jesse Keating - 0.5.8.1-1 -- Man page comment syntax fix. (ville.skytta) -- Make sure the bodhi.template file got written out (#683602) (jkeating) -- Wrap the diff in a try (#681789) (jkeating) -- Don't try to upload directories. (#689947) (jkeating) -- Fix tag-request (#684418) (jkeating) - -* Fri Mar 04 2011 Jesse Keating - 0.5.7.0-1 -- If chain has sets, handle them right (#679126) (jkeating) -- Fix "fedpkg help" command (make it work again) (#681242) (hun) -- Always generate a new srpm (#681359) (jkeating) -- Fix up uses of path (ticket #96) (jkeating) -- Clean up hardcoded "origin" (ticket #95) (jkeating) -- Fix obvious error in definition of curl command (pebolle) - -* Wed Feb 23 2011 Jesse Keating - 0.5.6.0-1 -- Fix improper use of strip() (jkeating) -- Improve the way we detect branch data (jkeating) -- Fix clone to work with old/new branch styles (jkeating) -- Add new and old support to switch_branches (jkeating) -- Update the regexes used for finding branches (jkeating) -- Don't use temporary editor files for spec (#677121) (jkeating) -- fedpkg requires rpm-build (#676973) (jkeating) -- Don't error out just from stderr from rpm (jkeating) - -* Wed Feb 09 2011 Jesse Keating - 0.5.5.0-1 -- Re-add 'lint' command hookup into argparse magic (hun) -- Catch errors parsing spec to get name. (#676383) (jkeating) - -* Wed Feb 09 2011 Jesse Keating - 0.5.4.0-1 -- Re-arrange verify-files and slight fixups (jkeating) -- Add "fedpkg verify-files" command (hun) -- Provide feedback about new-ticket. (ticket 91) (jkeating) -- Add the new pull options to bash completion (jkeating) -- Add a --rebase and --no-rebase option to pull (jkeating) -- Update the documentation for a lot of commands (jkeating) -- Handle working from a non-existent path (#675398) (jkeating) -- Fix an traceback when failing to watch a build. (jkeating) -- Handle arches argument for scratch builds (#675285) (jkeating) -- Trim the "- " out of clogs. (#675892) (jkeating) -- Exit with an error when appropriate (jkeating) -- Add build time man page generator (hun) -- Add help text for global --user option (hun) -- Move argparse setup into parse_cmdline function (hun) -- Require python-hashlib on EL5 and 4 (jkeating) -- Catch a traceback when trying to build from local branch (jkeating) - -* Mon Jan 31 2011 Jesse Keating 0.5.3.0-1 -- Catch the case where there is no branch merge point (#622592) (jkeating) -- Fix whitespace (jkeating) -- Add an argument to override the "distribution" (jkeating) -- upload to lookaside cache tgz files (dennis) -- Handle traceback if koji is down or unreachable. (jkeating) -- If we don't have a remote branch, query koji (#619979) (jkeating) -- Add a method to create an anonymous koji session (jkeating) -- Make sure we have sources for mockbuild (#665555) (jwboyer) (jkeating) -- Revert "Make sure we have an srpm when doing a mockbuild (#665555)" (jkeating) -- Regenerate the srpm if spec file is newer (ticket #84) (jkeating) -- Improve cert failure message (Ticket 90) (jkeating) -- Get package name from the specfile. (Ticket 75) (jkeating) -- Handle anonymous clones in clone_with_dirs. (#660183) (ricky) -- Make sure we have an srpm when doing a mockbuild (#665555) (jkeating) -- Catch all errors from watching tasks. (#670305) (jkeating) -- Fix a traceback when koji goes offline (#668889) (jkeating) -- Fix traceback with lint (ticket 89) (jkeating) - -* Wed Jan 05 2011 Dennis Gilmore - 0.5.2.0-1 -- new release see ChangeLog - -* Tue Aug 24 2010 Jesse Keating - 0.5.1.4-1 -- Fix setting push.default when cloning with dirs -- Remove build --test option in bash completion - -* Mon Aug 23 2010 Jesse Keating - 0.5.1.3-1 -- Error check the update call. #625679 -- Use the correct remote when listing revs -- Add the bash completion file -- make fedora-cvs only do anonymous chackouts since cvs is read only now. -- re-fix dist defines. -- Short cut the failure on repeated builds -- Allow passing srpms to the build command -- clone: set repo's push.default to tracking -- pull the username from fedora_cert to pass to bodhi -- Catch double ^c's from build. RHBZ #620465 -- Fix up chain building -- Add missing process call for non-pipe no tty. - -* Thu Aug 12 2010 Dennis Gilmore - 0.5.1.2-1 -- fix rh bz 619733 619879 619935 620254 620465 620595 620648 -- 620653 620750 621148 621808 622291 622716 - -* Fri Jul 30 2010 Dennis Gilmore -0.5.1.0-2 -- split fedpkg out on its own - -* Thu Jul 29 2010 Dennis Gilmore - 0.5.1.0-1 -- wrap fedora-cert in try except -- fedpkg fixes -- require python-kitchen on EL-4 and 5 - -* Wed Jul 28 2010 Dennis Gilmore - 0.5.0.1-1 -- Fix checking for unpushed changes on a branch - -* Wed Jul 28 2010 Dennis Gilmore - 0.5.0-1 -- update to 0.5.0 with the switch to dist-git - -* Thu Jul 08 2010 Dennis Gilmore - 0.4.2.2-1 -- new release with lost of fedpkg fixes - -* Mon Jun 14 2010 Dennis Gilmore - 0.4.2.1-1 -- set devel for F-14 -- point builds to koji.stg -- correctly create a git url for koji - -* Tue Mar 23 2010 Dennis Gilmore - 0.4.2-1 -- update to 0.4.2 -- adds missing fedora_cert. in fedora-packager-setup bz#573941 -- Require python-argparse for fedpkg bz#574206 -- Require make and openssh-clients bz#542209 -- Patch to make cvs checkouts more robust bz#569954 - -* Wed Mar 03 2010 Dennis Gilmore - 0.4.1-1 -- update to 0.4.1 -- adds a missing "import sys" from fedora-cert bz#570370 -- Require GitPython for fedpkg - -* Fri Feb 26 2010 Dennis Gilmore - 0.4.0-1 -- update to 0.4.0 adds fedpkg -- make a fedora_cert python library -- add basic date check for certs - -* Tue Aug 04 2009 Jesse Keating - 0.3.8-1 -- Add fedora-hosted and require offtrac - -* Thu Jul 30 2009 Dennis Gilmore - 0.3.7-1 -- define user_cert in fedora-cvs before refrencing it - -* Tue Jul 28 2009 Dennis Gilmore - 0.3.6-1 -- use anon checkout when a fedora cert doesnt exist bz#514108 -- quote arguments passed onto rpmbuild bz#513269 - -* Fri Jul 24 2009 Fedora Release Engineering - 0.3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Jul 13 2009 Dennis Gilmore - 0.3.5-1 -- add new rpmbuild-md5 script to build old style hash srpms -- it is a wrapper around rpmbuild - -* Mon Jul 6 2009 Tom "spot" Callaway - 0.3.4-3 -- add Requires: redhat-rpm-config to be sure fedora packagers are using all available macros - -* Wed Jun 24 2009 Dennis Gilmore - 0.3.4-2 -- minor bump - -* Mon Jun 22 2009 Dennis Gilmore - 0.3.4-1 -- update to 0.3.4 -- bugfix release with some new scripts - -* Mon Mar 02 2009 Dennis Gilmore - 0.3.3-1 -- update to 0.3.3 - -* Tue Feb 24 2009 Fedora Release Engineering - 0.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Aug 18 2008 Dennis Gilmore - 0.3.1-1 -- update to 0.3.1 fedora-cvs allows anonymous checkout -- fix some Requires add cvs curl and wget - -* Sun Mar 30 2008 Dennis Gilmore - 0.3.0-1 -- update to 0.3.0 fedora-cvs uses pyOpenSSL to work out username -- remove Requires on RCS's for fedora-hosted -- rename fedora-packager-setup.sh to fedora-packager-setup - -* Fri Feb 22 2008 Dennis Gilmore - 0.2.0-1 -- new upstream release -- update for fas2 -- fedora-cvs can now check out multiple modules at once -- only require git-core - -* Mon Dec 03 2007 Dennis Gilmore - 0.1.1-1 -- fix typo in description -- update to 0.1.1 fixes typo in fedora-cvs - -* Sun Nov 11 2007 Dennis Gilmore - 0.1-1 -- initial build +%autochangelog From e3a7199c28fa0a8b9f4ac3241c54b593a8e2ac89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 20 Nov 2022 09:02:08 +0100 Subject: [PATCH 13/46] Pull in rpmautospec It is the default mechanism, so fedora-packager should ensure it is installed. --- fedora-packager.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-packager.spec b/fedora-packager.spec index 70fd71e..78a3386 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -17,6 +17,7 @@ BuildRequires: automake Requires: koji >= 1.11.0 Requires: bodhi-client Requires: rpm-build rpmdevtools rpmlint +Requires: rpmautospec Requires: mock curl openssh-clients Requires: redhat-rpm-config Requires: fedpkg >= 1.0 From 55b98094c9dea06b1411e4c1d7254d29927ba18d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:07:44 +0000 Subject: [PATCH 14/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 801fcf4664510aa90b9cc446aad41d95f3a847c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 11:25:55 +0000 Subject: [PATCH 15/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5fec13811d67c281b7a30b18d73c014538bb3fcb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 22:59:14 +0000 Subject: [PATCH 16/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 85ac56327b6900d1275578efcb1e2b3680f8525e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 23:49:12 +0200 Subject: [PATCH 17/46] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- fedora-packager.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index 78a3386..970e919 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -7,7 +7,8 @@ Version: 0.6.0.7 Release: %autorelease Summary: Tools for setting up a fedora maintainer environment -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://pagure.io/fedora-packager Source0: https://releases.pagure.org/fedora-packager/fedora-packager-%{version}.tar.bz2 From 411d7a36b2b9567628feb0a563a0c0295657f3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 9 Aug 2024 10:59:30 -0400 Subject: [PATCH 18/46] Merge separate "upstream" into this repository There is no point in having a separate upstream, there are no other users of that project except for Fedora. My moving the few files that we need here, we can simplify the workflow quite a bit. Difference in build outputs: $ rpmdiff -iT noarch/fedora-packager-0.6.0.7-{11,12}.fc41.noarch.rpm removed REQUIRES config(fedora-packager) = 0.6.0.7-11.fc41 added REQUIRES config(fedora-packager) = 0.6.0.7-12.fc41 removed PROVIDES config(fedora-packager) = 0.6.0.7-11.fc41 added PROVIDES config(fedora-packager) = 0.6.0.7-12.fc41 removed PROVIDES fedora-packager = 0.6.0.7-11.fc41 added PROVIDES fedora-packager = 0.6.0.7-12.fc41 removed REQUIRES rpmlib(PartialHardlinkSets) <= 4.0.4-1 removed /usr/share/doc/fedora-packager removed /usr/share/doc/fedora-packager/AUTHORS removed /usr/share/doc/fedora-packager/ChangeLog removed /usr/share/doc/fedora-packager/TODO $ rpmdiff -iT noarch/fedora-packager-kerberos-0.6.0.7-{11,12}.fc41.noarch.rpm removed REQUIRES config(fedora-packager-kerberos) = 0.6.0.7-11.fc41 added REQUIRES config(fedora-packager-kerberos) = 0.6.0.7-12.fc41 removed PROVIDES config(fedora-packager-kerberos) = 0.6.0.7-11.fc41 added PROVIDES config(fedora-packager-kerberos) = 0.6.0.7-12.fc41 removed PROVIDES fedora-packager-kerberos = 0.6.0.7-11.fc41 added PROVIDES fedora-packager-kerberos = 0.6.0.7-12.fc41 removed /usr/share/licenses/fedora-packager-kerberos removed /usr/share/licenses/fedora-packager-kerberos/COPYING added /usr/share/licenses/fedora-packager added /usr/share/licenses/fedora-packager/COPYING The three doc files are dropped because they are completely outdated and incomplete and it doesn't make sense to install them. The COPYING files is shared because that's simpler. --- COPYING | 674 +++++++++++++++++++++++++++++++++++ fedora-burn-yubikey.py | 93 +++++ fedora-getsvn | 22 ++ fedora-packager.spec | 75 ++-- fedora.conf | 16 + fedoraproject_ipa_ca.crt | 22 ++ fedoraproject_org | 11 + fkinit | 112 ++++++ pkgname.py | 32 ++ rpmbuild-md5 | 6 + s390.conf | 16 + secondary-koji | 12 + stg.conf | 16 + stg_fedoraproject_ipa_ca.crt | 27 ++ stg_fedoraproject_org | 8 + 15 files changed, 1112 insertions(+), 30 deletions(-) create mode 100644 COPYING create mode 100644 fedora-burn-yubikey.py create mode 100755 fedora-getsvn create mode 100644 fedora.conf create mode 100644 fedoraproject_ipa_ca.crt create mode 100644 fedoraproject_org create mode 100755 fkinit create mode 100644 pkgname.py create mode 100755 rpmbuild-md5 create mode 100644 s390.conf create mode 100755 secondary-koji create mode 100644 stg.conf create mode 100644 stg_fedoraproject_ipa_ca.crt create mode 100644 stg_fedoraproject_org diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/fedora-burn-yubikey.py b/fedora-burn-yubikey.py new file mode 100644 index 0000000..5efd99e --- /dev/null +++ b/fedora-burn-yubikey.py @@ -0,0 +1,93 @@ +#!/usr/bin/python3 + +# Copyright (C) 2010 Red Hat Inc. +# Author: Mike McGrath +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. See http://www.gnu.org/copyleft/gpl.html for +# the full text of the license. + +# ykpersonalize -ofixed=ccccccccccci -afcaa0c5bf2e83ec040e4aeb7f8565293 -ouid=1e7f1da7d6d1 +from fedora.client import AccountSystem, AuthError +from getpass import getpass +import sys +import gettext +from optparse import OptionParser +import yubico + +t = gettext.translation('fas', '/usr/share/locale', fallback = True) +_ = t.gettext + +try: + ykey = yubico.find_yubikey(False) +except yubico.yubikey.YubiKeyError as ex: + print('Unable to get access to a yubikey: %s' % ex) + sys.exit(1) + +parser = OptionParser(version = "0.1") +parser.add_option('-u', '--username', + dest = 'username', + default = None, + metavar = 'username', + help = _('Fedora Account System username')) +parser.add_option('-S', '--slot', + dest = 'slot', + default = '1', + metavar = 'slot', + help = _('The Yubikey slot to be used')) +parser.add_option('-U', '--url', + dest = 'url', + default = 'https://admin.fedoraproject.org/accounts/', + metavar = 'url', + help = _('FAS URL (Default: https://admin.fedoraproject.org/accounts/')) + +(opts, args) = parser.parse_args() +slot = opts.slot + +if not opts.username: + print(_('Please provide a username.')) + parser.print_help() + sys.exit(0) + +print(_( +''' +Attention: You are about to reprogram your yubikey! Please ensure it is +plugged in to your USB slot before continuing. The secret key currently on +your yubikey will be destroyed as part of this operation! + +''')) + +print('Contacting %s' % opts.url) +password = getpass('Password for %s: ' % opts.username) + +fas = AccountSystem(username=opts.username, password=password, base_url=opts.url) +try: + new_key = fas.send_request('yubikey/genkey', auth=True) +except AuthError as e: + print(e) + sys.exit(1) + +print("") +print(_('New key generated in FAS, attempting to burn to yubikey')) +print("") + +opts = new_key['key'].split() + +try: + ykconfig = ykey.init_config() + ykconfig.mode_yubikey_otp(f'h:{opts[1]}'.encode(), f'h:{opts[2]}'.encode()) + ykconfig.fixed_string(str(f'm:{opts[0]}')) + ykconfig.ticket_flag('APPEND_CR', True) + ykconfig.config_flag('STATIC_TICKET', False) + if ykey.version_num() >= (2, 1): + ykconfig.config_flag('STRONG_PW1', False) + ykconfig.config_flag('STRONG_PW2', False) + ykconfig.config_flag('MAN_UPDATE', False) + if ykey.version_num() >= (2, 2): + ykconfig.extended_flag('SERIAL_API_VISIBLE', True) + ykey.write_config(ykconfig, slot=int(slot)) + print("Success! Your Yubikey ID is %s" % opts[0]) +except yubico.yubikey.YubiKeyError as ex: + print('Yubikey error: %s' % ex) diff --git a/fedora-getsvn b/fedora-getsvn new file mode 100755 index 0000000..72f08ab --- /dev/null +++ b/fedora-getsvn @@ -0,0 +1,22 @@ +#! /bin/sh + +if [ $# -ne 3 ]; +then + echo "Usage: $0 " + exit 1 +fi + +project=$1 +url=$2 +rev=$3 + +tmpdir=`mktemp -d` +curdir=`pwd` + +( + cd ${tmpdir} + LANG=C TZ=GMT svn export ${url} -r ${rev} ${project} + tar cjvf ${curdir}/${project}-svn${rev}.tar.bz2 ${project} +) + +rm -rf ${tmpdir} diff --git a/fedora-packager.spec b/fedora-packager.spec index 970e919..a97f161 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -1,7 +1,3 @@ -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%endif - Name: fedora-packager Version: 0.6.0.7 Release: %autorelease @@ -10,11 +6,25 @@ Summary: Tools for setting up a fedora maintainer environment # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://pagure.io/fedora-packager -Source0: https://releases.pagure.org/fedora-packager/fedora-packager-%{version}.tar.bz2 + +Source0: COPYING +Source1: fedora-getsvn +Source2: pkgname.py +Source3: rpmbuild-md5 +Source4: secondary-koji +Source5: fkinit +Source6: fedora-burn-yubikey.py + +Source10: fedora.conf +Source11: s390.conf +Source12: stg.conf +Source13: fedoraproject_org +Source14: stg_fedoraproject_org +Source15: fedoraproject_ipa_ca.crt +Source16: stg_fedoraproject_ipa_ca.crt BuildRequires: python3-devel -BuildRequires: make -BuildRequires: automake + Requires: koji >= 1.11.0 Requires: bodhi-client Requires: rpm-build rpmdevtools rpmlint @@ -36,51 +46,56 @@ Summary: files for connecting via kerberos to Fedora # This is the version in which SNI was fixed %if 0%{?fedora} Requires: krb5-workstation >= 1.14.3-4 -%else -%if 0%{?rhel} >= 7 +%elif 0%{?rhel} >= 7 Requires: krb5-workstation >= 1.14.1-24 %else # older rhels wont fully work without configuration, but lets make sure they have krb # we should be able to assume newer RHELs's will have a new enough version Requires: krb5-workstation %endif -%endif Requires: krb5-pkinit -BuildArch: noarch - %description kerberos Files for connecting via kerberos to Fedora %prep -%setup -q +# nada %build -%configure PYTHON=%{__python3} -%make_build +# nada %install -%make_install -sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* +install -D %{SOURCE0} %{buildroot}%{_licensedir}/%{name}/COPYING +install -D %{SOURCE1} %{buildroot}%{_bindir}/fedora-getsvn +install -D %{SOURCE2} %{buildroot}%{_bindir}/pkgname +install -D %{SOURCE3} %{buildroot}%{_bindir}/rpmbuild-md5 +install -D %{SOURCE4} %{buildroot}%{_bindir}/s390-koji +install -D %{SOURCE4} %{buildroot}%{_bindir}/stg-koji +install -D %{SOURCE5} %{buildroot}%{_bindir}/fkinit +install -D %{SOURCE6} %{buildroot}%{_bindir}/fedora-burn-yubikey + +install -m0644 -Dt %{buildroot}%{_sysconfdir}/koji.conf.d/ \ + %{SOURCE10} %{SOURCE11} %{SOURCE12} +install -m0644 -Dt %{buildroot}%{_sysconfdir}/krb5.conf.d/ \ + %{SOURCE13} %{SOURCE14} +install -m0644 -Dt %{buildroot}%{_sysconfdir}/pki/ipa/ \ + %{SOURCE15} %{SOURCE16} + # The fedora-burn-yubikey utility only worked with fas2, which is now retired. -rm -f %{buildroot}/usr/sbin/fedora-burn-yubikey +# rm -f %{buildroot}/usr/sbin/fedora-burn-yubikey %files -%license COPYING -%doc TODO AUTHORS ChangeLog -%{_bindir}/* -%exclude %{_bindir}/fedora-hosted -%exclude %{_bindir}/fedora-packager-setup -%exclude %{_bindir}/fedoradev-pkgowners -%exclude %{_bindir}/fedora-cert -%exclude %{_bindir}/fkinit -%exclude %{python3_sitelib}/fedora_cert - +%license %{_licensedir}/%{name}/ +%{_bindir}/fedora-getsvn +%{_bindir}/pkgname +%{_bindir}/rpmbuild-md5 +%{_bindir}/s390-koji +%{_bindir}/stg-koji +%{_bindir}/fedora-burn-yubikey %config(noreplace) %{_sysconfdir}/koji.conf.d/* - %files kerberos -%license COPYING +%license %{_licensedir}/%{name}/ %{_bindir}/fkinit %config %{_sysconfdir}/krb5.conf.d/* %{_sysconfdir}/pki/ipa/* diff --git a/fedora.conf b/fedora.conf new file mode 100644 index 0000000..429d679 --- /dev/null +++ b/fedora.conf @@ -0,0 +1,16 @@ +[fedora] + +;configuration for koji cli tool + +;url of XMLRPC server +server = https://koji.fedoraproject.org/kojihub + +;url of web interface +weburl = https://koji.fedoraproject.org/koji + +;url of package download site +topurl = https://kojipkgs.fedoraproject.org/ + +authtype = kerberos + +use_fast_upload = yes diff --git a/fedoraproject_ipa_ca.crt b/fedoraproject_ipa_ca.crt new file mode 100644 index 0000000..b4a1c7b --- /dev/null +++ b/fedoraproject_ipa_ca.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQsFADA8MRowGAYDVQQKDBFGRURP +UkFQUk9KRUNULk9SRzEeMBwGA1UEAwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4X +DTE2MTAxMzEzMDQ0NloXDTM2MTAxMzEzMDQ0NlowPDEaMBgGA1UECgwRRkVET1JB +UFJPSkVDVC5PUkcxHjAcBgNVBAMMFUNlcnRpZmljYXRlIEF1dGhvcml0eTCCASIw +DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLFCPrsPD3YW/yzvId7UsWCq/Ac +cD7IOtlt46slTa490TvfpwzB1IwA3H0LTEYV7LONMIxJIT8H4H2P7A/S4eDtA6sZ +s26Qp+3YLj+jHOwvNiONG5YBIn6vgUKc1SdwyuQsNwcGsH1nV2vXrKYz4ccMud1P +tzzwRMSWgwZLXcLvMMXYpDCxu4pVmgEtTnYz7Dii7MJ2aJsWEuslzjL6HjaegfGD +JjXCrqmNKcgbgD7fQq05wiYw8AbArjhfObDO626b4naB0VxLb9vGTDBaRbIeL7Or +nM11BWVqYAFFRZPL1jXkeb9Bpr9oj4PduRq6+tSZPa3wgtnoowAN2AqLHKMCAwEA +AaOBsDCBrTAfBgNVHSMEGDAWgBQVrijBhrLB6xwkwjZroAlWJGIpvDAPBgNVHRMB +Af8EBTADAQH/MA4GA1UdDwEB/wQEAwIBxjAdBgNVHQ4EFgQUFa4owYaywescJMI2 +a6AJViRiKbwwSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vaXBh +MDEucGh4Mi5mZWRvcmFwcm9qZWN0Lm9yZzo4MC9jYS9vY3NwMA0GCSqGSIb3DQEB +CwUAA4IBAQAZE5ZVf2MROtRR2O00ecXwl3vBE72xw87EQdAQ6J9sDjug5YrVW6OU +OfaRoVLyBSi5uPgj2RZ9VePdGNSDZ66DhspPtmbWcW0M1X2QPXwWQ/Idj3MfKE33 +b+V4A6T55p1kxXniNl0KZHlDVMECltwRBkd9mjr3LgWzk/EgqyiP56xrWEsvKUyv +ZMvoyFky2/BaNTN8KOposjDQZwR5sqE/CJzm/QJPg/6zQ4/tkFDOc7ZqIVkfIqoY +sycNYLLakqCV59xuJ2uDbV8Sn8LbH5+e3Px0mapnVxn8fJAPcCqDOmXJ5TVkVYlH +nYYOskqEw5stHYuEwujR2uXo8vfmIMpZ +-----END CERTIFICATE----- diff --git a/fedoraproject_org b/fedoraproject_org new file mode 100644 index 0000000..4f2dd10 --- /dev/null +++ b/fedoraproject_org @@ -0,0 +1,11 @@ +[realms] + FEDORAPROJECT.ORG = { + kdc = https://id.fedoraproject.org/KdcProxy + pkinit_anchors = FILE:/etc/pki/ipa/fedoraproject_ipa_ca.crt + } +[domain_realm] + .fedoraproject.org = FEDORAPROJECT.ORG + fedoraproject.org = FEDORAPROJECT.ORG + .centos.org = FEDORAPROJECT.ORG + centos.org = FEDORAPROJECT.ORG + diff --git a/fkinit b/fkinit new file mode 100755 index 0000000..3e09dbc --- /dev/null +++ b/fkinit @@ -0,0 +1,112 @@ +#!/bin/bash + +# Created by argbash-init v2.10.0 +# ARG_OPTIONAL_SINGLE([user],[u],[Fedora account name],[$USER]) +# ARG_OPTIONAL_BOOLEAN([staging],[],[Use the staging infrastructure]) +# ARG_HELP([Acquire a Kerberos ticket-granting ticket for Fedora]) +# ARGBASH_GO() +# needed because of Argbash --> m4_ignore([ +### START OF CODE GENERATED BY Argbash v2.10.0 one line above ### +# Argbash is a bash code generator used to get arguments parsing right. +# Argbash is FREE SOFTWARE, see https://argbash.io for more info + + +die() +{ + local _ret="${2:-1}" + test "${_PRINT_HELP:-no}" = yes && print_help >&2 + echo "$1" >&2 + exit "${_ret}" +} + + +begins_with_short_option() +{ + local first_option all_short_options='uh' + first_option="${1:0:1}" + test "$all_short_options" = "${all_short_options/$first_option/}" && return 1 || return 0 +} + +# THE DEFAULTS INITIALIZATION - OPTIONALS +_arg_user="$USER" +_arg_staging="off" + + +print_help() +{ + printf '%s\n' "Acquire a Kerberos ticket-granting ticket for Fedora" + printf 'Usage: %s [-u|--user ] [--(no-)staging] [-h|--help]\n' "$0" + printf '\t%s\n' "-u, --user: Fedora account name (default: '$USER')" + printf '\t%s\n' "--staging: Use the staging infrastructure (off by default)" + printf '\t%s\n' "-h, --help: Prints help" +} + + +parse_commandline() +{ + while test $# -gt 0 + do + _key="$1" + case "$_key" in + -u|--user) + test $# -lt 2 && die "Missing value for the optional argument '$_key'." 1 + _arg_user="$2" + shift + ;; + --user=*) + _arg_user="${_key##--user=}" + ;; + -u*) + _arg_user="${_key##-u}" + ;; + --staging) + _arg_staging="on" + ;; + -h|--help) + print_help + exit 0 + ;; + -h*) + print_help + exit 0 + ;; + *) + _PRINT_HELP=yes die "FATAL ERROR: Got an unexpected argument '$1'" 1 + ;; + esac + shift + done +} + +parse_commandline "$@" + +# OTHER STUFF GENERATED BY Argbash + +### END OF CODE GENERATED BY Argbash (sortof) ### ]) +# [ <-- needed because of Argbash + +finalize() +{ + rm -f $armorcache +} + +set -e + +armorcache=$(mktemp) +trap finalize EXIT + +if [ "$_arg_staging" == "on" ]; then + domain=STG.FEDORAPROJECT.ORG +else + domain=FEDORAPROJECT.ORG +fi + +kinit -n @$domain -c FILE:$armorcache + +echo "Enter your password and OTP concatenated. (Ignore that the prompt is for only the token)" +kinit -T FILE:$armorcache $_arg_user@$domain + + +# ^^^ TERMINATE YOUR CODE BEFORE THE BOTTOM ARGBASH MARKER ^^^ + +# ] <-- needed because of Argbash diff --git a/pkgname.py b/pkgname.py new file mode 100644 index 0000000..eb0ad3a --- /dev/null +++ b/pkgname.py @@ -0,0 +1,32 @@ +#!/usr/bin/python3 +""" +Pipe package NEVRAs into this script to get package names. + +NEVRA stands for Name, Epoch, Version, Release, Architecture. E.g.: + + $ echo fedora-packager-0:0.6.0.4-1.fc32.noarch | pkgname + fedora-packager + +You can omit epoch and/or architecture: + + $ echo fedora-packager-0.6.0.4-1.fc32 | pkgname + fedora-packager + +But, if version and release is omitted, the script can produce invalid results: + + $ echo fedora-packager | pkgname + fedora + +Created by Miro Hrončok, with suggestions from Adam Williamson. + +This script is trivial, consider it Public Domain. +""" +import fileinput +import sys + + +if len(sys.argv) > 1: + sys.exit(__doc__.strip()) + +for line in fileinput.input(): + print(line.rsplit("-", 2)[0]) diff --git a/rpmbuild-md5 b/rpmbuild-md5 new file mode 100755 index 0000000..aefe04d --- /dev/null +++ b/rpmbuild-md5 @@ -0,0 +1,6 @@ +#!/bin/bash +rpmbuild --define "_source_filedigest_algorithm 1" \ + --define "_binary_filedigest_algorithm 1" \ + --define "_binary_payload w9.gzdio" \ + --define "_source_payload w9.gzdio" \ + --define "_default_patch_fuzz 2" "$@" diff --git a/s390.conf b/s390.conf new file mode 100644 index 0000000..d890ab8 --- /dev/null +++ b/s390.conf @@ -0,0 +1,16 @@ +[s390] + +;configuration for koji cli tool + +;url of XMLRPC server +server = https://s390.koji.fedoraproject.org/kojihub + +;url of web interface +weburl = https://s390.koji.fedoraproject.org/koji + +;url of package download site +topurl = https://s390pkgs.fedoraproject.org/ + +authtype = kerberos + +use_fast_upload = yes diff --git a/secondary-koji b/secondary-koji new file mode 100755 index 0000000..813eb7e --- /dev/null +++ b/secondary-koji @@ -0,0 +1,12 @@ +#! /bin/sh + +arch=`basename $0 | cut -d '-' -f 1` + +config="/etc/koji.conf.d/${arch}.conf" + +if [ ! -f $config ]; then + echo "Config file for $arch doesn't exist" + exit 1 +fi + +koji --profile ${arch} "$@" diff --git a/stg.conf b/stg.conf new file mode 100644 index 0000000..6e1c733 --- /dev/null +++ b/stg.conf @@ -0,0 +1,16 @@ +[stg] + +;configuration for koji cli tool + +;url of XMLRPC server +server = https://koji.stg.fedoraproject.org/kojihub + +;url of web interface +weburl = https://koji.stg.fedoraproject.org/koji + +;url of package download site +topurl = https://kojipkgs.stg.fedoraproject.org/ + +authtype = kerberos + +use_fast_upload = yes diff --git a/stg_fedoraproject_ipa_ca.crt b/stg_fedoraproject_ipa_ca.crt new file mode 100644 index 0000000..41a3ac6 --- /dev/null +++ b/stg_fedoraproject_ipa_ca.crt @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIEqTCCAxGgAwIBAgIBATANBgkqhkiG9w0BAQsFADBAMR4wHAYDVQQKDBVTVEcu +RkVET1JBUFJPSkVDVC5PUkcxHjAcBgNVBAMMFUNlcnRpZmljYXRlIEF1dGhvcml0 +eTAeFw0yMTAyMTExMzExMDBaFw00MTAyMTExMzExMDBaMEAxHjAcBgNVBAoMFVNU +Ry5GRURPUkFQUk9KRUNULk9SRzEeMBwGA1UEAwwVQ2VydGlmaWNhdGUgQXV0aG9y +aXR5MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0MzQ9OVg4KTEs2Go +ASwcW1z/tJc60x7HG5VFC6EWft3MPH1p4APLJ/BZ4F/+ChHbbG35NTig0qK0SiLY +ct8Gyw66FoB2KQvks/1kCXuQquLnMCm9aEFAjlNDtUh9kcGrrjCfP4duwT6p/dl0 +Hue9J/FrCXfrxn3GSwizjC2ZZZV/sL3iDh3p2eBDksXpjGgQuDu2n+0g5U0dsNhM +9EYRkX2J/veESS3zpYDwRVHPwxIqmEGrK0wroqXwRZVf25HdsmP4B65Iz3aQKeXE +plLtZ6P99YfORQvu9GLhcgLPl5RQpvRBGacpyzGLhXqpAIl31PyurC+9yAvLANFl +Ncxf8ycvHGoOtiRPAbmWW+P+weuonmesHn8n3PV6JXcUkGoSFdfXw0MDAhLHCGQx +8DyrOZ8zskWdBzFxdCOIS/COnvUWBsjF6hzuUgIk3Ho89LyBYKZm1oC+ICTg94Au +dE1MOZQ1A9RllN3LP1dHPiAdrtBduWPsCYcnmgeiHH+jLr2tAgMBAAGjga0wgaow +HwYDVR0jBBgwFoAUQyunEUCOlySo2y3+sFr7ivM5yG8wDwYDVR0TAQH/BAUwAwEB +/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0OBBYEFEMrpxFAjpckqNst/rBa+4rzOchv +MEcGCCsGAQUFBwEBBDswOTA3BggrBgEFBQcwAYYraHR0cDovL2lwYS1jYS5zdGcu +ZmVkb3JhcHJvamVjdC5vcmcvY2Evb2NzcDANBgkqhkiG9w0BAQsFAAOCAYEADVXs +3iTxDA7cA6TDKfjs3GrHk94LnnLxAIKTubYEw1UZmVcx++JCy2uUc7Zorgq5WkNP +xmqrKqhJTV6BzoVVhFxdof+ro3qW80dRcAtUm9heqr8HBGjoRMa/mMlDs7nb/0AH +XLe7UWYGW3qoxxUIeMWL1U736agWVFxRSe4ng8uvrGac7tK0tW3oiAkId3PwL6BM +jLaoMsfXFOK13GAP2P/VnuLDMJN6taR2BGQkqi7oZ9DmR6HcqG4MtYBiQgLhvH75 +JsKC/ROLtlC/gbShsy5WDy3Dbo/Ei8QMqhudQrtNlQeNUXASm8rUvkJmeIspTzPD +fOywhVygYiyIvigGOmiuwtfpPQaPHOWsosgkwmzq104wnv2ILaQ8+oYf617bxldR +9d6l8OMOiYqt34fLbMSw15G+OEnl7t96USuCXIihVTU1Ykqmruhn/O4EeXd9QiIr +7qlGcnKJpxwLCmHBtw3kv8PgK9EjGQpLPFTPiIP0rSHTVTQFUb8IY+tGG0jz +-----END CERTIFICATE----- diff --git a/stg_fedoraproject_org b/stg_fedoraproject_org new file mode 100644 index 0000000..940422e --- /dev/null +++ b/stg_fedoraproject_org @@ -0,0 +1,8 @@ +[realms] + STG.FEDORAPROJECT.ORG = { + kdc = https://id.stg.fedoraproject.org/KdcProxy + pkinit_anchors = FILE:/etc/pki/ipa/stg_fedoraproject_ipa_ca.crt + } +[domain_realm] + .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG + stg.fedoraproject.org = STG.FEDORAPROJECT.ORG From 2bb511d3d90846e02ad3dc406d81a6a86ae3929f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 9 Aug 2024 11:19:40 -0400 Subject: [PATCH 19/46] Restore original GPLv2+ license text The project was always licensed as GPLv2+, but the license file was changed from GPLv2 to GPLv3 during a cleanup. (GPL was the file for the project, and COPYING was a symlink to automake's COPYING file.) commit 139f99fc38eca529cc74c2763d5dbe84465829bb Author: Todd Zullinger Date: Thu Jan 29 15:46:18 2009 -0600 Remove generated files and other autotools cruft --- COPYING | 1 - GPL | 339 ---- ... commit e23766acb2e084fe845e23392192deb5b1aaec1e Author: Todd Zullinger Date: Thu Jan 29 15:46:18 2009 -0600 Restore COPYING as a regular file --- COPYING | 674 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 674 insertions(+), 0 deletions(-) create mode 100644 COPYING Restore the original GPLv2 text so that the declared license matches the license text. --- COPYING | 885 ++++++++++++++----------------------------- fedora-packager.spec | 1 - 2 files changed, 275 insertions(+), 611 deletions(-) diff --git a/COPYING b/COPYING index 94a9ed0..a43ea21 100644 --- a/COPYING +++ b/COPYING @@ -1,626 +1,285 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to this License. - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. - 13. Use with the GNU Affero General Public License. +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. - 14. Revised Versions of this License. +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. + NO WARRANTY - 15. Disclaimer of Warranty. + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -628,15 +287,15 @@ free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least +convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - Copyright (C) + Copyright (C) 19yy - This program is free software: you can redistribute it and/or modify + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or + the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -645,30 +304,36 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/fedora-packager.spec b/fedora-packager.spec index a97f161..c2b928d 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -3,7 +3,6 @@ Version: 0.6.0.7 Release: %autorelease Summary: Tools for setting up a fedora maintainer environment -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://pagure.io/fedora-packager From fa47025bb11d3562b3ff22bd6f77b210664d1b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 9 Aug 2024 11:27:16 -0400 Subject: [PATCH 20/46] Actually drop fedora-burn-yubikey 20d5b901e08a683e3a6eb4ea56b4b2bbb4a317f4 tried to drop fedora-burn-yubikey, but because of confusion between /usr/bin and /usr/sbin, one copy was left behind. --- fedora-burn-yubikey.py | 93 ------------------------------------------ fedora-packager.spec | 6 --- 2 files changed, 99 deletions(-) delete mode 100644 fedora-burn-yubikey.py diff --git a/fedora-burn-yubikey.py b/fedora-burn-yubikey.py deleted file mode 100644 index 5efd99e..0000000 --- a/fedora-burn-yubikey.py +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/python3 - -# Copyright (C) 2010 Red Hat Inc. -# Author: Mike McGrath -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. See http://www.gnu.org/copyleft/gpl.html for -# the full text of the license. - -# ykpersonalize -ofixed=ccccccccccci -afcaa0c5bf2e83ec040e4aeb7f8565293 -ouid=1e7f1da7d6d1 -from fedora.client import AccountSystem, AuthError -from getpass import getpass -import sys -import gettext -from optparse import OptionParser -import yubico - -t = gettext.translation('fas', '/usr/share/locale', fallback = True) -_ = t.gettext - -try: - ykey = yubico.find_yubikey(False) -except yubico.yubikey.YubiKeyError as ex: - print('Unable to get access to a yubikey: %s' % ex) - sys.exit(1) - -parser = OptionParser(version = "0.1") -parser.add_option('-u', '--username', - dest = 'username', - default = None, - metavar = 'username', - help = _('Fedora Account System username')) -parser.add_option('-S', '--slot', - dest = 'slot', - default = '1', - metavar = 'slot', - help = _('The Yubikey slot to be used')) -parser.add_option('-U', '--url', - dest = 'url', - default = 'https://admin.fedoraproject.org/accounts/', - metavar = 'url', - help = _('FAS URL (Default: https://admin.fedoraproject.org/accounts/')) - -(opts, args) = parser.parse_args() -slot = opts.slot - -if not opts.username: - print(_('Please provide a username.')) - parser.print_help() - sys.exit(0) - -print(_( -''' -Attention: You are about to reprogram your yubikey! Please ensure it is -plugged in to your USB slot before continuing. The secret key currently on -your yubikey will be destroyed as part of this operation! - -''')) - -print('Contacting %s' % opts.url) -password = getpass('Password for %s: ' % opts.username) - -fas = AccountSystem(username=opts.username, password=password, base_url=opts.url) -try: - new_key = fas.send_request('yubikey/genkey', auth=True) -except AuthError as e: - print(e) - sys.exit(1) - -print("") -print(_('New key generated in FAS, attempting to burn to yubikey')) -print("") - -opts = new_key['key'].split() - -try: - ykconfig = ykey.init_config() - ykconfig.mode_yubikey_otp(f'h:{opts[1]}'.encode(), f'h:{opts[2]}'.encode()) - ykconfig.fixed_string(str(f'm:{opts[0]}')) - ykconfig.ticket_flag('APPEND_CR', True) - ykconfig.config_flag('STATIC_TICKET', False) - if ykey.version_num() >= (2, 1): - ykconfig.config_flag('STRONG_PW1', False) - ykconfig.config_flag('STRONG_PW2', False) - ykconfig.config_flag('MAN_UPDATE', False) - if ykey.version_num() >= (2, 2): - ykconfig.extended_flag('SERIAL_API_VISIBLE', True) - ykey.write_config(ykconfig, slot=int(slot)) - print("Success! Your Yubikey ID is %s" % opts[0]) -except yubico.yubikey.YubiKeyError as ex: - print('Yubikey error: %s' % ex) diff --git a/fedora-packager.spec b/fedora-packager.spec index c2b928d..7d11299 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -12,7 +12,6 @@ Source2: pkgname.py Source3: rpmbuild-md5 Source4: secondary-koji Source5: fkinit -Source6: fedora-burn-yubikey.py Source10: fedora.conf Source11: s390.conf @@ -71,7 +70,6 @@ install -D %{SOURCE3} %{buildroot}%{_bindir}/rpmbuild-md5 install -D %{SOURCE4} %{buildroot}%{_bindir}/s390-koji install -D %{SOURCE4} %{buildroot}%{_bindir}/stg-koji install -D %{SOURCE5} %{buildroot}%{_bindir}/fkinit -install -D %{SOURCE6} %{buildroot}%{_bindir}/fedora-burn-yubikey install -m0644 -Dt %{buildroot}%{_sysconfdir}/koji.conf.d/ \ %{SOURCE10} %{SOURCE11} %{SOURCE12} @@ -80,9 +78,6 @@ install -m0644 -Dt %{buildroot}%{_sysconfdir}/krb5.conf.d/ \ install -m0644 -Dt %{buildroot}%{_sysconfdir}/pki/ipa/ \ %{SOURCE15} %{SOURCE16} -# The fedora-burn-yubikey utility only worked with fas2, which is now retired. -# rm -f %{buildroot}/usr/sbin/fedora-burn-yubikey - %files %license %{_licensedir}/%{name}/ %{_bindir}/fedora-getsvn @@ -90,7 +85,6 @@ install -m0644 -Dt %{buildroot}%{_sysconfdir}/pki/ipa/ \ %{_bindir}/rpmbuild-md5 %{_bindir}/s390-koji %{_bindir}/stg-koji -%{_bindir}/fedora-burn-yubikey %config(noreplace) %{_sysconfdir}/koji.conf.d/* %files kerberos From 882f5fef53f3ebb8ccefca2feebe1a1be68f6cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 9 Aug 2024 11:33:43 -0400 Subject: [PATCH 21/46] Drop fedora-getsvn --- fedora-getsvn | 22 ---------------------- fedora-packager.spec | 3 --- 2 files changed, 25 deletions(-) delete mode 100755 fedora-getsvn diff --git a/fedora-getsvn b/fedora-getsvn deleted file mode 100755 index 72f08ab..0000000 --- a/fedora-getsvn +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -if [ $# -ne 3 ]; -then - echo "Usage: $0 " - exit 1 -fi - -project=$1 -url=$2 -rev=$3 - -tmpdir=`mktemp -d` -curdir=`pwd` - -( - cd ${tmpdir} - LANG=C TZ=GMT svn export ${url} -r ${rev} ${project} - tar cjvf ${curdir}/${project}-svn${rev}.tar.bz2 ${project} -) - -rm -rf ${tmpdir} diff --git a/fedora-packager.spec b/fedora-packager.spec index 7d11299..ee24915 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -7,7 +7,6 @@ License: GPL-2.0-or-later URL: https://pagure.io/fedora-packager Source0: COPYING -Source1: fedora-getsvn Source2: pkgname.py Source3: rpmbuild-md5 Source4: secondary-koji @@ -64,7 +63,6 @@ Files for connecting via kerberos to Fedora %install install -D %{SOURCE0} %{buildroot}%{_licensedir}/%{name}/COPYING -install -D %{SOURCE1} %{buildroot}%{_bindir}/fedora-getsvn install -D %{SOURCE2} %{buildroot}%{_bindir}/pkgname install -D %{SOURCE3} %{buildroot}%{_bindir}/rpmbuild-md5 install -D %{SOURCE4} %{buildroot}%{_bindir}/s390-koji @@ -80,7 +78,6 @@ install -m0644 -Dt %{buildroot}%{_sysconfdir}/pki/ipa/ \ %files %license %{_licensedir}/%{name}/ -%{_bindir}/fedora-getsvn %{_bindir}/pkgname %{_bindir}/rpmbuild-md5 %{_bindir}/s390-koji From ec95d50e99dbf79211a986f58a24749ed1cb004f Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 11 Apr 2024 15:02:27 +0000 Subject: [PATCH 22/46] fkinit: prompt for password and OTP separately Also runs 'klist' afterwards to confirm success. This adds an explicit dependency on 'systemd' for the use of the systemd-ask-password command. As that package was already an indirect dependency, this doesn't increase the footprint. Signed-off-by: Stephen Gallagher Originally submitted and reviewed in https://pagure.io/fedora-packager/pull-request/179. --- fedora-packager.spec | 1 + fkinit | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index ee24915..24b1fce 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -29,6 +29,7 @@ Requires: rpmautospec Requires: mock curl openssh-clients Requires: redhat-rpm-config Requires: fedpkg >= 1.0 +Requires: systemd Obsoletes: fedora-cert < 0.6.0.3-4 Obsoletes: fedora-packager-yubikey < 0.6.0.7-3 Recommends: fedora-packager-kerberos diff --git a/fkinit b/fkinit index 3e09dbc..4ec0766 100755 --- a/fkinit +++ b/fkinit @@ -103,8 +103,16 @@ fi kinit -n @$domain -c FILE:$armorcache -echo "Enter your password and OTP concatenated. (Ignore that the prompt is for only the token)" -kinit -T FILE:$armorcache $_arg_user@$domain +F_PASSWORD=$(systemd-ask-password "FAS password:") +F_OTP=$(systemd-ask-password "FAS OTP (leave blank if not configured):") + +echo -n ${F_PASSWORD}${F_OTP} | kinit -T FILE:$armorcache $_arg_user@$domain >/dev/null +unset F_PASSWORD +unset F_OTP + +# Display the active credential cache overview +echo +klist # ^^^ TERMINATE YOUR CODE BEFORE THE BOTTOM ARGBASH MARKER ^^^ From e49a605843f2384f1cf2818688647dec43d3e5bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 10 Aug 2024 10:18:28 -0400 Subject: [PATCH 23/46] Do not allow mismatched version installations In CI tests, we get this: Warning: skipped PGP checks for 1 package from repository: testing-farm-tag-repository - file /usr/share/licenses/fedora-packager/COPYING from install of fedora-packager-0.6.0.7-10.fc41.noarch conflicts with file from package fedora-packager-kerberos-0.6.0.7-16.fc41.noarch We don't want to install mismatched versions of the main package and the subpackage in any case. This could lead to confusion. --- fedora-packager.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-packager.spec b/fedora-packager.spec index 24b1fce..41f502d 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -33,6 +33,7 @@ Requires: systemd Obsoletes: fedora-cert < 0.6.0.3-4 Obsoletes: fedora-packager-yubikey < 0.6.0.7-3 Recommends: fedora-packager-kerberos +Conflicts: fedora-packager-kerberos != %{version}-%{release} BuildArch: noarch From 66e2aa91882f8966ad43b22f57152bc950d0c1a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 14 Aug 2024 17:54:17 +0200 Subject: [PATCH 24/46] Make kerberos subpackage required by the main package This fixes the spec file syntax. I tried to use Coflicts in a way that is not supported by rpm. But also, I think we should use Requires here. The importance of kerberos auth has only grown since this package was split out, and it doesn't make sense to have a "fedora packager environment" without kerberos. --- fedora-packager.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index 41f502d..d7e3e4d 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -32,8 +32,7 @@ Requires: fedpkg >= 1.0 Requires: systemd Obsoletes: fedora-cert < 0.6.0.3-4 Obsoletes: fedora-packager-yubikey < 0.6.0.7-3 -Recommends: fedora-packager-kerberos -Conflicts: fedora-packager-kerberos != %{version}-%{release} +Requires: fedora-packager-kerberos == %{version}-%{release} BuildArch: noarch From 22336a84fc10c7e8d0fad22544bfa19daf7ce5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 14 Aug 2024 17:57:36 +0200 Subject: [PATCH 25/46] Capitalize sentences and names [skip changelog] --- fedora-packager.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index d7e3e4d..d9edd55 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -1,7 +1,7 @@ Name: fedora-packager Version: 0.6.0.7 Release: %autorelease -Summary: Tools for setting up a fedora maintainer environment +Summary: Tools for setting up a Fedora maintainer environment License: GPL-2.0-or-later URL: https://pagure.io/fedora-packager @@ -37,24 +37,26 @@ Requires: fedora-packager-kerberos == %{version}-%{release} BuildArch: noarch %description -Set of utilities useful for a fedora packager in setting up their environment. +Set of utilities and configuration to set up a working Fedora packager +environment. %package kerberos -Summary: files for connecting via kerberos to Fedora +Summary: Configuration to connect via kerberos to Fedora # This is the version in which SNI was fixed %if 0%{?fedora} Requires: krb5-workstation >= 1.14.3-4 %elif 0%{?rhel} >= 7 Requires: krb5-workstation >= 1.14.1-24 %else -# older rhels wont fully work without configuration, but lets make sure they have krb -# we should be able to assume newer RHELs's will have a new enough version +# Older rhels won't fully work without configuration, but lets make +# sure they have krb we should be able to assume newer RHELs's will +# have a new enough version. Requires: krb5-workstation %endif Requires: krb5-pkinit %description kerberos -Files for connecting via kerberos to Fedora +%{summary}. %prep # nada From 3cd6e157cc5e9ea06addcfed1613fda6b581416f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 15 Aug 2024 13:23:36 +0200 Subject: [PATCH 26/46] Recommend fedrq --- fedora-packager.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-packager.spec b/fedora-packager.spec index d9edd55..208fcf0 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -34,6 +34,9 @@ Obsoletes: fedora-cert < 0.6.0.3-4 Obsoletes: fedora-packager-yubikey < 0.6.0.7-3 Requires: fedora-packager-kerberos == %{version}-%{release} +# A CLI tool to query Fedora and EPEL repositories +Recommends: fedrq + BuildArch: noarch %description From ec5a61722d6c5f1e8ed0df9ca78847849fdf8356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 15 Aug 2024 13:25:14 +0200 Subject: [PATCH 27/46] Recommend fedora-repoquery - See https://fedoraproject.org/wiki/Changes/fedora-repoquery_tool --- fedora-packager.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fedora-packager.spec b/fedora-packager.spec index 208fcf0..8966df9 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -36,6 +36,8 @@ Requires: fedora-packager-kerberos == %{version}-%{release} # A CLI tool to query Fedora and EPEL repositories Recommends: fedrq +# Another CLI tool to query Fedora, EPEL, ELN, and CentOS Stream repositories +Recommends: fedora-repoquery BuildArch: noarch From 273bbdb0e81f43b3d9f486174175d6b479c7b8c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 17 Aug 2024 10:16:32 +0200 Subject: [PATCH 28/46] Version 1.0 --- changelog | 30 ++++++++++++++++++++++++++++++ fedora-packager.spec | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index 7d478ec..1537502 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,33 @@ +* Sat Aug 17 2024 Zbigniew Jędrzejewski-Szmek - 1.0-1 +- Merge separate "upstream" into this repository: + this is a major change (simplification) to how the package is maintained, + but the actual package contents are not changed. To celebrate and highlight + it, the version is bumped to 1.0. +- Recommend fedora-repoquery + (see https://fedoraproject.org/wiki/Changes/fedora-repoquery_tool) +- Recommend fedrq +- Make kerberos subpackage required by the main package and + disallowed installation of mismatched versions +- fkinit: prompt for password and OTP separately +- Drop fedora-getsvn +- Actually drop fedora-burn-yubikey +- Restore original GPLv2+ license text + +* Thu Jul 25 2024 Miroslav Suchý - 0.6.0.7-11 +- convert GPLv2+ license to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 0.6.0.7-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 0.6.0.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 0.6.0.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Nov 23 2023 Zbigniew Jędrzejewski-Szmek - 0.6.0.7-7 +- Pull in rpmautospec + * Wed Jul 19 2023 Fedora Release Engineering - 0.6.0.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/fedora-packager.spec b/fedora-packager.spec index 8966df9..2b2c514 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -1,5 +1,5 @@ Name: fedora-packager -Version: 0.6.0.7 +Version: 1.0 Release: %autorelease Summary: Tools for setting up a Fedora maintainer environment From 6c43db08624565c0e54ca800206c360d54dabf1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 17 Aug 2024 13:39:08 +0200 Subject: [PATCH 29/46] Recommend rpmdistro-repoquery --- fedora-packager.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fedora-packager.spec b/fedora-packager.spec index 2b2c514..1c809b0 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -38,6 +38,8 @@ Requires: fedora-packager-kerberos == %{version}-%{release} Recommends: fedrq # Another CLI tool to query Fedora, EPEL, ELN, and CentOS Stream repositories Recommends: fedora-repoquery +# Yet another CLI tool to query Fedora, ELN, Alma, CentoOS Stream, etc. +Recommends: rpmdistro-repoquery BuildArch: noarch From 319a562210bdc8b6197aa8392ecef015b09a88e1 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Tue, 24 Sep 2024 14:34:23 -0500 Subject: [PATCH 30/46] Recommend python3-koji-cli-plugins This is needed for `koji edit-sidetag` e.g. for bootstrapping: ``` koji edit-sidetag --rpm-macro _with_bootstrap=1 ``` Signed-off-by: Michel Lind --- fedora-packager.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fedora-packager.spec b/fedora-packager.spec index 1c809b0..17bd7d3 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -23,6 +23,7 @@ Source16: stg_fedoraproject_ipa_ca.crt BuildRequires: python3-devel Requires: koji >= 1.11.0 +Requires: python3-koji-cli-plugins Requires: bodhi-client Requires: rpm-build rpmdevtools rpmlint Requires: rpmautospec @@ -41,6 +42,9 @@ Recommends: fedora-repoquery # Yet another CLI tool to query Fedora, ELN, Alma, CentoOS Stream, etc. Recommends: rpmdistro-repoquery +# Needed for koji edit-sidetag +Recommends: python3-koji-cli-plugins + BuildArch: noarch %description From 6f051d6fe83d09df99168ad12ae3744ee0724578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 11 Oct 2024 15:00:25 +0200 Subject: [PATCH 31/46] Downgrade kerberos dependency back to Recommends ... but keep conditional Requires to prevent file conflicts. (rhbz#2315569) --- fedora-packager.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index 1c809b0..6734710 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -32,7 +32,8 @@ Requires: fedpkg >= 1.0 Requires: systemd Obsoletes: fedora-cert < 0.6.0.3-4 Obsoletes: fedora-packager-yubikey < 0.6.0.7-3 -Requires: fedora-packager-kerberos == %{version}-%{release} +Recommends: fedora-packager-kerberos +Requires: (fedora-packager-kerberos = %{version}-%{release} if fedora-packager-kerberos) # A CLI tool to query Fedora and EPEL repositories Recommends: fedrq From e6509e5ab82a29e2577ef3094803132a02cc94e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:06:24 +0000 Subject: [PATCH 32/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 42690c1fe892d57214f743e8a4f1515f20692812 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Tue, 7 Jan 2025 22:40:31 +0200 Subject: [PATCH 33/46] Recommend fedora-review fedora-review is included in the packages to install in Installing Packager Tools [1], the only other package being fedora-packager. Make the setup a bit simpler by getting everything from fedora-packager. (As a side note, nothing in Package Maintainer Docs actually mentions *using* fedora review. So the other way to fix the issue would be to not ask to install fedora-review in Installing Packager Tools. But since it is a useful packager tool, it seems valid to included it in fedora-packager.) [1]: https://docs.fedoraproject.org/en-US/package-maintainers/Installing_Packager_Tools/ --- fedora-packager.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-packager.spec b/fedora-packager.spec index b804867..b2af40b 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -46,6 +46,9 @@ Recommends: rpmdistro-repoquery # Needed for koji edit-sidetag Recommends: python3-koji-cli-plugins +# A CLI tool that helps conduct package reviews +Recommends: fedora-review + BuildArch: noarch %description From d68c55fa44a6ec7424ceaa6515d8db284277ebc0 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 6 Feb 2025 14:42:08 +0000 Subject: [PATCH 34/46] fkinit: Use herestring for pass/OTP For added security, pass the password and OTP directly via a BASH herestring instead of via `echo`. This will avoid putting the value into the process table. Signed-off-by: Stephen Gallagher --- fkinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fkinit b/fkinit index 4ec0766..1d53287 100755 --- a/fkinit +++ b/fkinit @@ -106,7 +106,7 @@ kinit -n @$domain -c FILE:$armorcache F_PASSWORD=$(systemd-ask-password "FAS password:") F_OTP=$(systemd-ask-password "FAS OTP (leave blank if not configured):") -echo -n ${F_PASSWORD}${F_OTP} | kinit -T FILE:$armorcache $_arg_user@$domain >/dev/null +kinit -T FILE:$armorcache $_arg_user@$domain <<< "${F_PASSWORD}${F_OTP}" >/dev/null unset F_PASSWORD unset F_OTP From 56bb70b205af4a5b7158e907b2499f1954d78db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 6 Feb 2025 17:15:14 +0000 Subject: [PATCH 35/46] fkinit: Allow to pass the OTP token via $FKINIT_OTP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows me to run: $ FKINIT_OTP=$(ykman oath accounts code accounts.fedoraproject.org --single) fkinit I can even alias this: $ alias fkinit='FKINIT_OTP=$(ykman oath accounts code accounts.fedoraproject.org --single) fkinit' And the invocation then looks like this: $ fkinit Touch your YubiKey... 🔐 FAS password: (press TAB for no echo) Signed-off-by: Miro Hrončok --- fkinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fkinit b/fkinit index 1d53287..077678d 100755 --- a/fkinit +++ b/fkinit @@ -104,7 +104,7 @@ fi kinit -n @$domain -c FILE:$armorcache F_PASSWORD=$(systemd-ask-password "FAS password:") -F_OTP=$(systemd-ask-password "FAS OTP (leave blank if not configured):") +F_OTP=${FKINIT_OTP:-$(systemd-ask-password "FAS OTP (leave blank if not configured):")} kinit -T FILE:$armorcache $_arg_user@$domain <<< "${F_PASSWORD}${F_OTP}" >/dev/null unset F_PASSWORD From f818d36ccd8afe074520f4bd358792558cce16a5 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 6 Feb 2025 17:17:34 +0000 Subject: [PATCH 36/46] Add help documentation about $FKINIT_OTP variable Signed-off-by: Stephen Gallagher --- fkinit | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fkinit b/fkinit index 077678d..d2add1a 100755 --- a/fkinit +++ b/fkinit @@ -3,7 +3,7 @@ # Created by argbash-init v2.10.0 # ARG_OPTIONAL_SINGLE([user],[u],[Fedora account name],[$USER]) # ARG_OPTIONAL_BOOLEAN([staging],[],[Use the staging infrastructure]) -# ARG_HELP([Acquire a Kerberos ticket-granting ticket for Fedora]) +# ARG_HELP([Acquire a Kerberos ticket-granting ticket for Fedora],[If the environment variable \$FKINIT_OTP is set, it will be read for the one-time password instead of prompting for it.]) # ARGBASH_GO() # needed because of Argbash --> m4_ignore([ ### START OF CODE GENERATED BY Argbash v2.10.0 one line above ### @@ -37,8 +37,9 @@ print_help() printf '%s\n' "Acquire a Kerberos ticket-granting ticket for Fedora" printf 'Usage: %s [-u|--user ] [--(no-)staging] [-h|--help]\n' "$0" printf '\t%s\n' "-u, --user: Fedora account name (default: '$USER')" - printf '\t%s\n' "--staging: Use the staging infrastructure (off by default)" + printf '\t%s\n' "--staging, --no-staging: Use the staging infrastructure (off by default)" printf '\t%s\n' "-h, --help: Prints help" + printf '\n%s\n' "If the environment variable \$FKINIT_OTP is set, it will be read for the one-time password instead of prompting for it." } @@ -59,8 +60,9 @@ parse_commandline() -u*) _arg_user="${_key##-u}" ;; - --staging) + --no-staging|--staging) _arg_staging="on" + test "${1:0:5}" = "--no-" && _arg_staging="off" ;; -h|--help) print_help From 2e3de6ead152d0e9aa780e98c3ff6ec2d3757425 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 6 Feb 2025 14:39:44 -0500 Subject: [PATCH 37/46] Update to version 1.1 Signed-off-by: Stephen Gallagher --- fedora-packager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index b2af40b..875c6dc 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -1,5 +1,5 @@ Name: fedora-packager -Version: 1.0 +Version: 1.1 Release: %autorelease Summary: Tools for setting up a Fedora maintainer environment From 5f0ded984825f00d49f63de19bab8bb980746e67 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 11 Feb 2025 08:40:40 -0500 Subject: [PATCH 38/46] Fix version matching for krb5 The pre-1.0 version of fedora-packager lacked the dependency on fedora-packager-kerberos, so if we were updating from that version (such as on Fedora 40), fedora-packager-kerberos would attempt to upgrade while the fedora-packager package remained at the older version and they would encounter a file conflict. This patch adds the reverse dependency on fedora-packager-kerberos to ensure that they are both upgraded together. Signed-off-by: Stephen Gallagher --- fedora-packager.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-packager.spec b/fedora-packager.spec index 875c6dc..94ae68d 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -57,6 +57,9 @@ environment. %package kerberos Summary: Configuration to connect via kerberos to Fedora + +Requires: (fedora-packager = %{version}-%{release} if fedora-packager) + # This is the version in which SNI was fixed %if 0%{?fedora} Requires: krb5-workstation >= 1.14.3-4 From 0485438d22a28c775b23068910e75174c9ee0b64 Mon Sep 17 00:00:00 2001 From: Kashyap Chamarthy Date: Fri, 21 Mar 2025 20:47:30 +0100 Subject: [PATCH 39/46] Add a RISC-V Koji config file I named it "riscv" (instead of "risc-v", or "riscv64") because the Koji URLs begins with it: https://riscv-koji.fedoraproject.org/koji. Signed-off-by: Kashyap Chamarthy --- fedora-packager.spec | 3 +++ riscv.conf | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 riscv.conf diff --git a/fedora-packager.spec b/fedora-packager.spec index 94ae68d..eca5462 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -19,6 +19,7 @@ Source13: fedoraproject_org Source14: stg_fedoraproject_org Source15: fedoraproject_ipa_ca.crt Source16: stg_fedoraproject_ipa_ca.crt +Source17: riscv.conf BuildRequires: python3-devel @@ -89,6 +90,7 @@ install -D %{SOURCE3} %{buildroot}%{_bindir}/rpmbuild-md5 install -D %{SOURCE4} %{buildroot}%{_bindir}/s390-koji install -D %{SOURCE4} %{buildroot}%{_bindir}/stg-koji install -D %{SOURCE5} %{buildroot}%{_bindir}/fkinit +install -D %{SOURCE17} %{buildroot}%{_bindir}/riscv-koji install -m0644 -Dt %{buildroot}%{_sysconfdir}/koji.conf.d/ \ %{SOURCE10} %{SOURCE11} %{SOURCE12} @@ -102,6 +104,7 @@ install -m0644 -Dt %{buildroot}%{_sysconfdir}/pki/ipa/ \ %{_bindir}/pkgname %{_bindir}/rpmbuild-md5 %{_bindir}/s390-koji +%{_bindir}/riscv-koji %{_bindir}/stg-koji %config(noreplace) %{_sysconfdir}/koji.conf.d/* diff --git a/riscv.conf b/riscv.conf new file mode 100644 index 0000000..42c66db --- /dev/null +++ b/riscv.conf @@ -0,0 +1,16 @@ +[riscv] + +;configuration for koji cli tool + +;url of XMLRPC server +server = https://riscv-koji.fedoraproject.org/kojihub + +;url of web interface +weburl = https://riscv-koji.fedoraproject.org/koji + +;url of package download site +topurl = https://riscv-kojipkgs.fedoraproject.org/ + +authtype = kerberos + +use_fast_upload = yes From 45ef3873ef4778f42b2c3bd67ef6e18556541c5e Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 10 Jun 2025 06:33:59 -0400 Subject: [PATCH 40/46] fkinit: Add support for ~/.fedora.upn This is the known file for setting the FAS user for Fedora infrastructure client tools to use when the local Unix user does not match the FAS user. Adding support for this with fkinit makes it easier to use in containerized environments. --- fkinit | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fkinit b/fkinit index d2add1a..d8b1e17 100755 --- a/fkinit +++ b/fkinit @@ -36,7 +36,7 @@ print_help() { printf '%s\n' "Acquire a Kerberos ticket-granting ticket for Fedora" printf 'Usage: %s [-u|--user ] [--(no-)staging] [-h|--help]\n' "$0" - printf '\t%s\n' "-u, --user: Fedora account name (default: '$USER')" + printf '\t%s\n' "-u, --user: Fedora account name (default: value in ~/.fedora.upn if exists, otherwise '$USER')" printf '\t%s\n' "--staging, --no-staging: Use the staging infrastructure (off by default)" printf '\t%s\n' "-h, --help: Prints help" printf '\n%s\n' "If the environment variable \$FKINIT_OTP is set, it will be read for the one-time password instead of prompting for it." @@ -97,6 +97,10 @@ set -e armorcache=$(mktemp) trap finalize EXIT +if [ -f "$HOME/.fedora.upn" ] && [ -z "$_arg_user" ]; then + $_arg_user=$(<"$HOME/.fedora.upn") +fi + if [ "$_arg_staging" == "on" ]; then domain=STG.FEDORAPROJECT.ORG else From 6ee74af2e444e97daa8eac42c4b021721fc10efb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 27 Jun 2025 15:21:27 +0800 Subject: [PATCH 41/46] fixup riscv.conf to live in config dir not bindir --- fedora-packager.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index eca5462..3308ddd 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -90,10 +90,9 @@ install -D %{SOURCE3} %{buildroot}%{_bindir}/rpmbuild-md5 install -D %{SOURCE4} %{buildroot}%{_bindir}/s390-koji install -D %{SOURCE4} %{buildroot}%{_bindir}/stg-koji install -D %{SOURCE5} %{buildroot}%{_bindir}/fkinit -install -D %{SOURCE17} %{buildroot}%{_bindir}/riscv-koji install -m0644 -Dt %{buildroot}%{_sysconfdir}/koji.conf.d/ \ - %{SOURCE10} %{SOURCE11} %{SOURCE12} + %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE17} install -m0644 -Dt %{buildroot}%{_sysconfdir}/krb5.conf.d/ \ %{SOURCE13} %{SOURCE14} install -m0644 -Dt %{buildroot}%{_sysconfdir}/pki/ipa/ \ @@ -104,7 +103,6 @@ install -m0644 -Dt %{buildroot}%{_sysconfdir}/pki/ipa/ \ %{_bindir}/pkgname %{_bindir}/rpmbuild-md5 %{_bindir}/s390-koji -%{_bindir}/riscv-koji %{_bindir}/stg-koji %config(noreplace) %{_sysconfdir}/koji.conf.d/* From 73574f51d595c8c4ba6fa7c325adf4dc9c3524a1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 6 Jul 2025 15:44:20 -0700 Subject: [PATCH 42/46] Drop old s390 koji config and add a wrapper for riscv Signed-off-by: Kevin Fenzi --- fedora-packager.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index 3308ddd..a645e2a 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -87,8 +87,8 @@ Requires: krb5-pkinit install -D %{SOURCE0} %{buildroot}%{_licensedir}/%{name}/COPYING install -D %{SOURCE2} %{buildroot}%{_bindir}/pkgname install -D %{SOURCE3} %{buildroot}%{_bindir}/rpmbuild-md5 -install -D %{SOURCE4} %{buildroot}%{_bindir}/s390-koji install -D %{SOURCE4} %{buildroot}%{_bindir}/stg-koji +install -D %{SOURCE4} %{buildroot}%{_bindir}/riscv-koji install -D %{SOURCE5} %{buildroot}%{_bindir}/fkinit install -m0644 -Dt %{buildroot}%{_sysconfdir}/koji.conf.d/ \ @@ -102,7 +102,7 @@ install -m0644 -Dt %{buildroot}%{_sysconfdir}/pki/ipa/ \ %license %{_licensedir}/%{name}/ %{_bindir}/pkgname %{_bindir}/rpmbuild-md5 -%{_bindir}/s390-koji +%{_bindir}/riscv-koji %{_bindir}/stg-koji %config(noreplace) %{_sysconfdir}/koji.conf.d/* From 8221f339a63d8b97fd7b803b27a1a1a94ab10636 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:26:34 +0000 Subject: [PATCH 43/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 6cccdb38075b6472792b388a6546b8bac489b829 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 22 Sep 2025 11:19:05 +0300 Subject: [PATCH 44/46] krb5 configurations: add auto_fast_armor = true MIT Kerberos build gained capability to obtain Anonymous PKINIT ticket automatically and use it to build a FAST channel armor during initial ticket acquisition. This allows automatic enablement of passwordless pre-authentication methods provided by FreeIPA. The option is ignored by the Kerberos builds which do not have such support. Once Kerberos packages upgraded, users will be able to see requests for their OTP tokens in bare kinit command: $ kinit user Enter OTP token value: instead of using $ kinit -c fast.ccache -n @FEDORAPROJECT.ORG $ kinit -T fast.ccache user Enter OTP token value: Signed-off-by: Alexander Bokovoy --- fedoraproject_org | 1 + stg_fedoraproject_org | 1 + 2 files changed, 2 insertions(+) diff --git a/fedoraproject_org b/fedoraproject_org index 4f2dd10..5f8732a 100644 --- a/fedoraproject_org +++ b/fedoraproject_org @@ -2,6 +2,7 @@ FEDORAPROJECT.ORG = { kdc = https://id.fedoraproject.org/KdcProxy pkinit_anchors = FILE:/etc/pki/ipa/fedoraproject_ipa_ca.crt + auto_fast_armor = true } [domain_realm] .fedoraproject.org = FEDORAPROJECT.ORG diff --git a/stg_fedoraproject_org b/stg_fedoraproject_org index 940422e..7ad7c0c 100644 --- a/stg_fedoraproject_org +++ b/stg_fedoraproject_org @@ -2,6 +2,7 @@ STG.FEDORAPROJECT.ORG = { kdc = https://id.stg.fedoraproject.org/KdcProxy pkinit_anchors = FILE:/etc/pki/ipa/stg_fedoraproject_ipa_ca.crt + auto_fast_armor = true } [domain_realm] .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG From f16a03c6042d8831edcec60e1b02edebab917652 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 11 Oct 2025 14:32:23 +0800 Subject: [PATCH 45/46] fkinit: disable the timeouts for systemd-ask-password --- fkinit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fkinit b/fkinit index d8b1e17..7df469b 100755 --- a/fkinit +++ b/fkinit @@ -109,8 +109,8 @@ fi kinit -n @$domain -c FILE:$armorcache -F_PASSWORD=$(systemd-ask-password "FAS password:") -F_OTP=${FKINIT_OTP:-$(systemd-ask-password "FAS OTP (leave blank if not configured):")} +F_PASSWORD=$(systemd-ask-password --timeout=0 "FAS password:") +F_OTP=${FKINIT_OTP:-$(systemd-ask-password --timeout=0 "FAS OTP (leave blank if not configured):")} kinit -T FILE:$armorcache $_arg_user@$domain <<< "${F_PASSWORD}${F_OTP}" >/dev/null unset F_PASSWORD From c6eed73137a93167267b0226a7293edd982dd436 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Wed, 13 Aug 2025 13:53:15 +0200 Subject: [PATCH 46/46] Move fkinit user default check Otherwise the check for .fedora.upn does not apply --- fkinit | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fkinit b/fkinit index 7df469b..537edc0 100755 --- a/fkinit +++ b/fkinit @@ -28,8 +28,12 @@ begins_with_short_option() } # THE DEFAULTS INITIALIZATION - OPTIONALS -_arg_user="$USER" _arg_staging="off" +if [ -f "$HOME/.fedora.upn" ]; then + _arg_user=$(<"$HOME/.fedora.upn") +else + _arg_user="$USER" +fi print_help() @@ -97,10 +101,6 @@ set -e armorcache=$(mktemp) trap finalize EXIT -if [ -f "$HOME/.fedora.upn" ] && [ -z "$_arg_user" ]; then - $_arg_user=$(<"$HOME/.fedora.upn") -fi - if [ "$_arg_staging" == "on" ]; then domain=STG.FEDORAPROJECT.ORG else