[Lunar-commits] vsftpd: Does not like gcc wrappers.

[Dennis Veatch]

commit 036db912ccdfe25c8aad77174d0f5a69c3fa8d0f
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date:   Wed Dec 5 13:41:11 2007 -0500

    vsftpd: Does not like gcc wrappers.
    
    And twiddled with the BUILD a bit.
---
 ftp/vsftpd/BUILD   |   26 +++++++++++++++-----------
 ftp/vsftpd/DETAILS |    5 +++--
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ftp/vsftpd/BUILD b/ftp/vsftpd/BUILD
index 3b2a08b..88e9f09 100644
--- a/ftp/vsftpd/BUILD
+++ b/ftp/vsftpd/BUILD
@@ -1,31 +1,35 @@
 (
 
-  echo -e "#ifndef VSF_BUILDDEFS_H\n#define VSF_BUILDDEFS_H" > builddefs.h
+  echo -e "#ifndef VSF_BUILDDEFS_H\n#define VSF_BUILDDEFS_H" > builddefs.h &&
+
   if [ $(get_module_config USE_TCP_WRAPPERS) == "n" ] ; then
     echo "#undef VSF_BUILD_TCPWRAPPERS" >> builddefs.h
   else
     echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-  fi
+  fi &&
+
   if [ $(get_module_config USE_PAM) == "n" ] ; then
     echo "#undef VSF_BUILD_PAM" >> builddefs.h
   else
     echo "#define VSF_BUILD_PAM" >> builddefs.h
-  fi
+  fi &&
+
   if [ $(get_module_config USE_SSL) == "n" ] ; then
     echo "#undef VSF_BUILD_SSL" >> builddefs.h
   else
     echo "#define VSF_BUILD_SSL" >> builddefs.h
-  fi
-  echo "#endif /* VSF_BUILDDEFS_H */" >> builddefs.h
-  cat builddefs.h
+  fi &&
+
+  echo "#endif /* VSF_BUILDDEFS_H */" >> builddefs.h &&
+  cat builddefs.h       &&
 
   make CFLAGS="$CFLAGS" &&
-  prepare_install
+  prepare_install       &&
+
+  cp vsftpd /usr/sbin/vsftpd           &&
+  cp vsftpd.conf.5 /usr/share/man/man5 &&
+  cp vsftpd.8 /usr/share/man/man8      &&
 
-  cp vsftpd /usr/sbin/vsftpd
-  cp vsftpd.conf.5 /usr/share/man/man5
-  cp vsftpd.8 /usr/share/man/man8
-  
   if [ ! -f /etc/vsftpd.conf ] ; then
     sedit "s:anonymous_enable=YES:anonymous_enable=NO:" vsftpd.conf
     sedit "s:#local_enable=YES:local_enable=YES:" vsftpd.conf
diff --git a/ftp/vsftpd/DETAILS b/ftp/vsftpd/DETAILS
index b90fc62..9f5b132 100644
--- a/ftp/vsftpd/DETAILS
+++ b/ftp/vsftpd/DETAILS
@@ -8,9 +8,10 @@
          UPDATED=20060704
            SHORT="Secure and fast FTP server"
 
+USE_WRAPPERS=no
 cat << EOF
-If your main requirement from an FTP server is one of the following 
-things then yes, vsftpd is probably the FTP server you are looking for. 
+If your main requirement from an FTP server is one of the following
+things then yes, vsftpd is probably the FTP server you are looking for.
   Security
   Performance
   Stability