diff options
Diffstat (limited to 'source/n')
| -rwxr-xr-x | source/n/cifs-utils/cifs-utils.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/n/curl/curl.SlackBuild | 5 | ||||
| -rwxr-xr-x | source/n/cyrus-sasl/cyrus-sasl.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/n/dovecot/dovecot.SlackBuild | 6 | ||||
| -rw-r--r-- | source/n/netatalk/doinst.sh | 4 | ||||
| -rwxr-xr-x | source/n/netatalk/netatalk.SlackBuild | 23 | ||||
| -rw-r--r-- | source/n/openssh/doinst.sh | 3 | ||||
| -rwxr-xr-x | source/n/openssh/openssh.SlackBuild | 28 | ||||
| -rw-r--r-- | source/n/openssh/sshd.pam | 14 | ||||
| -rw-r--r-- | source/n/openssh/sshd_config-pam.diff | 12 | ||||
| -rwxr-xr-x | source/n/openvpn/openvpn.SlackBuild | 21 | ||||
| -rwxr-xr-x | source/n/popa3d/popa3d.SlackBuild | 7 | ||||
| -rw-r--r-- | source/n/popa3d/popa3d.pam.diff | 66 | ||||
| -rw-r--r-- | source/n/popa3d/popa3d.shadow.diff (renamed from source/n/popa3d/popa3d.diff) | 0 | ||||
| -rw-r--r-- | source/n/ppp/doinst.sh | 5 | ||||
| -rwxr-xr-x | source/n/ppp/ppp.SlackBuild | 14 | ||||
| -rwxr-xr-x | source/n/samba/samba.SlackBuild | 14 | ||||
| -rw-r--r-- | source/n/vsftpd/doinst.sh | 3 | ||||
| -rwxr-xr-x | source/n/vsftpd/vsftpd.SlackBuild | 9 |
19 files changed, 218 insertions, 20 deletions
diff --git a/source/n/cifs-utils/cifs-utils.SlackBuild b/source/n/cifs-utils/cifs-utils.SlackBuild index a73c85fd2..58a2c8a4e 100755 --- a/source/n/cifs-utils/cifs-utils.SlackBuild +++ b/source/n/cifs-utils/cifs-utils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cifs-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/curl/curl.SlackBuild b/source/n/curl/curl.SlackBuild index bb4f4c6d0..a286ac6de 100755 --- a/source/n/curl/curl.SlackBuild +++ b/source/n/curl/curl.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2016, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=curl VERSION=${VERSION:-$(echo curl-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -87,6 +87,7 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --with-ca-bundle=/usr/share/curl/ca-bundle.crt \ --with-libssh2 \ + --with-gssapi \ --enable-static=no \ $SSLOPT || exit 1 diff --git a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild index d833a63b4..fbdb54b4b 100755 --- a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild +++ b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cyrus-sasl VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -f 3- -d - | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/dovecot/dovecot.SlackBuild b/source/n/dovecot/dovecot.SlackBuild index b3e65db80..ac457aa71 100755 --- a/source/n/dovecot/dovecot.SlackBuild +++ b/source/n/dovecot/dovecot.SlackBuild @@ -93,8 +93,10 @@ rm -rf $PKGNAM-ce-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 -# Ship config set up for authentication from /etc/passwd and /etc/shadow. -zcat $CWD/dovecot.default.shadow.auth.diff.gz | patch -p1 --verbose || exit 1 +if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then # no PAM + # Ship config set up for authentication from /etc/passwd and /etc/shadow. + zcat $CWD/dovecot.default.shadow.auth.diff.gz | patch -p1 --verbose || exit 1 +fi # Since this package installs working config files in /etc/dovecot, there isn't # any need to send people to /usr/doc. Also, make sure that TLS is recommended. diff --git a/source/n/netatalk/doinst.sh b/source/n/netatalk/doinst.sh index 939e530ff..6cc086337 100644 --- a/source/n/netatalk/doinst.sh +++ b/source/n/netatalk/doinst.sh @@ -22,3 +22,7 @@ config etc/rc.d/rc.atalk.new config etc/netatalk/afp.conf.new config etc/netatalk/dbus-session.conf.new config etc/netatalk/extmap.conf.new + +if [ -r etc/pam.d/netatalk.new ]; then + config etc/pam.d/netatalk.new +fi diff --git a/source/n/netatalk/netatalk.SlackBuild b/source/n/netatalk/netatalk.SlackBuild index 8e77c3edf..7295fdd25 100755 --- a/source/n/netatalk/netatalk.SlackBuild +++ b/source/n/netatalk/netatalk.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2012, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012, 2015, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,8 +28,6 @@ PKGNAM=netatalk VERSION=${VERSION:-$(echo netatalk-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -48,6 +46,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -78,6 +78,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Choose correct options depending on whether PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + PAM_OPTIONS="--with-pam-confdir=/etc/pam.d --with-pam --enable-ddp" + unset SHADOW_OPTIONS +else + unset PAM_OPTIONS + SHADOW_OPTIONS="--with-shadow" +fi + # use the system libevent, because the internal one won't compile # with openssl 1.1. Also skip pam and kerberos (for now). CFLAGS="$SLKCFLAGS" \ @@ -89,8 +98,8 @@ CFLAGS="$SLKCFLAGS" \ --libexecdir=/usr/sbin \ --localstatedir=/var \ --disable-static \ - --with-shadow \ - --disable-static \ + $PAM_OPTIONS \ + $SHADOW_OPTIONS \ --with-libevent=system \ --with-dbus-sysconf-dir=/etc/dbus-1/system.d/ \ --with-dbus-daemon=/usr/bin/dbus-daemon \ @@ -132,6 +141,10 @@ cat $CWD/slack-desc > $PKG/install/slack-desc done ) +if [ ! -z "$PAM_OPTIONS" ]; then + mv $PKG/etc/pam.d/netatalk $PKG/etc/pam.d/netatalk.new +fi + mkdir -p $PKG/usr/doc/netatalk-$VERSION cp -a \ AUTHORS CONTRIBUTORS COPYING* COPYRIGHT NEWS VERSION \ diff --git a/source/n/openssh/doinst.sh b/source/n/openssh/doinst.sh index 08536ff69..ba1d1cdd3 100644 --- a/source/n/openssh/doinst.sh +++ b/source/n/openssh/doinst.sh @@ -21,6 +21,9 @@ preserve_perms() { config ${NEW} } +if [ -r etc/pam.d/sshd.new ]; then + config etc/pam.d/sshd.new +fi config etc/default/sshd.new config etc/ssh/ssh_config.new config etc/ssh/sshd_config.new diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild index 6b634a23c..3c614d877 100755 --- a/source/n/openssh/openssh.SlackBuild +++ b/source/n/openssh/openssh.SlackBuild @@ -2,7 +2,7 @@ # Copyright 2000 BSDi, Inc. Concord, CA, USA # Copyright 2001, 2002, 2003, 2004 Slackware Linux, Inc. Concord, CA, USA -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -54,16 +54,22 @@ fi if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" elif [ "$ARCH" = "arm" ]; then SLKCFLAGS="-O2 -march=armv4 -mtune=xscale" + LIBDIRSUFFIX="" elif [ "$ARCH" = "armel" ]; then SLKCFLAGS="-O2 -march=armv4t" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi # Clean target location: @@ -80,6 +86,17 @@ chown -R root:root . # Restore support for tcpwrappers: zcat $CWD/openssh.tcp_wrappers.diff.gz | patch -p1 --verbose || exit 1 +# Choose correct options depending on whether PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + PAM_OPTIONS="--with-pam --with-kerberos5" + unset SHADOW_OPTIONS + # Enable PAM in sshd_config: + zcat $CWD/sshd_config-pam.diff.gz | patch -p1 --verbose || exit 1 +else + unset PAM_OPTIONS + SHADOW_OPTIONS="--without-pam" +fi + autoreconf -vif # Compile package: @@ -88,7 +105,8 @@ CFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --mandir=/usr/man \ --sysconfdir=/etc/ssh \ - --without-pam \ + $PAM_OPTIONS \ + $SHADOW_OPTIONS \ --with-md5-passwords \ --with-libedit \ --with-tcp-wrappers \ @@ -170,6 +188,12 @@ fi cat $CWD/rc.sshd > etc/rc.d/rc.sshd.new chmod 755 etc/rc.d/rc.sshd.new + if [ ! -z "$PAM_OPTIONS" ]; then + # Add the pam stuff: + mkdir -p etc/pam.d + cat $CWD/sshd.pam > etc/pam.d/sshd.new + fi + # Copy runtime installation files: mkdir -p install zcat $CWD/doinst.sh.gz > install/doinst.sh diff --git a/source/n/openssh/sshd.pam b/source/n/openssh/sshd.pam new file mode 100644 index 000000000..0c465192e --- /dev/null +++ b/source/n/openssh/sshd.pam @@ -0,0 +1,14 @@ +#%PAM-1.0 +# pam_securetty.so is commented out since sshd already does a good job of +# protecting itself. You may uncomment it if you like, but then you may +# need to add additional consoles to /etc/securetty if you want to allow +# root logins on them, such as: ssh, pts/0, :0, etc +#auth required pam_securetty.so +auth include system-auth +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session include postlogin +session required pam_loginuid.so diff --git a/source/n/openssh/sshd_config-pam.diff b/source/n/openssh/sshd_config-pam.diff new file mode 100644 index 000000000..d5198c2ff --- /dev/null +++ b/source/n/openssh/sshd_config-pam.diff @@ -0,0 +1,12 @@ +diff -Nur openssh-6.6p1.orig/sshd_config openssh-6.6p1/sshd_config +--- openssh-6.6p1.orig/sshd_config 2014-01-12 02:20:47.000000000 -0600 ++++ openssh-6.6p1/sshd_config 2014-07-26 17:28:35.993833123 -0500 +@@ -94,7 +94,7 @@ + # If you just want the PAM account and session checks to run without + # PAM authentication, then enable this but set PasswordAuthentication + # and ChallengeResponseAuthentication to 'no'. +-#UsePAM no ++UsePAM yes + + #AllowAgentForwarding yes + #AllowTcpForwarding yes diff --git a/source/n/openvpn/openvpn.SlackBuild b/source/n/openvpn/openvpn.SlackBuild index ca2eb028c..21406b8b4 100755 --- a/source/n/openvpn/openvpn.SlackBuild +++ b/source/n/openvpn/openvpn.SlackBuild @@ -81,6 +81,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Choose correct options depending on whether PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + PAM_OPTIONS="--enable-plugin-auth-pam" + unset SHADOW_OPTIONS +else + unset PAM_OPTIONS + SHADOW_OPTIONS="--disable-plugin-auth-pam" +fi + if [ ! -x configure ]; then autoreconf -vif fi @@ -96,12 +105,22 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/openvpn-${VERSION} \ --enable-lzo \ --enable-iproute2 \ - --disable-plugin-auth-pam \ + $PAM_OPTIONS \ + $SHADOW_OPTIONS \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install-strip DESTDIR=$PKG || exit 1 +if [ ! -z "$PAM_OPTIONS" ]; then + # Make openvpn-auth-pam.so: + make -C plugin/auth-pam + strip --strip-unneeded plugin/auth-pam/openvpn-auth-pam.so + mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} + cp -a plugin/auth-pam/openvpn-auth-pam.so $PKG/usr/lib${LIBDIRSUFFIX}/ + mv plugin/auth-pam/README plugin/auth-pam/README.pam +fi + # Create a decent config directory. openvpn doesn't have one by # default, nor does it have a single config file. mkdir -p $PKG/etc/openvpn/{certs,keys} diff --git a/source/n/popa3d/popa3d.SlackBuild b/source/n/popa3d/popa3d.SlackBuild index be51f237c..511b8aa98 100755 --- a/source/n/popa3d/popa3d.SlackBuild +++ b/source/n/popa3d/popa3d.SlackBuild @@ -56,7 +56,12 @@ rm -rf popa3d-$VERSION tar xvf $CWD/popa3d-$VERSION.tar.?z || exit 1 cd popa3d-$VERSION || exit 1 -zcat $CWD/popa3d.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +# Choose correct options depending on whether PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + zcat $CWD/popa3d.pam.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +else + zcat $CWD/popa3d.shadow.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +fi chown -R root:root . find . \ diff --git a/source/n/popa3d/popa3d.pam.diff b/source/n/popa3d/popa3d.pam.diff new file mode 100644 index 000000000..c0b643844 --- /dev/null +++ b/source/n/popa3d/popa3d.pam.diff @@ -0,0 +1,66 @@ +diff -up ../popa3d-1.0.3.orig/Makefile ./Makefile +--- ../popa3d-1.0.3.orig/Makefile 2006-03-05 05:36:54.000000000 -0500 ++++ ./Makefile 2018-09-18 12:56:05.412312376 -0400 +@@ -5,26 +5,26 @@ MKDIR = mkdir -p + INSTALL = install -c + CFLAGS = -Wall -O2 -fomit-frame-pointer + # You may use OpenSSL's MD5 routines instead of the ones supplied here +-#CFLAGS += -DHAVE_OPENSSL ++CFLAGS += -DHAVE_OPENSSL + LDFLAGS = -s + LIBS = + # Linux with glibc, FreeBSD, NetBSD +-#LIBS += -lcrypt ++LIBS += -lcrypt + # HP-UX trusted system + #LIBS += -lsec + # Solaris (POP_STANDALONE, POP_VIRTUAL) + #LIBS += -lsocket -lnsl + # PAM +-#LIBS += -lpam ++LIBS += -lpam + # TCP wrappers + #LIBS += -lwrap + # libwrap may also want this + #LIBS += -lnsl + # OpenSSL (-DHAVE_OPENSSL) +-#LIBS += -lcrypto ++LIBS += -lcrypto + + DESTDIR = +-PREFIX = /usr/local ++PREFIX = /usr + SBINDIR = $(PREFIX)/sbin + MANDIR = $(PREFIX)/man + +Common subdirectories: ../popa3d-1.0.3.orig/md5 and ./md5 +diff -up ../popa3d-1.0.3.orig/params.h ./params.h +--- ../popa3d-1.0.3.orig/params.h 2006-03-05 08:18:32.000000000 -0500 ++++ ./params.h 2018-09-18 12:55:55.953210742 -0400 +@@ -13,7 +13,7 @@ + /* + * Are we going to be a standalone server or start via an inetd clone? + */ +-#define POP_STANDALONE 0 ++#define POP_STANDALONE 1 + + #if POP_STANDALONE + +@@ -103,7 +103,7 @@ + * A pseudo-user to run as before authentication. The user and its UID + * must not be used for any other purpose. + */ +-#define POP_USER POP_SERVER ++#define POP_USER "pop" + + /* + * An empty directory to chroot to before authentication. The directory +@@ -191,7 +191,7 @@ + * + * #undef this for qmail-style $HOME/Mailbox mailboxes. + */ +-#define MAIL_SPOOL_PATH "/var/mail" ++#define MAIL_SPOOL_PATH "/var/spool/mail" + + #ifndef MAIL_SPOOL_PATH + /* diff --git a/source/n/popa3d/popa3d.diff b/source/n/popa3d/popa3d.shadow.diff index 773f90856..773f90856 100644 --- a/source/n/popa3d/popa3d.diff +++ b/source/n/popa3d/popa3d.shadow.diff diff --git a/source/n/ppp/doinst.sh b/source/n/ppp/doinst.sh index 54facc41c..3a74db67c 100644 --- a/source/n/ppp/doinst.sh +++ b/source/n/ppp/doinst.sh @@ -10,6 +10,11 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } + +if [ -r etc/pam.d/ppp.new ]; then + config etc/pam.d/ppp.new +fi + config etc/ppp/chap-secrets.new config etc/ppp/options.new config etc/ppp/pap-secrets.new diff --git a/source/n/ppp/ppp.SlackBuild b/source/n/ppp/ppp.SlackBuild index 8c1a9dd95..13b21fb36 100755 --- a/source/n/ppp/ppp.SlackBuild +++ b/source/n/ppp/ppp.SlackBuild @@ -86,13 +86,25 @@ zcat $CWD/0028-pppoe-include-netinet-in.h-before-linux-in.h.patch.gz | patch -p1 zcat $CWD/ppp.glibc228.diff.gz | patch -p1 --verbose || exit 1 +# Choose correct options depending on whether PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + PAM_OPTIONS="USE_PAM=y" +else + unset PAM_OPTIONS +fi + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} || exit 1 -make $NUMJOBS || make || exit 1 +make $PAM_OPTIONS $NUMJOBS || make || exit 1 make install DESTDIR=$PKG/usr || exit 1 +if [ ! -z "$PAM_OPTIONS" ]; then + mkdir -p $PKG/etc/pam.d + cat pppd/ppp.pam > $PKG/etc/pam.d/ppp.new +fi + # Install PPP config files: mkdir -p $PKG/etc/ppp cp -a etc.ppp/* $PKG/etc/ppp diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index 76bc3c477..c7e364d4f 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -100,6 +100,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Choose correct options depending on whether PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + PAM_OPTIONS="--with-pam --with-pammodulesdir=/lib/security --with-system-mitkrb5 --with-experimental-mit-ad-dc" + unset SHADOW_OPTIONS +else + unset PAM_OPTIONS + SHADOW_OPTIONS="--without-pam" +fi + # Some of these options could be auto-detected, but declaring them # here doesn't hurt and helps document what features we're trying to # build in. @@ -133,7 +142,8 @@ CFLAGS="$SLKCFLAGS" \ --with-winbind \ --with-ldap \ --with-ads \ - --without-pam \ + $PAM_OPTIONS \ + $SHADOW_OPTIONS \ --build=$TARGET || exit 1 # Gives errors: #--builtin-libraries=replace,ccan \ 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 |