| 1 |
slyfox 15/05/29 08:07:03 |
| 2 |
|
| 3 |
Modified: CVE-2015-3306.patch |
| 4 |
Log: |
| 5 |
Removed CVS expansion patch damage, but it does not fix USE=copy build failure yet. |
| 6 |
|
| 7 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-ftp/proftpd/files/CVE-2015-3306.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/CVE-2015-3306.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/CVE-2015-3306.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/CVE-2015-3306.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: CVE-2015-3306.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/CVE-2015-3306.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- CVE-2015-3306.patch 27 May 2015 05:40:59 -0000 1.1 |
| 23 |
+++ CVE-2015-3306.patch 29 May 2015 08:07:03 -0000 1.2 |
| 24 |
@@ -1,8 +1,7 @@ |
| 25 |
https://github.com/proftpd/proftpd/commit/3ef395d81327558e6e6def43df9138b1cd4955dd |
| 26 |
-diff -ur proftpd-1.3.5.orig/contrib/mod_copy.c |
| 27 |
-proftpd-1.3.5/contrib/mod_copy.c |
| 28 |
---- contrib/mod_copy.c 2012-12-28 06:31:29.000000000 +0800 |
| 29 |
-+++ contrib/mod_copy.c 2015-05-27 10:36:12.411377839 +0800 |
| 30 |
+diff -ur a/contrib/mod_copy.c b/contrib/mod_copy.c |
| 31 |
+--- a/contrib/mod_copy.c 2012-12-28 06:31:29.000000000 +0800 |
| 32 |
++++ b/contrib/mod_copy.c 2015-05-27 10:36:12.411377839 +0800 |
| 33 |
@@ -31,7 +31,7 @@ |
| 34 |
|
| 35 |
#include "conf.h" |
| 36 |
@@ -204,9 +203,9 @@ |
| 37 |
|
| 38 |
/* Module command handler table */ |
| 39 |
copy_cmdtab, |
| 40 |
-diff -ur proftpd-1.3.5.orig/doc/contrib/mod_copy.html proftpd-1.3.5/doc/contrib/mod_copy.html |
| 41 |
---- doc/contrib/mod_copy.html 2015-05-27 11:29:40.919649342 +0800 |
| 42 |
-+++ doc/contrib/mod_copy.html 2015-05-27 11:48:13.087057870 +0800 |
| 43 |
+diff -ur a/doc/contrib/mod_copy.html b/doc/contrib/mod_copy.html |
| 44 |
+--- a/doc/contrib/mod_copy.html 2015-05-27 11:29:40.919649342 +0800 |
| 45 |
++++ b/doc/contrib/mod_copy.html 2015-05-27 11:48:13.087057870 +0800 |
| 46 |
@@ -27,22 +27,40 @@ |
| 47 |
instructions are discussed <a href="#Installation">here</a>. |
| 48 |
|
| 49 |
@@ -252,18 +251,9 @@ |
| 50 |
<hr> |
| 51 |
<h2><a name="SITE_CPFR">SITE CPFR</a></h2> |
| 52 |
This <code>SITE</code> command specifies the source file/directory to use |
| 53 |
-@@ -118,13 +136,8 @@ |
| 54 |
- <p> |
| 55 |
- <hr><br> |
| 56 |
- |
| 57 |
--Author: <i>$Author: idella4 $</i><br> |
| 58 |
--Last Updated: <i>$Date: 2015/05/27 05:40:59 $</i><br> |
| 59 |
-- |
| 60 |
--<br><hr> |
| 61 |
-- |
| 62 |
+@@ -127,4 +136,4 @@ |
| 63 |
<font size=2><b><i> |
| 64 |
-© Copyright 2009-2010 TJ Saunders<br> |
| 65 |
+© Copyright 2009-2015 TJ Saunders<br> |
| 66 |
All Rights Reserved<br> |
| 67 |
</i></b></font> |
| 68 |
- |
Archives