[arch-commits] Commit in postfix/repos (3 files)

[Eric Belanger]

    Date: Tuesday, July 29, 2008 @ 20:02:43
  Author: eric
Revision: 7305

Merged revisions 3992-7304 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/postfix/trunk

........
  r7297 | hugo | 2008-07-29 12:56:49 -0400 (Tue, 29 Jul 2008) | 2 lines
  
  upgpkg: postfix 2.5.3-1
      this fixes FS#10864  FS#8565 and FS#4163
........

Modified:
  postfix/repos/extra-x86_64/	(properties)
  postfix/repos/extra-x86_64/PKGBUILD
  postfix/repos/extra-x86_64/postfix

----------+
 PKGBUILD |   14 +++++++-------
 postfix  |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)


Property changes on: postfix/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /postfix/trunk:1-3991
   + /postfix/trunk:1-7304

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-29 23:58:22 UTC (rev 7304)
+++ extra-x86_64/PKGBUILD	2008-07-30 00:02:43 UTC (rev 7305)
@@ -2,10 +2,10 @@
 # Contributor: Jeff Brodnax <tullyarcher at bellsouth.net>
 # Maintainer: Dale Blount <dale at archlinux.org>
 pkgname=postfix
-pkgver=2.5.2
-pkgrel=2
+pkgver=2.5.3
+pkgrel=1
 pkgdesc="Secure, fast, easy to administer drop in replacement for Sendmail (MTA)"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs>=8.3' 'libldap' 'db>=4.7')
 backup=(etc/postfix/aliases etc/postfix/virtual etc/postfix/relocated \
@@ -13,15 +13,15 @@
 	etc/postfix/generic etc/postfix/canonical \
 	etc/postfix/main.cf etc/postfix/master.cf)
 install="$pkgname.install"
-provides=('smtp-server')
+provides=('smtp-server' 'smtp-forwarder')
 replaces=('postfix-mysql' 'postfix-pgsql')
-conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server')
+conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder')
 url="http://www.postfix.org/"
 source=(ftp://ftp.porcupine.org/mirrors/postfix-release/official/$pkgname-$pkgver.tar.gz \
         $pkgname.patch.bz2 \
 	$pkgname)
-md5sums=('b0965aea4d548d9bd231af7143aa6942' 'a3c45ff23ef036143711793fcf2478c3'\
-         '35f0bc4d5a318d27fda3f79551a0e923')
+md5sums=('4c0f8fece828c9bac14f351fc34d15b3' 'a3c45ff23ef036143711793fcf2478c3'\
+         'c847b96f08925f08b0f610468a8e21f6')
 
 build() {
 	cd $startdir/src/$pkgname-$pkgver

Modified: extra-x86_64/postfix
===================================================================
--- extra-x86_64/postfix	2008-07-29 23:58:22 UTC (rev 7304)
+++ extra-x86_64/postfix	2008-07-30 00:02:43 UTC (rev 7305)
@@ -3,7 +3,7 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/postfix/master`
+PID=`pgrep -f /usr/lib/postfix/master`
 
 start() {
   stat_busy "Starting Postfix"