commit: c1af609e3fb22fe9fdded9063ef1c693d63bbb58
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 26 18:17:03 2025 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 26 18:18:39 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1af609e
mail-filter/postsrsd: Install postsrsd.conf in /etc
... instead of moving it later.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
mail-filter/postsrsd/files/postsrsd-2.0.11-sysconfdir.patch | 11 +++++++++++
mail-filter/postsrsd/postsrsd-2.0.11-r1.ebuild | 5 +----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/mail-filter/postsrsd/files/postsrsd-2.0.11-sysconfdir.patch
b/mail-filter/postsrsd/files/postsrsd-2.0.11-sysconfdir.patch
new file mode 100644
index 000000000000..0c2d92fdda84
--- /dev/null
+++ b/mail-filter/postsrsd/files/postsrsd-2.0.11-sysconfdir.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -362,7 +362,7 @@
+
+ install(TARGETS postsrsd RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.conf"
+- DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/${PROJECT_NAME}"
++ DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}"
+ )
+ if(INSTALL_SYSTEMD_SERVICE)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.service"
diff --git a/mail-filter/postsrsd/postsrsd-2.0.11-r1.ebuild
b/mail-filter/postsrsd/postsrsd-2.0.11-r1.ebuild
index bb695c72f474..665bbb403e5f 100644
--- a/mail-filter/postsrsd/postsrsd-2.0.11-r1.ebuild
+++ b/mail-filter/postsrsd/postsrsd-2.0.11-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
CHROOT_DIR="${EPREFIX}/var/lib/postsrsd"
PATCHES=(
- "${FILESDIR}"/${PN}-2.0.11-docdir.patch
+ "${FILESDIR}"/${PN}-2.0.11-sysconfdir.patch
)
DOCS=( README.rst CHANGELOG.rst )
@@ -59,9 +59,6 @@ src_install() {
newconfd "${FILESDIR}"/postsrsd-2.0.11.confd postsrsd
keepdir "${CHROOT_DIR}"
- # Move the example config file to /etc
- mv "${ED}/usr/share/doc/${PF}/${PN}.conf" "${ED}/etc/" || die
-
local DOC_CONTENTS="When updating from version 1.x:
\n\nNote that most configuration options can no longer be set
from the
command line, therefore we cannot define them in OpenRC's
conf.d file
