commit: b9e139ebe68cde32d1c4e5d099d2345f88b0dba5 Author: Hoël Bézier <hoelbezier <AT> riseup <DOT> net> AuthorDate: Sat May 17 20:29:44 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 12 12:22:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e139eb
sys-apps/udevil: do not install /etc/conf.d/devmon, bug #832907 Do not install the /etc/conf.d/devmon configuration file. It was only used to set arguments to the devmon@.service systemd unit and defaulted to no arguments. Closes: https://bugs.gentoo.org/832907 Signed-off-by: Hoël Bézier <hoelbezier <AT> riseup.net> Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/udevil/files/udevil-0.4.4-no-conf.d.patch | 63 ++++++++++++++++++++++ sys-apps/udevil/udevil-0.4.4-r5.ebuild | 3 +- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/sys-apps/udevil/files/udevil-0.4.4-no-conf.d.patch b/sys-apps/udevil/files/udevil-0.4.4-no-conf.d.patch new file mode 100644 index 000000000000..0c99b662c4d4 --- /dev/null +++ b/sys-apps/udevil/files/udevil-0.4.4-no-conf.d.patch @@ -0,0 +1,63 @@ +diff --git a/etc/Makefile.am b/etc/Makefile.am +index 9b6e752..a33ce8e 100644 +--- a/etc/Makefile.am ++++ b/etc/Makefile.am +@@ -1,5 +1,5 @@ + if ADD_SYSTEMD +-EXTRA_DIST = udevil.conf devmon devmon@.service ++EXTRA_DIST = udevil.conf devmon@.service + else + EXTRA_DIST = udevil.conf + endif +@@ -11,11 +11,6 @@ install-data-hook: + $(srcdir)/udevil.conf \ + $(DESTDIR)/$(sysconfdir)/udevil/udevil.conf + if ADD_SYSTEMD +- test -d $(DESTDIR)/$(sysconfdir)/conf.d || mkdir -p -- \ +- $(DESTDIR)/$(sysconfdir)/conf.d +- test -f $(DESTDIR)/$(sysconfdir)/conf.d/devmon || $(INSTALL_DATA) \ +- $(srcdir)/systemd/devmon \ +- $(DESTDIR)/$(sysconfdir)/conf.d/devmon + test -d $(DESTDIR)/$(libdir)/systemd/system || \ + mkdir -p -- $(DESTDIR)/$(libdir)/systemd/system + $(INSTALL_DATA) $(srcdir)/systemd/devmon@.service \ +diff --git a/etc/Makefile.in b/etc/Makefile.in +index bf2b19b..4489e30 100644 +--- a/etc/Makefile.in ++++ b/etc/Makefile.in +@@ -262,7 +262,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + @ADD_SYSTEMD_FALSE@EXTRA_DIST = udevil.conf +-@ADD_SYSTEMD_TRUE@EXTRA_DIST = udevil.conf devmon devmon@.service ++@ADD_SYSTEMD_TRUE@EXTRA_DIST = udevil.conf devmon@.service + all: all-am + + .SUFFIXES: +@@ -462,11 +462,6 @@ install-data-hook: + test -f $(DESTDIR)/$(sysconfdir)/udevil/udevil.conf || $(INSTALL_DATA) \ + $(srcdir)/udevil.conf \ + $(DESTDIR)/$(sysconfdir)/udevil/udevil.conf +-@ADD_SYSTEMD_TRUE@ test -d $(DESTDIR)/$(sysconfdir)/conf.d || mkdir -p -- \ +-@ADD_SYSTEMD_TRUE@ $(DESTDIR)/$(sysconfdir)/conf.d +-@ADD_SYSTEMD_TRUE@ test -f $(DESTDIR)/$(sysconfdir)/conf.d/devmon || $(INSTALL_DATA) \ +-@ADD_SYSTEMD_TRUE@ $(srcdir)/systemd/devmon \ +-@ADD_SYSTEMD_TRUE@ $(DESTDIR)/$(sysconfdir)/conf.d/devmon + @ADD_SYSTEMD_TRUE@ test -d $(DESTDIR)/$(libdir)/systemd/system || \ + @ADD_SYSTEMD_TRUE@ mkdir -p -- $(DESTDIR)/$(libdir)/systemd/system + @ADD_SYSTEMD_TRUE@ $(INSTALL_DATA) $(srcdir)/systemd/devmon@.service \ +diff --git a/etc/systemd/devmon@.service b/etc/systemd/devmon@.service +index 23ccf87..1d707ce 100644 +--- a/etc/systemd/devmon@.service ++++ b/etc/systemd/devmon@.service +@@ -6,8 +6,7 @@ Type=simple + User=%i + # Set DISPLAY for popup dialogs + Environment=DISPLAY=:0 +-EnvironmentFile=/etc/conf.d/devmon +-ExecStart=/usr/bin/devmon $ARGS ++ExecStart=/usr/bin/devmon + + [Install] + WantedBy=multi-user.target + diff --git a/sys-apps/udevil/udevil-0.4.4-r5.ebuild b/sys-apps/udevil/udevil-0.4.4-r5.ebuild index 165c04be6453..49f609e4e6d2 100644 --- a/sys-apps/udevil/udevil-0.4.4-r5.ebuild +++ b/sys-apps/udevil/udevil-0.4.4-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,6 +31,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.4.4-stat.patch "${FILESDIR}"/${PN}-0.4.4-include-sysmacros.patch "${FILESDIR}"/${PN}-0.4.4-no-libtool.patch + "${FILESDIR}"/${PN}-0.4.4-no-conf.d.patch ) src_prepare() {
