gentoo resync : 03.12.2017

6 files changed, 60 insertions, 6 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6b317f13117d..60f689f32fda 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 464087a633e0..7c4fcfec3813 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,9 +1,9 @@
 DIST remmina-1.2.0_rc16.tar.gz 1008438 SHA256 edb347f9e4d0a2e682f7ffd22caa364b477653a1aca31d1c1922a86d81df4995 SHA512 a6d2fb95a3fc68ee7ce4c8205c775cbc7bb83fa2f90b68d04f355b4ca8b4d0956a29ecbc028260c432b55c582802e9f243ad62426212d9fd0f02f7e50a56856f WHIRLPOOL a5d136e1abaeafcc1ad070c400a0c7456e29d1406ea3542add5eb36c4cb1e32cedf0a2bac855298a5e1e703e19774d007ec70c822c49ec13a9f565123b33181d
 DIST remmina-1.2.0_rc20.tar.gz 1016674 SHA256 5663105735600cfe5dbbcd62e64ffb27bb6587e1035b04b2b63a32a98d25ef30 SHA512 096cbb9cf45e911466a6123eead727d45365ee434bf371603733de4e7ab9b445ce67019f2a66d45fe33aecab4d163f6f31ca38811adadc125494f8575fa3a64a WHIRLPOOL b3b218c32e46516f80f637dd8fefc59c16ed437b24b0d7a20336ee90b5364e29e618dfb1705de31341b3dfd0220df3ff38021f782e57127b193f6b58193b761e
 DIST remmina-1.2.0_rc21.tar.gz 1028685 SHA256 9b4ac39a4ca40fffc9ce52e4a504839626eb4e0b3d1cdddf54217beef1fcd535 SHA512 5b3f0bab14c57ae91375373b0181bdb4e6d933332ef1b5c590988b29d6afccfd77cece371e3bbf98bedc6c35a9ee8eefa37201ec09fb44d62de83a1cdaf706b0 WHIRLPOOL 560779b36f2efe830f69121ac532f4558acf3e6c82fe826308d4402d8710b1976b3f773ba3873387d9e0b2575c2be63531cecd272305ebdde47046ce342bef71
-DIST remmina-1.2.0_rc24.tar.gz 1052140 SHA256 7d959485469b8e99d4d950e6e916b22e28a6855d58955a1be7f49b3a5650e82c SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e WHIRLPOOL 9bbe41519b782d9ddd641e1d00ac1697e7965a553e1827c73152f73964b0db0c1eb7046d6f33d7b596af1669464b7b5adffb5fc8c73716ae433438692746a966
+DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
 EBUILD remmina-1.2.0_rc16-r1.ebuild 1987 BLAKE2B 005618e52733a4ed61084f51c553581e10a93abd5337f46156c395a4da672253cf3940a19abea0fa345c99f4091d32fc4c372f662b60d157cc9e769c9cb24e43 SHA512 8301d870a34688124dafbd9199c5364ab9fe7d3b4439e0d3fd62258bb64d89544b212ecd73dcb194ddbee17d8aa7308e09182f127bc74319c5ee27ac7c7627ce
 EBUILD remmina-1.2.0_rc20.ebuild 1917 BLAKE2B e0a31733df359a197f2ff84c1f51e406a291e18c26225261858ac838c4b667d0255b23f4167fdb4c911950d053c20f6652e7e0192b5e935c15e40bc5653e29c7 SHA512 3312e56870c95d24962805d2fa7bc6bab8d31b52f69650501ba7c25deec47ddddfd93aa8fffb4dfcad931744c1a48b63f361286a89235286044645e79660688c
 EBUILD remmina-1.2.0_rc21.ebuild 2009 BLAKE2B 8ec23ea98d38fdb189fcc200416ccee98ba9599274543fd922053b4376ed4bb3ae0dfcb9af24b39e925e989b3153672a1341c1f564b64b09f37ccc4805b500e9 SHA512 e3da5aa9cdbe94bc3bc61f2540495879d6ee1b69931f673ed126dfcf071379c5ee96d18a0c9e3e2a076029172e94333ebd81dbfe816d5b28bc35ca48d6eb5fe7
