mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 01:26:39 -04:00
mail/postfix-current: Update to 3.11.20250304
And while here, also fix pkg-install in the same way as in mail/postfix Reported by: Herbert J. Skuhra <herbert@gojira.at>
This commit is contained in:
Juraj Lutter
parent
fdf0c31cec
commit
f54649eb20
3 changed files with 27 additions and 45 deletions
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= postfix
|
||||
DISTVERSION= 3.10-20241027
|
||||
PORTREVISION?= 1
|
||||
DISTVERSION= 3.11-20250304
|
||||
PORTREVISION?= 0
|
||||
PORTEPOCH= 6
|
||||
CATEGORIES= mail
|
||||
MASTER_SITES= https://postfix-mirror.horus-it.com/postfix-release/ \
|
||||
|
|
@ -135,6 +135,8 @@ SASLKMIT_LIB_DEPENDS= libkrb5.so:security/krb5
|
|||
SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
|
||||
SQLITE_USES= sqlite
|
||||
|
||||
ALL_TARGET= default
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
HTML1= body_checks.5.html bounce.5.html postfix-power.png \
|
||||
|
|
@ -192,10 +194,7 @@ SHLIB_DIRECTORY= ${PREFIX}/lib/postfix
|
|||
# keep compatiblity with Postfix 2.6 .. 2.11 and use DAEMOMDIR
|
||||
META_DIRECTORY= ${DAEMONDIR}
|
||||
|
||||
SUB_LIST+= DAEMONDIR="${DAEMONDIR}" \
|
||||
META_DIRECTORY="${META_DIRECTORY}" \
|
||||
READMEDIR="${READMEDIR}" \
|
||||
REQUIRE="${_REQUIRE}"
|
||||
SUB_LIST+= REQUIRE="${_REQUIRE}"
|
||||
SUB_FILES+= mailer.conf.postfix pkg-install pkg-message
|
||||
|
||||
POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
|
||||
|
|
@ -381,19 +380,18 @@ post-patch:
|
|||
>> ${WRKSRC}/conf/postfix-files
|
||||
|
||||
do-configure:
|
||||
(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles \
|
||||
${MAKE} -C ${WRKSRC} -f Makefile.init makefiles \
|
||||
${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \
|
||||
shared=yes shlib_directory=${SHLIB_DIRECTORY} \
|
||||
dynamicmaps=yes \
|
||||
${POSTFIX_DYN_AUXLIBS} \
|
||||
AUXLIBS="${POSTFIX_AUXLIBS}" && \
|
||||
${ECHO_CMD} "all: default" >> Makefile)
|
||||
AUXLIBS="${POSTFIX_AUXLIBS}"
|
||||
|
||||
pre-install-INST_BASE-on:
|
||||
${MKDIR} ${STAGEDIR}/etc/rc.d
|
||||
|
||||
do-install:
|
||||
@(cd ${WRKSRC} && ${MAKE} non-interactive-package \
|
||||
${MAKE} -C ${WRKSRC} non-interactive-package \
|
||||
install_root=${STAGEDIR} tempdir=${WRKDIR} \
|
||||
shlib_directory=${SHLIB_DIRECTORY} \
|
||||
config_directory=${ETCDIR} \
|
||||
|
|
@ -405,7 +403,7 @@ do-install:
|
|||
manpage_directory=${PREFIX}/share/man \
|
||||
newaliases_path=${PREFIX}/bin/newaliases \
|
||||
readme_directory=${READMEDIR} \
|
||||
sendmail_path=${PREFIX}/sbin/sendmail )
|
||||
sendmail_path=${PREFIX}/sbin/sendmail
|
||||
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${STAGEDIR}${PREFIX}/bin/rmail
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1730106761
|
||||
SHA256 (postfix/postfix-3.10-20241027.tar.gz) = 8991606db1b85618849b079b4c2bbfe56a46bc957b8b4bcb21464aa75ce5e97c
|
||||
SIZE (postfix/postfix-3.10-20241027.tar.gz) = 5005876
|
||||
TIMESTAMP = 1741159933
|
||||
SHA256 (postfix/postfix-3.11-20250304.tar.gz) = 19f30dd72a67bdac7383819aee587b07b7f4e854a4ad2517da78a28db5487881
|
||||
SIZE (postfix/postfix-3.11-20250304.tar.gz) = 5048687
|
||||
|
|
|
|||
|
|
@ -9,17 +9,12 @@ BATCH=${BATCH:=no}
|
|||
POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
|
||||
|
||||
# fixed vars
|
||||
PREFIX="%%PREFIX%%"
|
||||
ETCDIR="%%ETCDIR%%"
|
||||
DAEMONDIR="%%DAEMONDIR%%"
|
||||
META_DIRECTORY="%%META_DIRECTORY%%"
|
||||
READMEDIR="%%READMEDIR%%"
|
||||
MC_TEMPLATE="%%DATADIR%%/mailer.conf.postfix"
|
||||
MC_TEMPLATE="${PKG_ROOTDIR}${PKG_PREFIX}/share/postfix/mailer.conf.postfix"
|
||||
|
||||
# FreeBSD <= 10.3
|
||||
MC_BASE="/etc/mail/mailer.conf"
|
||||
MC_BASE="${PKG_ROOTDIR}etc/mail/mailer.conf"
|
||||
# FreeBSD >= 10.3 (and current)
|
||||
MC_LOCALBASE="%%LOCALBASE%%/etc/mail/mailer.conf"
|
||||
MC_LOCALBASE="${PKG_ROOTDIR}%%LOCALBASE%%/etc/mail/mailer.conf"
|
||||
USE_LOCALBASE_MAILER_CONF="%%USE_LOCALBASE_MAILER_CONF%%"
|
||||
|
||||
if [ "${POSTFIX_DEFAULT_MTA}" = "no" ]; then
|
||||
|
|
@ -89,7 +84,7 @@ show_not_activated_msg() {
|
|||
echo "To finish installation run the following commands:"
|
||||
echo
|
||||
if [ "${USE_LOCALBASE_MAILER_CONF}" = "yes" ]; then
|
||||
echo " mkdir -p %%LOCALBASE%%/etc/mail"
|
||||
echo " mkdir -p ${PKG_ROOTDIR}%%LOCALBASE%%/etc/mail"
|
||||
else
|
||||
echo " mv -f ${mailerconf} ${mailerconf}.old"
|
||||
fi
|
||||
|
|
@ -121,36 +116,25 @@ install_mailer_conf() {
|
|||
mailerconf=$1
|
||||
echo "Activate Postfix in ${mailerconf}"
|
||||
if [ "${USE_LOCALBASE_MAILER_CONF}" = "yes" ]; then
|
||||
[ -d %%LOCALBASE%%/etc/mail ] || mkdir -p %%LOCALBASE%%/etc/mail
|
||||
[ -d "${PKG_ROOTDIR}%%LOCALBASE%%/etc/mail" ] || \
|
||||
mkdir -p "${PKG_ROOTDIR}/%LOCALBASE%%/etc/mail"
|
||||
fi
|
||||
[ -f ${mailerconf} ] && mv -f ${mailerconf} ${mailerconf}.old
|
||||
install -m 644 ${MC_TEMPLATE} ${mailerconf}
|
||||
}
|
||||
|
||||
# ==============================================================================
|
||||
# Run postfix reload
|
||||
# This is a candidate for a dedicated pkg-post-upgrade script, but it seems
|
||||
# this not fully implemented in pkg :(see upstream PR 941)
|
||||
# ==============================================================================
|
||||
try_reload(){
|
||||
${PREFIX}/sbin/postfix status 2>/dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
${PREFIX}/sbin/postfix reload
|
||||
else
|
||||
echo "postfix not running"
|
||||
fi
|
||||
show_needs_reload_msg() {
|
||||
echo "==============================================================="
|
||||
echo "Postfix installation changed, please run 'postfix reload'"
|
||||
echo "==============================================================="
|
||||
}
|
||||
|
||||
# ==============================================================================
|
||||
# Run postfix post-install to fix permissions and new config values
|
||||
# Fix permissions and new config values after installation
|
||||
# ==============================================================================
|
||||
if [ "$2" = "POST-INSTALL" ]; then
|
||||
/bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
|
||||
daemon_directory=${DAEMONDIR} \
|
||||
meta_directory=${META_DIRECTORY} \
|
||||
html_directory=${READMEDIR} \
|
||||
readme_directory=${READMEDIR} \
|
||||
upgrade-package
|
||||
chroot "${PKG_ROOTDIR}" \
|
||||
"${PKG_PREFIX}"/sbin/postfix set-permissions upgrade-configuration
|
||||
fi
|
||||
|
||||
# ==============================================================================
|
||||
|
|
@ -165,7 +149,7 @@ if [ -f "${MC_BASE}" ]; then
|
|||
if [ $? -eq 0 ]; then
|
||||
show_activated_msg ${MC_BASE}
|
||||
cmp_mailer ${MC_LOCALBASE} || install_mailer_conf ${MC_LOCALBASE}
|
||||
try_reload
|
||||
show_needs_reload_msg
|
||||
else
|
||||
cmp_mailer ${MC_LOCALBASE} || install_choice ${MC_LOCALBASE}
|
||||
fi
|
||||
|
|
@ -175,7 +159,7 @@ if [ -f "${MC_BASE}" ]; then
|
|||
install_choice ${MC_BASE}
|
||||
else
|
||||
show_activated_msg ${MC_BASE}
|
||||
try_reload
|
||||
show_needs_reload_msg
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue