diff options
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 f915774f4..25161226b 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 870050f20..2f7f12094 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 |