diff --git a/.cepces.metadata b/.cepces.metadata index 04de6e4..da61aa0 100644 --- a/.cepces.metadata +++ b/.cepces.metadata @@ -1 +1 @@ -4ff5c7852e9ac017010d0cf758457b67231931c6 SOURCES/cepces-0.3.8.tar.gz +de4ee6979401b2c4fc519c736543a37cf5014559 SOURCES/cepces-0.3.17.tar.gz diff --git a/.gitignore b/.gitignore index 160931a..533e196 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cepces-0.3.8.tar.gz +SOURCES/cepces-0.3.17.tar.gz diff --git a/SOURCES/cepces-0.3.8-fix-version.patch b/SOURCES/cepces-0.3.8-fix-version.patch deleted file mode 100644 index 38c57c2..0000000 --- a/SOURCES/cepces-0.3.8-fix-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: cepces-0.3.8/cepces/__init__.py -=================================================================== ---- cepces-0.3.8.orig/cepces/__init__.py 2023-02-15 21:58:32.000000000 +0100 -+++ cepces-0.3.8/cepces/__init__.py 2024-01-25 16:46:56.218989833 +0100 -@@ -23,7 +23,7 @@ import logging - __title__ = 'cepces' - __description__ = 'CEP/CES library.' - __url__ = 'https://github.com/openSUSE/cepces/' --__version__ = '0.3.7' -+__version__ = '0.3.8' - __author__ = 'Daniel Uvehag' - __author_email__ = 'daniel.uvehag@gmail.com' - __license__ = 'GPLv3' -Index: cepces-0.3.8/selinux/cepces.te -=================================================================== ---- cepces-0.3.8.orig/selinux/cepces.te 2023-02-15 21:58:32.000000000 +0100 -+++ cepces-0.3.8/selinux/cepces.te 2024-01-25 16:47:06.118006940 +0100 -@@ -1,4 +1,4 @@ --policy_module(cepces, 0.3.7) -+policy_module(cepces, 0.3.8) - - require { - type certmonger_t; diff --git a/SOURCES/cepces-setuptools.patch b/SOURCES/cepces-setuptools.patch new file mode 100644 index 0000000..aec26c3 --- /dev/null +++ b/SOURCES/cepces-setuptools.patch @@ -0,0 +1,72 @@ +From 81c3812b3649bab5bbd86f2c0e59fb1dae9d6132 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Tue, 18 Nov 2025 14:17:50 +0100 +Subject: [PATCH] Create a setup.py for setuptools 53.0 (RHEL9) + +--- + setup.py | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 53 insertions(+) + create mode 100644 setup.py + +diff --git a/setup.py b/setup.py +new file mode 100644 +index 0000000..0d5b859 +--- /dev/null ++++ b/setup.py +@@ -0,0 +1,53 @@ ++#!/usr/bin/env python3 ++"""Setup script for cepces.""" ++ ++from pathlib import Path ++ ++from setuptools import find_packages, setup ++ ++# Read the long description from README ++readme_file = Path(__file__).parent / "README.rst" ++long_description = readme_file.read_text(encoding="utf-8") ++ ++setup( ++ name="cepces", ++ version="0.3.17", ++ description="CEP/CES library.", ++ long_description=long_description, ++ long_description_content_type="text/x-rst", ++ author="Daniel Uvehag", ++ author_email="daniel.uvehag@gmail.com", ++ url="https://github.com/openSUSE/cepces", ++ project_urls={ ++ "Homepage": "https://github.com/openSUSE/cepces", ++ "Bug Tracker": "https://github.com/openSUSE/cepces/issues", ++ }, ++ license="GPLv3+", ++ license_files=["LICENSE"], ++ classifiers=[ ++ "Development Status :: 5 - Production/Stable", ++ "Environment :: Console", ++ "Intended Audience :: System Administrators", ++ "Topic :: System :: Systems Administration", ++ "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", ++ "Programming Language :: Python :: 3.9", ++ "Programming Language :: Python :: 3.10", ++ "Programming Language :: Python :: 3.11", ++ "Programming Language :: Python :: 3.12", ++ "Programming Language :: Python :: 3.13", ++ "Programming Language :: Python :: 3.14", ++ ], ++ keywords=["certificate", "ca", "cep", "ces", "adcs", "wstep", "xcep"], ++ python_requires=">=3.8", ++ package_dir={"": "src"}, ++ packages=find_packages(where="src"), ++ install_requires=[ ++ "cryptography >= 1.2", ++ "requests", ++ "requests_gssapi >= 1.4.0", ++ ], ++ data_files=[ ++ ("libexec/certmonger", ["bin/cepces-submit"]), ++ ], ++ include_package_data=True, ++) +-- +2.51.1 + diff --git a/SPECS/cepces.spec b/SPECS/cepces.spec index 6a47508..b0aad8d 100644 --- a/SPECS/cepces.spec +++ b/SPECS/cepces.spec @@ -1,3 +1,13 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 1; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + %bcond_without selinux %global selinux_variants targeted %global selinuxtype targeted @@ -7,18 +17,26 @@ %global modulename %{name} Name: cepces -Version: 0.3.8 -Release: 4%{?dist} +Version: 0.3.17 +Release: %autorelease Summary: Certificate Enrollment through CEP/CES License: GPL-3.0-or-later URL: https://github.com/openSUSE/%{name} Source0: https://github.com/openSUSE/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: cepces-0.3.8-fix-version.patch +Patch0: cepces-setuptools.patch BuildArch: noarch +BuildRequires: python3dist(setuptools) +BuildRequires: python3dist(cryptography) >= 1.2 +BuildRequires: python3dist(requests) +BuildRequires: python3dist(gssapi) +BuildRequires: python3dist(requests-gssapi) >= 1.4 +BuildRequires: python3dist(pytest) +BuildRequires: python3-devel + Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release} %if %{with selinux} Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) @@ -38,18 +56,20 @@ have been tested. %package -n python%{python3_pkgversion}-%{name} Summary: Python part of %{name} -BuildRequires: python3dist(setuptools) -BuildRequires: python3dist(cryptography) >= 1.2 -BuildRequires: python3dist(requests) -BuildRequires: python3dist(gssapi) -BuildRequires: python3dist(requests-gssapi) -BuildRequires: python3-devel - -Requires: python3dist(setuptools) Requires: python3dist(cryptography) >= 1.2 Requires: python3dist(requests) Requires: python3dist(gssapi) -Requires: python3dist(requests-gssapi) +Requires: python3dist(requests-gssapi) >= 1.4 + +# cepces/krb5/lib.py dynamically loads libgssapi_krb5.so.2 +Requires: krb5-libs +Requires(pre): krb5-libs +Requires(post): krb5-libs +# Uses keyctl for keyring handling +Recommends: keyutils +# Uses pinentry for username/password +Recommends: pinentry +Recommends: (pinentry-qt6 if plasma-workspace) %description -n python%{python3_pkgversion}-%{name} %{name} is an application for enrolling certificates through CEP and CES. @@ -96,7 +116,7 @@ done %install %py3_install -install -d %{buildroot}%{logdir} +install -d -m0755 %{buildroot}%{logdir} %if %{with selinux} # Install the SELinux module(s). @@ -131,9 +151,7 @@ cat <%{buildroot}%{_sysconfdir}/logrotate.d/%{name} EOF %check -# Create a symlink so test can locate cepces_test -ln -s tests/cepces_test . -%{__python3} setup.py test +%pytest %if %{with selinux} %pre selinux @@ -165,7 +183,7 @@ done # Install the CA into certmonger. if [[ "$1" == "1" ]]; then getcert add-ca -c %{name} \ - -e %{_libexecdir}/certmonger/%{name}-submit >/dev/null || : + -e %{_libexecdir}/certmonger/%{name}-submit --install >/dev/null || : fi %preun certmonger @@ -196,6 +214,25 @@ fi %endif %changelog +## START: Generated by rpmautospec +* Thu Jan 22 2026 Andreas Schneider - 0.3.17-1 +- Update to version 0.3.17 +- related: RHEL-121734 + +* Mon Dec 22 2025 Andreas Schneider - 0.3.16-1 +- Update to version 0.3.16 +- related: RHEL-121734 + +* Tue Dec 09 2025 Andreas Schneider - 0.3.13-1 +- Update to version 0.3.13 +- resolves: RHEL-133513 + +* Tue Nov 18 2025 Andreas Schneider - 0.3.12-1 +- Update to version 0.3.12 +- resolves: RHEL-121734 +- Added channel binding support +- resolves: RHEL-103417 + * Fri Feb 09 2024 Andreas Schneider - 0.3.8-4 - resolves: RHEL-24924 - Fix requirement on cepces-selinux @@ -273,3 +310,5 @@ fi * Mon Jun 27 2016 Daniel Uvehag - 0.1.0-1 - Initial package. + +## END: Generated by rpmautospec