diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-02 11:49:30 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-02 11:49:30 +0100 |
commit | 8c2be15938e3ec559429e4137420ac246c9f7641 (patch) | |
tree | 985da2395afe5f2fbafa6e8c1cfc4296a6cb4f58 /extra/postfix | |
parent | 9d0a374dab604311fd494d33b285d61d61d1d906 (diff) | |
parent | ac5ada660240f37d7347e42123071990f616e418 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/mtpaint/PKGBUILD
community-testing/mtpaint/PKGBUILD
community-testing/rawtherapee/PKGBUILD
community/gedit-plugins/PKGBUILD
core/iptables/PKGBUILD
core/sudo/PKGBUILD
extra/xfce4-xkb-plugin/PKGBUILD
multilib/lib32-zlib/PKGBUILD
staging/mtpaint/PKGBUILD
testing/kmod/PKGBUILD
testing/openjdk6/PKGBUILD
testing/run-parts/PKGBUILD
testing/xulrunner/PKGBUILD
Diffstat (limited to 'extra/postfix')
-rw-r--r-- | extra/postfix/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/postfix/install | 5 |
2 files changed, 8 insertions, 10 deletions
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index c5dbb9e31..a9b00ebe1 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 146479 2012-01-11 15:22:30Z stephane $ +# $Id: PKGBUILD 148446 2012-02-01 03:47:09Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix -pkgver=2.8.7 -pkgrel=2 +pkgver=2.9.0 +pkgrel=1 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') @@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ 'aliases.patch' \ 'rc.d') -sha1sums=('81c87aceff4d9af67a304354bab9c99ac98fc8a0' +sha1sums=('a04a72a8b9436279a30b7d1b62197be63124a132' '5fc3de6c7df1e5851a0a379e825148868808318b' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') @@ -58,7 +58,6 @@ package() { install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - cd "${pkgdir}" - patch -p0 -i "${srcdir}"/aliases.patch + sed 's/\(^\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files" + cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch } diff --git a/extra/postfix/install b/extra/postfix/install index c276e0919..cb97e2e6c 100644 --- a/extra/postfix/install +++ b/extra/postfix/install @@ -18,10 +18,9 @@ post_install() { post_upgrade() { post_install - if [ `vercmp $2 2.8.3` = -1 ]; then cat <<EOF + if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF -==> You must now execute "/etc/rc.d/postfix reload" (or restart). -==> This is needed because of an inter-daemon protocol change. +==> You must now run "postfix reload" due to inter-daemon protocol change. EOF fi |