Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2012-01-19 09:44:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfix", Maintainer is "varkoly@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2011-12-14 14:34:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes 2012-01-19 09:44:12.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Jan 12 12:18:17 UTC 2012 - varkoly@suse.com + +- Add postmap rebuild script to systemv init script too + +------------------------------------------------------------------- +Wed Jan 11 14:21:21 UTC 2012 - varkoly@suse.com + +- bnc#738900 - cyrus-imapd not receiving mail from postfix + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.wxOd7y/_old 2012-01-19 09:44:13.000000000 +0100 +++ /var/tmp/diff_new_pack.wxOd7y/_new 2012-01-19 09:44:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package postfix # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,13 @@ # - Name: postfix Summary: A fast, secure, and flexible mailer -Version: 2.8.7 -Release: 1 -License: IBM Public License .. +License: IPL-1.0 Group: Productivity/Networking/Email/Servers +Version: 2.8.7 +Release: 0 Url: http://www.postfix.org/ -AutoReqProv: on Source: %{name}-%{version}.tar.bz2 Source1: %{name}-SuSE.tar.gz Source2: %{name}-mysql.tar.bz2 @@ -42,7 +40,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq PreReq: /usr/bin/getent -PreReq: /usr/sbin/useradd /usr/sbin/groupadd +PreReq: /usr/sbin/useradd /usr/sbin/groupadd /usr/sbin/usermod PreReq: /bin/sed /bin/awk /bin/grep PreReq: textutils sh-utils fileutils pcre netcfg %if 0%{?suse_version} > 1130 @@ -51,7 +49,9 @@ Requires: iproute2 BuildRequires: db-devel BuildRequires: mysql-devel -BuildRequires: openldap2-devel pcre-devel postgresql-devel +BuildRequires: openldap2-devel +BuildRequires: pcre-devel +BuildRequires: postgresql-devel # require pwdutils to make postinstall script check work BuildRequires: pwdutils %if 0%{?suse_version} >= 1100 @@ -84,6 +84,7 @@ %define pf_uid 51 %define pf_gid 51 %define maildrop_gid 59 +%define mail_gid 12 %define conf_backup_dir /var/adm/backup/%{name} %define omc_pdir /usr/share/omc/ %define omc_dir /usr/share/omc/svcinfo.d/ @@ -100,9 +101,7 @@ %package devel Summary: Development headers for the postfix package -License: IBM Public License .. Group: Development/Libraries/C and C++ -AutoReqProv: on PreReq: %{name} = %{version} %description devel @@ -110,7 +109,6 @@ %package doc Summary: Documentations for the postfix package -License: IBM Public License .. Group: Productivity/Networking/Email/Servers %if 0%{?suse_version} >= 1120 BuildArch: noarch @@ -122,9 +120,7 @@ %package mysql Summary: Postfix plugin to support MySQL maps -License: IBM Public License .. Group: Productivity/Networking/Email/Servers -AutoReqProv: on PreReq: %{name} = %{version} %description mysql @@ -133,9 +129,7 @@ %package postgresql Summary: Postfix plugin to support PostgreSQL maps -License: IBM Public License .. Group: Productivity/Networking/Email/Servers -AutoReqProv: on PreReq: %{name} = %{version} %description postgresql @@ -181,6 +175,7 @@ /usr/sbin/groupadd -g %{pf_gid} -o -r %{name} 2> /dev/null || : /usr/sbin/groupadd -g %{maildrop_gid} -o -r maildrop 2> /dev/null || : /usr/sbin/useradd -r -o -g %{name} -u %{pf_uid} -s /bin/false -c "Postfix Daemon" -d /%{pf_queue_directory} %{name} 2> /dev/null || : +/usr/sbin/usermod -G %{maildrop_gid},%{mail_gid} {name} 2> /dev/null || : mkdir -p $RPM_BUILD_ROOT/%{_libdir} install lib/*.1 $RPM_BUILD_ROOT/%{_libdir} for i in $RPM_BUILD_ROOT/%{_libdir}/*.1; do @@ -330,6 +325,7 @@ /usr/sbin/groupadd -g %{pf_gid} -o -r %{name} 2> /dev/null || : /usr/sbin/groupadd -g %{maildrop_gid} -o -r maildrop 2> /dev/null || : /usr/sbin/useradd -r -o -g %{name} -u %{pf_uid} -s /bin/false -c "Postfix Daemon" -d /%{pf_queue_directory} %{name} 2> /dev/null || : +/usr/sbin/usermod -G %{maildrop_gid},%{mail_gid} {name} 2> /dev/null || : # --------------------------------------------------------------------------- %pre mysql ++++++ postfix-SuSE.tar.gz ++++++ 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 2011-08-22 11:29:28.000000000 +0200 +++ new/postfix-SuSE/rc.postfix 2012-01-12 13:17:54.000000000 +0100 @@ -107,6 +107,23 @@ 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 + test -e "$d" || continue; + if [ -e $m -a $m -nt $d ]; then + postmap $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 @@ -198,6 +215,7 @@ ## the echo return value is set appropriate. if ! checkproc -p $PIDFILE $MASTER_BIN; then + update_postmaps $POSTFIX_BIN start > /dev/null 2>&1 else rc_reset -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org