slyfox 15/05/29 08:07:03 Modified: CVE-2015-3306.patch Log: 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)
Revision Changes Path 1.2 net-ftp/proftpd/files/CVE-2015-3306.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/CVE-2015-3306.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/CVE-2015-3306.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/CVE-2015-3306.patch?r1=1.1&r2=1.2 Index: CVE-2015-3306.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/CVE-2015-3306.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CVE-2015-3306.patch 27 May 2015 05:40:59 -0000 1.1 +++ CVE-2015-3306.patch 29 May 2015 08:07:03 -0000 1.2 @@ -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 @@ /* 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 @@ <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> -
