diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-02-07 22:32:38 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2020-02-08 08:59:48 +0100 |
| commit | 080300e1e7dec7bb1a6297b5a4406e2c0be46048 (patch) | |
| tree | 4ca397920d9a177af9eb3ca6781e2c8498b3672d /source/n/vsftpd | |
| parent | 194ec853e8f20fd32d5a91eec74ff77383093f4e (diff) | |
| download | current-080300e1e7dec7bb1a6297b5a4406e2c0be46048.tar.gz | |
Fri Feb 7 22:32:38 UTC 202020200207223238
a/kernel-firmware-20200206_5351afe-noarch-1.txz: Upgraded.
ap/ghostscript-9.50-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
ap/gutenprint-5.3.3-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
ap/nano-4.8-x86_64-1.txz: Upgraded.
ap/screen-4.8.0-x86_64-1.txz: Upgraded.
ap/vim-8.2.0224-x86_64-1.txz: Upgraded.
d/cvs-1.11.23-x86_64-4.txz: Rebuilt.
Recompiled against krb5-1.17.1.
d/strace-5.5-x86_64-1.txz: Upgraded.
kde/kdelibs-4.14.38-x86_64-6.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/gtk+2-2.24.32-x86_64-3.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/gtk+3-3.24.13-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/libsoup-2.68.3-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/libssh-0.9.3-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/loudmouth-1.5.3-x86_64-4.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/neon-0.30.2-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
n/cifs-utils-6.10-x86_64-2.txz: Rebuilt.
Recompiled to build cifs.upcall.
n/curl-7.68.0-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
n/cyrus-sasl-2.1.27-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
xap/vim-gvim-8.2.0224-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n/vsftpd')
| -rw-r--r-- | source/n/vsftpd/doinst.sh | 3 | ||||
| -rwxr-xr-x | source/n/vsftpd/vsftpd.SlackBuild | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/source/n/vsftpd/doinst.sh b/source/n/vsftpd/doinst.sh index f915774f..25161226 100644 --- a/source/n/vsftpd/doinst.sh +++ b/source/n/vsftpd/doinst.sh @@ -9,6 +9,9 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } +if [ -r etc/pam.d/vsftpd.new ]; then + config etc/pam.d/vsftpd.new +fi config etc/vsftpd.conf.new config etc/logrotate.d/vsftpd.new rm -f etc/logrotate.d/vsftpd.new diff --git a/source/n/vsftpd/vsftpd.SlackBuild b/source/n/vsftpd/vsftpd.SlackBuild index 870050f2..2f7f1209 100755 --- a/source/n/vsftpd/vsftpd.SlackBuild +++ b/source/n/vsftpd/vsftpd.SlackBuild @@ -26,8 +26,6 @@ PKGNAM=vsftpd VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-5} -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -46,6 +44,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" else @@ -92,6 +92,11 @@ cat vsftpd.8 | gzip -9c > $PKG/usr/man/man8/vsftpd.8.gz mkdir -p $PKG/etc cat vsftpd.conf > $PKG/etc/vsftpd.conf.new +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + mkdir -p $PKG/etc/pam.d + cat RedHat/vsftpd.pam > $PKG/etc/pam.d/vsftpd.new +fi + mkdir -p $PKG/etc/logrotate.d zcat $CWD/vsftpd.log.gz > $PKG/etc/logrotate.d/vsftpd.new |