packages (AC-branch): vsftpd/vsftpd.spec - do not disable tcpwrappers to di...

[glen]

Author: glen                         Date: Tue Feb  2 16:27:03 2010 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- do not disable tcpwrappers to disable ssl
- disable ssl as no such openssl in ac as it needs (somebody disable only EVP_sha256 symbol?); rel 3

---- Files affected:
packages/vsftpd:
   vsftpd.spec (1.53.2.4 -> 1.53.2.5) 

---- Diffs:

================================================================
Index: packages/vsftpd/vsftpd.spec
diff -u packages/vsftpd/vsftpd.spec:1.53.2.4 packages/vsftpd/vsftpd.spec:1.53.2.5
--- packages/vsftpd/vsftpd.spec:1.53.2.4	Fri Jan 22 19:01:32 2010
+++ packages/vsftpd/vsftpd.spec	Tue Feb  2 17:26:58 2010
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	ssl		# build without OpenSSL support
+%bcond_with		ssl		# build without OpenSSL support
 #
 %define		_ftpdir	/home/services/ftp
 #
@@ -10,7 +10,7 @@
 Summary(pt_BR):	vsftpd - Daemon FTP Muito Seguro
 Name:		vsftpd
 Version:	2.1.0
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Daemons
 Source0:	ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
@@ -99,9 +99,13 @@
 
 %prep
 %setup -q
-%{?with_ssl:%patch0 -p1}
+%patch0 -p1
 %patch1 -p1
 
+%if %{without ssl}
+sed -i -e 's/#define VSF_BUILD_SSL/#undef VSF_BUILD_SSL/' builddefs.h
+%endif
+
 %build
 %{__make} \
 	CC="%{__cc}" \
@@ -191,6 +195,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53.2.5  2010/02/02 16:26:58  glen
+- do not disable tcpwrappers to disable ssl
+- disable ssl as no such openssl in ac as it needs (somebody disable only EVP_sha256 symbol?); rel 3
+
 Revision 1.53.2.4  2010/01/22 18:01:32  glen
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vsftpd/vsftpd.spec?r1=1.53.2.4&r2=1.53.2.5&f=u