-EBUILD remmina-1.2.0_rc24.ebuild 2008 BLAKE2B a42fb0c094979828b64b7b05d9d57cf17cbba8a629a1b747fb9cc604ec50818b09f8fdfe7408036f199442875c4595b225761f5b8a6a1f140978aab1e84552e6 SHA512 0f0a9ad6281b8d5dde23e965f13a528d49e6897a02f8c1d0552b607df46726200cb369dee498651f6e2ab236820ba8da17dc25dc021c1e14005f28bde39dc336
+EBUILD remmina-1.2.0_rc24.ebuild 2007 BLAKE2B 30c5e90c97fa5c9dc329108320e90d82ebcffc846634e727fe0e6e25d32e5febbe68e249bca955c91449da1c3cc4f22f5a6184c4515d1fef4685236573e37857 SHA512 b69b8a14476ed2ccc75ae82e723d0f780a513f8978d2b27f2331b7c0cfd77797bc1351441fcd048338ad33f1a16cffda4e514e43314c782ccd5e8bf846e18b3a
 MISC metadata.xml 1246 BLAKE2B a091f5d6a13aa88f677e99bbb408d1f9ffec47def14a95e276598cabd1619941d83bbb19acef3c8dda7fa897887e1f1d9fd03e8784b4b969d35aa1bfc8286054 SHA512 4116cdb618584c5b95ff0330fb9c9efad2736cafcf4e3622fd074d5026f1adc5b7ab8e420188bc3a689b31cc285318db953bfa66c54b7fe91de242136787a5d8
diff --git a/net-misc/remmina/remmina-1.2.0_rc24.ebuild b/net-misc/remmina/remmina-1.2.0_rc24.ebuild
index 6e63be10d66e..b0a238363e90 100644
--- a/net-misc/remmina/remmina-1.2.0_rc24.ebuild
+++ b/net-misc/remmina/remmina-1.2.0_rc24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="ayatana crypt rdp gnome-keyring nls spice ssh telepathy vnc zeroconf"
 
 CDEPEND="
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
index 5ddc75b6fdb2..9b22b5a8fb2c 100644
--- a/net-misc/telnet-bsd/Manifest
+++ b/net-misc/telnet-bsd/Manifest
@@ -1,5 +1,6 @@
 AUX telnet-bsd-1.2-fbsd.patch 2523 BLAKE2B dd8625ecb4d2d82d80ce3ec14c56fc979e76c996e55f059ffde68aa6fbd52828dcbe252331b9e56b8b701a1a3500b1a8e0b804e612e317d69f1bde9fd8cfc872 SHA512 15082f7c3c71b6f0860061d5c8b32dabcd54e7956919c328870c3cbb32fb96dd59c06931216e43beaa39a8c056088b6a73737ae8f7973136ba08f0c67aed2939
+AUX telnet-bsd-1.2-format-security.patch 1419 BLAKE2B c605a5e4b92d009221ef9d9e54533779a66a6cb4d4f51684f7c366a35738c8e6ea38c3b2d3cf58c5e808808e1d61cedbd18205f332637c40c91a67b595565fdd SHA512 f5f4b2b7e6f3ec641f5160ab41427ea46a8dd83a9a00d9e15bbe08ed3ab4b7190db05476666e20967b225e63bbf4b43ff59471be7e8f26c0eeed433503bfb081
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
-DIST telnet-bsd-1.2.tar.bz2 194518 SHA256 d6a9d26740ef75565cb1ed8ff11e327d240e6734748b2d1d2e96c126849e4733 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d WHIRLPOOL 673a5178f7c2305c9ad1ece9151d8d6c874ace147640f2d0e02a39f2641935af02fe42861c9ccc17b9f84e328c7e821f93ecf37dc3a86a9d1cf49700e7527f20
-EBUILD telnet-bsd-1.2-r1.ebuild 1117 BLAKE2B 1bdb8ac437a39e0277cd187d94355523b9726cff19414b19bd2f38f048b8cf682e24b8c9138827e6d473c4fc62f5b4a9e380e8b923d0128e5b965c3f519757e7 SHA512 5b2d4bbf07f229972da1e200b361cd456306c7ec5fdab129e34ea445c376031bfe679e1ab90b2c1b41990d84bf55441ccfad3d52cc1dafc0d4c1906218725292
+DIST telnet-bsd-1.2.tar.bz2 194518 BLAKE2B 59b46a4717dfbf2dffebbab96446ec020da1fab4838bae053e5539f3f85834e11f304ad9f8cb143aefb73cb3c6c0734430a4317df6e8a9a236a122a1268f3bd8 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d
+EBUILD telnet-bsd-1.2-r1.ebuild 1171 BLAKE2B e72685cbb8971ee671c0854ddcfa75d139bb1a0c07d5eedb36938ed113c180918189e119ec26d5830c3047c26d77e5abc2e7c83385e4f45bd45f456a42b7a793 SHA512 bb7f019dc5863a77f8cd4291b371c725deae06dac89afa49c6ca0bb4f06e5f5b032cbe4434bbcf7ce73f36dbbb8489016dc46dc3384cfc51e7bede8a05e0ca6a
 MISC metadata.xml 218 BLAKE2B 48f6dc072d599bb422bd1033c1b1ecc05aba8ac787c9a10425ecf89d08140c859a122f19502f1de050ea7341f4947aee0b88d10ee605b2a60ec4542ff29ac489 SHA512 c1894fa0ad03968827a0eb6410381bdaa9491a4b450f9a50959a93700f803ddc83f020040f4db06ed3ba68c12adb4a73b192525ef7e70c0bd10125e3da578c65
