gentoo resync : 19.10.2017

4 files changed, 2 insertions, 27 deletions

diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index a2182085dc08..4e7eff40fd9a 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -2,7 +2,7 @@ DIST ncftp-3.2.5.474.tar.bz2 454682 SHA256 b4ebe2415761a5137cd1d313c8fc1352f26d8
 DIST ncftp-3.2.6.tar.xz 418836 SHA256 7abd3e8f848f0efb4bb6a4bc5da58a59524d4378fc8d70a52adb0fe1fd00b89d SHA512 040db7e2ca2ee78b79d682a951fd98c1e0ee2936b64462259992d70c51241fa50ae06c66b4f40933ad0ab7122f581bbb8ba7cda764dba5f70a1f8c7d3d751199 WHIRLPOOL 9d41e9e1f9119482cdbb10b819a48b0e58e2df2f3f56fb1ccd0443527592d31aba48642b1831b272231fabb230b0c7c673099d2d272a6a9077001abbb02491a5
 DIST ncftp-325-v6.diff.gz 23295 SHA256 7fb95240c33aeca67e53be58f6016a7e1dcd753b125940f539dab7595e0d02ba SHA512 6e2e740fba2c2b5268ab5928db979ac813bd29dd76633603d69d747fdf765858e1de893a6067518b0b1f01d0b90d8d6426998f5d9b37bbbebe144951878e2b0a WHIRLPOOL 2f7868bdc0e74707a0b0e2e8a2a1b7d0634fd86ff440e5046a48d5b01c1efb86621a5844d56b0e8793d243fa1a998b6136d147a1a9aeeb95c00e1d312415ebb6
 EBUILD ncftp-3.2.5-r3.ebuild 1167 SHA256 2c1ffedc45bb169e925eab4515c763ae5771f46917cc7adf1d4617fce16a9390 SHA512 e17fbd19e18b55cf757cedca548a0568b366ee38dfc370468a03daecc9d5f028e3045999e54875e85bfc00c45bf32ac1fb7c50c7abbfed62fb1b89dc9e7c16ba WHIRLPOOL 1a6d1975cf8befd7e0c5e1c2d8ceeac793f88759d5af1e9ff0b6ab1ea48f16baa0ceb44c7f2b01ab1dff146a1ea9061c3b685d31fbd6b8be36f50ef06233da76
-EBUILD ncftp-3.2.6.ebuild 1060 SHA256 c94f4093fc2b88c365e00107c5be4552dd0358b1e8f74ad1cea4a9ee3e1c8997 SHA512 231619730f787b6a8005a1bd9af07245f7e8d6f718246a0d8e48e90f4d484aa0681584d3da34b6027ec78d3a097f0345d1996438da04a7736f16fba66d5b856b WHIRLPOOL d3fbe0da3bec649664967a99d25615bbe5fb3f97855f183f18f8aa32b9c27262cf88bc0e7084ba9247b70b2a11d4a6e6b74c6de7337d48938fd8d447ba17e2be
+EBUILD ncftp-3.2.6.ebuild 1059 SHA256 ea8743d757402770c68f27c4aebd855e4a4344b45316c0850297a5dd44ba1428 SHA512 3008cd651504685fc2fdc0121df8825b3e69038917f4ec925d0b77b96bbfb87e53bcee1901203780a6c78c53f478f2305e6c90ede211111e2ad4672ceb4ed5f7 WHIRLPOOL 19509eef59522bf63c45e7c960cc6956e028af3d5a8e3df4f70cbf273c3b429434b3709aa560faf7df9f66e660461608c04494dee2dfc02ea347eb505c306f0a
 MISC ChangeLog 2322 SHA256 9fd24ac61d902f6f69d1fc2e7538514fd21c16a2cfd52f346b52c1a53ef0d426 SHA512 b9c010dbaa123607a58c6d242e623a035e1f077e8a44b44ea413d5bc81f990db4cabcced811e98ffd8e500ca88ea494af9ab6e1992f5a43df3dd0686c86dccae WHIRLPOOL 0c7e1ad3f4bb741c127228be97f2c841b19565696e942106aa638d63485c8549ed359746f4d1048c8db7b772c6f825bdcfd78cee57142a82a795829a067a9ced
 MISC ChangeLog-2015 17803 SHA256 34f41bacc4fdf891983dcf4095aca1c5f28015754e4bdd9dcd29162c8bd2597e SHA512 b6d0a8be68acc8fcdf0c3a745685196808db6803991039f44f71d54c65ce930288fbe37c24aee47a623847c1a372c108897e5bd39321e18e821895965df5a1ad WHIRLPOOL b7f44ab88ccfd667a6632ac24cce1439e09170a15378077c872566499d4b477eb22091551689f59f586ac1cdac512d9486b639201af705d6cfde8d559ab83650
 MISC metadata.xml 738 SHA256 719fb096a36c8d1be308c67234688f6af2dea89fe59a0ef3445fdcc76d61008f SHA512 e792a9cbbc371515f5137c4c00faad6936b4c6cc27bcfd5bfab151b00002ae8159cb9b76777a4bdd59dd87ea951ea62898ac74f6afd8a4ec0a1e5dcec12210b3 WHIRLPOOL 6b08b542a318a5ab4e01163db4c1a631fbb709c4e0bb0df4842c30145583874dfce9a859206f0b4337e8e929e2cf5332bbb54d5892747a8fd14f2b79faaa35f3
diff --git a/net-ftp/ncftp/ncftp-3.2.6.ebuild b/net-ftp/ncftp/ncftp-3.2.6.ebuild
index db45d0a6a9c2..6d1ec1918465 100644
--- a/net-ftp/ncftp/ncftp-3.2.6.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="pch"
 
 DEPEND="
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));