Attachment #165377 for bug #206116

View | Details | Raw Unified | Return to bug 206116
Collapse All | Expand All




# $FreeBSD: head/mail/postsrsd/Makefile 385637 2015-05-07 16:32:43Z mat $

PORTNAME=	postsrsd
PORTVERSION=	1.3
PORTREVISION=	1
CATEGORIES=	mail

MAINTAINER=	ports@bsdserwis.com

USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
USE_RC_SUBR=	${PORTNAME}

PORTDOCS=	README.md main.cf.ex README_UPGRADE.md

OPTIONS_DEFINE=	DOCS

DOCS_CMAKE_ON=	-DENABLE_DOCS:STRING="ON"

PLIST_FILES=	sbin/postsrsd man/man8/postsrsd.8.gz etc/postsrsd.secret

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)mail/postsrsd.new/distinfo (-2 / +2 lines)
1	SHA256 (roehling-postsrsd-1.1_GH0.tar.gz) = 1bd8d92e94951cced7eb50f1cd571fb08d2fec627362ceab090393425925a83e	1	SHA256 (roehling-postsrsd-1.3_GH0.tar.gz) = 0f72c41052204a17c35a22a7651430156ca1dbcb98b1bfe48e44ec76248b62fc
2	SIZE (roehling-postsrsd-1.1_GH0.tar.gz) = 24209	2	SIZE (roehling-postsrsd-1.3_GH0.tar.gz) = 26409




--- CMakeLists.txt.orig	2015-12-13 08:56:05 UTC
+++ CMakeLists.txt
@@ -4,11 +4,14 @@ include(CheckIncludeFile)
 
 option(GENERATE_SRS_SECRET "Generate a random SRS secret if none exists during install" ON)
 option(USE_APPARMOR "Enable AppArmor profile" OFF)

 
+if(MK_CHROOT_DIR)
 set(CHROOT_DIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}" CACHE PATH "Chroot jail for daemon")
-set(CONFIG_DIR "/etc/default" CACHE PATH "Location of configuration file")
+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)
 
