From c7abd5baeaa0747d917ad3b7ab19267d4d9a37ca Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 18 Nov 2025 14:31:05 +0100 Subject: [PATCH] Update to version 0.3.12 - resolves: RHEL-121734 - Added channel binding support - resolves: RHEL-103417 --- cepces-setuptools.patch | 72 +++++++++++++++++++++++++++++++++++++++++ cepces.spec | 34 ++++++++++--------- gating.yaml | 2 +- sources | 2 +- 4 files changed, 93 insertions(+), 17 deletions(-) create mode 100644 cepces-setuptools.patch diff --git a/cepces-setuptools.patch b/cepces-setuptools.patch new file mode 100644 index 0000000..72f2bb5 --- /dev/null +++ b/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.12", ++ 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/cepces.spec b/cepces.spec index f324fa3..8e9a998 100644 --- a/cepces.spec +++ b/cepces.spec @@ -7,7 +7,7 @@ %global modulename %{name} Name: cepces -Version: 0.3.8 +Version: 0.3.12 Release: %autorelease Summary: Certificate Enrollment through CEP/CES @@ -15,10 +15,18 @@ 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 +46,16 @@ 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 + +# 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 +102,7 @@ done %install %py3_install -install -d %{buildroot}%{logdir} +install -d -m0755 %{buildroot}%{logdir} %if %{with selinux} # Install the SELinux module(s). @@ -131,9 +137,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 diff --git a/gating.yaml b/gating.yaml index 6985029..648918d 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,6 +1,6 @@ --- !Policy product_versions: - - rhel-8 + - rhel-9 decision_context: osci_compose_gate rules: - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/sources b/sources index fbd82eb..30aed32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cepces-0.3.8.tar.gz) = bb44e7bfe5ccb3c2e7f59665b1308bf493732ca8a5e6143c26f79b725c05b239a8af79042aa2df7ce2f9d95300099be8f79c1df5ac352d077e43c16b85734c3c +SHA512 (cepces-0.3.12.tar.gz) = 8259e3c26873549425ce5fb4b34ce6c71ebea58a70a9f077efe2a081b81eb831955cb6a654a86b53d5a8862d9c50ed47c992d606146d0525ad319ce8fde2b5a3