gentoo Easter resync : 12.04.2020

3 files changed, 3 insertions, 52 deletions

diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index e543069db050..59cfaeb65ecf 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,7 +1,6 @@
-AUX 2.7-CVE-2020-8955.patch 1924 BLAKE2B ba379cd994f45ba6a7944e9d16c0d98d4646b8c263e23fdd221bad54e942bfee9957df0205755cd3ea0a9fb6c374d32a8067b02f0985bdb3af9af21cc813e0d2 SHA512 181d0332dd724d12d734c697dec80c4451896d24b26de19642a8c773c17bf53e920ba283dec2cd5eda1ba158b764ac27596e58486c9fc4cad3ed81468a3da3c2
 DIST weechat-2.7.1.tar.xz 2226768 BLAKE2B 0ce14646c8d383c3338a52bacbb9cac036c2611cc8aae2c790af73df5aab25e49f8bc2addcf4527884774925a9b222c15a7a696d93ad57197052a746a0da95f6 SHA512 eb0cc4c7e0f2cf18d522b49429fe2d77b1cee3225686d0bc09f80a69b17362af0923df4cd5f4859207d84acb762d4042cd5b57799705d0b7e4759eade6c660e0
-DIST weechat-2.7.tar.xz 2226876 BLAKE2B accb97f018c5405850df5ba7d1d8ad0b23ccfd478cedf29ebbd1f468f364efcfce7a7a34ef557ce7f64c2157392c1b281f8f74e57782ed69b4e0ada9f1b67b37 SHA512 5377cf9c37520cb2b7d1ba43251df3f33d814783ea4bd20d28cb08a2106c8db0e44a392a61929987b807a7d5e69a3c0ed1f3fec122a014b7ea7068e159341075
-EBUILD weechat-2.7-r2.ebuild 4085 BLAKE2B c46368e6e1b4c938547f9b4d82fea46a4e1a24179b08ffbdeacbcadda140ac3fec5971002e890cc4e63e96a136329859d1cec0994e7849ff40a96c97fb697e85 SHA512 e8dac0642ba99faa003d59b1c67f7213b7afb2ab4338979df1051e85b59a5e01c577b907e62a691e4f7cd31e66bcaa59cf63fc309a75b0e5f24720ef28224d9e
+DIST weechat-2.8.tar.xz 2248868 BLAKE2B 756ce1719ecaa351a2780641758bb7587b45b8e6b16e5a82833009ddb27f71783a461cf89662e04118c75e2d372103eda5a11c98feb62d624b330b223bf22ede SHA512 3bebb42118fca6b601f1de8f4d52378619a10e5c490f5b46f86d27a9680f00a56d48a1ade729e78d965cae589e6c80647c22414393000c7d3cfcc94a1e41c4df
 EBUILD weechat-2.7.1.ebuild 4031 BLAKE2B bb3030970a66c9c4438f646467c57e7aeaa657de7a6753b94b0f36755c8538ecdbc875de06c3bbcf61a5c36afe982632f7d96e133a567d988dce36ec47047bf4 SHA512 48f7522555d69a4d389798202f98661436b46463937973a08ecb876b435161098c663c542ae618797e474b6ab0a845555e7250eba785a473589aed39abe3e762
+EBUILD weechat-2.8.ebuild 4034 BLAKE2B 267b0cc758bc9fc891efa337371aad866dafe7b6199fb8470c203ec4d7ce1053da1077d89fb3aa7b75ecb0704d5bf66b1785365949065f834f0b52d011f8a221 SHA512 33070e95c038ee15e1bb2cbeb72c66edcbe10f1e563fa62013532bdf686085dba38952de7fb506eb2dc1c8a48eaad0cf561d47972ddbf68e1e30e827d89fc3b0
 EBUILD weechat-9999.ebuild 4034 BLAKE2B 267b0cc758bc9fc891efa337371aad866dafe7b6199fb8470c203ec4d7ce1053da1077d89fb3aa7b75ecb0704d5bf66b1785365949065f834f0b52d011f8a221 SHA512 33070e95c038ee15e1bb2cbeb72c66edcbe10f1e563fa62013532bdf686085dba38952de7fb506eb2dc1c8a48eaad0cf561d47972ddbf68e1e30e827d89fc3b0
 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/files/2.7-CVE-2020-8955.patch b/net-irc/weechat/files/2.7-CVE-2020-8955.patch
deleted file mode 100644
index 0bad821f9130..000000000000
--- a/net-irc/weechat/files/2.7-CVE-2020-8955.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6f4f147d8e86adf9ad34a8ffd7e7f1f23a7e74da Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
-Date: Sat, 8 Feb 2020 20:24:50 +0100
-Subject: [PATCH] irc: fix crash when receiving a malformed message 324
- (channel mode)
-
-Thanks to Stuart Nevans Locke for reporting the issue.
----
- ChangeLog.adoc             |  1 +
- src/plugins/irc/irc-mode.c | 21 ++++++++++++---------
- 2 files changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/src/plugins/irc/irc-mode.c b/src/plugins/irc/irc-mode.c
-index 2237a344b..e79f0deb7 100644
---- a/src/plugins/irc/irc-mode.c
-+++ b/src/plugins/irc/irc-mode.c
-@@ -224,17 +224,20 @@ irc_mode_channel_update (struct t_irc_server *server,
-                     current_arg++;
-                 if (pos[0] == chanmode)
-                 {
--                    chanmode_found = 1;
--                    if (set_flag == '+')
-+                    if (!chanmode_found)
-                     {
--                        str_mode[0] = pos[0];
--                        str_mode[1] = '\0';
--                        strcat (new_modes, str_mode);
--                        if (argument)
-+                        chanmode_found = 1;
-+                        if (set_flag == '+')
-                         {
--                            if (new_args[0])
--                                strcat (new_args, " ");
--                            strcat (new_args, argument);
-+                            str_mode[0] = pos[0];
-+                            str_mode[1] = '\0';
-+                            strcat (new_modes, str_mode);
-+                            if (argument)
-+                            {
-+                                if (new_args[0])
-+                                    strcat (new_args, " ");
-+                                strcat (new_args, argument);
-+                            }
-                         }
-                     }
-                 }
diff --git a/net-irc/weechat/weechat-2.7-r2.ebuild b/net-irc/weechat/weechat-2.8.ebuild
index 36e757471243..37b7a1e45182 100644
--- a/net-irc/weechat/weechat-2.7-r2.ebuild
+++ b/net-irc/weechat/weechat-2.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
@@ -62,8 +62,6 @@ DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.ado
 # tests need to be fixed to not use system plugins if weechat is already installed
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PV}-CVE-2020-8955.patch" )
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }