Drop incorrectly backported patches: bug #550644 by Todd Goodman.

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

5 files changed, 10 insertions, 830 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 4527361963ef..f0bc7ddf5909 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.333 2015/05/30 21:00:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.334 2015/05/30 21:07:39 slyfox Exp $
+
+  30 May 2015; Sergei Trofimovich <slyfox@gentoo.org>
+  -files/CVE-2015-3306-test.patch, -files/CVE-2015-3306.patch,
+  -proftpd-1.3.5-r2.ebuild:
+  Drop incorrectly backported patches: bug #550644 by Todd Goodman.
 
 *proftpd-1.3.5a (30 May 2015)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 4ec5a974612e..eab418d14a6c 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,8 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX CVE-2015-3306-test.patch 8245 SHA256 92024334f91879a0246e33c3f8c5b626a879ba4173f0a40c1a4dda89cb076185 SHA512 d06aaf400303b8600f801285051f1e55c53cdf2db52d91a3be13624ef16de37331ec87576c558510d888fa289386af2634d836f49f5e0a8b77dd3361bea5f422 WHIRLPOOL 13abd63c0c0b1c8d7e52a35291cf9532a64c5931f2c492f7564e6b7ac3e582c6a7762eaf986a3c0801cbf5426b70747b8727980de708b2a2cd6a36bc237c2666
-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
@@ -25,15 +23,14 @@ DIST proftpd-mod-msg-0.4.1.tar.gz 8082 SHA256 255b79d31dc509ffad5d0fbcd469f833a8
 EBUILD proftpd-1.3.4d.ebuild 7744 SHA256 6fb2c0b72b30a7d3a4c5d680e606d81e5afd23d82de049d199b37ef43b2523b8 SHA512 cf40a11f3dcfae981d195cd45b051bfea5c915758536e351943b11085247592abdb7f2c5c762c1ec792f0246a598bdd104c139c88b5634747e8c3bc3e0141e1f WHIRLPOOL ed5be1ea7923c767a7fdbefbe873107fb50b8cdb1417a9317079f261712908a9adf81ba0bcabe0d15b4d91d5310fd558ef4d8a074188cffa86e16dda31d07ac3
 EBUILD proftpd-1.3.4e.ebuild 7761 SHA256 7025ab23d5b1e4832bc44f6701ec40a980e427a02cc0db26a75bd48c70c16fc0 SHA512 6bf296b13142fe152d0e01732a8fca066886960f3d75ebfdbd7573442bcbd57b12d7787e0ea06ae7d1373ab7c6babf179ee10a8f35f7c85c67ba97ab011d52be WHIRLPOOL d9c5748457161dbd13d42d454f54b63c94f48d3057cabc461ad9af3ee059f326c778386d69fc947b34d65e54cf969b06d9bd0d2849537d0d6d9c8d3236c61d6a
 EBUILD proftpd-1.3.5-r1.ebuild 7595 SHA256 cb13d7b257445956f949fec661ca39d5ba0fdaf066898732f0668a2aad32d30f SHA512 788dcf95e1d717dc660615b51c840aef3f173529159c45aa43f60b98ae3c740b3ac3b27ecb6ae15e74414cc150b0d1b124e335da6e294caaad5d91ea9e041f4a WHIRLPOOL 21c54afd0d60623932147673abeff29d8b8be76580d18d79462efb37d207d80baf128630cda40a57726ac834de2c7a55379f09d5606fe29a69a8fe3ededcd170
