Attachment 244632 Details for Bug 273498 – Updated git patch

[patch] Updated git patch

0001-security-lastpass-cli-Update-to-1.3.6-and-drop-maint.patch (text/plain), 6.48 KB, created by Thomas Hurst on 2023-09-04 16:41:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Hurst

Created: 2023-09-04 16:41:29 UTC

Size: 6.48 KB

patch

obsolete

>From 2fd01af9787bef49a9f41b99d4f1f84eed25819d Mon Sep 17 00:00:00 2001
>From: Thomas Hurst <tom@hur.st>
>Date: Fri, 1 Sep 2023 14:49:31 +0000
>Subject: [PATCH] security/lastpass-cli: Update to 1.3.6 and drop
> maintainership
>
>- Patch for upstream issue #532 has been refreshed to appease portlint
>- Drop maintainership - I no longer use LastPass
>---
> security/lastpass-cli/Makefile                | 21 +++----
> security/lastpass-cli/distinfo                |  6 +-
> .../lastpass-cli/files/patch-fno-common.patch | 61 -------------------
> security/lastpass-cli/files/patch-process.c   | 11 ++++
> security/lastpass-cli/files/patch-process.h   | 13 ++++
> 5 files changed, 37 insertions(+), 75 deletions(-)
> delete mode 100644 security/lastpass-cli/files/patch-fno-common.patch
> create mode 100644 security/lastpass-cli/files/patch-process.c
> create mode 100644 security/lastpass-cli/files/patch-process.h
>
>diff --git a/security/lastpass-cli/Makefile b/security/lastpass-cli/Makefile
>index 54faf59b5665..2da02a59a406 100644
>--- a/security/lastpass-cli/Makefile
>+++ b/security/lastpass-cli/Makefile
>@@ -1,10 +1,9 @@
> PORTNAME=	lastpass-cli
>-PORTVERSION=	1.3.3
>-PORTREVISION=	2
>+PORTVERSION=	1.3.6
> DISTVERSIONPREFIX=	v
> CATEGORIES=	security
> 
>-MAINTAINER=	tom@hur.st
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	LastPass command line interface tool
> WWW=		https://lastpass.com/
> 
>@@ -29,14 +28,14 @@ PINENTRY_DESC=		Use pinentry for password entry
> 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
>+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
>diff --git a/security/lastpass-cli/distinfo b/security/lastpass-cli/distinfo
>index aeea64d4a999..fb3c99c43d52 100644
>--- a/security/lastpass-cli/distinfo
>+++ b/security/lastpass-cli/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562505317
>-SHA256 (lastpass-lastpass-cli-v1.3.3_GH0.tar.gz) = f38e1ee7e06e660433a575a23b061c2f66ec666d746e988716b2c88de59aed73
>-SIZE (lastpass-lastpass-cli-v1.3.3_GH0.tar.gz) = 116434
>+TIMESTAMP = 1693845538
>+SHA256 (lastpass-lastpass-cli-v1.3.6_GH0.tar.gz) = 6573068abfda02426ba7374c03dde71d8870dcf44c8dc845bc53106be34bfedd
>+SIZE (lastpass-lastpass-cli-v1.3.6_GH0.tar.gz) = 117267
>diff --git a/security/lastpass-cli/files/patch-fno-common.patch b/security/lastpass-cli/files/patch-fno-common.patch
>deleted file mode 100644
>index f538b2f80e0a..000000000000
>--- a/security/lastpass-cli/files/patch-fno-common.patch
>+++ /dev/null
>@@ -1,61 +0,0 @@
>-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);
>diff --git a/security/lastpass-cli/files/patch-process.c b/security/lastpass-cli/files/patch-process.c
>new file mode 100644
>index 000000000000..5ef35b62e9ac
>--- /dev/null
>+++ b/security/lastpass-cli/files/patch-process.c
>@@ -0,0 +1,11 @@
>+--- process.c.orig	2023-09-01 07:49:12 UTC
>++++ process.c
>+@@ -75,6 +75,8 @@ static void ptrace(__attribute__((unused)) int x,
>+ 		   __attribute__((unused)) int w) {}
>+ #endif
>+ 
>++int ARGC;
>++char **ARGV;
>+ 
>+ #if defined(__linux__) || defined(__CYGWIN__) || (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
>+ static int pid_to_cmd(pid_t pid, char *cmd, size_t cmd_size)
>diff --git a/security/lastpass-cli/files/patch-process.h b/security/lastpass-cli/files/patch-process.h
>new file mode 100644
>index 000000000000..10a2f73f501e
>--- /dev/null
>+++ b/security/lastpass-cli/files/patch-process.h
>@@ -0,0 +1,13 @@
>+--- 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);
>-- 
>2.42.0
>

Flags:

tom: maintainer-approval+

Actions: View | Diff

Attachments on bug 273498: 244560 | 244632