Removed CVS expansion patch damage, but it does not fix USE=copy build failure yet.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

3 files changed, 18 insertions, 26 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/Manifest b/net-ftp/proftpd/Manifest
index eb88a8ca7ffe..75568427fdee 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX CVE-2015-3306-test.patch 8245 SHA256 92024334f91879a0246e33c3f8c5b626a879ba4173f0a40c1a4dda89cb076185 SHA512 d06aaf400303b8600f801285051f1e55c53cdf2db52d91a3be13624ef16de37331ec87576c558510d888fa289386af2634d836f49f5e0a8b77dd3361bea5f422 WHIRLPOOL 13abd63c0c0b1c8d7e52a35291cf9532a64c5931f2c492f7564e6b7ac3e582c6a7762eaf986a3c0801cbf5426b70747b8727980de708b2a2cd6a36bc237c2666
-AUX CVE-2015-3306.patch 6782 SHA256 b1823826ad5872774ad3e486827e21e6a800282e26b3f615bca58ccd35d2562c SHA512 35553f4fa182cbf810e0e736b86ee3de2fbeee9fc59e00cacb50f7ecf1b099023e07499957de68776eaabae7e223eacc95b7c098f5e89b7c13047dbe6781d428 WHIRLPOOL a1dbc9f0aecad4f48ed50c3d4df3adb6f0d3aa8f0ebc1ff104f1d77f2f2acd24ff7366b7dfa646f0b9d34d61b6badb7a93a1fc6ae389d7b2a3f98f01f77e514e
+AUX CVE-2015-3306.patch 6603 SHA256 0bceff6ad2020a11db8081391777993513e3da92d5c121ef18248a8e8341481b SHA512 b10970985bae763b7ff43fcb38226b7f10e95fa40f32d68fe9011143d4140f5c0b0a1bb10d19e36ccd454082e1c57d8be6566517f57b83f361424bfeb749af04 WHIRLPOOL 78e18d010177e7d7276d8949780a5ddae0bf84f5e678a66836f45d60f2a1bcf1101395e4f3fde3f86ed4901f00f38839692ad2d336c891177bf1b108964b0b4f
 AUX proftpd-1.3.4d-memset-fix.patch 1271 SHA256 814c230120772449a055479447db2684cbeeacea1c709070ebaf21071e8b2b45 SHA512 bb744eee680b8c7c612c09a04bf3b85d643629e043e6a6f178e80108470b7e1324547188b31f7a7854fbca4fe8af08b4ec3918fb7a0d819194bd1f2303f977fe WHIRLPOOL 0c2e770830b70f9ca6acd9b50eee2b3e8b3b567b6ef53d32972edd9e5fd8d1e60b6c3952055a932ede11341d105c4d7662f8bf06e3c72c4ad60633dc11cf4faf
 AUX proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch 1492 SHA256 00f90994dc0514d906de68d96cc798a8158ae50a50a4719a6b070de1ef669c42 SHA512 835976728f0a3d72766c8a2da192d009b30ec5f1d6dedb711e985409708275fe250f14cde168017e5c78ed339b028186e5eecf51a6b183dd0ea85294fa609bb3 WHIRLPOOL fae4ff0ec20dcc83c6be7e2eb73d44785ac95cf4bebbec5f91228864ebd744baaecb9c9ab185eab7ac5ecfdbec0f86c073a8e316e5196f0138dd550b4a4ca00a
 AUX proftpd-1.3.4e-link-tests.patch 344 SHA256 75c5c0568144c9af6fa48b6dfdf1d91b46964d4cc2020140d3acf20bea21ca95 SHA512 8a01081351f1bd198c801e3bfc91e6f97bf9082590690e02689d8446bba643457816ee55620898d97048246e73d828d6aa4f65517a14a1c95be77cdfbaa97c87 WHIRLPOOL 8aecb44b8fba1ed9d107e86107bc4c86075b5a9b9fbcf59d01b30f1b0d88a0ee3806f4d604871385a49a4e862093dcffdd090774b2490fb35222090817c0e568
