[Pkg-freeipa-devel] [Git][freeipa-team/freeipa][master] 4 commits: patches: Fix apache group properly.
Timo Aaltonen (@tjaalton)
gitlab at salsa.debian.org
Thu Nov 18 15:36:30 GMT 2021
Timo Aaltonen pushed to branch master at FreeIPA packaging / freeipa
Commits:
0428e800 by Timo Aaltonen at 2021-11-18T10:59:22+02:00
patches: Fix apache group properly.
- - - - -
118b06e9 by Timo Aaltonen at 2021-11-18T11:15:28+02:00
client: Move .tmpfile -> .tmpfiles.
- - - - -
2644cba6 by Timo Aaltonen at 2021-11-18T11:16:17+02:00
control: Bump debhelper to 13, gain dh_installtmpfiles being run.
- - - - -
038c24af by Timo Aaltonen at 2021-11-18T17:25:29+02:00
control, rules: Add --without-ipa-join-xml and drop libxmlrpc from depends.
- - - - -
9 changed files:
- debian/control
- debian/control.common
- debian/control.stub
- − debian/freeipa-client.postinst
- debian/freeipa-client.tmpfile → debian/freeipa-client.tmpfiles
- + debian/patches/0001-configure-Use-HTTPD_GROUP-in-init-tmpfiles-ipa.conf..patch
- − debian/patches/fix-apache-group.diff
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Vcs-Browser: https://salsa.debian.org/freeipa-team/freeipa
Homepage: http://www.freeipa.org
Build-Depends:
check,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
dh-python,
gettext,
krb5-user,
@@ -25,7 +25,6 @@ Build-Depends:
libsasl2-dev,
libssl-dev,
libtalloc-dev,
- libxmlrpc-core-c3-dev (>= 1.33.06),
python3-all-dev,
python3-cryptography,
python3-dbus,
@@ -93,7 +92,6 @@ Depends:
libpam-sss,
libsasl2-modules-gssapi-mit,
libsss-sudo,
- libxmlrpc-core-c3 (>= 1.16.33-3.1ubuntu5),
oddjob-mkhomedir,
python3-dnspython,
python3-ipaclient (= ${source:Version}),
=====================================
debian/control.common
=====================================
@@ -26,7 +26,6 @@ Depends:
libpam-sss,
libsasl2-modules-gssapi-mit,
libsss-sudo,
- libxmlrpc-core-c3 (>= 1.16.33-3.1ubuntu5),
oddjob-mkhomedir,
python3-dnspython,
python3-ipaclient (= ${source:Version}),
=====================================
debian/control.stub
=====================================
@@ -9,7 +9,7 @@ Vcs-Browser: https://salsa.debian.org/freeipa-team/freeipa
Homepage: http://www.freeipa.org
Build-Depends:
check,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
dh-python,
gettext,
krb5-user,
@@ -25,7 +25,6 @@ Build-Depends:
libsasl2-dev,
libssl-dev,
libtalloc-dev,
- libxmlrpc-core-c3-dev (>= 1.33.06),
python3-all-dev,
python3-cryptography,
python3-dbus,
=====================================
debian/freeipa-client.postinst deleted
=====================================
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ ! -e /run/ipa ]; then
- mkdir -m 0700 /run/ipa
-fi
-
-#DEBHELPER#
=====================================
debian/freeipa-client.tmpfile → debian/freeipa-client.tmpfiles
=====================================
=====================================
debian/patches/0001-configure-Use-HTTPD_GROUP-in-init-tmpfiles-ipa.conf..patch
=====================================
@@ -0,0 +1,69 @@
+From 0c56fcd63d497c28d9d62e34012c5d7aae64a1ec Mon Sep 17 00:00:00 2001
+From: Timo Aaltonen <tjaalton at 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 at 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/fix-apache-group.diff deleted
=====================================
@@ -1,7 +0,0 @@
---- 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:www-data:rwx
=====================================
debian/patches/series
=====================================
@@ -7,4 +7,4 @@
dnssec-race-wa.diff
fix-sssd-socket-activation.diff
fix-paths.diff
-fix-apache-group.diff
+0001-configure-Use-HTTPD_GROUP-in-init-tmpfiles-ipa.conf..patch
=====================================
debian/rules
=====================================
@@ -26,6 +26,7 @@ confflags = \
--with-ipaplatform=debian \
--with-sysconfenvdir=/etc/default \
--disable-pylint \
+ --without-ipa-join-xml \
--without-jslint
ifeq ($(ONLY_CLIENT), 1)
View it on GitLab: https://salsa.debian.org/freeipa-team/freeipa/-/compare/b086da4d6d75401f86cbc84efd7457f1f27c6169...038c24afcc564a96130f7e4bd1b0a37025067406
--
View it on GitLab: https://salsa.debian.org/freeipa-team/freeipa/-/compare/b086da4d6d75401f86cbc84efd7457f1f27c6169...038c24afcc564a96130f7e4bd1b0a37025067406
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20211118/6678f0a7/attachment-0001.htm>
More information about the Pkg-freeipa-devel
mailing list