Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package postfix for openSUSE:Factory checked
in at 2021-03-12 13:31:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/postfix (Old)
and /work/SRC/openSUSE:Factory/.postfix.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postfix"
Fri Mar 12 13:31:56 2021 rev:199 rq:878197 version:3.5.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/postfix/postfix-bdb.changes 2021-02-11
12:45:52.221356354 +0100
+++ /work/SRC/openSUSE:Factory/.postfix.new.2401/postfix-bdb.changes
2021-03-12 13:32:08.382226529 +0100
@@ -1,0 +2,13 @@
+Wed Mar 10 15:12:11 UTC 2021 - Peter Varkoly <vark...@suse.com>
+
+- (bsc#1183305) - config.postfix uses db as suffix for postmaps
+ Depending on DEF_DB_TYPE uses lmdb or db
+
+-------------------------------------------------------------------
+Fri Mar 5 13:22:42 UTC 2021 - Peter Varkoly <vark...@suse.com>
+
+- (bsc#1182833) - /usr/share/fillup-templates/sysconfig.postfix
+ still refers to /etc/services
+ Use getent to detect if smtps is already defined.
+
+-------------------------------------------------------------------
postfix.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
postfix.spec: same change
++++++ postfix-SUSE.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postfix-SUSE/config.postfix
new/postfix-SUSE/config.postfix
--- old/postfix-SUSE/config.postfix 2021-02-05 18:48:07.257071375 +0100
+++ new/postfix-SUSE/config.postfix 2021-03-10 16:25:15.291653816 +0100
@@ -12,8 +12,13 @@
if [ -d /run ]; then
export RUN="/run"
fi
+DB_SUFFIX="lmdb"
DEF_DB_TYPE=$(/usr/sbin/postconf -h default_database_type)
+if [ ${DEF_DB_TYPE} = "hash" ]; then
+ DB_SUFFIX="db"
+fi
export DEF_DB_TYPE
+export DB_SUFFIX
cpifnewer(){
# remove files, that do no longer exist
@@ -48,11 +53,11 @@
fi
chmod $mode ${pfmap}
test -e $pfmap && \
- if test $pfmap -nt ${pfmap}.db -o ! -e ${pfmap}.db ; then
- echo "rebuilding ${pfmap}.db"
+ if test $pfmap -nt ${pfmap}.${DB_SUFFIX} -o ! -e
${pfmap}.${DB_SUFFIX} ; then
+ echo "rebuilding ${pfmap}.${DB_SUFFIX}"
postmap ${pfmap}
fi
- chmod $mode ${pfmap}.db
+ chmod $mode ${pfmap}.${DB_SUFFIX}
shift
done
}
@@ -594,12 +599,11 @@
#$PCONF -# "smtpd_sasl_type"
fi
-
if test "$POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT" == "yes"; then
- grep -E '^smtps' /etc/services >/dev/null || {
+ if [ -z "$( getent services smtps )" ]; then
warn_user 1>&2 "adding service \"smtps\" to /etc/services"
echo "smtps 465/tcp # smtp over SSL" >>
/etc/services
- }
+ fi
fi
if test "$POSTFIX_SMTP_TLS_SERVER" == "yes" -o
"$POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT" == "yes"; then
if [ -z "$POSTFIX_TLS_CERTFILE" -o -z "$POSTFIX_TLS_KEYFILE" -o ! -e
"$POSTFIX_SSL_PATH/$POSTFIX_TLS_CERTFILE" -o ! -e
"$POSTFIX_SSL_PATH/$POSTFIX_TLS_KEYFILE" ]; then
@@ -1409,16 +1413,16 @@
if test -z "$r" && test "$POSTFIX_UPDATE_MAPS" == yes ; then
test -e /etc/aliases && \
- if test /etc/aliases -nt /etc/aliases.db \
- -o ! -e /etc/aliases.db ; then
- echo "Rebuilding /etc/aliases.db."
+ if test /etc/aliases -nt /etc/aliases.${DB_SUFFIX} \
+ -o ! -e /etc/aliases.${DB_SUFFIX} ; then
+ echo "Rebuilding /etc/aliases.${DB_SUFFIX}."
/usr/bin/newaliases
fi
update_db $POSTFIX_MAP_LIST
for i in $(get_alias_maps); do
- if test $i -nt $i.db -o ! -e $i.db; then
- echo "Rebuilding $i.db"
+ if test $i -nt $i.${DB_SUFFIX} -o ! -e $i.${DB_SUFFIX}; then
+ echo "Rebuilding $i.${DB_SUFFIX}"
/usr/sbin/postalias $i
fi
done
