From nobody Thu May 26 12:56:17 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9D2C01B5D1E7; Thu, 26 May 2022 12:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L87Gn2gB8z3Fc5; Thu, 26 May 2022 12:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653569777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8790HBYEEgxVIZ8L1nQfI/BSh6VedRw+ATkSk0EZt/I=; b=NMHjcGxrw6a1NjvsDEeSclepa/ZTzBw2VRADgKDULrsKLU6iOsNrw0auiR4yrOpcxwDA/W Brt38LrySehuaAJYsFDlatbrB8q+os9psoJZuxUJYKSzqP/8PJOlAJvsluZ88wuyLAOgTQ 4dXe8AWFR9ZIz97+jYwUcMYE8DZk0x4f4f04LEFxUM4QgGyjwuASrvQsu+AzST9qil4xHO cVjwSNmHGsSA4WsCO8Plv9RdtbtV21aIwX6CUNgFZgLZUGXdXplrBKzr4S+Z2M81+PUXVn RVcQamkYJZoZWd2Uf/+Wqm3ahk7IAtxtCZtvE1AgCNWtkk+WmENJkENkxvrLRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 378425B69; Thu, 26 May 2022 12:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24QCuHve070727; Thu, 26 May 2022 12:56:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24QCuH5N070726; Thu, 26 May 2022 12:56:17 GMT (envelope-from git) Date: Thu, 26 May 2022 12:56:17 GMT Message-Id: <202205261256.24QCuH5N070726@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason W. Bacon" Subject: git: a98b1edcc998 - main - security/globalprotect-openconnect: Update to 1.4.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jwb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a98b1edcc9983826cb5630d80b9706ec2330069c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653569777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8790HBYEEgxVIZ8L1nQfI/BSh6VedRw+ATkSk0EZt/I=; b=BGwVSjrRbSzT35YYZZgxRHoKiOwH/1sjUb/jk3GCVXwOuupFi0bCiTru9/9TNPlaiZS1Nu rF7Wdx3PyQTKCuN7r3Be+Vb0hoxvYeUI17lA+YhkYiWM099QjjsAtTZw5t9YWKf0HQZOQt b1TthfgY2N/32Ugf2r8yMcZeX5y1esjc1SSCg5ZKH6syTElJEyN7JMsuTqUq7EL32IRk/t NhB9yPOn/ItyasZlR0VPiZKL7vP7ANniJIzxGeQsaenBczydWll4fYZ0V9UeAy2BPk16Eg KVyx2WBC1jMWk0nZu8gAO9xdXmZkHaAqzYq/youNgo+sgqxRSL/DZ1hWnl9kYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653569777; a=rsa-sha256; cv=none; b=MGKh7ZS71C1YnUDBR27hCFbiEunrKGXAeTjtcwlgIKdxT8OMi6Y4P8kMWHVjVZ3o9g7ySc QgLqYXDzD5a01JZhXp8gSRMOvqX2SaRpPWbJSPUdvSqqy+z/J2kqIDOh6A4sxdEVS4eVd9 EwEKfVQJLXbC/JTkbdb4YDlWQWNe3082/Lhh5hTJFsWqTc69gpClvWSU7cMV/4o6dLgJMv Ngf09MNcPzQKs5PJ68OU/Ch/vLyCyS8LISTXZ7Q4kGYpHasH9g3ZIjMJdI/8C+xLPF6znh U9y8NcmAjtDQcRa1g+TeApxNCd5rGI+EVOeBcAVFY7n77NrJJ0xtrYOoxGGnmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=a98b1edcc9983826cb5630d80b9706ec2330069c commit a98b1edcc9983826cb5630d80b9706ec2330069c Author: Jason W. Bacon AuthorDate: 2022-05-26 12:53:26 +0000 Commit: Jason W. Bacon CommitDate: 2022-05-26 12:53:26 +0000 security/globalprotect-openconnect: Update to 1.4.4 New configuration interface A few bug and security fixes Add deinstall hook to terminate running processes that may be incompatible with the new version changes: https://github.com/yuezk/GlobalProtect-openconnect/releases Reported by: portscout --- security/globalprotect-openconnect/Makefile | 14 +++++++++++++- security/globalprotect-openconnect/distinfo | 6 +++--- security/globalprotect-openconnect/pkg-deinstall | 8 ++++++++ security/globalprotect-openconnect/pkg-plist | 2 +- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/security/globalprotect-openconnect/Makefile b/security/globalprotect-openconnect/Makefile index 9a07d1b3e6f6..f67d7129854a 100644 --- a/security/globalprotect-openconnect/Makefile +++ b/security/globalprotect-openconnect/Makefile @@ -1,6 +1,6 @@ PORTNAME= globalprotect-openconnect DISTVERSIONPREFIX= v -DISTVERSION= 1.4.1 +DISTVERSION= 1.4.4 CATEGORIES= security MAINTAINER= jwb@FreeBSD.org @@ -20,4 +20,16 @@ GH_PROJECT= GlobalProtect-openconnect GH_TUPLE+= itay-grudev:SingleApplication:v3.3.0:sa/3rdparty/SingleApplication GH_TUPLE+= SergiusTheBest:plog:1.1.6:plog/3rdparty/plog +ETCDIR= ${PREFIX}/etc/gpservice + +pre-configure: + ${REINPLACE_CMD} -e 's|/etc/gpservice|${PREFIX}&|g' \ + ${WRKSRC}/GPClient/settingsdialog.ui \ + ${WRKSRC}/GPService/CMakeLists.txt \ + ${WRKSRC}/GPService/gpservice.cpp + +post-stage: + ${MV} ${STAGEDIR}${ETCDIR}/gp.conf ${STAGEDIR}${ETCDIR}/gp.conf.sample + ${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd + .include diff --git a/security/globalprotect-openconnect/distinfo b/security/globalprotect-openconnect/distinfo index 7299f4e6737e..34297942dca6 100644 --- a/security/globalprotect-openconnect/distinfo +++ b/security/globalprotect-openconnect/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1646656332 -SHA256 (yuezk-GlobalProtect-openconnect-v1.4.1_GH0.tar.gz) = d0ecc53d5671f46026b0f0749f929debe8c0d8c559b26d51e5f069f61a6ba5f0 -SIZE (yuezk-GlobalProtect-openconnect-v1.4.1_GH0.tar.gz) = 118400 +TIMESTAMP = 1653518517 +SHA256 (yuezk-GlobalProtect-openconnect-v1.4.4_GH0.tar.gz) = ab8e0ec23727f56d29f5c931dbb138d4bc4b063276681514d3d9fa80ffdc2762 +SIZE (yuezk-GlobalProtect-openconnect-v1.4.4_GH0.tar.gz) = 127070 SHA256 (itay-grudev-SingleApplication-v3.3.0_GH0.tar.gz) = b5a789e7e4fda5239b09249a74a91c9ffea8581dcb59bc693e3db8af96d6f1bf SIZE (itay-grudev-SingleApplication-v3.3.0_GH0.tar.gz) = 21148 SHA256 (SergiusTheBest-plog-1.1.6_GH0.tar.gz) = 99fbb43772f92664ff086166fdff75cc437e9e50e74efec2fba80765fa6b67ae diff --git a/security/globalprotect-openconnect/pkg-deinstall b/security/globalprotect-openconnect/pkg-deinstall new file mode 100644 index 000000000000..151d67d8d66b --- /dev/null +++ b/security/globalprotect-openconnect/pkg-deinstall @@ -0,0 +1,8 @@ +#!/bin/sh + +# gpclient will hang in some cases if the running gpservice is outdated +if [ x"$2" = x"DEINSTALL" ]; then + pkill gpservice gpclient +fi + +exit 0 diff --git a/security/globalprotect-openconnect/pkg-plist b/security/globalprotect-openconnect/pkg-plist index dc1631ec6ae9..fd316461e921 100644 --- a/security/globalprotect-openconnect/pkg-plist +++ b/security/globalprotect-openconnect/pkg-plist @@ -1,6 +1,6 @@ bin/gpclient bin/gpservice -lib/systemd/system/gpservice.service +@sample %%ETCDIR%%/gp.conf.sample share/applications/com.yuezk.qt.gpclient.desktop share/dbus-1/system-services/com.yuezk.qt.GPService.service share/dbus-1/system.d/com.yuezk.qt.GPService.conf