[Devil-linux-commit] build/scripts tcp_wrappers,1.3,1.3.2.1 vsftpd,1.11,1.11.2.1

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

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

Modified Files:
      Tag: rel-1-2-patches
	tcp_wrappers 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.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- vsftpd	11 Jan 2004 14:43:05 -0000	1.11
+++ vsftpd	2 Dec 2005 13:08:24 -0000	1.11.2.1
@@ -29,6 +29,24 @@
 	build )
 		if [ "$CONFIG_VSFTPD" = "y" ]; then
 			disable_et_dyn
+			
+			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
+
 			if [ "$CONFIG_GCC_ET_DYN" = "y" ]; then
 			    make $PMAKE LINK="-Wl,-s,-pie" || exit 1
 			else

Index: tcp_wrappers
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/tcp_wrappers,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- tcp_wrappers	11 Jan 2004 14:43:05 -0000	1.3
+++ tcp_wrappers	2 Dec 2005 13:08:24 -0000	1.3.2.1
@@ -35,6 +35,7 @@
 		make linux || exit 1
 		strip_debug
 		cp libwrap.a /usr/lib || exit 1
+		cp tcpd.h /usr/include || exit 1
 	fi
 	;;