git: 2acb1f5ec43f - 2026Q4 - mail/postsrsd: Update 2.0.11 => 2.4.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Fri, 16 Oct 2026 02:13:34 UTC
The branch 2026Q4 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2acb1f5ec43f378b870b6716dfe0ba8f31299af3

commit 2acb1f5ec43f378b870b6716dfe0ba8f31299af3
Author:     Krzysztof <ports@bsdserwis.com>
AuthorDate: 2026-10-16 02:09:37 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-10-16 02:13:29 +0000

    mail/postsrsd: Update 2.0.11 => 2.4.1
    
    Changelog:
    https://github.com/roehling/postsrsd/releases/tag/2.0.12
    https://github.com/roehling/postsrsd/releases/tag/2.1.0
    https://github.com/roehling/postsrsd/releases/tag/2.2.0
    https://github.com/roehling/postsrsd/releases/tag/2.2.1
    https://github.com/roehling/postsrsd/releases/tag/2.2.2
    https://github.com/roehling/postsrsd/releases/tag/2.2.3
    https://github.com/roehling/postsrsd/releases/tag/2.2.4
    https://github.com/roehling/postsrsd/releases/tag/2.2.5
    https://github.com/roehling/postsrsd/releases/tag/2.2.6
    https://github.com/roehling/postsrsd/releases/tag/2.2.7
    https://github.com/roehling/postsrsd/releases/tag/2.3.0
    https://github.com/roehling/postsrsd/releases/tag/2.4.0
    https://github.com/roehling/postsrsd/releases/tag/2.4.1
    
    PR:             299414
    Sponsored by:   UNIS Labs (vvd, commit patch)
    MFH:            2026Q4
    
    (cherry picked from commit 6316fc2afe9b0485ee8a39b147ac2264ae1612f3)
---
 mail/postsrsd/Makefile                   |  6 +--
 mail/postsrsd/distinfo                   |  6 +--
 mail/postsrsd/files/patch-CMakeLists.txt | 66 +++++++++++++++-----------------
 mail/postsrsd/files/patch-src_config.c   |  8 ++--
 4 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/mail/postsrsd/Makefile b/mail/postsrsd/Makefile
index a10067746a7a..c8f7a553a82f 100644
--- a/mail/postsrsd/Makefile
+++ b/mail/postsrsd/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	postsrsd
-DISTVERSION=	2.0.11
-PORTREVISION=	1
+DISTVERSION=	2.4.1
 PORTEPOCH=	1
 CATEGORIES=	mail
 
@@ -51,9 +50,6 @@ SQLITE_DESC=	Use sqlite3 backebd for storing envelope senders
 SQLITE_USES=	sqlite
 SQLITE_CMAKE_BOOL=	WITH_SQLITE
 
-post-patch:
-		${REINPLACE_CMD} -e '/^chroot-dir/ s/^/#/' ${WRKSRC}/doc/postsrsd.conf
-
 post-install:
 		${INSTALL_DATA} ${WRKSRC}/doc/postsrsd.conf ${STAGEDIR}${PREFIX}/etc/postsrsd.conf.sample
 		${MKDIR} ${STAGEDIR}/var/run/${PORTNAME}
diff --git a/mail/postsrsd/distinfo b/mail/postsrsd/distinfo
index e940bb162bdf..b83c96a3f1da 100644
--- a/mail/postsrsd/distinfo
+++ b/mail/postsrsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745237953
-SHA256 (roehling-postsrsd-2.0.11_GH0.tar.gz) = 49e3699f30f6f5f92b34da931c525c8f1e3e93c00be2c11d64329eea1d428d14
-SIZE (roehling-postsrsd-2.0.11_GH0.tar.gz) = 64995
+TIMESTAMP = 1791319877
+SHA256 (roehling-postsrsd-2.4.1_GH0.tar.gz) = 77baf13fd39af9faa389c97f4156e0f0e050c0f3617e26fda062060ab0b2f820
+SIZE (roehling-postsrsd-2.4.1_GH0.tar.gz) = 91791
diff --git a/mail/postsrsd/files/patch-CMakeLists.txt b/mail/postsrsd/files/patch-CMakeLists.txt
index 067187f36c7c..c363fc77f743 100644
--- a/mail/postsrsd/files/patch-CMakeLists.txt
+++ b/mail/postsrsd/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2023-08-25 21:10:07 UTC
+--- CMakeLists.txt.orig	2026-08-12 08:28:49 UTC
 +++ CMakeLists.txt