@@ -16,8 +19,6 @@ find_program(HELP2MAN help2man DOC "path
 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_library(LIBSOCKET socket)
 find_library(LIBNSL nsl)
 
@@ -46,26 +47,6 @@ if(HAVE_TIME_H)
     add_definitions(-DHAVE_TIME_H)
 endif()
 
-if(NOT DEFINED INIT_FLAVOR)
-	if(IS_DIRECTORY "${SYSD_UNIT_DIR}" AND EXISTS "/usr/lib/systemd/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")
-        message(STATUS "Detected init flavor: upstart")
-        set(INIT_FLAVOR "upstart" 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-lsb")
-        set(INIT_FLAVOR "sysv-lsb" CACHE STRING "Init daemon of this system")
-    elseif(IS_DIRECTORY "/etc/init.d" AND EXISTS "/etc/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_executable(${PROJECT_NAME} postsrsd.c sha1.c srs2.c)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
@@ -74,15 +55,7 @@ endif()
 
 get_target_property(POSTSRSD ${PROJECT_NAME} LOCATION)
 get_filename_component(POSTSRSD ${POSTSRSD} NAME_WE)
-set(APPARMOR_PROFILE "${CMAKE_INSTALL_PREFIX}/sbin/${POSTSRSD}")
-string(REGEX REPLACE "^/+" "" APPARMOR_PROFILE "${APPARMOR_PROFILE}")
-string(REPLACE "/" "." APPARMOR_PROFILE "${APPARMOR_PROFILE}")
-
-configure_file(${PROJECT_NAME}.lsb_init.in ${PROJECT_NAME}.lsb_init @ONLY)
-configure_file(${PROJECT_NAME}.rh_init.in ${PROJECT_NAME}.rh_init @ONLY)
-configure_file(${PROJECT_NAME}.upstart.in ${PROJECT_NAME}.upstart @ONLY)
-configure_file(${PROJECT_NAME}.apparmor.in ${PROJECT_NAME}.apparmor @ONLY)
+
 configure_file(postinstall.cmake.in postinstall.cmake @ONLY)
 
-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}.upstart.in ${PROJECT_NAME}.upstart @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(postinstall.cmake.in postinstall.cmake @ONLY)
@@ -92,7 +65,7 @@ add_custom_command(TARGET ${PROJECT_NAME
 	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
 )

 endif()
 
 if(USE_APPARMOR)
@@ -100,6 +73,8 @@ if(USE_APPARMOR)
 endif()
 
 install(TARGETS ${PROJECT_NAME} DESTINATION "sbin")
+if(ENABLE_DOCS)
 install(FILES README.md README_UPGRADE.md main.cf.ex DESTINATION "${DOC_DIR}")
+endif()
 install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/postinstall.cmake")
 




--- postinstall.cmake.in.orig	2015-12-13 08:56:05 UTC
+++ postinstall.cmake.in
@@ -7,51 +7,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@")
 

 	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 +22,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()
 




--- postsrsd.c	2014-01-03 01:01:47.000000000 +0100
+++ postsrsd.c.new	2014-06-18 23:31:33.290651741 +0200
@@ -28,7 +28,7 @@
 #include <pwd.h>
 #include <string.h>
 #include <poll.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <syslog.h>
 
 #ifndef VERSION
@@ -47,7 +47,7 @@
   memset (&hints, 0, sizeof(hints));
   hints.ai_family = family;
   hints.ai_socktype = SOCK_STREAM;
-  hints.ai_flags = AI_ADDRCONFIG | AI_V4MAPPED;
+  hints.ai_flags = AI_ADDRCONFIG;
   err = getaddrinfo(NULL, service, &hints, &addr);
   if (err != 0) {
     fprintf(stderr, "%s: bind_service(%s): %s\n", self, service, gai_strerror(err));

Lines 1-11 Link Here

(-)mail/postsrsd.new/files/patch-srs2.c (-4 / +8 lines)
1	--- srs2.c 2014-01-03 01:01:47.000000000 +0100	1	--- srs2.c.orig 2015-12-13 08:56:05 UTC
2	+++ srs2.c.new 2014-06-17 16:13:45.773381667 +0200	2	+++ srs2.c
3	@@ -21,7 +21,7 @@	3	@@ -21,7 +21,11 @@
4	#include <sys/types.h> /* tyepdefs */	4	#include <sys/types.h> /* tyepdefs */
5	#include <sys/time.h> /* timeval / timezone struct */	5	#include <sys/time.h> /* timeval / timezone struct */
6	#include <string.h> /* memcpy, strcpy, memset */	6	#include <string.h> /* memcpy, strcpy, memset */
7	-#include <alloca.h>	7	-#include <alloca.h>
8	+#include <stdlib.h>	8	+#if defined(__FreeBSD__)
		9	+# include <stdlib.h>
		10	+#else
		11	+# include <alloca.h>
		12	+#endif
9		13
10	#ifdef USE_OPENSSL	14	#ifdef USE_OPENSSL
11	#include <openssl/hmac.h>	15	#include <openssl/hmac.h>

Lines 1-9 Link Here

(-)mail/postsrsd.new/files/patch-srs2.h (-6 / +7 lines)
1	--- srs2.h 2014-01-03 01:01:47.000000000 +0100	1	--- srs2.h.orig 2015-12-13 08:56:05 UTC
2	+++ srs2.h.new 2014-06-17 16:16:22.880373371 +0200	2	+++ srs2.h
3	@@ -20,6 +20,7 @@	3	@@ -23,7 +23,7 @@
4	#include <stdio.h>	4	#ifdef __APPLE__
5	#include <stdlib.h>	5	#include <sys/types.h>
6	#include <ctype.h>	6	#endif
		7	-
7	+#include <time.h>	8	+#include <time.h>
8		9
9	#ifndef __BEGIN_DECLS	10	#ifndef __BEGIN_DECLS

Lines 1-3 Link Here

(-)mail/postsrsd.new/pkg-plist (-3 lines)
1	sbin/postsrsd
2	man/man8/postsrsd.8.gz
3	etc/postsrsd.secret

Return to bug 206116

Lines 2-9 Link Here

(-)mail/postsrsd.new/Makefile (-3 / +4 lines)
2	# $FreeBSD: head/mail/postsrsd/Makefile 385637 2015-05-07 16:32:43Z mat $	2	# $FreeBSD: head/mail/postsrsd/Makefile 385637 2015-05-07 16:32:43Z mat $
3		3
4	PORTNAME= postsrsd	4	PORTNAME= postsrsd
5	PORTVERSION= 1.1	5	PORTVERSION= 1.3
6	PORTREVISION= 1
7	CATEGORIES= mail	6	CATEGORIES= mail
8		7
9	MAINTAINER= ports@bsdserwis.com	8	MAINTAINER= ports@bsdserwis.com
Lines 25-34 Link Here
25	USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}	24	USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
26	USE_RC_SUBR= ${PORTNAME}	25	USE_RC_SUBR= ${PORTNAME}
27		26
28	PORTDOCS= README.md main.cf.ex	27	PORTDOCS= README.md main.cf.ex README_UPGRADE.md
29		28
30	OPTIONS_DEFINE= DOCS	29	OPTIONS_DEFINE= DOCS
31		30
32	DOCS_CMAKE_ON= -DENABLE_DOCS:STRING="ON"	31	DOCS_CMAKE_ON= -DENABLE_DOCS:STRING="ON"
33		32
		33	PLIST_FILES= sbin/postsrsd man/man8/postsrsd.8.gz etc/postsrsd.secret
		34
34	.include <bsd.port.mk>	35	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)mail/postsrsd.new/files/patch-CMakeLists.txt (-24 / +41 lines)
1	--- CMakeLists.txt 2014-01-03 01:01:47.000000000 +0100	1	--- CMakeLists.txt.orig 2015-12-13 08:56:05 UTC
2	+++ CMakeLists.txt.new 2014-06-18 02:01:27.734952000 +0200	2	+++ CMakeLists.txt
3	@@ -3,45 +3,22 @@	3	@@ -4,11 +4,14 @@ include(CheckIncludeFile)
4		4
5	option(GENERATE_SRS_SECRET "Generate a random SRS secret if none exists during install" ON)	5	option(GENERATE_SRS_SECRET "Generate a random SRS secret if none exists during install" ON)
6	option(USE_APPARMOR "Enable AppArmor profile" OFF)	6	option(USE_APPARMOR "Enable AppArmor profile" OFF)
Lines 8-57 Link Here
8		8
9	+if(MK_CHROOT_DIR)	9	+if(MK_CHROOT_DIR)
10	set(CHROOT_DIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}" CACHE PATH "Chroot jail for daemon")	10	set(CHROOT_DIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}" CACHE PATH "Chroot jail for daemon")
11	-set(CONFIG_DIR "/etc/default" CACHE PATH "Location of configuration file")
12	+endif()	11	+endif()
13	+set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Location of configuration file")	12	set(SYSCONF_DIR "/etc" CACHE PATH "Global system configuration folder")
		13	set(SYSD_UNIT_DIR "${SYSCONF_DIR}/systemd/system" CACHE PATH "Systemd unit file folder")
		14	-set(CONFIG_DIR "${SYSCONF_DIR}/default" CACHE PATH "Location of startup configuration file")
		15	+set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Location of startup configuration file")
		16	set(DOC_DIR "share/doc/${PROJECT_NAME}" CACHE PATH "Path for documentation files")
		17	mark_as_advanced(CHROOT_DIR SYSCONF_DIR SYSD_UNIT_DIR CONFIG_DIR DOC_DIR)
14		18
15	find_program(HELP2MAN help2man DOC "path to help2man executable")	19	@@ -16,8 +19,6 @@ find_program(HELP2MAN help2man DOC "path
16	find_program(DD dd DOC "path to dd executable")	20	find_program(DD dd DOC "path to dd executable")
17	find_program(BASE64 base64 DOC "path to base64 executable")	21	find_program(BASE64 base64 DOC "path to base64 executable")
		22	find_program(OPENSSL openssl DOC "path to OpenSSL executable")
18	-find_program(INSSERV insserv DOC "path to insserv executable")	23	-find_program(INSSERV insserv DOC "path to insserv executable")
19	-find_program(CHKCONFIG chkconfig DOC "path to chkconfig executable")	24	-find_program(CHKCONFIG chkconfig DOC "path to chkconfig executable")
20	-	25	find_library(LIBSOCKET socket)
		26	find_library(LIBNSL nsl)
		27
		28	@@ -46,26 +47,6 @@ if(HAVE_TIME_H)
		29	add_definitions(-DHAVE_TIME_H)
		30	endif()
		31
21	-if(NOT DEFINED INIT_FLAVOR)	32	-if(NOT DEFINED INIT_FLAVOR)
22	- if(IS_DIRECTORY "/etc/init" AND EXISTS "/lib/init/upstart-job")	33	- if(IS_DIRECTORY "${SYSD_UNIT_DIR}" AND EXISTS "/usr/lib/systemd/systemd")
		34	- message(STATUS "Detected init flavor: systemd")
		35	- set(INIT_FLAVOR "systemd" CACHE STRING "Init daemon of this system")
		36	- elseif(IS_DIRECTORY "${SYSCONF_DIR}/init" AND EXISTS "/lib/init/upstart-job")
23	- message(STATUS "Detected init flavor: upstart")	37	- message(STATUS "Detected init flavor: upstart")
24	- set(INIT_FLAVOR "upstart" CACHE STRING "Init daemon of this system")	38	- set(INIT_FLAVOR "upstart" CACHE STRING "Init daemon of this system")
25	- elseif(IS_DIRECTORY "/etc/init.d" AND EXISTS "/lib/lsb/init-functions")	39	- elseif(IS_DIRECTORY "${SYSCONF_DIR}/init.d" AND EXISTS "${SYSCONF_DIR}/init.d/functions")
26	- message(STATUS "Detected init flavor: sysv-lsb")
27	- set(INIT_FLAVOR "sysv-lsb" CACHE STRING "Init daemon of this system")
28	- elseif(IS_DIRECTORY "/etc/init.d" AND EXISTS "/etc/init.d/functions")
29	- message(STATUS "Detected init flavor: sysv-redhat")	40	- message(STATUS "Detected init flavor: sysv-redhat")
30	- set(INIT_FLAVOR "sysv-redhat" CACHE STRING "Init daemon of this system")	41	- set(INIT_FLAVOR "sysv-redhat" CACHE STRING "Init daemon of this system")
		42	- elseif(IS_DIRECTORY "${SYSCONF_DIR}/init.d" AND EXISTS "/lib/lsb/init-functions")
		43	- message(STATUS "Detected init flavor: sysv-lsb")
		44	- set(INIT_FLAVOR "sysv-lsb" CACHE STRING "Init daemon of this system")
31	- else()	45	- else()
32	- message(STATUS "Detected init flavor: none")	46	- message(STATUS "Detected init flavor: none")
33	- message(STATUS "System startup files will not be installed")	47	- message(STATUS "System startup files will not be installed")
34	- set(INIT_FLAVOR "" CACHE STRING "Init daemon of this system")	48	- set(INIT_FLAVOR "" CACHE STRING "Init daemon of this system")
35	- endif()	49	- endif()
36	-endif()	50	-endif()
37		51	-
38	add_executable(${PROJECT_NAME} postsrsd.c sha1.c srs2.c)	52	add_executable(${PROJECT_NAME} postsrsd.c sha1.c srs2.c)
39		53
		54	if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
		55	@@ -74,15 +55,7 @@ endif()
		56
40	get_target_property(POSTSRSD ${PROJECT_NAME} LOCATION)	57	get_target_property(POSTSRSD ${PROJECT_NAME} LOCATION)
41	get_filename_component(POSTSRSD ${POSTSRSD} NAME_WE)	58	get_filename_component(POSTSRSD ${POSTSRSD} NAME_WE)
42	-set(APPARMOR_PROFILE "${CMAKE_INSTALL_PREFIX}/sbin/${POSTSRSD}")	59	-set(APPARMOR_PROFILE "${CMAKE_INSTALL_PREFIX}/sbin/${POSTSRSD}")
43	-string(REGEX REPLACE "^/+" "" APPARMOR_PROFILE "${APPARMOR_PROFILE}")	60	-string(REGEX REPLACE "^/+" "" APPARMOR_PROFILE "${APPARMOR_PROFILE}")
44	-string(REPLACE "/" "." APPARMOR_PROFILE "${APPARMOR_PROFILE}")	61	-string(REPLACE "/" "." APPARMOR_PROFILE "${APPARMOR_PROFILE}")
45	-
46	-configure_file(${PROJECT_NAME}.lsb_init.in ${PROJECT_NAME}.lsb_init @ONLY)
47	-configure_file(${PROJECT_NAME}.rh_init.in ${PROJECT_NAME}.rh_init @ONLY)
48	-configure_file(${PROJECT_NAME}.upstart.in ${PROJECT_NAME}.upstart @ONLY)
49	-configure_file(${PROJECT_NAME}.apparmor.in ${PROJECT_NAME}.apparmor @ONLY)
50	+
51	configure_file(postinstall.cmake.in postinstall.cmake @ONLY)
52		62
53	if(HELP2MAN)	63	-configure_file(init/${PROJECT_NAME}.sysv-lsb.in ${PROJECT_NAME}.sysv-lsb @ONLY)
54	@@ -49,7 +26,7 @@	64	-configure_file(init/${PROJECT_NAME}.sysv-redhat.in ${PROJECT_NAME}.sysv-redhat @ONLY)
		65	-configure_file(init/${PROJECT_NAME}.upstart.in ${PROJECT_NAME}.upstart @ONLY)
		66	-configure_file(init/${PROJECT_NAME}.apparmor.in ${PROJECT_NAME}.apparmor @ONLY)
		67	-configure_file(init/${PROJECT_NAME}.systemd.in ${PROJECT_NAME}.systemd @ONLY)
		68	configure_file(init/${PROJECT_NAME}.default.in ${PROJECT_NAME}.default @ONLY)
		69
		70	configure_file(postinstall.cmake.in postinstall.cmake @ONLY)
		71	@@ -92,7 +65,7 @@ add_custom_command(TARGET ${PROJECT_NAME
55	COMMAND ${HELP2MAN} ARGS -s8 -o${PROJECT_NAME}.8 -n "Postfix Sender Rewriting Scheme daemon" -N -h-h -v-v ${CMAKE_CURRENT_BINARY_DIR}/${POSTSRSD}	72	COMMAND ${HELP2MAN} ARGS -s8 -o${PROJECT_NAME}.8 -n "Postfix Sender Rewriting Scheme daemon" -N -h-h -v-v ${CMAKE_CURRENT_BINARY_DIR}/${POSTSRSD}
56	VERBATIM	73	VERBATIM
57	)	74	)
Lines 60-71 Link Here
60	endif()	77	endif()
61		78
62	if(USE_APPARMOR)	79	if(USE_APPARMOR)
63	@@ -57,6 +34,8 @@	80	@@ -100,6 +73,8 @@ if(USE_APPARMOR)
64	endif()	81	endif()
65		82
66	install(TARGETS ${PROJECT_NAME} DESTINATION "sbin")	83	install(TARGETS ${PROJECT_NAME} DESTINATION "sbin")
67	+if(ENABLE_DOCS)	84	+if(ENABLE_DOCS)
68	install(FILES README.md main.cf.ex DESTINATION "share/doc/${PROJECT_NAME}")	85	install(FILES README.md README_UPGRADE.md main.cf.ex DESTINATION "${DOC_DIR}")
69	+endif()	86	+endif()
70	install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/postinstall.cmake")	87	install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/postinstall.cmake")
71		88

Lines 1-9 Link Here

(-)mail/postsrsd.new/files/patch-postinstall.cmake.in (-15 / +30 lines)
1	--- postinstall.cmake.in 2014-01-03 01:01:47.000000000 +0100	1	--- postinstall.cmake.in.orig 2015-12-13 08:56:05 UTC
2	+++ postinstall.cmake.in.new 2014-06-18 01:47:16.240011867 +0200	2	+++ postinstall.cmake.in
3	@@ -5,37 +5,13 @@	3	@@ -7,51 +7,13 @@ set(INIT_FLAVOR "@INIT_FLAVOR@")
4	set(SECRET_FILE "@PROJECT_NAME@.secret")	4	set(SECRET_FILE "@PROJECT_NAME@.secret")
5	set(DD "@DD@")	5	set(DD "@DD@")
6	set(BASE64 "@BASE64@")	6	set(BASE64_ENCODE "@BASE64_ENCODE@")
7	-set(INSSERV "@INSSERV@")	7	-set(INSSERV "@INSSERV@")
8	-set(CHKCONFIG "@CHKCONFIG@")	8	-set(CHKCONFIG "@CHKCONFIG@")
9		9
Lines 12-49 Link Here
12	file(MAKE_DIRECTORY "$ENV{DESTDIR}${CHROOT_DIR}")	12	file(MAKE_DIRECTORY "$ENV{DESTDIR}${CHROOT_DIR}")
13	endif()	13	endif()
14		14
15	-if(INIT_FLAVOR AND NOT EXISTS "$ENV{DESTDIR}${CONFIG_DIR}/@PROJECT_NAME@")	15	-if(INIT_FLAVOR)
16	- file(INSTALL FILES "@CMAKE_CURRENT_SOURCE_DIR@/@PROJECT_NAME@.default" DESTINATION "${CONFIG_DIR}" RENAME "@PROJECT_NAME@")	16	- if (NOT EXISTS "$ENV{DESTDIR}${CONFIG_DIR}/@PROJECT_NAME@")
		17	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.default" DESTINATION "${CONFIG_DIR}" RENAME "@PROJECT_NAME@")
		18	- else()
		19	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.default" DESTINATION "${CONFIG_DIR}" RENAME "@PROJECT_NAME@.new")
		20	- message(STATUS "")
		21	- message(STATUS "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*")
		22	- message(STATUS "! ${CONFIG_DIR}/@PROJECT_NAME@ will NOT be overwritten!")
		23	- message(STATUS "! Please note the changes from @PROJECT_NAME@.new in the same folder and")
		24	- message(STATUS "! update your configuration accordinly.")
		25	- message(STATUS "! See also README_UPGRADE.md for details")
		26	- message(STATUS "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*")
		27	- message(STATUS "")
		28	- endif()
17	-endif()	29	-endif()
18	-	30	-
19	-if(INIT_FLAVOR STREQUAL "sysv-lsb")	31	-if(INIT_FLAVOR STREQUAL "sysv-lsb")
20	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.lsb_init" TYPE PROGRAM DESTINATION "/etc/init.d" RENAME "@PROJECT_NAME@")	32	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.sysv-lsb" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
21	- if(INSSERV)	33	- if(INSSERV)
22	- execute_process(	34	- execute_process(
23	- COMMAND ${INSSERV} -p "$ENV{DESTDIR}/etc/init.d" @PROJECT_NAME@	35	- COMMAND ${INSSERV} -p "$ENV{DESTDIR}${SYSCONF_DIR}/init.d" @PROJECT_NAME@
24	- )	36	- )
25	- endif()	37	- endif()
26	-elseif(INIT_FLAVOR STREQUAL "sysv-redhat")	38	-elseif(INIT_FLAVOR STREQUAL "sysv-redhat")
27	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.rh_init" TYPE PROGRAM DESTINATION "/etc/init.d" RENAME "@PROJECT_NAME@")	39	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.sysv-redhat" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
28	- if(CHKCONFIG AND NOT "$ENV{DESTDIR}")	40	- if(CHKCONFIG AND NOT "$ENV{DESTDIR}")
29	- execute_process(	41	- execute_process(
30	- COMMAND ${CHKCONFIG} --add @PROJECT_NAME@	42	- COMMAND ${CHKCONFIG} --add @PROJECT_NAME@
31	- )	43	- )
32	- endif()	44	- endif()
33	-elseif(INIT_FLAVOR STREQUAL "upstart")	45	-elseif(INIT_FLAVOR STREQUAL "upstart")
34	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.upstart" DESTINATION "/etc/init" RENAME "@PROJECT_NAME@.conf")	46	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.upstart" DESTINATION "${SYSCONF_DIR}/init" RENAME "@PROJECT_NAME@.conf")
		47	-elseif(INIT_FLAVOR STREQUAL "systemd")
		48	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.systemd" DESTINATION "${SYSD_UNIT_DIR}" RENAME "@PROJECT_NAME@.service")
