summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/postfix/doinst.sh1
-rw-r--r--network/postfix/postfix.SlackBuild13
-rw-r--r--network/postfix/postfix.info8
3 files changed, 14 insertions, 8 deletions
diff --git a/network/postfix/doinst.sh b/network/postfix/doinst.sh
index 5a4c96e902..c4afc6a422 100644
--- a/network/postfix/doinst.sh
+++ b/network/postfix/doinst.sh
@@ -21,7 +21,6 @@ config etc/postfix/main.cf.default.new
config etc/postfix/main.cf.new
config etc/postfix/makedefs.out.new
config etc/postfix/master.cf.new
-config etc/postfix/postfix-files.new
config etc/postfix/relocated.new
config etc/postfix/transport.new
config etc/postfix/virtual.new
diff --git a/network/postfix/postfix.SlackBuild b/network/postfix/postfix.SlackBuild
index 0c5b1ac7c6..ecde0b3979 100644
--- a/network/postfix/postfix.SlackBuild
+++ b/network/postfix/postfix.SlackBuild
@@ -20,20 +20,25 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM="postfix"
-VERSION="2.5.5"
+VERSION="2.6.1"
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
-PKG="$TMP/pkg-$PRGNAM"
+PKG="$TMP/package-$PRGNAM"
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e
@@ -215,15 +220,17 @@ gzip -9 $PKG/usr/man/*/*
cd $PKG/etc/postfix
# Since we gzip the manpages, let's fix the postfix-files to reflect that
# so it won't throw errors during post-install
+( cd $PKG/usr/libexec/postfix
grep manpage postfix-files | while read line;
do MANPAGE="$(echo "$line" | cut -d: -f1)"
sed -i s#"$MANPAGE"#"$MANPAGE.gz"# postfix-files ;
done
+)
# Create .new files
for i in \
access aliases canonical generic header_checks main.cf main.cf.default \
- makedefs.out master.cf postfix-files relocated transport virtual ;
+ makedefs.out master.cf relocated transport virtual ;
do \
mv $i $i.new ;
done
diff --git a/network/postfix/postfix.info b/network/postfix/postfix.info
index 6c8d31c196..d8c7749ebe 100644
--- a/network/postfix/postfix.info
+++ b/network/postfix/postfix.info
@@ -1,8 +1,8 @@
PRGNAM="postfix"
-VERSION="2.5.5"
+VERSION="2.6.1"
HOMEPAGE="http://www.postfix.org/"
-DOWNLOAD="http://www.subneural.net/postfix-release/official/postfix-2.5.5.tar.gz"
-MD5SUM="6b4b848bdd2239dddfc9d385e57e19ef"
+DOWNLOAD="http://www.subneural.net/postfix-release/official/postfix-2.6.1.tar.gz"
+MD5SUM="737bbc245da9c72c174893397f70ae86"
MAINTAINER="Alan Hicks"
EMAIL="alan@lizella.net"
-APPROVED="rworkman"
+APPROVED="dsomero"