Attachment #244632 for bug #273498

View | Details | Raw Unified | Return to bug 273498
Collapse All | Expand All




PORTNAME=	lastpass-cli
PORTVERSION=	1.3.6
PORTREVISION=	2
DISTVERSIONPREFIX=	v
CATEGORIES=	security

MAINTAINER=	ports@FreeBSD.org
COMMENT=	LastPass command line interface tool
WWW=		https://lastpass.com/


XCLIP_DESC=		Use xclip for interacting with X11 clipboard
XSEL_DESC=		Use xsel for interacting with X11 clipboard

BASH_BUILD_DEPENDS=		bash-completion>=0:shells/bash-completion
BASH_RUN_DEPENDS=		bash-completion>=0:shells/bash-completion
BASH_PLIST_FILES=		share/bash-completion/completions/lpass
MANPAGES_BUILD_DEPENDS=		asciidoc:textproc/asciidoc \
				xmlto:textproc/xmlto
MANPAGES_ALL_TARGET=		all doc-man
MANPAGES_INSTALL_TARGET=	install install-doc
MANPAGES_PLIST_FILES=		${MANPREFIX}/share/man/man1/lpass.1.gz

PINENTRY_RUN_DEPENDS=	pinentry:security/pinentry
XCLIP_RUN_DEPENDS=	xclip:x11/xclip

Lines 1-3 Link Here

(-)b/security/lastpass-cli/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1562505317	1	TIMESTAMP = 1693845538
2	SHA256 (lastpass-lastpass-cli-v1.3.3_GH0.tar.gz) = f38e1ee7e06e660433a575a23b061c2f66ec666d746e988716b2c88de59aed73	2	SHA256 (lastpass-lastpass-cli-v1.3.6_GH0.tar.gz) = 6573068abfda02426ba7374c03dde71d8870dcf44c8dc845bc53106be34bfedd
3	SIZE (lastpass-lastpass-cli-v1.3.3_GH0.tar.gz) = 116434	3	SIZE (lastpass-lastpass-cli-v1.3.6_GH0.tar.gz) = 117267




diff --git a/globals.c b/globals.c
new file mode 100644
index 0000000..59e9c30
--- /dev/null
+++ 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
--- process.h
+++ 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);

Added Link Here

(-)b/security/lastpass-cli/files/patch-process.c (+11 lines)
1	--- process.c.orig 2023-09-01 07:49:12 UTC
2	+++ process.c
3	@@ -75,6 +75,8 @@ static void ptrace(__attribute__((unused)) int x,
4	__attribute__((unused)) int w) {}
5	#endif
6
7	+int ARGC;
8	+char **ARGV;
9
10	#if defined(__linux__) \|\| defined(__CYGWIN__) \|\| (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
11	static int pid_to_cmd(pid_t pid, char *cmd, size_t cmd_size)




--- process.h.orig	2023-09-01 07:49:45 UTC
+++ 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);

Return to bug 273498

Lines 1-10 Link Here

