Merge branch 'master' into ppa

.travis.yml

@@ -0,0 +1,5 @@
+language: c
+compiler:
+  - gcc
+script: make
+

CMakeLists.txt

@@ -5,19 +5,24 @@ option(GENERATE_SRS_SECRET "Generate a random SRS secret if none exists during i
 option(USE_APPARMOR "Enable AppArmor profile" OFF)
 
 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")
 
 find_program(HELP2MAN help2man DOC "path to help2man executable")
 find_program(DD dd DOC "path to dd executable")
 find_program(BASE64 base64 DOC "path to base64 executable")
 find_program(INSSERV insserv DOC "path to insserv executable")
+find_program(CHKCONFIG chkconfig DOC "path to chkconfig executable")
 
 if(NOT DEFINED INIT_FLAVOR)
     if(IS_DIRECTORY "/etc/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 "/etc/init.d")
-        message(STATUS "Detected init flavor: sysv")
-        set(INIT_FLAVOR "sysv" CACHE STRING "Init daemon of this system")
+    elseif(IS_DIRECTORY "/etc/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")
+    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")
     else()
         message(STATUS "Detected init flavor: none")
         message(STATUS "System startup files will not be installed")
@@ -33,7 +38,8 @@ 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}.init.in ${PROJECT_NAME}.init @ONLY)
+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)

postinstall.cmake.in

@@ -1,40 +1,49 @@
 set(GENERATE_SRS_SECRET "@GENERATE_SRS_SECRET@")
 set(CHROOT_DIR "@CHROOT_DIR@")
+set(CONFIG_DIR "@CONFIG_DIR@")
 set(INIT_FLAVOR "@INIT_FLAVOR@")
 set(SECRET_FILE "@PROJECT_NAME@.secret")
 set(DD "@DD@")
 set(BASE64 "@BASE64@")
 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 AND NOT EXISTS "$ENV{DESTDIR}/etc/default/@PROJECT_NAME@")
-	file(INSTALL "@CMAKE_CURRENT_SOURCE_DIR@/@PROJECT_NAME@.default" DESTINATION "/etc/default" RENAME "@PROJECT_NAME@")
+if(INIT_FLAVOR AND NOT EXISTS "$ENV{DESTDIR}${CONFIG_DIR}/@PROJECT_NAME@")
+	file(INSTALL FILES "@CMAKE_CURRENT_SOURCE_DIR@/@PROJECT_NAME@.default" DESTINATION "${CONFIG_DIR}" RENAME "@PROJECT_NAME@")
 endif()
 
-if(INIT_FLAVOR STREQUAL "sysv")
-	file(INSTALL "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.init" TYPE PROGRAM DESTINATION "/etc/init.d" RENAME "@PROJECT_NAME@")
+if(INIT_FLAVOR STREQUAL "sysv-lsb")
+	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.lsb_init" TYPE PROGRAM DESTINATION "/etc/init.d" RENAME "@PROJECT_NAME@")
 	if(INSSERV)
 		execute_process(
 			COMMAND ${INSSERV} -p "$ENV{DESTDIR}/etc/init.d" @PROJECT_NAME@
 		)
 	endif()
+elseif(INIT_FLAVOR STREQUAL "sysv-redhat")
+	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.rh_init" TYPE PROGRAM DESTINATION "/etc/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 "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.upstart" DESTINATION "/etc/init" RENAME "@PROJECT_NAME@.conf")
+	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.upstart" DESTINATION "/etc/init" RENAME "@PROJECT_NAME@.conf")
 endif()
 
 if(GENERATE_SRS_SECRET AND DD AND BASE64 AND EXISTS "/dev/urandom" AND NOT EXISTS "$ENV{DESTDIR}/etc/${SECRET_FILE}")
 	message(STATUS "Generating secret key")
 	execute_process(
 		COMMAND ${DD} if=/dev/urandom bs=18 count=1
-		COMMAND ${BASE64} -w0
+		COMMAND ${BASE64}
 		OUTPUT_FILE "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}"
 		ERROR_QUIET
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)
-file(INSTALL "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "/etc" FILE_PERMISSIONS OWNER_READ OWNER_WRITE)
+file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "/etc" RENAME "${SECRET_FILE}" FILE_PERMISSIONS OWNER_READ OWNER_WRITE)
 file(REMOVE "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}")
 endif()

postsrsd.c

@@ -32,7 +32,7 @@
 #include <syslog.h>
 
 #ifndef VERSION
-#define VERSION "1.0"
+#define VERSION "1.1"
 #endif
 
 static char *self = NULL;
