packages (AC-branch): vsftpd/vsftpd.spec - switch to EVP_sha1 in Ac (EVP_sh...

[adamg]

Author: adamg                        Date: Thu Jun  3 09:50:28 2010 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- switch to EVP_sha1 in Ac (EVP_sha256 not supported by openssl-0.9.7); release 4

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

---- Diffs:

================================================================
Index: packages/vsftpd/vsftpd.spec
diff -u packages/vsftpd/vsftpd.spec:1.53.2.5 packages/vsftpd/vsftpd.spec:1.53.2.6
--- packages/vsftpd/vsftpd.spec:1.53.2.5	Tue Feb  2 17:26:58 2010
+++ packages/vsftpd/vsftpd.spec	Thu Jun  3 11:50:23 2010
@@ -10,7 +10,7 @@
 Summary(pt_BR):	vsftpd - Daemon FTP Muito Seguro
 Name:		vsftpd
 Version:	2.1.0
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Daemons
 Source0:	ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
@@ -23,10 +23,11 @@
 Source5:	%{name}.init
 Patch0:		%{name}-builddefs.patch
 Patch1:		%{name}-amd64-findlibs.patch
+Patch2:		%{name}-use-evp_sha1.patch
 URL:		http://vsftpd.beasts.org/
 BuildRequires:	libcap-devel
 BuildRequires:	libwrap-devel
-%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.8j}
+%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7m}
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{name}-init = %{version}-%{release}
 Requires:	filesystem >= 2.0-1
@@ -101,6 +102,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %if %{without ssl}
 sed -i -e 's/#define VSF_BUILD_SSL/#undef VSF_BUILD_SSL/' builddefs.h
@@ -195,6 +197,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53.2.6  2010/06/03 09:50:23  adamg
+- switch to EVP_sha1 in Ac (EVP_sha256 not supported by openssl-0.9.7); release 4
+
 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
================================================================

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