From 78ec530871875bf4a94c49df01a4a1e145fc006f Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Wed, 7 Jun 2023 14:49:16 +0300 Subject: [PATCH] drop upstreamed patches --- debian/changelog | 3 -- debian/patches/fix-ldap-so-path.diff | 11 -------- ...ll-fix-missing-dyndb-keytab-directive.diff | 28 ------------------- debian/patches/series | 2 -- 4 files changed, 44 deletions(-) delete mode 100644 debian/patches/fix-ldap-so-path.diff delete mode 100644 debian/patches/install-fix-missing-dyndb-keytab-directive.diff diff --git a/debian/changelog b/debian/changelog index 28c54496f..b26a0cfb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,11 +2,8 @@ freeipa (4.10.2+dfsg1-1) UNRELEASED; urgency=medium * New upstream release. * control: Bump sssd, bind9 depends. - * patches: Specify krb5_keytab in the named.conf template. * copyright, watch: Filter prebuilt html documentation from the tarball. - * fix-ldap-so-path.diff: Specify the path to ldap.so again, and use - multiarch path. -- Timo Aaltonen Tue, 21 Feb 2023 10:13:42 +0200 diff --git a/debian/patches/fix-ldap-so-path.diff b/debian/patches/fix-ldap-so-path.diff deleted file mode 100644 index 41c59cdb7..000000000 --- a/debian/patches/fix-ldap-so-path.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ipaplatform/debian/paths.py -+++ b/ipaplatform/debian/paths.py -@@ -79,7 +79,7 @@ class DebianPathNamespace(BasePathNamesp - UPDATE_CA_TRUST = "/usr/sbin/update-ca-certificates" - BIND_LDAP_DNS_IPA_WORKDIR = "/var/cache/bind/dyndb-ldap/ipa/" - BIND_LDAP_DNS_ZONE_WORKDIR = "/var/cache/bind/dyndb-ldap/ipa/master/" -- BIND_LDAP_SO = "ldap.so" -+ BIND_LDAP_SO = "/usr/lib/{0}/bind/ldap.so".format(MULTIARCH) - LIBARCH = "/{0}".format(MULTIARCH) - LIBSOFTHSM2_SO = "/usr/lib/{0}/softhsm/libsofthsm2.so".format(MULTIARCH) - PAM_KRB5_SO = "/usr/lib/{0}/security/pam_krb5.so".format(MULTIARCH) diff --git a/debian/patches/install-fix-missing-dyndb-keytab-directive.diff b/debian/patches/install-fix-missing-dyndb-keytab-directive.diff deleted file mode 100644 index c7043f226..000000000 --- a/debian/patches/install-fix-missing-dyndb-keytab-directive.diff +++ /dev/null @@ -1,28 +0,0 @@ -From 9d8c285a2eb32f4097ff562c14a3f4f4e0dca140 Mon Sep 17 00:00:00 2001 -From: Jarl Gullberg -Date: Mon, 20 Feb 2023 19:32:20 +0100 -Subject: [PATCH] install: Fix missing dyndb keytab directive - -bind-dyndb-ldap uses the krb5_keytab directive to set the path to -the keytab to use. This directive was not being used in the -configuration template, resulting in a failure to start named if -the keytab path differed from the defaults. - -This issue was discovered when packaging FreeIPA for Debian, -which is one of the platforms where the path is customized. - -Signed-off-by: Jarl Gullberg ---- - install/share/bind.named.conf.template | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/install/share/bind.named.conf.template b/install/share/bind.named.conf.template -index 28c21d0a7ab..01b77c5ae1c 100644 ---- a/install/share/bind.named.conf.template -+++ b/install/share/bind.named.conf.template -@@ -58,4 +58,5 @@ dyndb "ipa" "$BIND_LDAP_SO" { - server_id "$FQDN"; - auth_method "sasl"; - sasl_mech "EXTERNAL"; -+ krb5_keytab "FILE:$NAMED_KEYTAB"; - }; diff --git a/debian/patches/series b/debian/patches/series index 395c4507b..4c729c541 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,7 @@ # upstreamed -install-fix-missing-dyndb-keytab-directive.diff # not upstreamable dnssec-race-wa.diff fix-sssd-socket-activation.diff # send upstream -fix-ldap-so-path.diff