diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/06_debian_paths.diff | 110 |
1 files changed, 110 insertions, 0 deletions
diff --git a/debian/patches/06_debian_paths.diff b/debian/patches/06_debian_paths.diff new file mode 100644 index 0000000..3a71195 --- /dev/null +++ b/debian/patches/06_debian_paths.diff @@ -0,0 +1,110 @@ +Index: postfix-dev/conf/main.cf +=================================================================== +--- postfix-dev.orig/conf/main.cf 2019-03-01 11:19:20.961713352 -0500 ++++ postfix-dev/conf/main.cf 2019-03-01 11:19:20.953713352 -0500 +@@ -47,7 +47,7 @@ + # See the files in examples/chroot-setup for setting up Postfix chroot + # environments on different UNIX systems. + # +-queue_directory = /var/spool/postfix ++#queue_directory = /var/spool/postfix + + # The command_directory parameter specifies the location of all + # postXXX commands. +@@ -58,7 +58,7 @@ + # daemon programs (i.e. programs listed in the master.cf file). This + # directory must be owned by root. + # +-daemon_directory = /usr/libexec/postfix ++daemon_directory = /usr/lib/postfix/sbin + + # The data_directory parameter specifies the location of Postfix-writable + # data files (caches, random numbers). This directory must be owned +@@ -465,8 +465,8 @@ + # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN + # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. + # +-#mailbox_command = /some/where/procmail +-#mailbox_command = /some/where/procmail -a "$EXTENSION" ++#mailbox_command = /usr/bin/procmail ++#mailbox_command = /usr/bin/procmail -a "$EXTENSION" + + # The mailbox_transport specifies the optional transport in master.cf + # to use after processing aliases and .forward files. This parameter +Index: postfix-dev/examples/smtpd-policy/greylist.pl +=================================================================== +--- postfix-dev.orig/examples/smtpd-policy/greylist.pl 2019-03-01 11:19:20.961713352 -0500 ++++ postfix-dev/examples/smtpd-policy/greylist.pl 2019-03-01 11:19:20.953713352 -0500 +@@ -73,7 +73,7 @@ + # In case of database corruption, this script saves the database as + # $database_name.time(), so that the mail system does not get stuck. + # +-$database_name="/var/mta/greylist.db"; ++$database_name="/var/lib/postfix/greylist.db"; + $greylist_delay=60; + + # +Index: postfix-dev/makedefs +=================================================================== +--- postfix.orig/makedefs ++++ postfix/makedefs +@@ -496,11 +496,18 @@ case "$SYSTEM.$RELEASE" in + exit 1 + fi + SYSLIBS="-ldb" ++ SEARCHDIRS=$(${CC-gcc} -print-search-dirs 2>/dev/null | ++ sed -n '/^libraries: =/s/libraries: =//p' | ++ sed -e 's/:/\n/g' | xargs -n1 readlink -f | ++ grep -v 'gcc\|/[0-9.]\+$' | sort -u) ++ if [ -z "$SEARCHDIRS" ]; then ++ SEARCHDIRS="/usr/lib64 /lib64 /usr/lib /lib" ++ fi + ;; + esac + for name in nsl resolv $GDBM_LIBS + do +- for lib in /usr/lib64 /lib64 /usr/lib /lib ++ for lib in $SEARCHDIRS + do + test -e $lib/lib$name.a -o -e $lib/lib$name.so && { + SYSLIBS="$SYSLIBS -l$name" +@@ -575,11 +582,18 @@ EOF + exit 1 + fi + SYSLIBS="-ldb" ++ SEARCHDIRS=$(${CC-gcc} -print-search-dirs 2>/dev/null | ++ sed -n '/^libraries: =/s/libraries: =//p' | ++ sed -e 's/:/\n/g' | xargs -n1 readlink -f | ++ grep -v 'gcc\|/[0-9.]\+$' | sort -u) ++ if [ -z "$SEARCHDIRS" ]; then ++ SEARCHDIRS="/usr/lib64 /lib64 /usr/lib /lib" ++ fi + ;; + esac + for name in nsl resolv + do +- for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/* ++ for lib in $SEARCHDIRS + do + test -e $lib/lib$name.a -o -e $lib/lib$name.so && { + SYSLIBS="$SYSLIBS -l$name" +@@ -613,11 +627,18 @@ EOF + exit 1 + fi + SYSLIBS="-ldb" ++ SEARCHDIRS=$(${CC-gcc} -print-search-dirs 2>/dev/null | ++ sed -n '/^libraries: =/s/libraries: =//p' | ++ sed -e 's/:/\n/g' | xargs -n1 readlink -f | ++ grep -v 'gcc\|/[0-9.]\+$' | sort -u) ++ if [ -z "$SEARCHDIRS" ]; then ++ SEARCHDIRS="/usr/lib64 /lib64 /usr/lib /lib" ++ fi + ;; + esac + for name in nsl resolv + do +- for lib in /usr/lib64 /lib64 /usr/lib /lib ++ for lib in $SEARCHDIRS + do + test -e $lib/lib$name.a -o -e $lib/lib$name.so && { + SYSLIBS="$SYSLIBS -l$name" |