gentoo resync : 14.05.2020

3 files changed, 89 insertions, 2 deletions

diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index 9786d6f29309..a1ec31a1f17c 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -1,8 +1,9 @@
+AUX lastpass-cli-1.3.3-gcc10-fix.patch 2855 BLAKE2B 9d20c68d2d1349d557fef3d147e799cca1db7181e767011fcba73d2cb2639f2fa0e6a1f321561f0cffa39dfa365080984c923f10eff8fb9a3eeab19ca11418a3 SHA512 53d8d6842d21fad888597750d4ebef4de351621751befe791a09921210ddae13a2fbeb21e17aca759e60c3c6172ae786fbea42d8e9dbb379386033fe2b3a5bfa
 DIST lastpass-cli-1.3.1.tar.gz 114843 BLAKE2B 7983d4090092ef3443d8c502d157934fa2384426f0be22c796795cdf664be3ba396f64daa81cdf896cb6901d4063f93e54b62cda4349b14fa4d312a21c5bb76d SHA512 092d28dc459719e662fbb2c5e92e8cc75be108aa9d7b62569ee44cb34dd9588e78151fdc5ad114c30e8de21c0b8803edc41db9295548c7cbfe6e537c9a52aad2
 DIST lastpass-cli-1.3.2.tar.gz 116399 BLAKE2B d00ab9443935b90eab7337702a52e0ed2e7f2e67c20ed6764f72e25ae123e0420013aa9220ece8a57b7e3bbe2f243ff56bd054fecdbd064f086536bc5eaf0d88 SHA512 b293e86d70988aa5860a94fdc2bc65341bb253d2423c8f745730419400adc91ff860017d35657d283458c477c2385ff2532b8aefa752f886b207da8d10bf9018
 DIST lastpass-cli-1.3.3.tar.gz 116434 BLAKE2B 341f99a7a5edd157c271a0989a004ace8300f2121230b4c0b7c23152643ebc0e3f60717a057b4e6acc802fe641ccd84c770bfcb3d89c505713aea23692d1542b SHA512 9b9274cae1fe4045b7df4402170c522ab5765929739e76141b35a75ce3c8af824acd881e194face45e8721d6ce778bde97ff1a1ac23515de0c6dba28d61a8c7e
 DIST lastpass-cli-man-1.3.1.tar.xz 5700 BLAKE2B 736ab71ad55cfcb657c727f3dc9dc15775dab1a0232d1ffc51b8794e49911531c96a841b4a5ac0b31f0516cd7aa54027ac7d0eb096816730cdfd192c04d99449 SHA512 e60807683ecd681b3937ef447d3e6a487d25418fe99f51ba99e54bf643c5254dd18427a03e7f035198ef34ff578bbb6116baf04eb554f54d85e7d059b6bfed7e
 EBUILD lastpass-cli-1.3.1-r1.ebuild 1415 BLAKE2B c3a538042b71247b6b8d3c54219f9ba52b0d86c43fe8ab8a25f43b74d729dd6db4347647177aab2589ffa3f8dfb6cdc64aa8b3c25223144d9507fb53fac03102 SHA512 c17c165c9816c02b54d3b7182d70f43ec0f65ee0130ef6060d8e0fcb1140d4bce6ebf8e9253eafa251d569064fa9699a892cedf1bd6d929380d88d948fadc734
 EBUILD lastpass-cli-1.3.2.ebuild 1637 BLAKE2B 0f2ea3383ffa4f3a0ecb6d0ec7bf7d5d3846616f66dacb1782adda191c35d206289e0abdf86d5201c09dec82d1b42c6e3b5526531b075e57956a470e235f6414 SHA512 888df5219a4702fa9829d6792af7adb82ead09ad479fc51986da11688b3552d77a50e7a20bfea448a4e73f93dc1ccb3ba30937a26555929ab3f4d7a7ecba32e7