(-)b/security/lastpass-cli/Makefile (-11 / +10 lines)
1	PORTNAME= lastpass-cli	1	PORTNAME= lastpass-cli
2	PORTVERSION= 1.3.3	2	PORTVERSION= 1.3.6
3	PORTREVISION= 2
4	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
5	CATEGORIES= security	4	CATEGORIES= security
6		5
7	MAINTAINER= tom@hur.st	6	MAINTAINER= ports@FreeBSD.org
8	COMMENT= LastPass command line interface tool	7	COMMENT= LastPass command line interface tool
9	WWW= https://lastpass.com/	8	WWW= https://lastpass.com/
10		9
Lines 29-42 PINENTRY_DESC= Use pinentry for password entry Link Here
29	XCLIP_DESC= Use xclip for interacting with X11 clipboard	28	XCLIP_DESC= Use xclip for interacting with X11 clipboard
30	XSEL_DESC= Use xsel for interacting with X11 clipboard	29	XSEL_DESC= Use xsel for interacting with X11 clipboard
31		30
32	BASH_BUILD_DEPENDS= bash-completion>=0:shells/bash-completion	31	BASH_BUILD_DEPENDS= bash-completion>=0:shells/bash-completion
33	BASH_RUN_DEPENDS= bash-completion>=0:shells/bash-completion	32	BASH_RUN_DEPENDS= bash-completion>=0:shells/bash-completion
34	BASH_PLIST_FILES= share/bash-completion/completions/lpass	33	BASH_PLIST_FILES= share/bash-completion/completions/lpass
35	MANPAGES_BUILD_DEPENDS= asciidoc:textproc/asciidoc \	34	MANPAGES_BUILD_DEPENDS= asciidoc:textproc/asciidoc \
36	xmlto:textproc/xmlto	35	xmlto:textproc/xmlto
37	MANPAGES_ALL_TARGET= all doc-man	36	MANPAGES_ALL_TARGET= all doc-man
38	MANPAGES_INSTALL_TARGET=install install-doc	37	MANPAGES_INSTALL_TARGET= install install-doc
39	MANPAGES_PLIST_FILES= ${MANPREFIX}/share/man/man1/lpass.1.gz	38	MANPAGES_PLIST_FILES= ${MANPREFIX}/share/man/man1/lpass.1.gz
40		39
41	PINENTRY_RUN_DEPENDS= pinentry:security/pinentry	40	PINENTRY_RUN_DEPENDS= pinentry:security/pinentry
42	XCLIP_RUN_DEPENDS= xclip:x11/xclip	41	XCLIP_RUN_DEPENDS= xclip:x11/xclip

Removed Link Here

(-)a/security/lastpass-cli/files/patch-fno-common.patch (-61 lines)
1	diff --git a/globals.c b/globals.c
2	new file mode 100644
3	index 0000000..59e9c30
4	--- /dev/null
5	+++ globals.c
6	@@ -0,0 +1,40 @@
7	+/*
8	+ *
9	+ * Copyright (C) 2014-2018 LastPass.
10	+ *
11	+ * This program is free software; you can redistribute it and/or modify
12	+ * it under the terms of the GNU General Public License as published by
13	+ * the Free Software Foundation; either version 2 of the License, or
14	+ * (at your option) any later version.
15	+ *
16	+ * This program is distributed in the hope that it will be useful,
17	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
18	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19	+ * GNU General Public License for more details.
20	+ *
21	+ * You should have received a copy of the GNU General Public License along
22	+ * with this program; if not, write to the Free Software Foundation, Inc.,
23	+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
24	+ *
25	+ * In addition, as a special exception, the copyright holders give
26	+ * permission to link the code of portions of this program with the
27	+ * OpenSSL library under certain conditions as described in each
28	+ * individual source file, and distribute linked combinations
29	+ * including the two.
30	+ *
31	+ * You must obey the GNU General Public License in all respects
32	+ * for all of the code used other than OpenSSL. If you modify
33	+ * file(s) with this exception, you may extend this exception to your
34	+ * version of the file(s), but you are not obligated to do so. If you
35	+ * do not wish to do so, delete this exception statement from your
36	+ * version. If you delete this exception statement from all source
37	+ * files in the program, then also delete it here.
38	+ *
39	+ * See LICENSE.OpenSSL for more details regarding this exception.
40	+ */
41	+
42	+#include "process.h"
43	+
44	+/* Globals */
45	+int ARGC;
46	+char **ARGV;
47	diff --git a/process.h b/process.h
48	index 58c2480..4cc2cf4 100644
49	--- process.h
50	+++ process.h
51	@@ -4,8 +4,8 @@
52	#include <stdbool.h>
53	#include <sys/types.h>
54
55	-int ARGC;
56	-char **ARGV;
57	+extern int ARGC;
58	+extern char **ARGV;
59
60	void process_set_name(const char *name);
61	void process_disable_ptrace(void);

Added Link Here

(-)b/security/lastpass-cli/files/patch-process.h (-1 / +13 lines)
0	-	1	--- process.h.orig 2023-09-01 07:49:45 UTC
		2	+++ process.h
		3	@@ -4,8 +4,8 @@
		4	#include <stdbool.h>
		5	#include <sys/types.h>
		6
		7	-int ARGC;
		8	-char **ARGV;
		9	+extern int ARGC;
		10	+extern char **ARGV;
		11
		12	void process_set_name(const char *name);
		13	void process_disable_ptrace(void);