From 5da516da08bb15f6cb0d38ce8a1db5dcd05d9d16 Mon Sep 17 00:00:00 2001 From: Kevin Daudt Date: Mon, 15 May 2023 05:42:25 +0000 Subject: [PATCH] community/postsrsd: fix default config location --- community/postsrsd/APKBUILD | 4 ++-- .../postsrsd/postsrsd-conf-change-defaults.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/community/postsrsd/APKBUILD b/community/postsrsd/APKBUILD index 3c08e27653f..7cda3962980 100644 --- a/community/postsrsd/APKBUILD +++ b/community/postsrsd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kevin Daudt pkgname=postsrsd pkgver=2.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="Postfix Sender Rewriting Scheme daemon" url="https://github.com/roehling/postsrsd" arch="all" @@ -56,7 +56,7 @@ package() { sha512sums=" 59e1f6c06fa483332f26d478cf37201becf7075a6e24809acfa66dc268d1e1ce4554ca6c36d3ae7ed1dd4da9559ef9c50a1eb8863ec17aa3c536ee2ea4d477ec postsrsd-2.0.4.tar.gz -99c6685b6a5488572ce8ba2ba5c21fcfc1ad3850655e4e9a907a07d7f47d2000917932afa345e02405d5266b00de489858d5af7b13edd9031f65fe3f05a46eae postsrsd-conf-change-defaults.patch +7bd2525c96a1270c7484282efec502acc58fc9dea0e3f31595eb6a33f17c39645ea02e7a36b528078cfc599a5296cce5ca6a81744cef159e49d5e6827171b69b postsrsd-conf-change-defaults.patch 4b871700d7aebfe21bcd13e5f57b1c2ea27902d827c64027b4d36971ba4d2bb8b4bc144b0f5bd9baf75ff47bb3aba562c9fff517cbb11475bbc35b5137542806 cmake-dont-install-systemdfile.patch 213a45f07de7f45ddbfaa905a80682ac7a9762d6f0c62b11101aaeee07a7ffe802a392dc1a97389adfed7ca16e8268ad0dc20e99b8501a9a7c21736dca79a7e1 postsrsd.initd " diff --git a/community/postsrsd/postsrsd-conf-change-defaults.patch b/community/postsrsd/postsrsd-conf-change-defaults.patch index 327615329bb..bb1635d3994 100644 --- a/community/postsrsd/postsrsd-conf-change-defaults.patch +++ b/community/postsrsd/postsrsd-conf-change-defaults.patch @@ -20,3 +20,18 @@ index fd3ecba..f93d478 100644 # SRS tag separator # This is the character following the initial SRS0 or SRS1 tag of a generated +diff --git a/src/postsrsd_build_config.h.in b/src/postsrsd_build_config.h.in +index f2d89b7..15e9d2e 100644 +--- a/src/postsrsd_build_config.h.in ++++ b/src/postsrsd_build_config.h.in +@@ -20,8 +20,8 @@ + /* clang-format off */ + #define POSTSRSD_VERSION "@PROJECT_VERSION@" + #define SIZEOF_UNSIGNED_LONG @SIZEOF_UNSIGNED_LONG@ +-#define DEFAULT_CONFIG_FILE "@CMAKE_INSTALL_FULL_SYSCONFDIR@/@PROJECT_NAME@.conf" +-#define DEFAULT_SECRETS_FILE "@CMAKE_INSTALL_FULL_SYSCONFDIR@/@PROJECT_NAME@.secret" ++#define DEFAULT_CONFIG_FILE "@CMAKE_INSTALL_FULL_SYSCONFDIR@/@PROJECT_NAME@/@PROJECT_NAME@.conf" ++#define DEFAULT_SECRETS_FILE "@CMAKE_INSTALL_FULL_SYSCONFDIR@/@PROJECT_NAME@/@PROJECT_NAME@.secret" + #define DEFAULT_CHROOT_DIR "@POSTSRSD_CHROOTDIR@" + #define DEFAULT_POSTSRSD_USER "@POSTSRSD_USER@" + /* clang-format on */