Author: blues Date: Tue Dec 28 16:39:26 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel.2: allow ssl build on AC - changed sha256 to sha1 (less secure but still ok and working)
---- Files affected: packages/vsftpd: vsftpd.spec (1.75 -> 1.76) , vsftpd-switch_sha256_to_sha1.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/vsftpd/vsftpd.spec diff -u packages/vsftpd/vsftpd.spec:1.75 packages/vsftpd/vsftpd.spec:1.76 --- packages/vsftpd/vsftpd.spec:1.75 Tue Dec 28 17:19:23 2010 +++ packages/vsftpd/vsftpd.spec Tue Dec 28 17:39:20 2010 @@ -1,6 +1,5 @@ # $Revision$, $Date$ ### TODO: -# - fix ssl build on AC # - default config does not work with inetd configuration # %define _ftpdir /home/services/ftp @@ -12,7 +11,7 @@ Summary(pt_BR.UTF-8): vsftpd - Daemon FTP Muito Seguro Name: vsftpd Version: 2.3.2 -Release: 1 +Release: 2 License: GPL v2 Group: Daemons Source0: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz @@ -26,10 +25,15 @@ Patch0: %{name}-builddefs.patch Patch1: %{name}-amd64-findlibs.patch Patch2: %{name}-clamav.patch +Patch3: %{name}-switch_sha256_to_sha1.patch URL: http://vsftpd.beasts.org/ BuildRequires: libcap-devel BuildRequires: libwrap-devel +%if "%{pld_release}" == "ac" +BuildRequires: openssl-devel >= 0.9.7d +%else BuildRequires: openssl-devel >= 0.9.8 +%endif BuildRequires: rpmbuild(macros) >= 1.268 Requires: %{name}-init = %{version}-%{release} Requires: filesystem >= 3.0-11 @@ -92,6 +96,9 @@ %if %{with clamav} %patch2 -p1 %endif +%if "%{pld_release}" == "ac" +%patch3 -p1 +%endif %build %{__make} \ @@ -182,6 +189,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.76 2010/12/28 16:39:20 blues +- rel.2: allow ssl build on AC - changed sha256 to sha1 (less secure but + still ok and working) + Revision 1.75 2010/12/28 16:19:23 blues - not for AC + some todo's ================================================================ Index: packages/vsftpd/vsftpd-switch_sha256_to_sha1.patch diff -u /dev/null packages/vsftpd/vsftpd-switch_sha256_to_sha1.patch:1.1 --- /dev/null Tue Dec 28 17:39:26 2010 +++ packages/vsftpd/vsftpd-switch_sha256_to_sha1.patch Tue Dec 28 17:39:20 2010 @@ -0,0 +1,11 @@ +--- ./ssl.c.org 2009-10-19 04:34:08.000000000 +0200 ++++ ./ssl.c 2010-12-28 17:33:27.730241842 +0100 +@@ -608,7 +608,7 @@ ssl_cert_digest(SSL* p_ssl, struct vsf_s + str_reserve(p_str, EVP_MAX_MD_SIZE); + str_empty(p_str); + str_rpad(p_str, EVP_MAX_MD_SIZE); +- if (!X509_digest(p_cert, EVP_sha256(), (unsigned char*) str_getbuf(p_str), ++ if (!X509_digest(p_cert, EVP_sha1(), (unsigned char*) str_getbuf(p_str), + &num_bytes)) + { + die("X509_digest failed"); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vsftpd/vsftpd.spec?r1=1.75&r2=1.76&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit