patches: Drop upstreamed patches.

debian/changelog

@@ -3,6 +3,7 @@ freeipa (4.9.10-1) UNRELEASED; urgency=medium
   * New upstream release.
   * control: Add systemd-timesyncd to freeipa-client Conflicts. (Closes:
     #1008195)
+  * patches: Drop upstreamed patches.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 29 Mar 2022 12:04:21 +0300
 

debian/patches/0001-configure-Use-HTTPD_GROUP-in-init-tmpfiles-ipa.conf..patch

@@ -1,69 +0,0 @@
-From 0c56fcd63d497c28d9d62e34012c5d7aae64a1ec Mon Sep 17 00:00:00 2001
-From: Timo Aaltonen <tjaalton@debian.org>
-Date: Thu, 18 Nov 2021 10:38:04 +0200
-Subject: [PATCH] configure: Use HTTPD_GROUP in init/tmpfiles/ipa.conf.in
-
-This is a platform specific value.
-
-Signed-off-by: Timo Aaltonen <tjaalton@debian.org>
----
- configure.ac               | 6 ++++++
- init/tmpfilesd/Makefile.am | 4 +++-
- init/tmpfilesd/ipa.conf.in | 2 +-
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9d7a33825..ab210fc61 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -384,6 +384,7 @@ AC_SUBST([IPAPLATFORM])
- AC_MSG_RESULT([${IPAPLATFORM}])
- 
- if test "x${IPAPLATFORM}" == "xdebian"; then
-+    HTTPD_GROUP="www-data"
-     KRB5KDC_SERVICE="krb5-kdc.service"
-     NAMED_GROUP="bind"
-     ODS_USER="opendnssec"
-@@ -391,6 +392,7 @@ if test "x${IPAPLATFORM}" == "xdebian"; then
-     # see https://www.debian.org/doc/packaging-manuals/python-policy/ap-packaging_tools.html
-     PYTHON_INSTALL_EXTRA_OPTIONS="--install-layout=deb"
- else
-+    HTTPD_GROUP="apache"
-     KRB5KDC_SERVICE="krb5kdc.service"
-     NAMED_GROUP="named"
-     ODS_USER="ods"
-@@ -398,6 +400,10 @@ else
-     PYTHON_INSTALL_EXTRA_OPTIONS=""
- fi
- 
-+AC_MSG_CHECKING([HTTPD_GROUP])
-+AC_SUBST([HTTPD_GROUP])
-+AC_MSG_RESULT([${HTTPD_GROUP}])
-+
- AC_SUBST([KRB5KDC_SERVICE])
- 
- AC_MSG_CHECKING([NAMED_GROUP])
-diff --git a/init/tmpfilesd/Makefile.am b/init/tmpfilesd/Makefile.am
-index 3ea4533ee..3fbfb9582 100644
---- a/init/tmpfilesd/Makefile.am
-+++ b/init/tmpfilesd/Makefile.am
-@@ -7,4 +7,6 @@ systemdtmpfiles_DATA =         \
- CLEANFILES = $(systemdtmpfiles_DATA)
- 
- %: %.in Makefile
--	cp '$(srcdir)/$@.in' $@
-+	sed \
-+		-e 's|@HTTPD_GROUP[@]|$(HTTPD_GROUP)|g' \
-+		 '$(srcdir)/$@.in' >$@
-diff --git a/init/tmpfilesd/ipa.conf.in b/init/tmpfilesd/ipa.conf.in
-index 6467e1b93..e2b15aa5b 100644
---- a/init/tmpfilesd/ipa.conf.in
-+++ b/init/tmpfilesd/ipa.conf.in
-@@ -1,3 +1,3 @@
- d /run/ipa 0711 root root
- d /run/ipa/ccaches 6770 ipaapi ipaapi
--a+ /run/ipa/ccaches - - - - g:apache:rwx
-+a+ /run/ipa/ccaches - - - - g:@HTTPD_GROUP@:rwx
--- 
-2.32.0
-

debian/patches/0001-ipaplatform-debian-Fix-named-keytab-name.patch

@@ -1,28 +0,0 @@
-From 5814a18e99bcea70325d1d3f872d87ec1b91037d Mon Sep 17 00:00:00 2001
-From: Timo Aaltonen <tjaalton@debian.org>
-Date: Sat, 23 Oct 2021 09:36:11 +0300
-Subject: [PATCH] ipaplatform/debian: Fix named keytab name
-
-This was changed in bind9 9.16 packaging
-
-Signed-off-by: Timo Aaltonen <tjaalton@debian.org>
----
- ipaplatform/debian/paths.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ipaplatform/debian/paths.py b/ipaplatform/debian/paths.py
-index ff235a2e9..c596e18c2 100644
---- a/ipaplatform/debian/paths.py
-+++ b/ipaplatform/debian/paths.py
-@@ -36,7 +36,7 @@ class DebianPathNamespace(BasePathNamespace):
-     NAMED_CUSTOM_OPTIONS_CONF = "/etc/bind/ipa-options-ext.conf"
-     NAMED_LOGGING_OPTIONS_CONF = "/etc/bind/ipa-logging-ext.conf"
-     NAMED_VAR_DIR = "/var/cache/bind"
--    NAMED_KEYTAB = "/etc/bind/named.keytab"
-+    NAMED_KEYTAB = "/etc/bind/krb5.keytab"
-     NAMED_RFC1912_ZONES = "/etc/bind/named.conf.default-zones"
-     NAMED_ROOT_KEY = "/etc/bind/bind.keys"
-     NAMED_MANAGED_KEYS_DIR = "/var/cache/bind/dynamic"
--- 
-2.32.0
-

debian/patches/fix-paths.diff

@@ -1,18 +0,0 @@
---- a/ipaplatform/base/paths.py
-+++ b/ipaplatform/base/paths.py
-@@ -28,13 +28,13 @@ class BasePathNamespace:
-     BIN_HOSTNAMECTL = "/bin/hostnamectl"
-     CRYPTO_POLICY_OPENSSLCNF_FILE = None
-     ECHO = "/bin/echo"
--    FIPS_MODE_SETUP = "/usr/bin/fips-mode-setup"
-+    FIPS_MODE_SETUP = "/bin/fips-mode-setup"
-     GZIP = "/bin/gzip"
-     LS = "/bin/ls"
-     SYSTEMCTL = "/bin/systemctl"
-     SYSTEMD_RUN = "/bin/systemd-run"
-     SYSTEMD_DETECT_VIRT = "/usr/bin/systemd-detect-virt"
--    SYSTEMD_TMPFILES = "/usr/bin/systemd-tmpfiles"
-+    SYSTEMD_TMPFILES = "/bin/systemd-tmpfiles"
-     TAR = "/bin/tar"
-     AUTOFS_LDAP_AUTH_CONF = "/etc/autofs_ldap_auth.conf"
-     ETC_FEDORA_RELEASE = "/etc/fedora-release"

debian/patches/series

@@ -1,10 +1,7 @@
 # upstreamed
 
 # not upstreamable
-
-# send upstream
 dnssec-race-wa.diff
 fix-sssd-socket-activation.diff
-fix-paths.diff
-0001-configure-Use-HTTPD_GROUP-in-init-tmpfiles-ipa.conf..patch
-0001-ipaplatform-debian-Fix-named-keytab-name.patch
+
+# send upstream