@@ -26,14 +26,12 @@ EBUILD proftpd-1.3.4e.ebuild 7761 SHA256 7025ab23d5b1e4832bc44f6701ec40a980e427a
 EBUILD proftpd-1.3.5-r1.ebuild 7595 SHA256 cb13d7b257445956f949fec661ca39d5ba0fdaf066898732f0668a2aad32d30f SHA512 788dcf95e1d717dc660615b51c840aef3f173529159c45aa43f60b98ae3c740b3ac3b27ecb6ae15e74414cc150b0d1b124e335da6e294caaad5d91ea9e041f4a WHIRLPOOL 21c54afd0d60623932147673abeff29d8b8be76580d18d79462efb37d207d80baf128630cda40a57726ac834de2c7a55379f09d5606fe29a69a8fe3ededcd170
 EBUILD proftpd-1.3.5-r2.ebuild 7873 SHA256 e630b12f896993fe19fc895d9192ed53d616a02b86c77a492c0048f49f1ab340 SHA512 550e63a0f0bfb4f168fae93e8f3f13da278fb9f2049aa10663259f66d81dccfde57bef6d2d36435b763a1b99cdc40d2c2e275b9f3ee40b0ed2e07dd08bba7d8f WHIRLPOOL af83736da4df6d132a7745d1e97e51b56e9c594f5dc12dfac42ca67de57d20cf44543a72e1e00c5430f70377fd19dbed6213010a6a7c164b1b1865874de368d0
 EBUILD proftpd-1.3.5.ebuild 7588 SHA256 48e07644e8dee46ac15deca105cf3b0420f4f16a8053eeaefd57c8382f6710fa SHA512 b9efadf7d7fb2f38d968f73cf822a95fde7db51dbb4d51363b6a8b28cf4ab6472621a842a6892c363c9e066b4022b988c09c7159d6c9985033ece62ff5115fd9 WHIRLPOOL fdb272a3802d7fbbec849d3f1a65960bb6807dfea166b664e558d0c90046e44b48aef0eaccace2136225b8ff6351995835571b94e7da69196050a75815792c4c
-MISC ChangeLog 56680 SHA256 bd361d4dd03aa8925b1dfcbee8f88e4bd83daf7a9d1cecbd0f84f78cde9834ad SHA512 fd66f3dbdbcee7f91536d6969eb3b1bae7de7f851e8ade5c45e101f05761f9cad5bf695b587b21eb301eb287ce9c0bd2dd1d9e888c76893046d88a04ea6f28b5 WHIRLPOOL c047871be5d0d131b984b94bc92c5dcb6df13cabf034036cbf145754c9df391cf39c087610e229f5b8eaf852185005521f11f380ae63b1dbe09917172a7574e6
+MISC ChangeLog 56849 SHA256 78e5131ed73e9537662bc2c76c1c265b429af22bc56d22505e6dc2c18b69fcf0 SHA512 3f409186e32ec984190da14f5e47f36b630087563b9ab65618c8e948f10415c153637b4c49b403752aa04d33ac53c232ce9c50974a37e9feab31a5a62d5370dc WHIRLPOOL 81c7c1f372ce81cdfdbe02d09cb7538e028221b1e2b6b91ff4c03ee22364f0599fcd69a25289c1366befe485285785142197b75d6e0d9b3d3d0a882079a27506
 MISC metadata.xml 3411 SHA256 ec37973d72776d25452672149710748670540c4d17ee283712819810a4ee4c13 SHA512 a803fc0b237660f028baf4a5c013f0dfbf17ff5ad1763b4ab1ff87c45105c307966a448989e04d43e57459f33f00297ebbc9d3e936b72752ec293e2ed0f5f6ab WHIRLPOOL bf7ef105c1e9d6af85e5c5aa9d1ae2dd556d9de35b92cfe4be2ef466ec83f67e1928df854efbf2af4a84409b9ebe29e1bc3dd7b5aa02cca4885f3c0806168598
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iKYEAREIAGYFAlVlWPpfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
-OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw2xsgCfZfw7Yggw9fe+TO2F6ihAGSPO
-i7wAn19TDtP51P/Znpwm/8BX2Y725ZIA
-=iah9
+iEYEAREIAAYFAlVoHisACgkQcaHudmEf86rXaACeJtVoLa04x/kArLxabpmEN6CA
+mIYAn320h8FXkspjw8QdIiQ2KB9f4MKT
+=Rfj6
 -----END PGP SIGNATURE-----
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>
 -&copy; Copyright 2009-2010 TJ Saunders<br>
 +&copy; Copyright 2009-2015 TJ Saunders<br>
   All Rights Reserved<br>
  </i></b></font>
-