diff --git a/net-misc/telnet-bsd/files/telnet-bsd-1.2-format-security.patch b/net-misc/telnet-bsd/files/telnet-bsd-1.2-format-security.patch
new file mode 100644
index 000000000000..b167bcec964c
--- /dev/null
+++ b/net-misc/telnet-bsd/files/telnet-bsd-1.2-format-security.patch
@@ -0,0 +1,52 @@
+--- a/telnet/utilities.c
++++ b/telnet/utilities.c
+@@ -739,22 +739,22 @@ printsub(char direction, unsigned char *pointer, int length)
+ 		case ENV_VAR:
+ 		  if (pointer[1] == TELQUAL_SEND)
+ 		    goto def_case;
+-		  fprintf(NetTrace, "\" VAR " + noquote);
++		  fprintf(NetTrace, "%s", "\" VAR " + noquote);
+ 		  noquote = 2;
+ 		  break;
+ 
+ 		case ENV_VALUE:
+-		  fprintf(NetTrace, "\" VALUE " + noquote);
++		  fprintf(NetTrace, "%s", "\" VALUE " + noquote);
+ 		  noquote = 2;
+ 		  break;
+ 
+ 		case ENV_ESC:
+-		  fprintf(NetTrace, "\" ESC " + noquote);
++		  fprintf(NetTrace, "%s", "\" ESC " + noquote);
+ 		  noquote = 2;
+ 		  break;
+ 
+ 		case ENV_USERVAR:
+-		  fprintf(NetTrace, "\" USERVAR " + noquote);
++		  fprintf(NetTrace, "%s", "\" USERVAR " + noquote);
+ 		  noquote = 2;
+ 		  break;
+ 
+--- a/telnetd/utility.c
++++ b/telnetd/utility.c
+@@ -897,17 +897,17 @@ printsub(char direction, unsigned char *pointer, int length)
+ 			case ENV_VAR:
+ 			    if (pointer[1] == TELQUAL_SEND)
+ 				goto def_case;
+-			    netoprintf("\" VAR " + noquote);
++			    netoprintf("%s", "\" VAR " + noquote);
+ 			    noquote = 2;
+ 			    break;
+ 
+ 			case ENV_VALUE:
+-			    netoprintf("\" VALUE " + noquote);
++			    netoprintf("%s", "\" VALUE " + noquote);
+ 			    noquote = 2;
+ 			    break;
+ 
+ 			case ENV_ESC:
+-			    netoprintf("\" ESC " + noquote);
++			    netoprintf("%s", "\" ESC " + noquote);
+ 			    noquote = 2;
+ 			    break;
+ 
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
index 6b62c3f28171..562cbb582529 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-fbsd.patch
+	epatch "${FILESDIR}"/${PN}-1.2-format-security.patch
 	eaclocal
 	eautoreconf
 }