Slackware 13.1slackware-13.1

Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits.  The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription.  Consider picking up
a copy to help support the project.  Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality.  :-)
Enjoy!

3 files changed, 30 insertions, 109 deletions

diff --git a/source/n/vsftpd/vsftpd.SlackBuild b/source/n/vsftpd/vsftpd.SlackBuild
index c202e392..06b56763 100755
--- a/source/n/vsftpd/vsftpd.SlackBuild
+++ b/source/n/vsftpd/vsftpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,11 +20,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=2.1.2
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo vsftpd-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
@@ -49,16 +59,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# This allows the libfinder script to find stuff in */lib64
-if [ "$LIBDIRSUFFIX" = "64" ]; then
-  zcat $CWD/vsftpd.vsf_findlibs.sh.diff.gz | patch -p1 --verbose || exit 1
-fi
-
 zcat $CWD/vsftpd.builddefs.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/vsftpd.conf.diff.gz | patch -p1 --verbose || exit 1
 
-sed -i -e "s#lib/#lib${LIBDIRSUFFIX}/#g" vsf_findlibs.sh
-
 make $NUMJOBS || make || exit 1
 
 mkdir -p $PKG/usr/sbin
@@ -81,10 +84,18 @@ mkdir -p $PKG/home/ftp
 
 mkdir -p $PKG/usr/doc/vsftpd-$VERSION
 cp -a \
-  AUDIT BENCHMARKS BUGS COPYING* COPYRIGHT Changelog EXAMPLE FAQ \
+  AUDIT BENCHMARKS BUGS COPYING* COPYRIGHT EXAMPLE FAQ \
   INSTALL LICENSE README* REFS REWARD SECURITY SIZE SPEED TODO TUNING \
   $PKG/usr/doc/vsftpd-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r Changelog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat Changelog | head -n 1000 > $DOCSDIR/Changelog
+  touch -r Changelog $DOCSDIR/Changelog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/n/vsftpd/vsftpd.conf.diff b/source/n/vsftpd/vsftpd.conf.diff
index 230d858c..1f410a7a 100644
--- a/source/n/vsftpd/vsftpd.conf.diff
+++ b/source/n/vsftpd/vsftpd.conf.diff
@@ -1,5 +1,6 @@
---- ./vsftpd.conf.orig	2008-12-17 14:31:40.000000000 -0600
-+++ ./vsftpd.conf	2009-03-29 22:09:21.000000000 -0500
+diff -Nur vsftpd-2.2.1.orig/vsftpd.conf vsftpd-2.2.1/vsftpd.conf
+--- vsftpd-2.2.1.orig/vsftpd.conf	2009-10-18 21:04:23.000000000 -0500
++++ vsftpd-2.2.1/vsftpd.conf	2009-10-19 10:22:16.609407947 -0500
 @@ -19,7 +19,7 @@
  #
  # Default umask for local users is 077. You may wish to change this to 022,
@@ -23,7 +24,7 @@
  #
  # You may change the default value for timing out an idle session.
  #idle_session_timeout=600
-@@ -100,14 +100,17 @@
+@@ -101,12 +101,13 @@
  # default to avoid remote users being able to cause excessive I/O on large
  # sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
  # the presence of the "-R" option, so there is a strong case for enabling it.
@@ -36,13 +37,9 @@
 -listen=YES
 +# When "listen" directive is enabled, vsftpd runs in standalone mode (rather
 +# than from inetd) and listens on IPv4 sockets. To use vsftpd in standalone
-+# mode rather than with inetd, either change the line below to 'listen=YES'
-+# or comment it out. This directive cannot be used in conjunction with the
-+# listen_ipv6 directive.
++# mode rather than with inetd, change the line below to 'listen=YES'
++# This directive cannot be used in conjunction with the listen_ipv6 directive.
 +listen=NO
  #
  # This directive enables listening on IPv6 sockets. To listen on IPv4 and IPv6