35	-endif()	49	-endif()
36	-	50	-
37	-if(GENERATE_SRS_SECRET AND DD AND BASE64 AND EXISTS "/dev/urandom" AND NOT EXISTS "$ENV{DESTDIR}/etc/${SECRET_FILE}")	51	-if(GENERATE_SRS_SECRET AND DD AND BASE64_ENCODE AND EXISTS "/dev/urandom" AND NOT EXISTS "$ENV{DESTDIR}${SYSCONF_DIR}/${SECRET_FILE}")
38	+if(GENERATE_SRS_SECRET AND DD AND BASE64 AND EXISTS "/dev/urandom")	52	+if(GENERATE_SRS_SECRET AND DD AND BASE64_ENCODE AND EXISTS "/dev/urandom")
39	message(STATUS "Generating secret key")	53	message(STATUS "Generating secret key")
40	execute_process(	54	execute_process(
41	COMMAND ${DD} if=/dev/urandom bs=18 count=1	55	COMMAND ${DD} if=/dev/urandom bs=18 count=1
42	@@ -44,6 +20,6 @@	56	@@ -60,7 +22,7 @@ if(GENERATE_SRS_SECRET AND DD AND BASE64
43	ERROR_QUIET	57	ERROR_QUIET
44	OUTPUT_STRIP_TRAILING_WHITESPACE	58	OUTPUT_STRIP_TRAILING_WHITESPACE
45	)	59	)
46	-file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "/etc" RENAME "${SECRET_FILE}" FILE_PERMISSIONS OWNER_READ OWNER_WRITE)	60	-file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "${SYSCONF_DIR}" RENAME "${SECRET_FILE}" PERMISSIONS OWNER_READ OWNER_WRITE)
47	+file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "${CONFIG_DIR}" RENAME "${SECRET_FILE}" FILE_PERMISSIONS OWNER_READ OWNER_WRITE)	61	+file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "${CONFIG_DIR}" RENAME "${SECRET_FILE}" PERMISSIONS OWNER_READ OWNER_WRITE)
48	file(REMOVE "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}")	62	file(REMOVE "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}")
49	endif()	63	endif()
		64

Lines 1-20 Link Here

(-)mail/postsrsd.new/files/patch-postsrsd.c (-20 lines)
1	--- postsrsd.c 2014-01-03 01:01:47.000000000 +0100
2	+++ postsrsd.c.new 2014-06-18 23:31:33.290651741 +0200
3	@@ -28,7 +28,7 @@
4	#include <pwd.h>
5	#include <string.h>
6	#include <poll.h>
7	-#include <wait.h>
8	+#include <sys/wait.h>
9	#include <syslog.h>
10
11	#ifndef VERSION
12	@@ -47,7 +47,7 @@
13	memset (&hints, 0, sizeof(hints));
14	hints.ai_family = family;
15	hints.ai_socktype = SOCK_STREAM;
16	- hints.ai_flags = AI_ADDRCONFIG \| AI_V4MAPPED;
17	+ hints.ai_flags = AI_ADDRCONFIG;
18	err = getaddrinfo(NULL, service, &hints, &addr);
19	if (err != 0) {
20	fprintf(stderr, "%s: bind_service(%s): %s\n", self, service, gai_strerror(err));