From 462ccca80d6a605f02509ebc1709c66cfe8fe2316366d4ad0140357c0100978f Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Thu, 25 Jul 2019 11:56:17 +0000 Subject: [PATCH] Accepting request 718507 from home:mgerstner:branches:network - removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by firewalld, see [1]. [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html - removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by firewalld, see [1]. [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html OBS-URL: https://build.opensuse.org/request/show/718507 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=218 --- krb5-mini.changes | 8 ++++++++ krb5-mini.spec | 4 ---- krb5.changes | 8 ++++++++ krb5.spec | 4 ---- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/krb5-mini.changes b/krb5-mini.changes index 928df91..bc47337 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jul 24 09:57:59 UTC 2019 - matthias.gerstner@suse.com + +- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by + firewalld, see [1]. + + [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html + ------------------------------------------------------------------- Wed Feb 13 17:45:34 UTC 2019 - Jan Engelhardt diff --git a/krb5-mini.spec b/krb5-mini.spec index ed608d5..23f61ce 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -164,7 +164,6 @@ mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}/krb5.conf.d mkdir -p %{buildroot}/etc/profile.d/ mkdir -p %{buildroot}/var/log/krb5 -mkdir -p %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/ # create plugin directories mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/kdb mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/preauth @@ -173,8 +172,6 @@ mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/tls install -m 644 %{vendorFiles}/krb5.conf %{buildroot}%{_sysconfdir} install -m 644 %{vendorFiles}/krb5.csh.profile %{buildroot}/etc/profile.d/krb5.csh install -m 644 %{vendorFiles}/krb5.sh.profile %{buildroot}/etc/profile.d/krb5.sh -install -m 644 %{vendorFiles}/SuSEFirewall.kdc %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/kdc -install -m 644 %{vendorFiles}/SuSEFirewall.kadmind %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/kadmind # Do not write directly to /var/lib/kerberos anymore as it breaks transactional # updates. Use systemd-tmpfiles to copy the files there when it doesn't exist @@ -327,7 +324,6 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so %dir %{_sysconfdir}/krb5.conf.d %attr(0644,root,root) %config /etc/profile.d/krb5* %config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server -%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* %{_fillupdir}/sysconfig.* %{_unitdir}/kadmind.service %{_unitdir}/krb5kdc.service diff --git a/krb5.changes b/krb5.changes index 766ccd3..7967f5a 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jul 24 09:57:44 UTC 2019 - matthias.gerstner@suse.com + +- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by + firewalld, see [1]. + + [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html + ------------------------------------------------------------------- Tue May 7 10:08:00 UTC 2019 - Samuel Cabrero diff --git a/krb5.spec b/krb5.spec index d939310..c0d8b28 100644 --- a/krb5.spec +++ b/krb5.spec @@ -240,7 +240,6 @@ mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}/krb5.conf.d mkdir -p %{buildroot}/etc/profile.d/ mkdir -p %{buildroot}/var/log/krb5 -mkdir -p %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/ # create plugin directories mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/kdb mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/preauth @@ -249,8 +248,6 @@ mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/tls install -m 644 %{vendorFiles}/krb5.conf %{buildroot}%{_sysconfdir} install -m 644 %{vendorFiles}/krb5.csh.profile %{buildroot}/etc/profile.d/krb5.csh install -m 644 %{vendorFiles}/krb5.sh.profile %{buildroot}/etc/profile.d/krb5.sh -install -m 644 %{vendorFiles}/SuSEFirewall.kdc %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/kdc -install -m 644 %{vendorFiles}/SuSEFirewall.kadmind %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/kadmind # Do not write directly to /var/lib/kerberos anymore as it breaks transactional # updates. Use systemd-tmpfiles to copy the files there when it doesn't exist @@ -448,7 +445,6 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so %ghost %attr(0600,root,root) %config(noreplace) %{_sharedstatedir}/kerberos/krb5kdc/kdc.conf %ghost %attr(0600,root,root) %config(noreplace) %{_sharedstatedir}/kerberos/krb5kdc/kadm5.acl %ghost %attr(0600,root,root) %config(noreplace) %{_sharedstatedir}/kerberos/krb5kdc/kadm5.dict -%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* %{_fillupdir}/sysconfig.* /usr/sbin/rc* /usr/lib/mit/sbin/kadmin.local diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index e86afd7..4523298 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:95b4f11ad9c88869e57d6632babb8e7de78f2b85ba10f42fc5cd208b98d6ed5d -size 183363 +oid sha256:c3f9f3338b54e3b724d04e745a0afb43141ff85599292f13129dc7431b299a6d +size 182948