gentoo resync : 19.10.2017

2 files changed, 0 insertions, 25 deletions

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 069920fe4e86..61d18c6e7d7e 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -2,7 +2,6 @@ AUX proftpd-1.3.6-use-trace.patch 477 SHA256 5d4e5da19f3dfe8ca96996f0b1250d6a452
 AUX proftpd-1.3.6_rc4-diskuse-refresh-api.patch 576 SHA256 68b27e9d457f87a80f6c4a1f943352bb5b81c0316250117f4b9a3166e99e9e4b SHA512 08a0674600944ff5d13033651a1dea1647c9d22f18efe6505e051b36566bf357bc41439d2dd7c2900e873ef8d600ba7f16332680dda1abb2529808fbe5a4e573 WHIRLPOOL 0b2c283027eedd7d3a6a58b2e8b1be80da47f3ea2c5094a4eff7452be3ab2e29361777d4f1e8008af46d84c8a4c7a23ed5fc4014c267d899d57f3c724fe4f0f0
 AUX proftpd-1.3.6_rc4-gss-refresh-api.patch 1868 SHA256 1e6360fba78b2f5242fbcb428c581365e66ea39e639bf3aa03e68609cfbcda51 SHA512 4cc235bdb60ea4c84794d4347826b040057067d8283dcfcb795d5d25a156de480df7d897078ab8ab4faf12d4fc9e714a55f723ce27c9397bc2223550597df674 WHIRLPOOL ffc1a64355593db43d40cf822c9b65f311b75223e14e334edaef1b4b916e36f085e30d13203beecc8d900023c8f85315f6b44f04c6f9c69ce4c8c64c82e4878d
 AUX proftpd-1.3.6_rc4-msg-refresh-api.patch 903 SHA256 dd232a954737848c8077b604b0d3c7050b3eb6e720aefd4e70489331dd25937b SHA512 d0dcc467289b4107aecee66edf122667b2fbb9b1f1a6a6ecea517f286090d22682200b9d11f503465cb9b5387e8fb749cc09c3033825282450fe1d6c0a4bb11d WHIRLPOOL b620914736899842696737932858ba3fe50dc2f90bf2d95dc96bd6ab0cda44d9fb29a5292ba2e9e421e98e24e446accef58542efca6d2e711b0dd9347aae5c06
-AUX proftpd-1.3.6_rc4-open-tests.patch 1206 SHA256 20d19ba6a64e961925d811e1921682b5df73a56537d89e37c2f7127bb0a81c6b SHA512 d860eebfa05870866e0e523af34c25d3c7513d4a2f0b0a84963f86c58475d957013fbf503f9d0934146c566326f49784dbc4e7ba4ac089a9214558a677bb9266 WHIRLPOOL 11562795fe868e3ee25f78e4d3caaf0609dff8d3c00b46c23c7fa21a7d59ff733d0bd168570edd7c13a71f7c263515db77afd63ddc34c94fdb47ab76807d1817
 AUX proftpd-1.3.6_rc4-vroot-refresh-api.patch 736 SHA256 fcc15a6c5f8f8cd8ad50328897c5be9aab772ed2997c858ac1a0e09582b1b295 SHA512 9cd98e2fb8c17d2ca38f5f7a20f5c6ffb03da7f51e53542237992bd2b98b2ef5b5fc0634cd7f5eef24fba8a601703b70ff7d0404e1c5103394e9fda260b815cd WHIRLPOOL 75cf5fede0c02128acbd93f31dfc6a501ad2488c8084c6fbc8771532a3a1d58c79676dbbeeded3eaeaf8e00989167d77169128eb7fe0f952a940a4c10b821638
 AUX proftpd-tmpfiles.d.conf 34 SHA256 75288bb0c76392ae10e7ef3ff27e7b665742cdac8ce4c70dff9f29d645d0f0f3 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52 WHIRLPOOL d3ef47f4e2abc178c2d153599e7b13148345a470c76410b499e41912f9e90a48c1217e7fdee3d6777b1598dd09840f8bffbd208fa9addbeaaaf9c64058d8df93
 AUX proftpd.conf.sample 1275 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0 SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df WHIRLPOOL a9f71cf50926ccdf5fe1116250c29a4048e7eb7fc7eb73732023b7c6e78c56b02356c001c203d9dc8c46f817471116977f76e961a6b2a60c03ae1d4722d9e3e1
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6_rc4-open-tests.patch b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-open-tests.patch
deleted file mode 100644
index f65a2cc3fbb4..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6_rc4-open-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-gcc-6.3 + glibc-2.25 now can detect 2-argument open that is supposed to created new files.
-diff --git a/tests/api/fsio.c b/tests/api/fsio.c
-index 2041f43..18d173b 100644
---- a/tests/api/fsio.c
-+++ b/tests/api/fsio.c
-@@ -1058,3 +1058,3 @@ START_TEST (fsio_sys_access_file_test) {
-   /* Make the file to check; we want it to have perms 664.*/
--  fd = open(fsio_test_path, O_CREAT|O_EXCL|O_WRONLY);
-+  fd = open(fsio_test_path, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR);
-   fail_if(fd < 0, "Unable to create file '%s': %s", fsio_test_path,
-diff --git a/tests/api/scoreboard.c b/tests/api/scoreboard.c
-index f0ffdbc..f26d833 100644
---- a/tests/api/scoreboard.c
-+++ b/tests/api/scoreboard.c
-@@ -267,3 +267,3 @@ START_TEST (scoreboard_lock_test) {
- 
--  fd = open(test_file2, O_CREAT|O_EXCL|O_RDWR);
-+  fd = open(test_file2, O_CREAT|O_EXCL|O_RDWR, S_IRUSR | S_IWUSR);
-   fail_unless(fd >= 0, "Failed to open '%s': %s", test_file2, strerror(errno));
-@@ -911,3 +911,3 @@ START_TEST (scoreboard_entry_lock_test) {
- 
--  fd = open(test_file2, O_CREAT|O_EXCL|O_RDWR);
-+  fd = open(test_file2, O_CREAT|O_EXCL|O_RDWR, S_IRUSR | S_IWUSR);
-   fail_unless(fd >= 0, "Failed to open '%s': %s", test_file2, strerror(errno));