diff options
Diffstat (limited to 'mail/postfix-current/files')
| -rw-r--r-- | mail/postfix-current/files/patch-conf_main.cf | 11 | ||||
| -rw-r--r-- | mail/postfix-current/files/patch-makedefs | 27 | ||||
| -rw-r--r-- | mail/postfix-current/files/patch-src_util_sys__defs.h | 12 | ||||
| -rw-r--r-- | mail/postfix-current/files/pkg-install.in | 6 | ||||
| -rw-r--r-- | mail/postfix-current/files/pkg-message.in | 1 |
5 files changed, 15 insertions, 42 deletions
diff --git a/mail/postfix-current/files/patch-conf_main.cf b/mail/postfix-current/files/patch-conf_main.cf new file mode 100644 index 000000000000..ecdcaecc206e --- /dev/null +++ b/mail/postfix-current/files/patch-conf_main.cf @@ -0,0 +1,11 @@ +--- conf/main.cf.orig 2022-03-12 22:37:09 UTC ++++ conf/main.cf +@@ -681,4 +681,7 @@ sample_directory = /etc/postfix + # readme_directory: The location of the Postfix README files. + # + readme_directory = no +-inet_protocols = ipv4 ++inet_protocols = all ++ ++# smtp CA path (default to system-wide location) ++smtp_tls_CApath = /etc/ssl/certs diff --git a/mail/postfix-current/files/patch-makedefs b/mail/postfix-current/files/patch-makedefs deleted file mode 100644 index bc2fcbf36c3b..000000000000 --- a/mail/postfix-current/files/patch-makedefs +++ /dev/null @@ -1,27 +0,0 @@ ---- makedefs.orig 2021-04-24 20:49:37 UTC -+++ makedefs -@@ -309,6 +309,24 @@ case "$SYSTEM.$RELEASE" in - : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} - : ${PLUGIN_LD="${CC} -shared"} - ;; -+ FreeBSD.13*) SYSTYPE=FREEBSD13 -+ : ${CC=cc} -+ : ${SHLIB_SUFFIX=.so} -+ : ${SHLIB_CFLAGS=-fPIC} -+ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'} -+ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} -+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} -+ : ${PLUGIN_LD="${CC} -shared"} -+ ;; -+ FreeBSD.14*) SYSTYPE=FREEBSD14 -+ : ${CC=cc} -+ : ${SHLIB_SUFFIX=.so} -+ : ${SHLIB_CFLAGS=-fPIC} -+ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'} -+ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} -+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} -+ : ${PLUGIN_LD="${CC} -shared"} -+ ;; - DragonFly.*) SYSTYPE=DRAGONFLY - ;; - OpenBSD.2*) SYSTYPE=OPENBSD2 diff --git a/mail/postfix-current/files/patch-src_util_sys__defs.h b/mail/postfix-current/files/patch-src_util_sys__defs.h deleted file mode 100644 index 96beb47184f3..000000000000 --- a/mail/postfix-current/files/patch-src_util_sys__defs.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/util/sys_defs.h.orig 2020-05-21 18:34:23 UTC -+++ src/util/sys_defs.h -@@ -30,7 +30,8 @@ - #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ - || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ - || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \ -- || defined(FREEBSD11) || defined(FREEBSD12) \ -+ || defined(FREEBSD11) || defined(FREEBSD12) || defined(FREEBSD13) \ -+ || defined(FREEBSD14) \ - || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ - || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ - || defined(OPENBSD5) || defined(OPENBSD6) \ diff --git a/mail/postfix-current/files/pkg-install.in b/mail/postfix-current/files/pkg-install.in index 0b7e47cfe011..340c1df561e7 100644 --- a/mail/postfix-current/files/pkg-install.in +++ b/mail/postfix-current/files/pkg-install.in @@ -61,7 +61,7 @@ yesno() { # Respect POSTFIX_DEFAULT_MTA, do not ask for confirmation! # (This helps tools like salt, ansible or puppet on new installations) # ============================================================================== -install_choise(){ +install_choice(){ local mailerconf mailerconf=$1 @@ -167,12 +167,12 @@ if [ -f "${MC_BASE}" ]; then cmp_mailer ${MC_LOCALBASE} || install_mailer_conf ${MC_LOCALBASE} try_reload else - cmp_mailer ${MC_LOCALBASE} || install_choise ${MC_LOCALBASE} + cmp_mailer ${MC_LOCALBASE} || install_choice ${MC_LOCALBASE} fi else cmp_mailer ${MC_BASE} if [ $? -ne 0 ]; then - install_choise ${MC_BASE} + install_choice ${MC_BASE} else show_activated_msg ${MC_BASE} try_reload diff --git a/mail/postfix-current/files/pkg-message.in b/mail/postfix-current/files/pkg-message.in index 57bf7b01a678..1727326607e1 100644 --- a/mail/postfix-current/files/pkg-message.in +++ b/mail/postfix-current/files/pkg-message.in @@ -11,6 +11,7 @@ Run the following commands to enable postfix during startup: If postfix is *not* already activated in %%MC_PREFIX%%/etc/mail/mailer.conf - mv %%MC_PREFIX%%/etc/mail/mailer.conf %%MC_PREFIX%%/etc/mail/mailer.conf.old + - install -d %%MC_PREFIX%%/etc/mail - install -m 0644 %%DATADIR%%/mailer.conf.postfix %%MC_PREFIX%%/etc/mail/mailer.conf Disable sendmail(8) specific tasks, |