@@ -307,9 +307,12 @@ int main (int argc, char **argv)
         return EXIT_SUCCESS;
     }
   }
+  if (optind < argc) {
+    fprintf (stderr, "%s: extra argument on command line: %s\n", self, argv[optind]);
+    return EXIT_FAILURE;
+  }
   if (domain == NULL) {
     fprintf (stderr, "%s: You must set a home domain (-d)\n", self);
-    show_help();
     return EXIT_FAILURE;
   }
 
@@ -333,7 +336,6 @@ int main (int argc, char **argv)
     }
   } else {
     fprintf (stderr, "%s: You must set a secret (-s)\n", self);
-    show_help();
     return EXIT_FAILURE;
   }
   /* Bind ports. May require privileges if the config specifies ports below 1024 */

postsrsd.init.in → postsrsd.lsb_init.in

@@ -36,9 +36,9 @@ RUN_AS=nobody
 CHROOT=@CHROOT_DIR@
 
 # Read config file if it is present.
-if [ -r /etc/default/$NAME ]
+if [ -r @CONFIG_DIR@/$NAME ]
 then
-    . /etc/default/$NAME
+    . @CONFIG_DIR@/$NAME
 fi
 
 test -r "$SRS_SECRET" -a -n "$SRS_DOMAIN" || exit 0

postsrsd.rh_init.in

@@ -0,0 +1,92 @@
+#! /bin/sh
+#
+# @PROJECT_NAME@
+#               start/stop the @PROJECT_NAME@ daemon for Postfix
+#
+# chkconfig: 2345 75 35
+# description: Sender Rewriting Scheme (SRS) for Postfix.
+# processname: @POSTSRSD@
+# pidfile: /var/run/@PROJECT_NAME@.pid
+# config: @CONFIG_DIR@/@PROJECT_NAME@
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=@CMAKE_INSTALL_PREFIX@/sbin/@POSTSRSD@
+NAME=@PROJECT_NAME@
+prog=@POSTSRSD@
+DESC="Postfix Sender Rewriting Scheme daemon"
+
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+. /etc/init.d/functions
+
+# Default configuration
+SRS_DOMAIN=`postconf -h mydomain || true`
+SRS_FORWARD_PORT=10001
+SRS_REVERSE_PORT=10002
+SRS_SECRET=/etc/@PROJECT_NAME@.secret
+RUN_AS=nobody
+CHROOT=@CHROOT_DIR@
+
+# Read config file if it is present.
+if [ -r @CONFIG_DIR@/$NAME ]
+then
+    . @CONFIG_DIR@/$NAME
+fi
+
+test -r "$SRS_SECRET" -a -n "$SRS_DOMAIN" || exit 0
+
+do_start()
+{
+	echo -n "Starting $DESC: "
+	daemon $DAEMON -4 -f"$SRS_FORWARD_PORT" -r"$SRS_REVERSE_PORT" -d"$SRS_DOMAIN" -s"$SRS_SECRET" \
+	               -u"$RUN_AS" -p"$PIDFILE" -c"$CHROOT" -X"$SRS_EXCLUDE_DOMAINS" -D
+	RETVAL=$?
+	echo
+    	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$NAME
+    	return $RETVAL
+}
+
+do_stop()
+{
+	echo -n "Stopping $DESC: "
+	killproc $prog
+        RETVAL=$?
+        echo
+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$NAME
+        return $RETVAL
+}
+
+case "$1" in
+  start)
+	do_start
+	;;
+  stop)
+	do_stop
+	;;
+  status)
+	status $NAME
+	;;
+  restart|force-reload)
+	do_stop
+	do_start
+	;;
+  reload)
+	;;
+  condrestart|try-restart)
+	if [ -f /var/lock/subsys/$NAME ]; then
+		do_stop
+		do_start
+	fi
+	;;
+  *)
+	echo "Usage: $NAME {start|stop|restart|condrestart|try-restart|reload|force-reload|status|usage}"
+	[ "$1" = "usage" ] && exit 0
+	exit 2
+	;;
+esac
+exit $?
+

postsrsd.upstart.in

@@ -5,7 +5,7 @@ start on (filesystem and net-device-up)
 stop on runlevel [!2345]
 respawn
 
-env DEFAULTFILE=/etc/default/@PROJECT_NAME@
+env DEFAULTFILE=@CONFIG_DIR@/@PROJECT_NAME@
 
 script
 	SRS_DOMAIN=`postconf -h mydomain || true`