diff options
| -rw-r--r-- | network/opensmtpd/configure.diff | 11 | ||||
| -rw-r--r-- | network/opensmtpd/opensmtpd.SlackBuild | 36 | ||||
| -rw-r--r-- | network/opensmtpd/opensmtpd.info | 10 | ||||
| -rw-r--r-- | network/opensmtpd/rc.opensmtpd | 2 |
4 files changed, 37 insertions, 22 deletions
diff --git a/network/opensmtpd/configure.diff b/network/opensmtpd/configure.diff new file mode 100644 index 0000000000..ad3378e2f9 --- /dev/null +++ b/network/opensmtpd/configure.diff @@ -0,0 +1,11 @@ +--- configure.orig 2015-06-30 01:22:36.000000000 -0700 ++++ configure 2015-07-21 18:33:56.261377490 -0700 +@@ -19210,7 +19210,7 @@ + LIBS="$save_LIBS" + + +- if test $use_db_api = 1; then ++ if test x$use_db_api = x1; then + HAVE_DB_API_TRUE= + HAVE_DB_API_FALSE='#' + else diff --git a/network/opensmtpd/opensmtpd.SlackBuild b/network/opensmtpd/opensmtpd.SlackBuild index 57f9282999..c30f512a1d 100644 --- a/network/opensmtpd/opensmtpd.SlackBuild +++ b/network/opensmtpd/opensmtpd.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for opensmtpd # Copyright 2013-2014 Robby Workman, Northport, Alabama, USA +# Copyright 2015 Richard Narron, California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=opensmtpd -VERSION=${VERSION:-5.4.2p1} +VERSION=${VERSION:-5.7.1p1} +EXTRAS=${EXTRAS:-5.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -41,16 +43,16 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fstack-protector" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fstack-protector" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -fstack-protector" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fstack-protector" LIBDIRSUFFIX="" fi @@ -76,18 +78,21 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT + cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +patch -p0 <$CWD/configure.diff CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -105,6 +110,7 @@ CXXFLAGS="$SLKCFLAGS" \ --with-privsep-user=smtpd \ --with-queue-user=smtpq \ --with-ca-file=/etc/ssl/certs/ca-certificates.crt \ + --enable-table-db \ --build=$ARCH-slackware-linux make @@ -137,9 +143,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - INSTALL LICENSE README.md THANKS examples \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a INSTALL LICENSE README.md THANKS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/opensmtpd/opensmtpd.info b/network/opensmtpd/opensmtpd.info index 6b933c2894..331141fab4 100644 --- a/network/opensmtpd/opensmtpd.info +++ b/network/opensmtpd/opensmtpd.info @@ -1,10 +1,10 @@ PRGNAM="opensmtpd" -VERSION="5.4.2p1" +VERSION="5.7.1p1" HOMEPAGE="http://www.opensmtpd.org/" -DOWNLOAD="http://www.opensmtpd.org/archives/opensmtpd-5.4.2p1.tar.gz" -MD5SUM="c76b39a5fcc0ad05eea541e74b16e62a" +DOWNLOAD="http://www.opensmtpd.org/archives/opensmtpd-5.7.1p1.tar.gz" +MD5SUM="bf81fdc691808efa6acd7bdde5df757f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" +MAINTAINER="Richard Narron" +EMAIL="richard@aaazen.com" diff --git a/network/opensmtpd/rc.opensmtpd b/network/opensmtpd/rc.opensmtpd index cd0039fda2..bd4dc25cda 100644 --- a/network/opensmtpd/rc.opensmtpd +++ b/network/opensmtpd/rc.opensmtpd @@ -9,7 +9,7 @@ smtpd_start() { } smtpd_stop() { - smtpctl stop + smtpctl stop || pkill smtpd } # Restart smtpd: |