IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

drop upstreamed patches

Browse Source
This commit is contained in:
Timo Aaltonen
2023-06-07 14:49:16 +03:00
parent f52e2b0a2c
commit 78ec530871
4 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@@ -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 <tjaalton@debian.org> Tue, 21 Feb 2023 10:13:42 +0200

11
debian/patches/fix-ldap-so-path.diff vendored
View File

@@ -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)

28
debian/patches/install-fix-missing-dyndb-keytab-directive.diff vendored
View File

@@ -1,28 +0,0 @@
From 9d8c285a2eb32f4097ff562c14a3f4f4e0dca140 Mon Sep 17 00:00:00 2001
From: Jarl Gullberg <jarl.gullberg@gmail.com>
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 <jarl.gullberg@gmail.com>
---
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";
};

2
debian/patches/series vendored
View File

@@ -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