From owner-svn-ports-head@freebsd.org Thu Apr 30 15:16:55 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 80DB62C05A7; Thu, 30 Apr 2020 15:16:55 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Cf9z2qtyz3Bpl; Thu, 30 Apr 2020 15:16:55 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5C35820DB9; Thu, 30 Apr 2020 15:16:55 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03UFGtu6071944; Thu, 30 Apr 2020 15:16:55 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03UFGsjB071941; Thu, 30 Apr 2020 15:16:54 GMT (envelope-from flo@FreeBSD.org) Message-Id: <202004301516.03UFGsjB071941@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Thu, 30 Apr 2020 15:16:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533462 - in head/mail/postsrsd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: flo X-SVN-Commit-Paths: in head/mail/postsrsd: . files X-SVN-Commit-Revision: 533462 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2020 15:16:55 -0000 Author: flo Date: Thu Apr 30 15:16:54 2020 New Revision: 533462 URL: https://svnweb.freebsd.org/changeset/ports/533462 Log: Update to 1.6 PR: 246037 Submitted by: Krzysztof Modified: head/mail/postsrsd/Makefile head/mail/postsrsd/distinfo head/mail/postsrsd/files/patch-CMakeLists.txt Modified: head/mail/postsrsd/Makefile ============================================================================== --- head/mail/postsrsd/Makefile Thu Apr 30 15:15:28 2020 (r533461) +++ head/mail/postsrsd/Makefile Thu Apr 30 15:16:54 2020 (r533462) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postsrsd -PORTVERSION= 1.5 +PORTVERSION= 1.6 CATEGORIES= mail MAINTAINER= ports@bsdserwis.com Modified: head/mail/postsrsd/distinfo ============================================================================== --- head/mail/postsrsd/distinfo Thu Apr 30 15:15:28 2020 (r533461) +++ head/mail/postsrsd/distinfo Thu Apr 30 15:16:54 2020 (r533462) @@ -1,3 +1,3 @@ TIMESTAMP = 1488207086 -SHA256 (roehling-postsrsd-1.5_GH0.tar.gz) = 418e2d239cc4c70e4877f6c63ded7edb3e89a52147e59c702f49b6cb96c45b07 -SIZE (roehling-postsrsd-1.5_GH0.tar.gz) = 32019 +SHA256 (roehling-postsrsd-1.6_GH0.tar.gz) = c7db909ec0e326cc92b624d1776ce96acc8bc1637bae532c4bd981168118aa13 +SIZE (roehling-postsrsd-1.6_GH0.tar.gz) = 32111 Modified: head/mail/postsrsd/files/patch-CMakeLists.txt ============================================================================== --- head/mail/postsrsd/files/patch-CMakeLists.txt Thu Apr 30 15:15:28 2020 (r533461) +++ head/mail/postsrsd/files/patch-CMakeLists.txt Thu Apr 30 15:16:54 2020 (r533462) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2019-01-11 15:10:33 UTC +--- CMakeLists.txt.orig 2019-02-23 13:28:34 UTC +++ CMakeLists.txt -@@ -9,12 +9,15 @@ include(CheckIncludeFile) +@@ -6,12 +6,15 @@ include(TestBigEndian) option(GENERATE_SRS_SECRET "Generate a random SRS secret if none exists during install" ON) option(USE_APPARMOR "Enable AppArmor profile" OFF) @@ -17,21 +17,21 @@ 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) -@@ -22,8 +25,6 @@ find_program(HELP2MAN help2man DOC "path +@@ -19,8 +22,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(SYSTEMD systemd) find_library(LIBSOCKET socket) find_library(LIBNSL nsl) +@@ -65,26 +66,6 @@ endif() + check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG) + add_definitions(-DSIZEOF_UNSIGNED_LONG=${SIZEOF_UNSIGNED_LONG}) -@@ -60,26 +61,6 @@ if(HAVE_SYS_TYPES_H) - add_definitions(-DHAVE_SYS_TYPES_H) - endif() - -if(NOT DEFINED INIT_FLAVOR) -- if(IS_DIRECTORY "${SYSD_UNIT_DIR}" AND EXISTS "/usr/lib/systemd/systemd") +- if(SYSTEMD) - message(STATUS "Detected init flavor: systemd") - set(INIT_FLAVOR "systemd" CACHE STRING "Init daemon of this system") - elseif(IS_DIRECTORY "${SYSCONF_DIR}/init" AND EXISTS "/lib/init/upstart-job") @@ -53,10 +53,10 @@ add_executable(${PROJECT_NAME} postsrsd.c sha1.c srs2.c) enable_testing() add_executable(${PROJECT_NAME}_tests tests.c sha1.c srs2.c) -@@ -92,15 +73,7 @@ endif() - - get_target_property(POSTSRSD ${PROJECT_NAME} LOCATION) - get_filename_component(POSTSRSD ${POSTSRSD} NAME_WE) +@@ -95,15 +76,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") + target_link_libraries(${PROJECT_NAME}_tests ${LIBSOCKET} ${LIBNSL}) + 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}") @@ -69,7 +69,7 @@ configure_file(init/${PROJECT_NAME}.default.in ${PROJECT_NAME}.default @ONLY) configure_file(postinstall.cmake.in postinstall.cmake @ONLY) -@@ -110,7 +83,7 @@ add_custom_command(TARGET ${PROJECT_NAME +@@ -113,7 +86,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 ) @@ -78,7 +78,7 @@ endif() if(USE_APPARMOR) -@@ -127,6 +100,8 @@ if(USE_SELINUX) +@@ -130,6 +103,8 @@ if(USE_SELINUX) endif() install(TARGETS ${PROJECT_NAME} DESTINATION "sbin")