[Pkg-sssd-devel] [Git][sssd-team/sssd][master] Install dbus policy in /usr instead of /etc

[Timo Aaltonen (@tjaalton)]

Timo Aaltonen pushed to branch master at Debian SSSD packaging / sssd


Commits:
af30288c by Gioele Barabucci at 2023-02-20T08:13:18+00:00
Install dbus policy in /usr instead of /etc

sssd-dbus installs the `org.freedesktop.sssd.infopipe.conf` policy
in `/etc/dbus-1`. Since Debian 9 the standard directory for
package-installed dbus policies is `/usr/share/dbus-1`.

See: https://bugs.debian.org/1006631

Fixes: lintian: dbus-policy-in-etc

Closes: #1031547

- - - - -


4 changed files:

- + debian/patches/0004-Makefile-Install-dbus-policy-in-usr-not-etc.patch
- debian/patches/series
- debian/sssd-dbus.install
- + debian/sssd-dbus.maintscript


Changes:

=====================================
debian/patches/0004-Makefile-Install-dbus-policy-in-usr-not-etc.patch
=====================================
@@ -0,0 +1,29 @@
+From: Gioele Barabucci <gioele at svario.it>
+Date: Sat, 18 Feb 2023 10:53:27 +0100
+Subject: Makefile: Install dbus policy in /usr, not /etc
+Forwarded: https://github.com/SSSD/sssd/pull/6580
+
+From <https://bugs.debian.org/1006631>:
+
+> dbus supports policy files in both `/usr/share/dbus-1/system.d` and
+> `/etc/dbus-1/systemd`. [The] recently released dbus 1.14.0, officially
+> deprecates installing packages' default policies into `/etc/dbus-1/systemd`,
+> instead reserving it for the sysadmin. This is the same idea as the
+> difference between `/usr/lib/udev/rules.d` and `/etc/udev/rules.d`.
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 99209e6..3aa73c5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -58,7 +58,7 @@ sssddatadir = $(datadir)/sssd
+ sssdapiplugindir = $(sssddatadir)/sssd.api.d
+ sssdtapscriptdir = $(sssddatadir)/systemtap
+ krb5snippetsdir = $(sssddatadir)/krb5-snippets
+-dbuspolicydir = $(sysconfdir)/dbus-1/system.d
++dbuspolicydir = $(datadir)/dbus-1/system.d
+ dbusservicedir = $(datadir)/dbus-1/system-services
+ sss_statedir = $(localstatedir)/lib/sss
+ runstatedir = @runstatedir@


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 fix-whitespace-test.diff
 default-to-socket-activated-services.diff
 fix-shebang-on-sss_analyze.patch
+0004-Makefile-Install-dbus-policy-in-usr-not-etc.patch


=====================================
debian/sssd-dbus.install
=====================================
@@ -1,5 +1,5 @@
-etc/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
 lib/systemd/system/sssd-ifp.service
 usr/libexec/sssd/sssd_ifp
 usr/share/dbus-1/system-services/org.freedesktop.sssd.infopipe.service
+usr/share/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
 usr/share/man/man5/sssd-ifp.5


=====================================
debian/sssd-dbus.maintscript
=====================================
@@ -0,0 +1 @@
+rm_conffile /etc/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf 2.8.2-3~



View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/commit/af30288cc790a1c2e3bb0ed344136e2b470a7b50

-- 
View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/commit/af30288cc790a1c2e3bb0ed344136e2b470a7b50
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-sssd-devel/attachments/20230220/0cfe5282/attachment-0001.htm>