-EBUILD lastpass-cli-1.3.3.ebuild 1637 BLAKE2B 0f2ea3383ffa4f3a0ecb6d0ec7bf7d5d3846616f66dacb1782adda191c35d206289e0abdf86d5201c09dec82d1b42c6e3b5526531b075e57956a470e235f6414 SHA512 888df5219a4702fa9829d6792af7adb82ead09ad479fc51986da11688b3552d77a50e7a20bfea448a4e73f93dc1ccb3ba30937a26555929ab3f4d7a7ecba32e7
+EBUILD lastpass-cli-1.3.3.ebuild 1695 BLAKE2B 9f58fb5d95d82dd7ce549c88093da7a76c8a52a4770110f24b24920c82daaf1b0a5e629982fc2d452769902bb4a1475be636810ce8092a7f3694e90a50945c7c SHA512 6839ceef84878313f12663897878c0bb6505aefb0869a7504f68f061eabcdc1e753ce90d09cc414795014bf53b76e3568676d475ccd6534c3613c73c94565d0c
 MISC metadata.xml 643 BLAKE2B a5a01a1dbcc257692bd14369470d69eef33a00a9910ed5006c62f1f5fec2a9a261dd6ece42bcaa68345a21f6e26958f965f90459501324b0e7a168f3fcc4f7f9 SHA512 6b1a7f6566687384d328260576dad306dd07add06001b3746b4f37f05ff91b6ee72e1e2ecfd35463a5b78b4ba8dd1a7757503bdf992372dbd474967e4bf0e9f3
diff --git a/app-admin/lastpass-cli/files/lastpass-cli-1.3.3-gcc10-fix.patch b/app-admin/lastpass-cli/files/lastpass-cli-1.3.3-gcc10-fix.patch
new file mode 100644
index 000000000000..186d4a6a1a70
--- /dev/null
+++ b/app-admin/lastpass-cli/files/lastpass-cli-1.3.3-gcc10-fix.patch
@@ -0,0 +1,82 @@
+From 6b69a534863741734b550daf43b5d06c8d899b9a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Thu, 23 Jan 2020 00:25:50 +0100
+Subject: [PATCH] Mark global variable as extern
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC now defaults to -fno-common. As a result, global variable accesses
+are more efficient on various targets. In C, global variables with
+multiple tentative definitions now result in linker errors.
+
+Fix #532
+
+Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
+---
+ globals.c | 40 ++++++++++++++++++++++++++++++++++++++++
+ process.h |  4 ++--
+ 2 files changed, 42 insertions(+), 2 deletions(-)
+ create mode 100644 globals.c
+
+diff --git a/globals.c b/globals.c
+new file mode 100644
+index 0000000..59e9c30
+--- /dev/null
++++ b/globals.c
+@@ -0,0 +1,40 @@
++/*
++ *
++ * Copyright (C) 2014-2018 LastPass.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * In addition, as a special exception, the copyright holders give
++ * permission to link the code of portions of this program with the
++ * OpenSSL library under certain conditions as described in each
++ * individual source file, and distribute linked combinations
++ * including the two.
++ *
++ * You must obey the GNU General Public License in all respects
++ * for all of the code used other than OpenSSL.  If you modify
++ * file(s) with this exception, you may extend this exception to your
++ * version of the file(s), but you are not obligated to do so.  If you
++ * do not wish to do so, delete this exception statement from your
++ * version.  If you delete this exception statement from all source
++ * files in the program, then also delete it here.
++ *
++ * See LICENSE.OpenSSL for more details regarding this exception.
++ */
++
++#include "process.h"
++
++/* Globals */
++int ARGC;
++char **ARGV;
+diff --git a/process.h b/process.h
+index 58c2480..4cc2cf4 100644
+--- a/process.h
++++ b/process.h
+@@ -4,8 +4,8 @@
+ #include <stdbool.h>
+ #include <sys/types.h>
+ 
+-int ARGC;
+-char **ARGV;
++extern int ARGC;
++extern char **ARGV;
+ 
+ void process_set_name(const char *name);
+ void process_disable_ptrace(void);
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
index a8047a4f3661..fefda5aeb792 100644
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,6 +29,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-1.3.3-gcc10-fix.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"