[Devil-linux-commit] build/scripts vsftpd,1.14,1.15

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16471/build/scripts

Modified Files:
	vsftpd 
Log Message:

- added ssl and libwrap support to vsftpd config file


Index: vsftpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/vsftpd,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- vsftpd	28 Dec 2004 18:55:09 -0000	1.14
+++ vsftpd	5 Dec 2005 16:46:40 -0000	1.15
@@ -28,7 +28,25 @@
 case $1 in
 	build )
 		if [ "$CONFIG_VSFTPD" = "y" ]; then
-			replace_str builddefs.h "#undef VSF_BUILD_SSL" "#define VSF_BUILD_SSL"
+#			replace_str builddefs.h "#undef VSF_BUILD_SSL" "#define	VSF_BUILD_SSL"
+#
+			BUILDDEF=builddefs.h
+			mv $BUILDDEF ./builddefs.h.orig 
+			echo -e "#ifndef VSF_BUILDDEFS_H\n#define VSF_BUILDDEFS_H\n\n" > $BUILDDEF
+
+			echo "#define VSF_BUILD_PAM" >> $BUILDDEF || exit 1
+			if [ "$CONFIG_TCP_WRAPPERS" = "y" ]; then
+				echo "#define VSF_BUILD_TCPWRAPPERS" >> $BUILDDEF || exit 1
+			else 
+				echo "#undef VSF_BUILD_TCPWRAPPERS" >> $BUILDDEF || exit 1
+			fi
+			if [ "$CONFIG_OPENSSL_BIN" = "y" ]; then
+				echo "#define VSF_BUILD_SSL" >> $BUILDDEF || exit 1
+			else 
+				echo "#undef VSF_BUILD_SSL" >> $BUILDDEF || exit 1
+			fi
+			echo -e "\n#endif /* VSF_BUILDDEFS_H */" >> $BUILDDEF || exit 1
+
 			make $PMAKE CFLAGS="-O2 -Wall -Wshadow -W -no-pie" LINK="-Wl,-s,-pie" || exit 1
 			strip_debug
 		fi