Hello community, here is the log from the commit of package postfix checked in at Mon Feb 26 19:06:54 CET 2007. -------- --- postfix/postfix.changes 2007-01-16 09:11:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/postfix/postfix.changes 2007-02-26 10:34:32.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 26 10:32:36 CET 2007 - varkoly@suse.de + +- #247351 - postfix - Ports for SuSEfirewall added via packages + +- Move postfix.xml into the postfix-SuSE tarball + +------------------------------------------------------------------- Old: ---- postfix.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.uE6894/_old 2007-02-26 19:06:38.000000000 +0100 +++ /var/tmp/diff_new_pack.uE6894/_new 2007-02-26 19:06:38.000000000 +0100 @@ -22,10 +22,9 @@ Autoreqprov: on Summary: A fast, secure, and flexible mailer Version: 2.3.2 -Release: 34 +Release: 37 Source: postfix-%{version}.tar.gz Source1: postfix-SuSE.tar.gz -Source2: postfix.xml Patch: dynamic_maps.patch Patch1: dynamic_maps_pie.patch Prereq: /usr/sbin/useradd /usr/sbin/groupadd %insserv_prereq %fillup_prereq /bin/sed /bin/awk /bin/grep textutils sh-utils fileutils pcre openldap2-client netcfg /sbin/ip @@ -187,7 +186,9 @@ rm -rf $RPM_BUILD_ROOT/var/spool/postfix install -m 644 postfix-SuSE/master.cf $RPM_BUILD_ROOT/%{conf_backup_dir}/master.cf mkdir -p $RPM_BUILD_ROOT/%{omc_dir} -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{omc_dir} +install -m 644 postfix-SuSE/postfix.xml $RPM_BUILD_ROOT/%{omc_dir} +mkdir -p $RPM_BUILD_ROOT/usr/share/SuSEfirewall2/services/ +install -m 644 postfix-SuSE/postfix-fw $RPM_BUILD_ROOT/usr/share/SuSEfirewall2/services/postfix { cat<<EOF # @@ -491,6 +492,7 @@ %config(noreplace) /etc/postfix/header_checks %config(noreplace) /etc/postfix/bounce.cf.default %config(noreplace) /etc/postfix/dynamicmaps.cf +%config(noreplace) /usr/share/SuSEfirewall2/services/postfix %dir /etc/sasl2/ %config(noreplace) /etc/sasl2/smtpd.conf /etc/postfix/LICENSE @@ -567,7 +569,10 @@ Wietse Venema <wietse@porcupine.org> -%changelog -n postfix +%changelog +* Mon Feb 26 2007 - varkoly@suse.de +- #247351 - postfix - Ports for SuSEfirewall added via packages +- Move postfix.xml into the postfix-SuSE tarball * Mon Jan 15 2007 - varkoly@suse.de - #144104 - postfix does not start - Implementing Fate #301840: Postfix XML Service Description Document ++++++ postfix-SuSE.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-SuSE/postfix-fw new/postfix-SuSE/postfix-fw --- old/postfix-SuSE/postfix-fw 1970-01-01 01:00:00.000000000 +0100 +++ new/postfix-SuSE/postfix-fw 2007-02-26 10:29:47.000000000 +0100 @@ -0,0 +1,17 @@ +## Description: Firewall Configuration file for postfix + +# space separated list of allowed TCP ports +TCP="25 465" + +# space separated list of allowed UDP ports +UDP="" + +# space separated list of allowed RPC services +RPC="" + +# space separated list of allowed IP protocols +IP="" + +# space separated list of allowed UDP broadcast ports +BROADCAST="" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-SuSE/postfix.xml new/postfix-SuSE/postfix.xml --- old/postfix-SuSE/postfix.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/postfix-SuSE/postfix.xml 2007-01-16 09:11:27.000000000 +0100 @@ -0,0 +1,77 @@ +<?xml version="1.0"?> +<!-- +Sample Service Description XML Document. + +This file should be placed in /etc/omc/svcinfo.d +It should be named <service name>.xml. The reason for the naming scheme, +is that other services can refer to this service in their dependency list using +the file name minus the '.xml' extension. + +Note: The name of the service is the name of this file without the .xml +file extension. + --> + +<serviceDescription version="1.0"> + + <!-- Caption for display purposes --> + <caption>Postfix Mail Server</caption> + + <!-- Description of this service --> + <description> + Postfix is a fast, secure, and flexible mailer. + Postfix aims to be an alternative to the widely-used sendmail program. + </description> + + <!-- + Define the services that this service has a dependency on. + There must be a corresponding Service Description XML file + for the antecedent service in the /etc/omc/svcinfo.d directory. + --> + <dependsOn> + <serviceName>network</serviceName> + <serviceName>syslog</serviceName> + </dependsOn> + + <!-- + The startCommand tag specifies the command line that will be + invoked to start the service. The return code from this command + must be as follows: + 0 - success + 1 - generic or unspecified error + 2 - invalid or excess argument(s) + 3 - unimplemented feature (e.g. "reload") + 4 - user had insufficient privileges + 5 - program is not installed + 6 - program is not configured + 7 - program is not running + --> + <startCommand>/usr/sbin/postfix start</startCommand> + + <!-- + The reStartCommand tag specifies the command line that will be + invoked to restart the service. The return code from this command + must be as specified in the startCommand tag. + --> + <reStartCommand>/usr/sbin/postfix restart</reStartCommand> + + <!-- + The stopCommand tag specifies the command line that will be + invoked to stop the service. The return code from this command + must be as specified in the startCommand tag. + --> + <stopCommand>/usr/sbin/postfix stop</stopCommand> + + <!-- + The statusCommand specifies the command line that can be run + that will report on the status of the service. The return code + from this command line should be as follows: + 0 - service up and running + 1 - service dead, but /var/run/ pid file exists + 2 - service dead, but /var/lock/ lock file exists + 3 - service not running (unused) + 4 - service status unknown :-( + --> + <statusCommand>/etc/init.d/postfix status</statusCommand> + +</serviceDescription> + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-SuSE/SuSEconfig.postfix new/postfix-SuSE/SuSEconfig.postfix --- old/postfix-SuSE/SuSEconfig.postfix 2007-01-16 09:08:32.000000000 +0100 +++ new/postfix-SuSE/SuSEconfig.postfix 2007-02-26 10:24:26.000000000 +0100 @@ -485,10 +485,10 @@ $line = $1; } if ( $use_amavis eq "yes" ) { - $line =~ /(\#?\s*smtp\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(\s+\w+)/; + $line =~ /(\#?\s*smtp\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; $line = $1."10".$2." -o content_filter=smtp:[127.0.0.1]:10024"; } else { - $line =~ /(\#?\s*smtp\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(\s+\w+)/; + $line =~ /(\#?\s*smtp\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; $line = $1."-".$2; } } elsif( /\#?\s*(local\s+unix.*)/ ) { @@ -520,10 +520,10 @@ $line = $1." -o smtpd_tls_wrappermode=yes"; } if ( $use_amavis eq "yes" ) { - $line =~ /(\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(\s+\w+)/; + $line =~ /(\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; $line = $1."10".$2." -o content_filter=smtp:[127.0.0.1]:10024"; } else { - $line =~ /(\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(\s+\w+)/; + $line =~ /(\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; $line = $1."-".$2; } } elsif( /^(\#?\s*(?:pickup|qmgr)\s+)(?:fifo|unix)(\s+.*)/ ) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org