From 59139c508ff0e163cdc8bb90aef51888d735504f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 28 Jun 2023 14:28:26 +0200 Subject: [PATCH] Update to version 0.3.7 --- .gitignore | 1 + 16.patch | 23 ----------------------- 18.patch | 46 ---------------------------------------------- 19.patch | 51 --------------------------------------------------- cepces.spec | 19 ++++++------------- sources | 2 +- 6 files changed, 8 insertions(+), 134 deletions(-) delete mode 100644 16.patch delete mode 100644 18.patch delete mode 100644 19.patch diff --git a/.gitignore b/.gitignore index 645ad94..84e7e07 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cepces-0.3.5.tar.gz +/cepces-0.3.7.tar.gz diff --git a/16.patch b/16.patch deleted file mode 100644 index 384f814..0000000 --- a/16.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c985686b9f80c363c1f24d00bfa0e381a918813b Mon Sep 17 00:00:00 2001 -From: Ding-Yi Chen -Date: Tue, 14 Jun 2022 18:14:50 +1000 -Subject: [PATCH] Fixes #15 cepces.conf.dist: server should be pointed to - actual CEP host - ---- - conf/cepces.conf.dist | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/conf/cepces.conf.dist b/conf/cepces.conf.dist -index fe3a5a1..34f9c97 100644 ---- a/conf/cepces.conf.dist -+++ b/conf/cepces.conf.dist -@@ -1,6 +1,6 @@ - [global] --# Hostname of the issuing certification authority. This is an optional setting --# and is only used to construct the URL to the Policy Provider endpoint. -+# Hostname of the Certificate Enrollment Policy (CEP) Server. -+# Used to construct the URL to the CEP endpoint. - # - # Default: ca - server=ca diff --git a/18.patch b/18.patch deleted file mode 100644 index 07f69be..0000000 --- a/18.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b68b7a713a2acbbb6e0ce7bc9b8ef43fb913a2a8 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 23 Jun 2022 19:13:25 +0200 -Subject: [PATCH] Replace old requests_kerberos with requests_gssapi - -Signed-off-by: Andreas Schneider ---- - cepces/soap/auth.py | 8 +++++--- - requirements.txt | 2 +- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/cepces/soap/auth.py b/cepces/soap/auth.py -index bb5536d..26f549e 100644 ---- a/cepces/soap/auth.py -+++ b/cepces/soap/auth.py -@@ -21,7 +21,8 @@ - """This module contains SOAP related authentication.""" - from abc import ABCMeta, abstractmethod, abstractproperty - import os --from requests_kerberos import HTTPKerberosAuth -+import gssapi -+from requests_gssapi import HTTPSPNEGOAuth - from cepces import Base - from cepces.krb5 import types as ktypes - from cepces.krb5.core import Context, Keytab, Principal -@@ -117,8 +118,9 @@ def _init_ccache(self): - os.environ["KRB5CCNAME"] = ccache_name - - def _init_transport(self): -- self._transport = HTTPKerberosAuth(principal=self._config['name'], -- delegate=True) -+ name = gssapi.Name(self._config['name'], gssapi.NameType.user) -+ creds = gssapi.Credentials(name=name, usage="initiate") -+ self._transport = HTTPSPNEGOAuth(creds=creds, delegate=True) - - @property - def transport(self): -diff --git a/requirements.txt b/requirements.txt -index e111f9d..eb560d3 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,3 +1,3 @@ - cryptography>=1.2 - requests --requests_kerberos>=0.9 -+requests_gssapi>=1.2.2 diff --git a/19.patch b/19.patch deleted file mode 100644 index 6bc88f7..0000000 --- a/19.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 569860e9cfc083785f18033cd96d24c453b25d09 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Mon, 11 Jul 2022 16:37:48 +0200 -Subject: [PATCH 1/2] setup: Do not install example configs - -Packagers should take care of installing them correctly. ---- - setup.py | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/setup.py b/setup.py -index 480e30f..65c5ebc 100755 ---- a/setup.py -+++ b/setup.py -@@ -69,13 +69,6 @@ - - data_files=[ - ('/usr/local/libexec/certmonger', ['bin/cepces-submit']), -- ( -- '/usr/local/etc/cepces', -- [ -- 'conf/cepces.conf.dist', -- 'conf/logging.conf.dist', -- ] -- ), - ], - - install_requires=[], - -From 0d6401a1912370010e81943c81737b4276615a26 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Mon, 11 Jul 2022 16:38:31 +0200 -Subject: [PATCH 2/2] setup: Respect the prefix the user specifies - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 65c5ebc..b0718d2 100755 ---- a/setup.py -+++ b/setup.py -@@ -68,7 +68,7 @@ - ], - - data_files=[ -- ('/usr/local/libexec/certmonger', ['bin/cepces-submit']), -+ ('libexec/certmonger', ['bin/cepces-submit']), - ], - - install_requires=[], diff --git a/cepces.spec b/cepces.spec index 3217357..14c8348 100644 --- a/cepces.spec +++ b/cepces.spec @@ -4,25 +4,14 @@ %global selinux_package_dir %{_datadir}/selinux/packages Name: cepces -Version: 0.3.5 -Release: 8%{?dist} +Version: 0.3.7 +Release: 1%{?dist} 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 -# cepces.conf.dist: server should be pointed to actual CEP host -# https://github.com/openSUSE/cepces/issues/15 -# Merged to master after ver 0.3.5 -Patch0: https://patch-diff.githubusercontent.com/raw/openSUSE/%{name}/pull/16.patch - -# Replace old requests_kerberos with requests_gssapi -Patch1: https://patch-diff.githubusercontent.com/raw/openSUSE/%{name}/pull/18.patch - -# Cleanup for installing the project -Patch2: https://patch-diff.githubusercontent.com/raw/openSUSE/%{name}/pull/19.patch - BuildArch: noarch Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release} @@ -190,6 +179,10 @@ fi %files selinux -f selinux-files.txt %changelog +* Wed Jun 28 2023 Andreas Schneider - 0.3.7-1 +- Update to version 0.3.7 + * https://github.com/openSUSE/cepces/releases/tag/v0.3.7 + * Wed Jun 14 2023 Python Maint - 0.3.5-8 - Rebuilt for Python 3.12 diff --git a/sources b/sources index 9ac170c..ae7abb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cepces-0.3.5.tar.gz) = 335c0aa6dcd24563a66f651e856f8cad0cd724bb10c099c0b8b11900ec1ae20ff42fd475f2d02aeb6aa532f9004d3820b5f840514721b6be64a30142ca28bed7 +SHA512 (cepces-0.3.7.tar.gz) = 3e7dbaeec84f8f69b27a2938a851434fa4fb73b8cac4cc8cb148b3f7af529c78ea2f0b61bada007064e7663afaa050d716e47496982a5f89ce8aba41602772a3