- # sockets, you must run two copies of vsftpd whith two configuration files.
- # Make sure, that one of the listen options is commented !!
- #listen_ipv6=YES
-+
+ # sockets, you must run two copies of vsftpd with two configuration files.
diff --git a/source/n/vsftpd/vsftpd.vsf_findlibs.sh.diff b/source/n/vsftpd/vsftpd.vsf_findlibs.sh.diff
deleted file mode 100644
index 147ee742..00000000
--- a/source/n/vsftpd/vsftpd.vsf_findlibs.sh.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -Nur vsftpd-2.1.2.orig/vsf_findlibs.sh vsftpd-2.1.2/vsf_findlibs.sh
---- vsftpd-2.1.2.orig/vsf_findlibs.sh	2009-05-21 15:43:11.000000000 -0500
-+++ vsftpd-2.1.2/vsf_findlibs.sh	2009-05-31 00:41:38.308704816 -0500
-@@ -6,61 +6,61 @@
- 
- if find_func hosts_access tcpwrap.o; then
-   echo "-lwrap";
--  locate_library /lib/libnsl.so && echo "-lnsl";
-+  locate_library /lib64/libnsl.so && echo "-lnsl";
- fi
- 
- # Look for PAM (done weirdly due to distribution bugs (e.g. Debian) or the
- # crypt library.
- if find_func pam_start sysdeputil.o; then
--  locate_library /lib/libpam.so.0 && echo "/lib/libpam.so.0";
--  locate_library /usr/lib/libpam.so && echo "-lpam";
-+  locate_library /lib64/libpam.so.0 && echo "/lib64/libpam.so.0";
-+  locate_library /usr/lib64/libpam.so && echo "-lpam";
-   # HP-UX ends shared libraries with .sl
--  locate_library /usr/lib/libpam.sl && echo "-lpam";
-+  locate_library /usr/lib64/libpam.sl && echo "-lpam";
-   # AIX ends shared libraries with .a
--  locate_library /usr/lib/libpam.a && echo "-lpam";
-+  locate_library /usr/lib64/libpam.a && echo "-lpam";
- else
--  locate_library /lib/libcrypt.so && echo "-lcrypt";
--  locate_library /usr/lib/libcrypt.so && echo "-lcrypt";
-+  locate_library /lib64/libcrypt.so && echo "-lcrypt";
-+  locate_library /usr/lib64/libcrypt.so && echo "-lcrypt";
- fi
- 
- # Look for the dynamic linker library. Needed by older RedHat when
- # you link in PAM
--locate_library /lib/libdl.so && echo "-ldl";
-+locate_library /lib64/libdl.so && echo "-ldl";
- 
- # Look for libsocket. Solaris needs this.
--locate_library /lib/libsocket.so && echo "-lsocket";
-+locate_library /lib64/libsocket.so && echo "-lsocket";
- 
- # Look for libnsl. Solaris needs this.
--locate_library /lib/libnsl.so && echo "-lnsl";
-+locate_library /lib64/libnsl.so && echo "-lnsl";
- 
- # Look for libresolv. Solaris needs this.
--locate_library /lib/libresolv.so && echo "-lresolv";
-+locate_library /lib64/libresolv.so && echo "-lresolv";
- 
- # Look for libutil. Older FreeBSD need this for setproctitle().
--locate_library /usr/lib/libutil.so && echo "-lutil";
-+locate_library /usr/lib64/libutil.so && echo "-lutil";
- 
- # For older HP-UX...
--locate_library /usr/lib/libsec.sl && echo "-lsec";
-+locate_library /usr/lib64/libsec.sl && echo "-lsec";
- 
- # Look for libcap (capabilities)
--if locate_library /lib/libcap.so.1; then
--  echo "/lib/libcap.so.1";
--elif locate_library /lib/libcap.so.2; then
--  echo "/lib/libcap.so.2";
-+if locate_library /lib64/libcap.so.1; then
-+  echo "/lib64/libcap.so.1";
-+elif locate_library /lib64/libcap.so.2; then
-+  echo "/lib64/libcap.so.2";
- else
--  locate_library /usr/lib/libcap.so && echo "-lcap";
--  locate_library /lib/libcap.so && echo "-lcap";
-+  locate_library /usr/lib64/libcap.so && echo "-lcap";
-+  locate_library /lib64/libcap.so && echo "-lcap";
- fi
- 
- # Solaris needs this for nanosleep()..
--locate_library /lib/libposix4.so && echo "-lposix4";
--locate_library /usr/lib/libposix4.so && echo "-lposix4";
-+locate_library /lib64/libposix4.so && echo "-lposix4";
-+locate_library /usr/lib64/libposix4.so && echo "-lposix4";
- 
- # Tru64 (nanosleep)
- locate_library /usr/shlib/librt.so && echo "-lrt";
- 
- # Solaris sendfile
--locate_library /usr/lib/libsendfile.so && echo "-lsendfile";
-+locate_library /usr/lib64/libsendfile.so && echo "-lsendfile";
- 
- # OpenSSL
- if find_func SSL_library_init ssl.o; then