Hello community,
here is the log from the commit of package postfix for openSUSE:12.2 checked in
at 2012-07-31 14:05:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/postfix (Old)
and /work/SRC/openSUSE:12.2/.postfix.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postfix", Maintainer is "vark...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.2/postfix/postfix.changes 2012-06-25
15:50:28.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.postfix.new/postfix.changes 2012-07-31
14:16:07.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 19 06:52:18 UTC 2012 - vark...@suse.com
+
+- bnc#771811 - postfix update does not regenerate the maps
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ postfix.spec ++++++
--- /var/tmp/diff_new_pack.uxMcJD/_old 2012-07-31 14:16:13.000000000 +0200
+++ /var/tmp/diff_new_pack.uxMcJD/_new 2012-07-31 14:16:13.000000000 +0200
@@ -302,7 +302,7 @@
mkdir -p %{buildroot}/etc/postfix/system
install -m 0644 %{name}-SuSE/postfix.service
%{buildroot}/lib/systemd/system/
install -m 0755 %{name}-SuSE/update_chroot.systemd
%{buildroot}/etc/postfix/system/update_chroot
-install -m 0755 %{name}-SuSE/rebuild_tables.systemd
%{buildroot}/etc/postfix/system/rebuild_tables
+install -m 0755 %{name}-SuSE/update_postmaps.systemd
%{buildroot}/etc/postfix/system/update_postmaps
install -m 0755 %{name}-SuSE/wait_qmgr.systemd
%{buildroot}/etc/postfix/system/wait_qmgr
install -m 0755 %{name}-SuSE/cond_slp.systemd
%{buildroot}/etc/postfix/system/cond_slp
%endif
@@ -482,7 +482,7 @@
%if 0%{?suse_version} >= 1140
%dir /etc/postfix/system
%config %attr(0755,root,root) /etc/postfix/system/update_chroot
-%config %attr(0755,root,root) /etc/postfix/system/rebuild_tables
+%config %attr(0755,root,root) /etc/postfix/system/update_postmaps
%config %attr(0755,root,root) /etc/postfix/system/wait_qmgr
%config %attr(0755,root,root) /etc/postfix/system/cond_slp
%config /lib/systemd/system/postfix.service
++++++ postfix-SuSE.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postfix-SuSE/postfix.service
new/postfix-SuSE/postfix.service
--- old/postfix-SuSE/postfix.service 2012-01-17 12:14:10.000000000 +0100
+++ new/postfix-SuSE/postfix.service 2012-07-19 08:46:19.000000000 +0200
@@ -26,6 +26,7 @@
ExecStartPre=-/bin/echo 'Starting mail service (Postfix)'
EnvironmentFile=-/etc/sysconfig/postfix
ExecStartPre=/etc/postfix/system/update_chroot
+ExecStartPre=/etc/postfix/system/update_postmaps
ExecStart=/usr/sbin/postfix start
ExecStartPost=/etc/postfix/system/wait_qmgr 60
ExecStartPost=/etc/postfix/system/cond_slp register
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postfix-SuSE/rc.postfix new/postfix-SuSE/rc.postfix
--- old/postfix-SuSE/rc.postfix 2012-03-07 07:29:40.000000000 +0100
+++ new/postfix-SuSE/rc.postfix 2012-07-19 08:48:49.000000000 +0200
@@ -107,29 +107,6 @@
return $RET
}
-update_postmaps() {
- test -f /etc/sysconfig/postfix && . /etc/sysconfig/postfix
-
- if [ -n "${POSTFIX_UPDATE_MAPS/[yY][Ee][Ss]/}" ]; then
- return
- fi
- # Update the postmaps
- for i in $POSTFIX_MAP_LIST; do
- m=/etc/postfix/$i;
- d=$m.db
- if [ -e $m -a $m -nt $d ]; then
- postmap $m;
- fi
- done
- for i in /etc/aliases /etc/aliases.d/*; do
- m=${i/.db//}
- d=$m.db
- if [ -e $m -a $m -nt $d ]; then
- postalias $m;
- fi
- done
-}
-
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
# rc_status check and set local and overall rc status
@@ -221,7 +198,7 @@
## the echo return value is set appropriate.
if ! checkproc -p $PIDFILE $MASTER_BIN; then
- update_postmaps
+ /etc/postfix/system/update_postmaps
$POSTFIX_BIN start > /dev/null 2>&1
else
rc_reset
@@ -270,6 +247,7 @@
echo -n "Reload mail service (Postfix)"
+ /etc/postfix/system/update_postmaps
$POSTFIX_BIN reload > /dev/null 2>&1
rc_status -v
POSTFIX_BIN flush > /dev/null 2>&1
@@ -281,6 +259,7 @@
reload)
echo -n "Reload mail service (Postfix)"
+ /etc/postfix/system/update_postmaps
$POSTFIX_BIN reload > /dev/null 2>&1
rc_status -v
$POSTFIX_BIN flush > /dev/null 2>&1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postfix-SuSE/rebuild_tables.systemd
new/postfix-SuSE/rebuild_tables.systemd
--- old/postfix-SuSE/rebuild_tables.systemd 2011-12-13 15:49:34.000000000
+0100
+++ new/postfix-SuSE/rebuild_tables.systemd 1970-01-01 01:00:00.000000000
+0100
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2011 SUSE LINUX Products AG
-#
-# Author: Peter Varkoly
-# Please send feedback to http://www.suse.de/feedback/
-#
-# /etc/postfix/system/rebuild_tables
-#
-
-test -f /etc/sysconfig/postfix && . /etc/sysconfig/postfix
-
-if [ -n "${POSTFIX_UPDATE_MAPS/[yY][Ee][Ss]/}" ]; then
- return
-fi
-# Update the postmaps
-for i in $POSTFIX_MAP_LIST; do
- m=/etc/postfix/$i;
- d=$m.db
- test -e "$d" || continue;
- if [ -e $m -a $m -nt $d ]; then
- postmap $m;
- fi
-done
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postfix-SuSE/update_postmaps.systemd
new/postfix-SuSE/update_postmaps.systemd
--- old/postfix-SuSE/update_postmaps.systemd 1970-01-01 01:00:00.000000000
+0100
+++ new/postfix-SuSE/update_postmaps.systemd 2012-07-19 08:51:08.000000000
+0200
@@ -0,0 +1,31 @@
+#!/bin/bash
+# Copyright (c) 2012 SUSE LINUX Products AG
+#
+# Author: Peter Varkoly
+# Please send feedback to http://www.suse.de/feedback/
+#
+# /etc/postfix/system/update_postmaps
+#
+
+
+test -f /etc/sysconfig/postfix && . /etc/sysconfig/postfix
+
+if [ -n "${POSTFIX_UPDATE_MAPS/[yY][Ee][Ss]/}" ]; then
+ return
+fi
+# Update the postmaps
+for i in $POSTFIX_MAP_LIST; do
+ m=/etc/postfix/$i;
+ d=$m.db
+ if [ -e $m -a $m -nt $d ]; then
+ postmap $m;
+ fi
+done
+for i in /etc/aliases /etc/aliases.d/*; do
+ m=${i/.db//}
+ d=$m.db
+ if [ -e $m -a $m -nt $d ]; then
+ postalias $m;
+ fi
+done
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