-EBUILD proftpd-1.3.5-r2.ebuild 7874 SHA256 fb167a780bd9e1013f24e71ab3720a3f36bcccb7a8d9732d8b56226a02d5af0c SHA512 eb7f2220cce9763789f1cf889561d3dc79b238efd19bf095af454a61ac43dd4411e22b090ff7544d788d9af4d2b8eb3ab8a57d1a99c99482f8f218fae9365ff9 WHIRLPOOL bde858c62b1d5053abc41db99ff5006c8dfafd0cd8628881cd09a3e7e0f9574af29738d24032fe381a307139bd245e232ca0abfd9bec99f84aa972dc46895470
 EBUILD proftpd-1.3.5.ebuild 7588 SHA256 48e07644e8dee46ac15deca105cf3b0420f4f16a8053eeaefd57c8382f6710fa SHA512 b9efadf7d7fb2f38d968f73cf822a95fde7db51dbb4d51363b6a8b28cf4ab6472621a842a6892c363c9e066b4022b988c09c7159d6c9985033ece62ff5115fd9 WHIRLPOOL fdb272a3802d7fbbec849d3f1a65960bb6807dfea166b664e558d0c90046e44b48aef0eaccace2136225b8ff6351995835571b94e7da69196050a75815792c4c
 EBUILD proftpd-1.3.5a.ebuild 7547 SHA256 02558ea04afc8c736abd44bf2608ffdc91db5684476be51ec6f64659e5e8a49c SHA512 d12601784de7aba6c246831607f1d309cbf94d4ada39dc63e332b8260185e4a591a168d043ba3ae43c42a361e6d9c773a9ead0de27c1f0ad281d580d6dad209a WHIRLPOOL eb70db61b4dde3d2aa7e51bf7b63150aec39f885234e32644a97232e5b9517af9f77fe2effd9709ee8df8024693cbd6f296a2fa7f61187527222db2523de9c3b