-@@ -49,7 +49,7 @@ set(POSTSRSD_CONFIGDIR
+@@ -42,7 +42,7 @@ set(POSTSRSD_DATADIR
          "The default directory where PostSRSd should look for configuration files"
  )
  set(POSTSRSD_DATADIR
@@ -9,14 +9,19 @@
      CACHE PATH "The default directory where PostSRSd should put runtime data"
  )
  set(POSTSRSD_CHROOTDIR
-@@ -73,24 +73,21 @@ option(WITH_REDIS
+@@ -66,6 +66,8 @@ add_feature_info(WITH_REDIS WITH_REDIS "use Redis as d
         OFF
  )
  add_feature_info(WITH_REDIS WITH_REDIS "use Redis as database backend")
 +set(DOC_DIR "share/doc/${PROJECT_NAME}" CACHE PATH "Path for documentation files")
 +option(MK_CHROOT_DIR "Chroot jail for daemon" OFF)
- option(TESTS_WITH_ASAN "Run test suite with AddressSanitizer" ON)
- option(DEVELOPER_BUILD "Add strict compiler options for development only" OFF)
+ option(WITH_SECCOMP "Enable additional sandboxing with seccomp" OFF)
+ add_feature_info(
+     WITH_SECCOMP WITH_SECCOMP "use seccomp for additional sandboxing"
+@@ -90,13 +92,13 @@ option(EXECUTABLE_WITH_ASAN "Build PostSRSd executable
+ option(EXECUTABLE_WITH_ASAN "Build PostSRSd executable with AddressSanitizer"
+        OFF
+ )
 -option(GENERATE_SRS_SECRET "Generate and install a postsrsd.secret" ON)
 +option(GENERATE_SRS_SECRET "Generate and install a postsrsd.secret" OFF)
  add_feature_info(
@@ -29,6 +34,9 @@
  add_feature_info(
      INSTALL_SYSTEMD_SERVICE INSTALL_SYSTEMD_SERVICE
      "install the systemd postsrsd.service unit"
+@@ -108,11 +110,6 @@ add_feature_info(
+     INSTALL_SYSTEMD_SYSUSERS DO_INSTALL_SYSTEMD_SYSUSERS
+     "instruct systemd to create the PostSRSd user \"${POSTSRSD_USER}\""
  )
 -find_systemd_unit_destination(DETECTED_SYSTEMD_UNITDIR)
 -set(SYSTEMD_UNITDIR
@@ -38,28 +46,7 @@
  find_systemd_sysusers_destination(DETECTED_SYSTEMD_SYSUSERSDIR)
  set(SYSTEMD_SYSUSERSDIR
      "${DETECTED_SYSTEMD_SYSUSERSDIR}"
-@@ -118,7 +115,6 @@ mark_as_advanced(
-     TESTS_WITH_ASAN
-     GENERATE_SRS_SECRET
-     DEVELOPER_BUILD
--    SYSTEMD_UNITDIR
-     POSTSRSD_CONFIGDIR
-     POSTSRSD_CHROOTDIR
-     POSTSRSD_DATADIR
-@@ -200,11 +196,7 @@ endif()
- set(THREADS_PREFER_PTHREAD_FLAG TRUE)
- find_package(Threads QUIET)
- 
--add_autotools_dependency(
--    Confuse
--    LIBRARY_NAME confuse
--    EXPORTED_TARGET Confuse::Confuse
--)
-+find_package(Confuse REQUIRED)
- 
- if(WITH_REDIS)
-     set(DISABLE_TESTS
-@@ -221,6 +213,7 @@ if(WITH_REDIS)
+@@ -303,6 +300,7 @@ if(WITH_REDIS)
              DIRECTORY "${hiredis_SOURCE_DIR}" PROPERTY EXCLUDE_FROM_ALL TRUE
          )
      endif()
@@ -67,20 +54,29 @@
      if(TARGET hiredis::hiredis_static)
          set(HIREDIS_TARGET hiredis::hiredis_static)
      elseif(TARGET hiredis::hiredis)
-@@ -364,13 +357,9 @@ install(TARGETS postsrsd RUNTIME DESTINATION ${CMAKE_I
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.conf"
+@@ -342,11 +340,7 @@ if(WITH_SECCOMP)
+ endif()
+ 
+ if(WITH_SECCOMP)
+-    add_autotools_dependency(
+-        seccomp
+-        LIBRARY_NAME seccomp
+-        EXPORTED_TARGET seccomp::seccomp
+-    )
++find_package(Confuse REQUIRED)
+ endif()
+ 
+ configure_file(
+@@ -422,10 +416,8 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_N
          DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/${PROJECT_NAME}"
  )
+ 
 -if(INSTALL_SYSTEMD_SERVICE)
 -    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.service"
 -            DESTINATION "${SYSTEMD_UNITDIR}"
 -    )
--    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sysusers.d/${PROJECT_NAME}.conf"
--            DESTINATION "${SYSTEMD_SYSUSERSDIR}"
--    )
-+
 +if(ENABLE_DOCS)
 +       install(FILES README.rst CHANGELOG.rst doc/postsrsd.conf DESTINATION "${DOC_DIR}" )
  endif()
- 
- if(GENERATE_SRS_SECRET)
+ if(INSTALL_SYSTEMD_SYSUSERS AND NOT POSTSRSD_USER STREQUAL "nobody")
+     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sysusers.d/${PROJECT_NAME}.conf"
diff --git a/mail/postsrsd/files/patch-src_config.c b/mail/postsrsd/files/patch-src_config.c
index 9373b010cad3..60ac15cf2819 100644
--- a/mail/postsrsd/files/patch-src_config.c
+++ b/mail/postsrsd/files/patch-src_config.c
@@ -1,10 +1,10 @@
---- src/config.c.orig	2023-07-15 18:53:41 UTC
+--- src/config.c.orig	2026-08-12 08:28:49 UTC
 +++ src/config.c
-@@ -21,6 +21,7 @@
- #include "util.h"
+@@ -22,6 +22,7 @@
  
+ #include <ctype.h>
  #include <errno.h>
 +#include <getopt.h>
+ #include <pwd.h>
  #include <stdio.h>
  #include <stdlib.h>
- #include <string.h>