From 39ade0e594dcbdb6a15c13f014de663983b0320f903a996a4b7220b7f367f849 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Mon, 11 Mar 2024 07:49:33 +0000 Subject: [PATCH] Accepting request 1153219 from home:pmonrealgonzalez:branches:network - Add crypto-policies support [bsc#1211301] * Update krb5.conf in vendor-files.tar.bz2 - Add crypto-policies support [bsc#1211301] * Update krb5.conf in vendor-files.tar.bz2 OBS-URL: https://build.opensuse.org/request/show/1153219 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=280 --- krb5-mini.changes | 6 ++++++ krb5-mini.spec | 14 +++++++++++++- krb5.changes | 6 ++++++ krb5.spec | 14 +++++++++++++- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 40 insertions(+), 4 deletions(-) diff --git a/krb5-mini.changes b/krb5-mini.changes index 1a8740d..851675e 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 29 10:07:57 UTC 2024 - Pedro Monreal + +- Add crypto-policies support [bsc#1211301] + * Update krb5.conf in vendor-files.tar.bz2 + ------------------------------------------------------------------- Tue Oct 3 11:29:23 UTC 2023 - Dominique Leuenberger diff --git a/krb5-mini.spec b/krb5-mini.spec index c81d9ef..043f32b 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -1,7 +1,7 @@ # # spec file for package krb5-mini # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -51,6 +51,10 @@ BuildRequires: pkgconfig(com_err) BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(libverto) BuildRequires: pkgconfig(ncurses) +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 +BuildRequires: crypto-policies +Requires: crypto-policies +%endif Requires(post): %fillup_prereq Requires: this-is-only-for-build-envs Conflicts: krb5 @@ -158,6 +162,11 @@ install -m 600 %{vendorFiles}/kdc.conf %{buildroot}%{_datadir}/kerberos/krb5kdc/ install -m 600 %{vendorFiles}/kadm5.acl %{buildroot}%{_datadir}/kerberos/krb5kdc/ install -m 600 %{vendorFiles}/kadm5.dict %{buildroot}%{_datadir}/kerberos/krb5kdc/ +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 +# Default include on this directory +ln -sv %{_sysconfdir}/crypto-policies/back-ends/krb5.config %{buildroot}%{_sysconfdir}/krb5.conf.d/crypto-policies +%endif + # all libs must have permissions 0755 for lib in `find %{buildroot}/%{_libdir}/ -type f -name "*.so*"` do @@ -269,6 +278,9 @@ sed -i "s/%{_lto_cflags}//" %{buildroot}%{_bindir}/krb5-config %doc %{krb5docdir}/README %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/krb5.conf %dir %{_sysconfdir}/krb5.conf.d +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 +%config(noreplace,missingok) %{_sysconfdir}/krb5.conf.d/crypto-policies +%endif %config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server %{_fillupdir}/sysconfig.* %{_unitdir}/kadmind.service diff --git a/krb5.changes b/krb5.changes index ace2808..2d345b7 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 29 10:07:57 UTC 2024 - Pedro Monreal + +- Add crypto-policies support [bsc#1211301] + * Update krb5.conf in vendor-files.tar.bz2 + ------------------------------------------------------------------- Wed Dec 20 23:18:05 UTC 2023 - Dirk Müller diff --git a/krb5.spec b/krb5.spec index 1cb7eb4..b42d9fe 100644 --- a/krb5.spec +++ b/krb5.spec @@ -1,7 +1,7 @@ # # spec file for package krb5 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -57,6 +57,10 @@ BuildRequires: pkgconfig(libverto) BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(ss) BuildRequires: pkgconfig(systemd) +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 +BuildRequires: crypto-policies +Requires: crypto-policies +%endif Conflicts: krb5-mini Obsoletes: krb5-plugin-preauth-pkinit-nss @@ -226,6 +230,11 @@ install -m 600 %{vendorFiles}/kdc.conf %{buildroot}%{_datadir}/kerberos/krb5kdc/ install -m 600 %{vendorFiles}/kadm5.acl %{buildroot}%{_datadir}/kerberos/krb5kdc/ install -m 600 %{vendorFiles}/kadm5.dict %{buildroot}%{_datadir}/kerberos/krb5kdc/ +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 +# Default include on this directory +ln -sv %{_sysconfdir}/crypto-policies/back-ends/krb5.config %{buildroot}%{_sysconfdir}/krb5.conf.d/crypto-policies +%endif + # all libs must have permissions 0755 for lib in `find %{buildroot}/%{_libdir}/ -type f -name "*.so*"` do @@ -365,6 +374,9 @@ done %doc %{krb5docdir}/README %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/krb5.conf %dir %{_sysconfdir}/krb5.conf.d +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 +%config(noreplace,missingok) %{_sysconfdir}/krb5.conf.d/crypto-policies +%endif %{_libdir}/libgssapi_krb5.* %{_libdir}/libgssrpc.so.* %{_libdir}/libk5crypto.so.* diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index c9dcba2..b40eaad 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3353e03f3789a78e8fcc3f9e6b85c5f343330c385516eb2e32736fa8e7a51013 -size 182614 +oid sha256:d43b6e3c03d7c739ef9effae47c1ad0f1e63577db3472496fc93762a54b9e546 +size 182932