Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

3 files changed, 31 insertions, 22 deletions

diff --git a/source/n/proftpd/etc/proftpd.conf b/source/n/proftpd/etc/proftpd.conf
index ffb0df3fe..50ee487c2 100644
--- a/source/n/proftpd/etc/proftpd.conf
+++ b/source/n/proftpd/etc/proftpd.conf
@@ -10,39 +10,39 @@ DefaultServer			on
 
 # Port 21 is the standard FTP port.
 Port				21
+
 # Umask 022 is a good standard umask to prevent new dirs and files
 # from being group and world writable.
 Umask				022
 
+# Don't use IPv6 support by default.
+UseIPv6				off
+
 # To prevent DoS attacks, set the maximum number of child processes
 # to 30.  If you need to allow more than 30 concurrent connections
 # at once, simply increase this value.  Note that this ONLY works
 # in standalone mode, in inetd mode you should use an inetd server
 # that allows you to limit maximum number of processes per service
-# (such as xinetd)
+# (such as xinetd).
 MaxInstances			30
 
-# Set the user and group that the server normally runs at.
+# Set the user and group under which the server will run.
 User				nobody
 Group				nogroup
 
-# This next option is required for NIS or NIS+ to work properly:
-#PersistentPasswd off
-
+# Set system log location:
 SystemLog			/var/log/proftpd.log
 TransferLog			/var/log/xferlog
 
 # Normally, we want files to be overwriteable.
-<Directory /*>
-  AllowOverwrite		on
-</Directory>
+AllowOverwrite			on
 
 # A basic anonymous FTP server configuration.
 # To enable this, remove the user ftp from /etc/ftpusers.
 <Anonymous ~ftp>
-  RequireValidShell		off
   User				ftp
   Group				ftp
+
   # We want clients to be able to login with "anonymous" as well as "ftp"
   UserAlias			anonymous ftp
 
diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild
index db0d0d267..7d04e9e6c 100755
--- a/source/n/proftpd/proftpd.SlackBuild
+++ b/source/n/proftpd/proftpd.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2016  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2016, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,14 +20,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
-VERSION=1.3.5b
-DIRVER=1.3.5b
-BUILD=${BUILD:-1}
+PKGNAM=proftpd
+VERSION=1.3.6
+DIRVER=1.3.6
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-PROFTPD_MODS="mod_radius:mod_ban:mod_readme:mod_ratio:mod_tls:mod_wrap:mod_ctrls_admin:mod_quotatab:mod_quotatab_file"
+PROFTPD_MODS="mod_radius:mod_ban:mod_readme:mod_ratio:mod_tls:mod_wrap:mod_ctrls_admin:mod_quotatab:mod_quotatab_file:mod_sftp:mod_facl"
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -39,6 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -53,7 +63,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-proftpd
 
@@ -86,7 +95,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-nls \
   --localstatedir=/var/run \
   --with-modules="${PROFTPD_MODS}" \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/source/n/proftpd/slack-desc b/source/n/proftpd/slack-desc
index 5ed80ca92..35b73bf2e 100644
--- a/source/n/proftpd/slack-desc
+++ b/source/n/proftpd/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
 # leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
 proftpd: proftpd (FTP server daemon)
 proftpd:
 proftpd: ProFTPD is the Professional File Transfer Protocol (FTP) server
-proftpd: daemon.  ProFTPD grew out of the desire to have a secure and
+proftpd: daemon. ProFTPD grew out of the desire to have a secure and
 proftpd: configurable FTP server, and out of a significant admiration of the
 proftpd: Apache web server.
 proftpd:
-proftpd:
+proftpd: Homepage: http://www.proftpd.org
 proftpd:
 proftpd:
 proftpd: