4 files changed, 24 insertions, 26 deletions
diff --git a/network/opensmtpd/README b/network/opensmtpd/README
index 2931722d49..bbd1b2606f 100644
--- a/network/opensmtpd/README
+++ b/network/opensmtpd/README
@@ -5,6 +5,7 @@ speaking the SMTP protocol.
 
 You must have smtpd and smtpq users and groups on the system for
 privilege separation - something like this should suffice:
+
   groupadd -g 270 smtpd
   useradd -u 270 -g 270 -r -s /bin/false -d /var/empty smtpd
   groupadd -g 271 smtpq
@@ -17,3 +18,9 @@ rc.opensmtpd).
 This package conflicts with the stock sendmail package included in
 Slackware and overwrites some of its files, so remove the sendmail
 package before installing opensmtpd.
+
+In the change from version 5.7.3p2 to 5.9.2p1 the ownership and permissions
+changed for the /var/spool/offline directory
+
+  chown -R root:smtpq /var/spool/offline
+  chmod 770           /var/spool/offline
diff --git a/network/opensmtpd/configure.diff b/network/opensmtpd/configure.diff
deleted file mode 100644
index ad3378e2f9..0000000000
--- a/network/opensmtpd/configure.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 9ddff435fb..d8d9ab0c45 100644
--- a/network/opensmtpd/opensmtpd.SlackBuild
+++ b/network/opensmtpd/opensmtpd.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opensmtpd
-VERSION=${VERSION:-5.7.3p2}
+VERSION=${VERSION:-5.9.2p1}
 EXTRAS=${EXTRAS:-5.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -85,6 +85,7 @@ cd $TMP
 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 \
@@ -92,8 +93,6 @@ find -L . \
  \( -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" \
 ./configure \
@@ -101,16 +100,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc/opensmtpd \
   --localstatedir=/var \
-  --with-sock-dir=/var/run \
+  --with-path-socket=/var/run \
   --mandir=/usr/man \
   --with-mantype=doc \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --without-rpath \
-  --with-maildir=/var/spool/mail \
-  --with-privsep-user=smtpd \
-  --with-queue-user=smtpq \
-  --with-ca-file=/etc/ssl/certs/ca-certificates.crt \
-  --enable-table-db \
+  --with-path-mbox=/var/spool/mail \
+  --with-user-smtpd=smtpd \
+  --with-user-queue=smtpq \
+  --with-group-queue=smtpq \
+  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \
+  --with-table-db \
   --build=$ARCH-slackware-linux
 
 make
@@ -124,9 +124,10 @@ rm -f $PKG/usr/bin/sendmail $PKG/usr/sbin/sendmail
 ln -s smtpctl $PKG/usr/sbin/sendmail
 ln -s ../sbin/sendmail $PKG/usr/bin/sendmail
 
-rm -f $PKG/usr/sbin/mailq $PKG/usr/sbin/newaliases
-ln -s makemap $PKG/usr/sbin/newaliases
+rm -f $PKG/usr/sbin/mailq $PKG/usr/sbin/newaliases $PKG/usr/sbin/makemap
 ln -s smtpctl $PKG/usr/sbin/mailq
+ln -s smtpctl $PKG/usr/sbin/newaliases
+ln -s smtpctl $PKG/usr/sbin/makemap
 
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.opensmtpd > $PKG/etc/rc.d/rc.opensmtpd.new
@@ -144,6 +145,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a INSTALL LICENSE README.md THANKS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README             > $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -151,4 +153,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -p -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/opensmtpd/opensmtpd.info b/network/opensmtpd/opensmtpd.info
index 896808a413..75b162c6c3 100644
--- a/network/opensmtpd/opensmtpd.info
+++ b/network/opensmtpd/opensmtpd.info
@@ -1,8 +1,8 @@
 PRGNAM="opensmtpd"
-VERSION="5.7.3p2"
+VERSION="5.9.2p1"
 HOMEPAGE="http://www.opensmtpd.org/"
-DOWNLOAD="http://www.opensmtpd.org/archives/opensmtpd-5.7.3p2.tar.gz"
-MD5SUM="85bdccf1f28945771f79fd33e893cc43"
+DOWNLOAD="https://www.opensmtpd.org/archives/opensmtpd-5.9.2p1.tar.gz"
+MD5SUM="d109374dcc4bc8be14f790b859f1dd31"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libasr"