Date: Wed, 9 Aug 2023 13:04:47 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 06c06ad9fa8d - main - mail/postsrsd: update to 2.0.6 Message-ID: <202308091304.379D4lTk090570@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=06c06ad9fa8d2594adf5a5fe7120c623c48dd90a commit 06c06ad9fa8d2594adf5a5fe7120c623c48dd90a Author: Krzysztof <ports@bsdserwis.com> AuthorDate: 2023-08-08 08:46:41 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-08-09 13:01:35 +0000 mail/postsrsd: update to 2.0.6 Changelog: https://github.com/roehling/postsrsd/releases/tag/2.0.6 PR: 273002 --- mail/postsrsd/Makefile | 32 ++++-- mail/postsrsd/distinfo | 6 +- mail/postsrsd/files/patch-CMakeLists.txt | 144 ++++++++++++------------- mail/postsrsd/files/patch-postinstall.cmake.in | 69 ------------ mail/postsrsd/files/patch-src_config.c | 10 ++ mail/postsrsd/files/patch-src_milter.c | 10 ++ mail/postsrsd/files/patch-src_srs.c | 10 ++ mail/postsrsd/files/patch-src_srs2.c | 10 ++ mail/postsrsd/files/patch-src_util.c | 10 ++ 9 files changed, 142 insertions(+), 159 deletions(-) diff --git a/mail/postsrsd/Makefile b/mail/postsrsd/Makefile index e5d18c465489..85d67c883672 100644 --- a/mail/postsrsd/Makefile +++ b/mail/postsrsd/Makefile @@ -1,34 +1,44 @@ PORTNAME= postsrsd -PORTVERSION= 1.10 +DISTVERSION= 2.0.6 CATEGORIES= mail MAINTAINER= ports@bsdserwis.com COMMENT= Postfix Sender Rewriting Scheme daemon WWW= https://github.com/roehling/postsrsd -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE= BSD3CLAUSE GPLv3+ +LICENSE_COMB= dual -BUILD_DEPENDS= help2man:misc/help2man +LIB_DEPENDS= libconfuse.so:devel/libconfuse USES= cmake cpe pkgconfig +USE_LDCONFIG= yes + CPE_VENDOR= ${PORTNAME}_project USE_GITHUB= yes GH_ACCOUNT= roehling USE_RC_SUBR= ${PORTNAME} +OPTIONS_DEFINE= DOCS REDIS + +DOCS_CMAKE_BOOL= ENABLE_DOCS + +REDIS_DESC= Store envelope senders in redis +REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis +REDIS_CMAKE_BOOL= WITH_REDIS + CMAKE_ARGS= --no-warn-unused-cli \ + -DBUILD_TESTING=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS \ -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \ -DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib" -PLIST_FILES= man/man8/postsrsd.8.gz \ - sbin/postsrsd - -PORTDOCS= README.md README_UPGRADE.md main.cf.ex +PLIST_FILES= \ + sbin/postsrsd \ + ${LOCALBASE}/etc/${PORTNAME}.secret -OPTIONS_DEFINE= DOCS - -DOCS_CMAKE_BOOL= ENABLE_DOCS +PORTDOCS= README.rst CHANGELOG.rst postsrsd.conf .include <bsd.port.mk> diff --git a/mail/postsrsd/distinfo b/mail/postsrsd/distinfo index 9957be2425e4..1bb8d40c1eb7 100644 --- a/mail/postsrsd/distinfo +++ b/mail/postsrsd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488207086 -SHA256 (roehling-postsrsd-1.10_GH0.tar.gz) = 4880bf12f1a75791f10a995e46a7fce26ee760d1d6942b4602244d2026d4e64a -SIZE (roehling-postsrsd-1.10_GH0.tar.gz) = 34844 +TIMESTAMP = 1690572136 +SHA256 (roehling-postsrsd-2.0.6_GH0.tar.gz) = 4f45695e208b349dfebd182f48a95b8646781cfe68ae81ecbbee889897a5ec80 +SIZE (roehling-postsrsd-2.0.6_GH0.tar.gz) = 61894 diff --git a/mail/postsrsd/files/patch-CMakeLists.txt b/mail/postsrsd/files/patch-CMakeLists.txt index c4e43dfaf237..954083d1fa8e 100644 --- a/mail/postsrsd/files/patch-CMakeLists.txt +++ b/mail/postsrsd/files/patch-CMakeLists.txt @@ -1,88 +1,80 @@ ---- CMakeLists.txt.orig 2020-12-12 09:55:17 UTC +--- CMakeLists.txt.orig 2023-07-15 18:53:41 UTC +++ CMakeLists.txt -@@ -7,12 +7,15 @@ include(CTest) +@@ -55,6 +55,7 @@ option(WITH_REDIS + ) + add_feature_info(WITH_REDIS WITH_REDIS "use Redis as database backend") - option(GENERATE_SRS_SECRET "Generate a random SRS secret if none exists during install" ON) - option(USE_APPARMOR "Enable AppArmor profile" OFF) +option(MK_CHROOT_DIR "Chroot jail for daemon" OFF) - option(USE_SELINUX "Enable SELinux policy module" OFF) - + option(TESTS_WITH_ASAN "Run test suite with AddressSanitizer" ON) + option(GENERATE_SRS_SECRET "Generate and install a postsrsd.secret" ON) + add_feature_info( +@@ -71,15 +72,13 @@ set(POSTSRSD_DATADIR + "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/${PROJECT_NAME}" + CACHE PATH "The default directory where PostSRSd should put runtime data" + ) ++set(DOC_DIR "share/doc/${PROJECT_NAME}" CACHE PATH "Path for documentation files") +if(MK_CHROOT_DIR) - set(CHROOT_DIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}" CACHE PATH "Chroot jail for daemon") + set(POSTSRSD_CHROOTDIR + "${POSTSRSD_DATADIR}" + CACHE PATH "The default chroot directory where PostSRSd should jail itself" + ) +-find_systemd_unit_destination(DETECTED_SYSTEMD_UNITDIR) +-set(SYSTEMD_UNITDIR +- "${DETECTED_SYSTEMD_UNITDIR}" +- CACHE PATH "Install destination for systemd service unit" +-) +endif() - set(SYSCONF_DIR "/etc" CACHE PATH "Global system configuration folder") - set(SYSD_UNIT_DIR "${SYSCONF_DIR}/systemd/system" CACHE PATH "Systemd unit file folder") --set(CONFIG_DIR "${SYSCONF_DIR}/default" CACHE PATH "Location of startup configuration file") -+set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Location of startup configuration file") - set(DOC_DIR "share/doc/${PROJECT_NAME}" CACHE PATH "Path for documentation files") - mark_as_advanced(CHROOT_DIR SYSCONF_DIR SYSD_UNIT_DIR CONFIG_DIR DOC_DIR) - -@@ -20,8 +23,6 @@ find_program(HELP2MAN help2man DOC "path to help2man e - find_program(DD dd DOC "path to dd executable") - find_program(BASE64 base64 DOC "path to base64 executable") - find_program(OPENSSL openssl DOC "path to OpenSSL executable") --find_program(INSSERV insserv DOC "path to insserv executable") --find_program(CHKCONFIG chkconfig DOC "path to chkconfig executable") - find_program(SYSTEMCTL systemctl DOC "path to systemctl executable") - - if(CMAKE_SYSTEM_NAME MATCHES "SunOS") -@@ -69,23 +70,6 @@ endif() - check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG) - add_definitions(-DSIZEOF_UNSIGNED_LONG=${SIZEOF_UNSIGNED_LONG}) --if(NOT DEFINED INIT_FLAVOR) -- if(SYSTEMCTL) -- message(STATUS "Detected init flavor: systemd") -- set(INIT_FLAVOR "systemd" CACHE STRING "Init daemon of this system") -- elseif(IS_DIRECTORY "${SYSCONF_DIR}/init.d" AND EXISTS "${SYSCONF_DIR}/init.d/functions") -- message(STATUS "Detected init flavor: sysv-redhat") -- set(INIT_FLAVOR "sysv-redhat" CACHE STRING "Init daemon of this system") -- elseif(IS_DIRECTORY "${SYSCONF_DIR}/init.d" AND EXISTS "/lib/lsb/init-functions") -- message(STATUS "Detected init flavor: sysv-lsb") -- set(INIT_FLAVOR "sysv-lsb" CACHE STRING "Init daemon of this system") -- else() -- message(STATUS "Detected init flavor: none") -- message(STATUS "System startup files will not be installed") -- set(INIT_FLAVOR "" CACHE STRING "Init daemon of this system") -- endif() --endif() -- - add_definitions(-DPOSTSRSD_VERSION=\"${PROJECT_VERSION}\") - add_executable(${PROJECT_NAME} postsrsd.c sha1.c srs2.c) - -@@ -95,16 +79,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "SunOS") - endif() - - set(POSTSRSD "${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}") --set(APPARMOR_PROFILE "${CMAKE_INSTALL_PREFIX}/sbin/${POSTSRSD}") --string(REGEX REPLACE "^/+" "" APPARMOR_PROFILE "${APPARMOR_PROFILE}") --string(REPLACE "/" "." APPARMOR_PROFILE "${APPARMOR_PROFILE}") + if(POSTSRSD_CHROOTDIR) + file(RELATIVE_PATH CHROOTABLE_DATADIR "${POSTSRSD_CHROOTDIR}" +@@ -105,7 +104,6 @@ mark_as_advanced( + POSTSRSD_USER + POSTSRSD_DATADIR + POSTSRSD_CHROOTDIR +- SYSTEMD_UNITDIR + ) --configure_file(init/${PROJECT_NAME}.sysv-lsb.in ${PROJECT_NAME}.sysv-lsb @ONLY) --configure_file(init/${PROJECT_NAME}.sysv-redhat.in ${PROJECT_NAME}.sysv-redhat @ONLY) --configure_file(init/${PROJECT_NAME}.apparmor.in ${PROJECT_NAME}.apparmor @ONLY) --configure_file(init/${PROJECT_NAME}.systemd.in ${PROJECT_NAME}.systemd @ONLY) - configure_file(init/${PROJECT_NAME}.default.in ${PROJECT_NAME}.default @ONLY) --configure_file(init/${PROJECT_NAME}-systemd-launcher.in ${PROJECT_NAME}-systemd-launcher @ONLY) + FetchContent_Declare( +@@ -181,11 +179,7 @@ endif() + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads QUIET) - configure_file(postinstall.cmake.in postinstall.cmake @ONLY) +-add_autotools_dependency( +- Confuse +- LIBRARY_NAME confuse +- EXPORTED_TARGET Confuse::Confuse +-) ++find_package(Confuse REQUIRED) -@@ -118,7 +94,7 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD - COMMAND ${HELP2MAN} ARGS -s8 -o${PROJECT_NAME}.8 -n "Postfix Sender Rewriting Scheme daemon" -N -h-h -v-v ${CMAKE_CURRENT_BINARY_DIR}/${POSTSRSD} - VERBATIM + if(WITH_REDIS) + set(DISABLE_TESTS +@@ -202,6 +196,7 @@ if(WITH_REDIS) + DIRECTORY "${hiredis_SOURCE_DIR}" PROPERTY EXCLUDE_FROM_ALL TRUE + ) + endif() ++ find_package(Hiredis REQUIRED) + if(TARGET hiredis::hiredis_static) + set(HIREDIS_TARGET hiredis::hiredis_static) + elseif(TARGET hiredis::hiredis) +@@ -315,7 +310,7 @@ target_compile_features(postsrsd PRIVATE c_std_99) + target_link_libraries( + postsrsd + PRIVATE Confuse::Confuse +- $<$<BOOL:${WITH_SQLITE}>:sqlite3::sqlite3> ++ $<$<BOOL:${WITH_SQLITE}>:sqlite3> + $<$<BOOL:${WITH_REDIS}>:${HIREDIS_TARGET}> + $<$<BOOL:${WITH_MILTER}>:LibMilter::LibMilter> + ${LIBSOCKET} +@@ -335,9 +330,9 @@ install(TARGETS postsrsd RUNTIME DESTINATION ${CMAKE_I + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.conf" + DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/${PROJECT_NAME}" ) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.8 DESTINATION "share/man/man8") -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.8 DESTINATION "man/man8") - endif() - - if(USE_APPARMOR) -@@ -135,6 +111,8 @@ if(USE_SELINUX) - endif() - - install(TARGETS ${PROJECT_NAME} DESTINATION "sbin") --install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-systemd-launcher DESTINATION "share/${PROJECT_NAME}") +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.service" +- DESTINATION "${SYSTEMD_UNITDIR}" +-) +if(ENABLE_DOCS) -+ install(FILES README.md README_UPGRADE.md main.cf.ex DESTINATION "${DOC_DIR}") ++ install(FILES README.rst CHANGELOG.rst doc/postsrsd.conf DESTINATION "${DOC_DIR}" ) +endif() - install(FILES README.md README_UPGRADE.md main.cf.ex DESTINATION "${DOC_DIR}") - install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/postinstall.cmake") + + if(GENERATE_SRS_SECRET) + find_program(DD dd DOC "path to dd executable") diff --git a/mail/postsrsd/files/patch-postinstall.cmake.in b/mail/postsrsd/files/patch-postinstall.cmake.in deleted file mode 100644 index 91b345d09cf8..000000000000 --- a/mail/postsrsd/files/patch-postinstall.cmake.in +++ /dev/null @@ -1,69 +0,0 @@ ---- postinstall.cmake.in.orig 2015-12-13 08:56:05 UTC -+++ postinstall.cmake.in -@@ -1,4 +1,3 @@ --set(GENERATE_SRS_SECRET "@GENERATE_SRS_SECRET@") - set(SYSCONF_DIR "@SYSCONF_DIR@") - set(SYSD_UNIT_DIR "@SYSD_UNIT_DIR@") - set(CHROOT_DIR "@CHROOT_DIR@") -@@ -7,51 +6,13 @@ set(INIT_FLAVOR "@INIT_FLAVOR@") - set(SECRET_FILE "@PROJECT_NAME@.secret") - set(DD "@DD@") - set(BASE64_ENCODE "@BASE64_ENCODE@") --set(INSSERV "@INSSERV@") --set(CHKCONFIG "@CHKCONFIG@") - - if(CHROOT_DIR AND NOT EXISTS "$ENV{DESTDIR}${CHROOT_DIR}") - message(STATUS "Chroot jail: $ENV{DESTDIR}${CHROOT_DIR}") - file(MAKE_DIRECTORY "$ENV{DESTDIR}${CHROOT_DIR}") - endif() - --if(INIT_FLAVOR) -- if (NOT EXISTS "$ENV{DESTDIR}${CONFIG_DIR}/@PROJECT_NAME@") -- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.default" DESTINATION "${CONFIG_DIR}" RENAME "@PROJECT_NAME@") -- else() -- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.default" DESTINATION "${CONFIG_DIR}" RENAME "@PROJECT_NAME@.new") -- message(STATUS "") -- message(STATUS "*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*") -- message(STATUS "*!* ${CONFIG_DIR}/@PROJECT_NAME@ will NOT be overwritten!") -- message(STATUS "*!* Please note the changes from @PROJECT_NAME@.new in the same folder and") -- message(STATUS "*!* update your configuration accordinly.") -- message(STATUS "*!* See also README_UPGRADE.md for details") -- message(STATUS "*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*") -- message(STATUS "") -- endif() --endif() -- --if(INIT_FLAVOR STREQUAL "sysv-lsb") -- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.sysv-lsb" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@") -- if(INSSERV) -- execute_process( -- COMMAND ${INSSERV} -p "$ENV{DESTDIR}${SYSCONF_DIR}/init.d" @PROJECT_NAME@ -- ) -- endif() --elseif(INIT_FLAVOR STREQUAL "sysv-redhat") -- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.sysv-redhat" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@") -- if(CHKCONFIG AND NOT "$ENV{DESTDIR}") -- execute_process( -- COMMAND ${CHKCONFIG} --add @PROJECT_NAME@ -- ) -- endif() --elseif(INIT_FLAVOR STREQUAL "upstart") -- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.upstart" DESTINATION "${SYSCONF_DIR}/init" RENAME "@PROJECT_NAME@.conf") --elseif(INIT_FLAVOR STREQUAL "systemd") -- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.systemd" DESTINATION "${SYSD_UNIT_DIR}" RENAME "@PROJECT_NAME@.service") --endif() -- --if(GENERATE_SRS_SECRET AND DD AND BASE64_ENCODE AND EXISTS "/dev/urandom" AND NOT EXISTS "$ENV{DESTDIR}${SYSCONF_DIR}/${SECRET_FILE}") -+if(GENERATE_SRS_SECRET AND DD AND BASE64_ENCODE AND EXISTS "/dev/urandom") - message(STATUS "Generating secret key") - execute_process( - COMMAND ${DD} if=/dev/urandom bs=18 count=1 -@@ -60,7 +21,7 @@ if(GENERATE_SRS_SECRET AND DD AND BASE64 - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE - ) --file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "${SYSCONF_DIR}" RENAME "${SECRET_FILE}" PERMISSIONS OWNER_READ OWNER_WRITE) -+file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "${CONFIG_DIR}" RENAME "${SECRET_FILE}" PERMISSIONS OWNER_READ OWNER_WRITE) - file(REMOVE "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}") - endif() - diff --git a/mail/postsrsd/files/patch-src_config.c b/mail/postsrsd/files/patch-src_config.c new file mode 100644 index 000000000000..9373b010cad3 --- /dev/null +++ b/mail/postsrsd/files/patch-src_config.c @@ -0,0 +1,10 @@ +--- src/config.c.orig 2023-07-15 18:53:41 UTC ++++ src/config.c +@@ -21,6 +21,7 @@ + #include "util.h" + + #include <errno.h> ++#include <getopt.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> diff --git a/mail/postsrsd/files/patch-src_milter.c b/mail/postsrsd/files/patch-src_milter.c new file mode 100644 index 000000000000..e62eebab4b69 --- /dev/null +++ b/mail/postsrsd/files/patch-src_milter.c @@ -0,0 +1,10 @@ +--- src/milter.c.orig 2023-07-15 18:53:41 UTC ++++ src/milter.c +@@ -33,6 +33,7 @@ + # include <unistd.h> + # endif + # include <string.h> ++# include <strings.h> + + static char* milter_uri = NULL; + static char* milter_path = NULL; diff --git a/mail/postsrsd/files/patch-src_srs.c b/mail/postsrsd/files/patch-src_srs.c new file mode 100644 index 000000000000..9472800e6613 --- /dev/null +++ b/mail/postsrsd/files/patch-src_srs.c @@ -0,0 +1,10 @@ +--- src/srs.c.orig 2023-07-15 18:53:41 UTC ++++ src/srs.c +@@ -21,6 +21,7 @@ + + #include <ctype.h> + #include <string.h> ++#include <strings.h> + + char* postsrsd_forward(const char* addr, const char* domain, srs_t* srs, + database_t* db, domain_set_t* local_domains, bool* error, diff --git a/mail/postsrsd/files/patch-src_srs2.c b/mail/postsrsd/files/patch-src_srs2.c new file mode 100644 index 000000000000..c2998fab85fb --- /dev/null +++ b/mail/postsrsd/files/patch-src_srs2.c @@ -0,0 +1,10 @@ +--- src/srs2.c.orig 2023-07-15 18:53:41 UTC ++++ src/srs2.c +@@ -21,6 +21,7 @@ + #include <postsrsd_build_config.h> + #include <stdarg.h> + #include <string.h> /* memcpy, strcpy, memset */ ++#include <strings.h> + #ifdef HAVE_ALLOCA_H + # include <alloca.h> + #endif diff --git a/mail/postsrsd/files/patch-src_util.c b/mail/postsrsd/files/patch-src_util.c new file mode 100644 index 000000000000..f4fd936dfda0 --- /dev/null +++ b/mail/postsrsd/files/patch-src_util.c @@ -0,0 +1,10 @@ +--- src/util.c.orig 2023-07-15 18:53:41 UTC ++++ src/util.c +@@ -23,6 +23,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <strings.h> + #ifdef HAVE_FCNTL_H + # include <fcntl.h> + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308091304.379D4lTk090570>