diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2015-05-29 08:07:03 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2015-05-29 08:07:03 +0000 |
| commit | c9a52e3513749a1cd1ba118f4d50fa8620786e0c (patch) | |
| tree | b72d3d9e62563fdd1f890674a5438f0c12c24da1 /net-ftp | |
| parent | Version bump. Removed old (diff) | |
| download | gentoo-2-c9a52e3513749a1cd1ba118f4d50fa8620786e0c.tar.gz gentoo-2-c9a52e3513749a1cd1ba118f4d50fa8620786e0c.tar.bz2 gentoo-2-c9a52e3513749a1cd1ba118f4d50fa8620786e0c.zip | |
Removed CVS expansion patch damage, but it does not fix USE=copy build failure yet.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/proftpd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-ftp/proftpd/files/CVE-2015-3306.patch | 24 |
2 files changed, 12 insertions, 18 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index 6d11c441d3db..56d74a3a78e9 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-ftp/proftpd # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.330 2015/05/27 05:40:59 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.331 2015/05/29 08:07:03 slyfox Exp $ + + 29 May 2015; Sergei Trofimovich <slyfox@gentoo.org> files/CVE-2015-3306.patch: + Removed CVS expansion patch damage, but it does not fix USE=copy build failure + yet. *proftpd-1.3.5-r2 (27 May 2015) diff --git a/net-ftp/proftpd/files/CVE-2015-3306.patch b/net-ftp/proftpd/files/CVE-2015-3306.patch index eb5e5405173b..515cb2acd76f 100644 --- a/net-ftp/proftpd/files/CVE-2015-3306.patch +++ b/net-ftp/proftpd/files/CVE-2015-3306.patch @@ -1,8 +1,7 @@ https://github.com/proftpd/proftpd/commit/3ef395d81327558e6e6def43df9138b1cd4955dd -diff -ur proftpd-1.3.5.orig/contrib/mod_copy.c -proftpd-1.3.5/contrib/mod_copy.c ---- contrib/mod_copy.c 2012-12-28 06:31:29.000000000 +0800 -+++ contrib/mod_copy.c 2015-05-27 10:36:12.411377839 +0800 +diff -ur a/contrib/mod_copy.c b/contrib/mod_copy.c +--- a/contrib/mod_copy.c 2012-12-28 06:31:29.000000000 +0800 ++++ b/contrib/mod_copy.c 2015-05-27 10:36:12.411377839 +0800 @@ -31,7 +31,7 @@ #include "conf.h" @@ -204,9 +203,9 @@ proftpd-1.3.5/contrib/mod_copy.c /* Module command handler table */ copy_cmdtab, -diff -ur proftpd-1.3.5.orig/doc/contrib/mod_copy.html proftpd-1.3.5/doc/contrib/mod_copy.html ---- doc/contrib/mod_copy.html 2015-05-27 11:29:40.919649342 +0800 -+++ doc/contrib/mod_copy.html 2015-05-27 11:48:13.087057870 +0800 +diff -ur a/doc/contrib/mod_copy.html b/doc/contrib/mod_copy.html +--- a/doc/contrib/mod_copy.html 2015-05-27 11:29:40.919649342 +0800 ++++ b/doc/contrib/mod_copy.html 2015-05-27 11:48:13.087057870 +0800 @@ -27,22 +27,40 @@ instructions are discussed <a href="#Installation">here</a>. @@ -252,18 +251,9 @@ diff -ur proftpd-1.3.5.orig/doc/contrib/mod_copy.html proftpd-1.3.5/doc/contrib/ <hr> <h2><a name="SITE_CPFR">SITE CPFR</a></h2> This <code>SITE</code> command specifies the source file/directory to use -@@ -118,13 +136,8 @@ - <p> - <hr><br> - --Author: <i>$Author: idella4 $</i><br> --Last Updated: <i>$Date: 2015/05/27 05:40:59 $</i><br> -- --<br><hr> -- +@@ -127,4 +136,4 @@ <font size=2><b><i> -© Copyright 2009-2010 TJ Saunders<br> +© Copyright 2009-2015 TJ Saunders<br> All Rights Reserved<br> </i></b></font> - |