-MISC ChangeLog 57253 SHA256 33c5c9ef9951d4a302533768d9ac6a83aa72b45a4032d14c5930c5d484cdc8ea SHA512 b5304ac9e945725de5799ebcfbc7aa9863c08c0ada25e7c7bebdc97867a778d59f31cc68dfb5636cc7759b9db743f1152eeba77dd10cf30e3dd45243058358f7 WHIRLPOOL eae395a5d114805b90ab168b8f9276e2d4410468107f5b0823aeeb026737ec1ca47f38013fb31ae01f03035a22e4e000a98bbb774ba6b8dd989a8dfc83067f7c
+MISC ChangeLog 57467 SHA256 5b789c996a508a25c7dbaf8c3c3f002149b1432ee99259692560fce26d6251ba SHA512 c04056fd62c626664f08d5d203d85b38737389d95c442ead5ffd1ad7cb705c064a91ac4bcdf8506abd0aa4ee6d7672eaeda15966c6f76f804511d8d1768e598b WHIRLPOOL e4d1da84965dd86af8fa7c426cde611d5f5a3263e78a768ef58549069f6edcb8049106799105e064796418ef2e601b2bf9b385a716f1c9b2d85d916c2821f752
 MISC metadata.xml 3411 SHA256 ec37973d72776d25452672149710748670540c4d17ee283712819810a4ee4c13 SHA512 a803fc0b237660f028baf4a5c013f0dfbf17ff5ad1763b4ab1ff87c45105c307966a448989e04d43e57459f33f00297ebbc9d3e936b72752ec293e2ed0f5f6ab WHIRLPOOL bf7ef105c1e9d6af85e5c5aa9d1ae2dd556d9de35b92cfe4be2ef466ec83f67e1928df854efbf2af4a84409b9ebe29e1bc3dd7b5aa02cca4885f3c0806168598
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVqJO8ACgkQcaHudmEf86rBrgCggrYHS7+WTQu9W+1p3NCD+Vb7
-g3wAn0P6hNlHqSc153Ljsmi9X6/SHjCZ
-=911V
+iEYEAREIAAYFAlVqJpwACgkQcaHudmEf86pHoQCdENhViLDAi3SthpV7tY3YIrAn
+BdQAmweAUA2OIgPEFtkAAzfODngMDFEP
+=V0F5
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/files/CVE-2015-3306-test.patch b/net-ftp/proftpd/files/CVE-2015-3306-test.patch
deleted file mode 100644
index 9c939faa8442..000000000000
--- a/net-ftp/proftpd/files/CVE-2015-3306-test.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-https://github.com/proftpd/proftpd/commit/3ef395d81327558e6e6def43df9138b1cd4955dd
-diff --git a/tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm b/tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm
-index 251df45..00d8610 100644
---- a/tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm
-+++ b/tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm
-@@ -21,6 +21,11 @@ my $TESTS = {
-     test_class => [qw(forking)],
-   },
- 
-+  copy_file_no_login => {
-+    order => ++$order,
-+    test_class => [qw(bug forking)],
-+  },
-+
-   copy_dir => {
-     order => ++$order,
-     test_class => [qw(forking)],
-@@ -86,6 +91,11 @@ my $TESTS = {
-     test_class => [qw(forking)],
-   },
- 
-+  copy_cpfr_cpto_no_login => {
-+    order => ++$order,
-+    test_class => [qw(bug forking)],
-+  },
-+
-   copy_cpto_no_cpfr => {
-     order => ++$order,
-     test_class => [qw(forking)],
-@@ -263,6 +273,137 @@ sub copy_file {
-   unlink($log_file);
- }
- 
-+sub copy_file_no_login {
-+  my $self = shift;
-+  my $tmpdir = $self->{tmpdir};
-+
-+  my $config_file = "$tmpdir/copy.conf";
-+  my $pid_file = File::Spec->rel2abs("$tmpdir/copy.pid");
-+  my $scoreboard_file = File::Spec->rel2abs("$tmpdir/copy.scoreboard");
-+
-+  my $log_file = File::Spec->rel2abs('tests.log');
-+
-+  my $auth_user_file = File::Spec->rel2abs("$tmpdir/copy.passwd");
-+  my $auth_group_file = File::Spec->rel2abs("$tmpdir/copy.group");
-+
-+  my $user = 'proftpd';
-+  my $passwd = 'test';
-+  my $group = 'ftpd';
-+  my $home_dir = File::Spec->rel2abs($tmpdir);
-+  my $uid = 500;
-+  my $gid = 500;
-+
-+  # Make sure that, if we're running as root, that the home directory has
-+  # permissions/privs set for the account we create
-+  if ($< == 0) {
-+    unless (chmod(0755, $home_dir)) {
-+      die("Can't set perms on $home_dir to 0755: $!");
-+    }
-+
-+    unless (chown($uid, $gid, $home_dir)) {
-+      die("Can't set owner of $home_dir to $uid/$gid: $!");
-+    }
-+  }
-+
-+  auth_user_write($auth_user_file, $user, $passwd, $uid, $gid, $home_dir,
-+    '/bin/bash');
-+  auth_group_write($auth_group_file, $group, $gid, $user);
-+
-+  my $src_file = File::Spec->rel2abs("$home_dir/foo.txt");
-+  if (open(my $fh, "> $src_file")) {
-+    print $fh "Hello, World!\n";
-+
-+    unless (close($fh)) {
-+      die("Can't write $src_file: $!");
-+    }
-+
-+  } else {
-+    die("Can't open $src_file: $!");
-+  }
-+
-+  my $dst_file = File::Spec->rel2abs("$home_dir/bar.txt");
-+
-+  my $config = {
-+    PidFile => $pid_file,
-+    ScoreboardFile => $scoreboard_file,
-+    SystemLog => $log_file,
-+
-+    AuthUserFile => $auth_user_file,
-+    AuthGroupFile => $auth_group_file,
-+
-+    IfModules => {
-+      'mod_delay.c' => {
-+        DelayEngine => 'off',
-+      },
-+    },
-+  };
-+
-+  my ($port, $config_user, $config_group) = config_write($config_file, $config);
-+
-+  # Open pipes, for use between the parent and child processes.  Specifically,
-+  # the child will indicate when it's done with its test by writing a message
-+  # to the parent.
-+  my ($rfh, $wfh);
-+  unless (pipe($rfh, $wfh)) {
-+    die("Can't open pipe: $!");
-+  }
-+
-+  my $ex;
-+
-+  # Fork child
-+  $self->handle_sigchld();
-+  defined(my $pid = fork()) or die("Can't fork: $!");
-+  if ($pid) {
-+    eval {
-+      my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port);
-+
-+      eval { $client->site('COPY', 'foo.txt', 'bar.txt') };
-+      unless ($@) { 
-+        die("SITE COPY succeeded unexpectedly");
-+      }
-+
-+      my $resp_code = $client->response_code();
-+      my $resp_msg = $client->response_msg();
-+
-+      my $expected;
-+      $expected = 530;
-+      $self->assert($expected == $resp_code,
-+        test_msg("Expected response code $expected, got $resp_code"));
-+
-+      $expected = "Please login with USER and PASS";
-+      $self->assert($expected eq $resp_msg,
-+        test_msg("Expected response message '$expected', got '$resp_msg'"));
-+    };
-+
-+    if ($@) {
-+      $ex = $@;
-+    }
-+
-+    $wfh->print("done\n");
-+    $wfh->flush();
-+
-+  } else {
-+    eval { server_wait($config_file, $rfh) };
-+    if ($@) {
-+      warn($@);
-+      exit 1;
-+    }
-+
-+    exit 0;
-+  }
-+
-+  # Stop server
-+  server_stop($pid_file);
-+
-+  $self->assert_child_ok($pid);
-+
-+  if ($ex) {
-+    die($ex);
-+  }
-+
-+  unlink($log_file);
-+}
-+
- sub copy_dir {
-   my $self = shift;
-   my $tmpdir = $self->{tmpdir};
-@@ -2606,6 +2747,153 @@ sub copy_cpfr_cpto {
-   unlink($log_file);
- }
- 
-+sub copy_cpfr_cpto_no_login {
-+  my $self = shift;
-+  my $tmpdir = $self->{tmpdir};
-+
-+  my $config_file = "$tmpdir/copy.conf";
-+  my $pid_file = File::Spec->rel2abs("$tmpdir/copy.pid");
-+  my $scoreboard_file = File::Spec->rel2abs("$tmpdir/copy.scoreboard");
-+
-+  my $log_file = File::Spec->rel2abs('tests.log');
-+
-+  my $auth_user_file = File::Spec->rel2abs("$tmpdir/copy.passwd");
-+  my $auth_group_file = File::Spec->rel2abs("$tmpdir/copy.group");
-+
-+  my $user = 'proftpd';
-+  my $passwd = 'test';
-+  my $group = 'ftpd';
-+  my $home_dir = File::Spec->rel2abs($tmpdir);
-+  my $uid = 500;
-+  my $gid = 500;
-+
-+  # Make sure that, if we're running as root, that the home directory has
-+  # permissions/privs set for the account we create
-+  if ($< == 0) {
-+    unless (chmod(0755, $home_dir)) {
-+      die("Can't set perms on $home_dir to 0755: $!");
-+    }
-+
-+    unless (chown($uid, $gid, $home_dir)) {
-+      die("Can't set owner of $home_dir to $uid/$gid: $!");
-+    }
-+  }
-+
-+  auth_user_write($auth_user_file, $user, $passwd, $uid, $gid, $home_dir,
-+    '/bin/bash');
-+  auth_group_write($auth_group_file, $group, $gid, $user);
-+
-+  my $src_file = File::Spec->rel2abs("$home_dir/foo.txt");
-+  if (open(my $fh, "> $src_file")) {
-+    print $fh "Hello, World!\n";
-+
-+    unless (close($fh)) {
-+      die("Can't write $src_file: $!");
-+    }
-+
-+  } else {
-+    die("Can't open $src_file: $!");
-+  }
-+
-+  my $dst_file = File::Spec->rel2abs("$home_dir/bar.txt");
-+
-+  my $config = {
-+    PidFile => $pid_file,
-+    ScoreboardFile => $scoreboard_file,
-+    SystemLog => $log_file,
-+
-+    AuthUserFile => $auth_user_file,
-+    AuthGroupFile => $auth_group_file,
-+
-+    IfModules => {
-+      'mod_delay.c' => {
-+        DelayEngine => 'off',
-+      },
-+    },
-+  };
-+
-+  my ($port, $config_user, $config_group) = config_write($config_file, $config);
-+
-+  # Open pipes, for use between the parent and child processes.  Specifically,
-+  # the child will indicate when it's done with its test by writing a message
-+  # to the parent.
-+  my ($rfh, $wfh);
-+  unless (pipe($rfh, $wfh)) {
-+    die("Can't open pipe: $!");
-+  }
-+
-+  my $ex;
-+
-+  # Fork child
-+  $self->handle_sigchld();
-+  defined(my $pid = fork()) or die("Can't fork: $!");
-+  if ($pid) {
-+    eval {
-+      my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port);
-+ 
-+      eval { $client->site('CPFR', 'foo.txt') };
-+      unless ($@) {
-+        die("SITE CPFR succeeded unexpectedly");
-+      }
-+
-+      my $resp_code = $client->response_code();
-+      my $resp_msg = $client->response_msg();
-+
-+      my $expected;
-+      $expected = 530;
-+      $self->assert($expected == $resp_code,
-+        test_msg("Expected response code $expected, got $resp_code"));
-+
-+      $expected = "Please login with USER and PASS";
-+      $self->assert($expected eq $resp_msg,
-+        test_msg("Expected response message '$expected', got '$resp_msg'"));
-+
-+      eval { $client->site('CPTO', 'bar.txt') };
-+      unless ($@) {
-+        die("SITE CPTO succeeded unexpectedly");
-+      }
-+
-+      $resp_code = $client->response_code();
-+      $resp_msg = $client->response_msg();
-+
-+      $expected = 530;
-+      $self->assert($expected == $resp_code,
-+        test_msg("Expected response code $expected, got $resp_code"));
-+
-+      $expected = "Please login with USER and PASS";
-+      $self->assert($expected eq $resp_msg,
-+        test_msg("Expected response message '$expected', got '$resp_msg'"));
-+    };
-+
-+    if ($@) {
-+      $ex = $@;
-+    }
-+
-+    $wfh->print("done\n");
-+    $wfh->flush();
-+
-+  } else {
-+    eval { server_wait($config_file, $rfh) };
-+    if ($@) {
-+      warn($@);
-+      exit 1;
-+    }
-+
-+    exit 0;
-+  }
-+
-+  # Stop server
-+  server_stop($pid_file);
-+
-+  $self->assert_child_ok($pid);
-+
-+  if ($ex) {
-+    die($ex);
-+  }
-+
-+  unlink($log_file);
-+}
-+
- sub copy_cpto_no_cpfr {
-   my $self = shift;
-   my $tmpdir = $self->{tmpdir};
diff --git a/net-ftp/proftpd/files/CVE-2015-3306.patch b/net-ftp/proftpd/files/CVE-2015-3306.patch
deleted file mode 100644
index 515cb2acd76f..000000000000
--- a/net-ftp/proftpd/files/CVE-2015-3306.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-https://github.com/proftpd/proftpd/commit/3ef395d81327558e6e6def43df9138b1cd4955dd
-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"
- 
--#define MOD_COPY_VERSION	"mod_copy/0.4"
-+#define MOD_COPY_VERSION	"mod_copy/0.5"
- 
- /* Make sure the version of proftpd is as necessary. */
- #if PROFTPD_VERSION_NUMBER < 0x0001030401
-@@ -40,6 +40,8 @@
- 
- extern pr_response_t *resp_list, *resp_err_list;
- 
-+static int copy_engine = TRUE;
-+
- static const char *trace_channel = "copy";
- 
- /* These are copied largely from src/mkhome.c */
-@@ -363,7 +365,7 @@
-     errno = xerrno;
-     return -1;
-   }
--   
-+
-   if (S_ISREG(st.st_mode)) { 
-     char *abs_path;
- 
-@@ -471,10 +473,37 @@
-   return 0;
- }
- 
-+/* Configuration handlers
-+ */
-+
-+/* usage: CopyEngine on|off */
-+MODRET set_copyengine(cmd_rec *cmd) {
-+  int engine = -1;
-+  config_rec *c;
-+
-+  CHECK_ARGS(cmd, 1);
-+  CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
-+
-+  engine = get_boolean(cmd, 1);
-+  if (engine == -1) {
-+    CONF_ERROR(cmd, "expected Boolean parameter");
-+  }
-+
-+  c = add_config_param(cmd->argv[0], 1, NULL);
-+  c->argv[0] = palloc(c->pool, sizeof(int));
-+  *((int *) c->argv[0]) = engine;
-+
-+  return PR_HANDLED(cmd);
-+}
-+
- /* Command handlers
-  */
- 
- MODRET copy_copy(cmd_rec *cmd) {
-+  if (copy_engine == FALSE) {
-+    return DECLINED(cmd);
-+  }
-+
-   if (cmd->argc < 2) {
-     return PR_DECLINED(cmd);
-   }
-@@ -539,12 +568,27 @@
-   register unsigned int i;
-   int res;
-   char *path = "";
-+  unsigned char *authenticated = NULL;
-+
-+  if (copy_engine == FALSE) {
-+    return PR_DECLINED(cmd);
-+  }
- 
-   if (cmd->argc < 3 ||
-       strncasecmp(cmd->argv[1], "CPFR", 5) != 0) {
-     return PR_DECLINED(cmd);
-   }
- 
-+  authenticated = get_param_ptr(cmd->server->conf, "authenticated", FALSE);
-+  if (authenticated == NULL ||
-+      *authenticated == FALSE) {
-+    pr_response_add_err(R_530, _("Please login with USER and PASS"));
-+
-+    pr_cmd_set_errno(cmd, EPERM);
-+    errno = EPERM;
-+    return PR_ERROR(cmd);
-+  }
-+
-   CHECK_CMD_MIN_ARGS(cmd, 3);
- 
-   /* Construct the target file name by concatenating all the parameters after
-@@ -594,12 +638,27 @@
- MODRET copy_cpto(cmd_rec *cmd) {
-   register unsigned int i;
-   char *from, *to = "";
-+  unsigned char *authenticated = NULL;
-+
-+  if (copy_engine == FALSE) {
-+    return PR_DECLINED(cmd);
-+  }
- 
-   if (cmd->argc < 3 ||
-       strncasecmp(cmd->argv[1], "CPTO", 5) != 0) {
-     return PR_DECLINED(cmd);
-   }
- 
-+  authenticated = get_param_ptr(cmd->server->conf, "authenticated", FALSE);
-+  if (authenticated == NULL ||
-+      *authenticated == FALSE) {
-+    pr_response_add_err(R_530, _("Please login with USER and PASS"));
-+
-+    pr_cmd_set_errno(cmd, EPERM);
-+    errno = EPERM;
-+    return PR_ERROR(cmd);
-+  }
-+
-   CHECK_CMD_MIN_ARGS(cmd, 3);
- 
-   from = pr_table_get(session.notes, "mod_copy.cpfr-path", NULL);
-@@ -632,6 +691,10 @@
- }
- 
- MODRET copy_log_site(cmd_rec *cmd) {
-+  if (copy_engine == FALSE) {
-+    return PR_DECLINED(cmd);
-+  }
-+
-   if (cmd->argc < 3 ||
-       strncasecmp(cmd->argv[1], "CPTO", 5) != 0) {
-     return PR_DECLINED(cmd);
-@@ -643,23 +706,58 @@
-   return PR_DECLINED(cmd);
- }
- 
-+MODRET copy_post_pass(cmd_rec *cmd) {
-+  config_rec *c;
-+
-+  if (copy_engine == FALSE) {
-+    return PR_DECLINED(cmd);
-+  }
-+
-+  /* The CopyEngine directive may have been changed for this user by
-+   * e.g. mod_ifsession, thus we check again.
-+   */
-+  c = find_config(main_server->conf, CONF_PARAM, "CopyEngine", FALSE);
-+  if (c != NULL) {
-+    copy_engine = *((int *) c->argv[0]);
-+  }
-+
-+  return PR_DECLINED(cmd);
-+}
-+
- /* Initialization functions
-  */
- 
- static int copy_sess_init(void) {
-+  config_rec *c;
-+
-+  c = find_config(main_server->conf, CONF_PARAM, "CopyEngine", FALSE);
-+  if (c != NULL) {
-+    copy_engine = *((int *) c->argv[0]);
-+  }
-+
-+  if (copy_engine == FALSE) {
-+    return 0;
-+  }
-+
-   /* Advertise support for the SITE command */
-   pr_feat_add("SITE COPY");
--
-   return 0;
- }
- 
- /* Module API tables
-  */
- 
-+static conftable copy_conftab[] = {
-+  { "CopyEngine",	set_copyengine,		NULL },
-+
-+  { NULL }
-+};
-+
- static cmdtable copy_cmdtab[] = {
-   { CMD, 	C_SITE, G_WRITE,	copy_copy,	FALSE,	FALSE, CL_MISC },
-   { CMD, 	C_SITE, G_DIRS,		copy_cpfr,	FALSE,	FALSE, CL_MISC },
-   { CMD, 	C_SITE, G_WRITE,	copy_cpto,	FALSE,	FALSE, CL_MISC },
-+  { POST_CMD,	C_PASS,	G_NONE,		copy_post_pass, FALSE,	FALSE },
-   { LOG_CMD, 	C_SITE, G_NONE,		copy_log_site,	FALSE,	FALSE },
-   { LOG_CMD_ERR, C_SITE, G_NONE,	copy_log_site,	FALSE,	FALSE },
- 
-@@ -676,7 +774,7 @@
-   "copy",
- 
-   /* Module configuration handler table */
--  NULL,
-+  copy_conftab,
- 
-   /* Module command handler table */
-   copy_cmdtab,
-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>.
- 
- <p>
--The most current version of <code>mod_copy</code> can be found at:
--<pre>
--  <a href="http://www.castaglia.org/proftpd/">http://www.castaglia.org/proftpd/</a>
--</pre>
-+The most current version of <code>mod_copy</code> is distributed with the
-+ProFTPD source code.
- 
- <h2>Author</h2>
- <p>
- Please contact TJ Saunders &lt;tj <i>at</i> castaglia.org&gt; with any
- questions, concerns, or suggestions regarding this module.
- 
-+<h2>Directives</h2>
-+<ul>
-+  <li><a href="#CopyEngine">CopyEngine</a>
-+</ul>
-+
- <h2><code>SITE</code> Commands</h2>
- <ul>
-   <li><a href="#SITE_CPFR">SITE CPFR</a>
-   <li><a href="#SITE_CPTO">SITE CPTO</a>
- </ul>
- 
-+<p>
-+<hr>
-+<h2><a name="CopyEngine">CopyEngine</a></h2>
-+<strong>Syntax:</strong> CopyEngine <em>on|off</em><br>
-+<strong>Default:</strong> CopyEngine on<br>
-+<strong>Context:</strong> server config, <code>&lt;VirtualHost&gt;</code>, <code>&lt;Global&gt;</code><br>
-+<strong>Module:</strong> mod_radius<br>
-+<strong>Compatibility:</strong> 1.3.6rc1 and later
-+
-+<p>
-+The <code>CopyEngine</code> directive enables or disables the module's
-+handling of <code>SITE COPY</code> <i>et al</i> commands.  If it is set to
-+<em>off</em> this module ignores these commands.
-+
-+<p>
- <hr>
- <h2><a name="SITE_CPFR">SITE CPFR</a></h2>
- This <code>SITE</code> command specifies the source file/directory to use
-@@ -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>
diff --git a/net-ftp/proftpd/proftpd-1.3.5-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.5-r2.ebuild
deleted file mode 100644
index 026607d2167c..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.5-r2.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.5-r2.ebuild,v 1.2 2015/05/30 13:57:11 idella4 Exp $
-
-EAPI=5
-inherit eutils multilib systemd
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_MSG="0.4.1"
-MOD_VROOT="0.9.3"
-
-DESCRIPTION="An advanced and very configurable FTP server"
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
-	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/mod_vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test trace unique_id vroot xinetd"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
-	openssl? ( dev-libs/openssl:0= )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	local mod_name=$1
-	local mod_topdir=${WORKDIR}/${2:-${mod_name}}
-
-	mv "${mod_topdir}/${mod_name}.c" contrib || die
-	mv "${mod_topdir}/${mod_name}.html" doc/contrib || die
-	rm -r "${mod_topdir}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-netaddr-segv.patch
-	# Bug 546644 security patch CVE-2015-3306
-	# CVE-2015-3306.patch was re-based, CVE-2015-3306-test.patch is as it came in
-	# https://github.com/proftpd/proftpd/commit/3ef395d81327558e6e6def43df9138b1cd4955dd
-	epatch "${FILESDIR}"/{CVE-2015-3306.patch,CVE-2015-3306-test.patch}
-
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use msg && __prepare_module mod_msg
-	use vroot && __prepare_module mod_vroot ${PN}-mod_vroot-mod_vroot-${MOD_VROOT}
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use dynmasq && m="${m}:mod_dynmasq"
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	use log_forensic && m="${m}:mod_log_forensic"
-	use msg && m="${m}:mod_msg"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	use snmp && m="${m}:mod_snmp"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use unique_id && m="${m}:mod_unique_id"
-	use vroot && m="${m}:mod_vroot"
-
-	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
-		einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
-		m="${m}:${PROFTP_CUSTOM_MODULES}"
-	fi
-
-	[[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale
-	rm -rf "${ED}"/var/run
-
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-
-	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
-}