From nobody Sun Sep 18 11:42:50 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 4MVmBy2qhCz4crdQ; Sun, 18 Sep 2022 11:42:50 +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 4MVmBy24hYz44dZ; Sun, 18 Sep 2022 11:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663501370; 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=90W+5B9ZY1dq4fHCj1kxHSkTShm8Jn+SFjXDOcd1EAA=; b=M6NeL+GaA4OKeKMJ/bqQ8I2Gajo9O83OXfcLTpH0HBv0ldClwQN5BTolYS5tR+5jJOS2Lm SqqGKSZEIACiSAOIlT2/0S5IfYayqKzk45VgAcSQLTDmAn5HwETxmnyQOESGlvLPzpve3f Yi1eUj6Oo2vtDhxwBx2hX8TIR6MvgK+Y2APfPmMqf2A4qkYmxWup59IBnE3I3KgVI6fr2t TzkA9lVNVT1WylCkeJs0uxF4/81LHll8KEQdCf76notCIOE0Lrrh8wMkE6Dv5Km3NWE88C s5GdxWNDsWIxffNlym24hg6Ocd6c9qXiJbkt2y1T9OzdDtKnKbQSzbIiw2DjzQ== 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 4MVmBy0rWKz12Ng; Sun, 18 Sep 2022 11:42:50 +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 28IBgojS066611; Sun, 18 Sep 2022 11:42:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28IBgoGE066610; Sun, 18 Sep 2022 11:42:50 GMT (envelope-from git) Date: Sun, 18 Sep 2022 11:42:50 GMT Message-Id: <202209181142.28IBgoGE066610@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 7602a4002e7e - main - security/putty*: clean up options and patches 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7602a4002e7e273cd41c1fa879f7837f0b466816 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663501370; 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=90W+5B9ZY1dq4fHCj1kxHSkTShm8Jn+SFjXDOcd1EAA=; b=ieTWt3XH3ifJQKiQUZayb+aUaLp9nWWSGW5ifFUlsh1Ulf3k+RmAB/5+n+SlptfrR177fh ycGsKbxiTfwtqWVhAHVGmAkL2vVp+BHP5TxD+uawpO/nAnQe1IrU+v2NQVqVoyaotKZQ4S khRB/FBfOZohsKgW18aMgf9+vmYGSeLSbztRX63HEQrCIAT0ItRjvrPS6EoZ0X2NDoysyu quLmqvBmk2lLXzm4z9WLT+lmjhz3gxCEp6S9WjKGv663amR0BoMMLCLInpRlJgO7nv/4Co kWcT1eLQMovUAHluGlgVO6KI1EwxXHplOwA/yvBKXZ3mwbDcm2sYpAWIdW4JqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663501370; a=rsa-sha256; cv=none; b=h0Mr/MWtGI0XWcY5ZV58WXzys7Jesz7L7sb/hN/v2S9gVe8fFOmCg/Hv+NQtYGWEhf139j rFGnejtWoPQpBEakA/xy/pygj2C/DSq8L1wqlXX85EDVh62/nDgyEl+PGtrZi2NLJN6WBM czXELNNUUM9fpbRhTbKMprSsnAQ253wzPouPm6yzQ2IMer29tQK5s0nq5+Gan9IQkBX8Qg ON35f2GRR4PQh3v3sxuXbOn40LejqG6VFkoIBcxDE0MbDBi1u09uC7hF5tFPUjcexBef/1 JOdSJq2v59W8CWhm7bZEP0mPl8f3zaU19NhPv+U5sZlqxxEOo3gzGihkmUBIVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=7602a4002e7e273cd41c1fa879f7837f0b466816 commit 7602a4002e7e273cd41c1fa879f7837f0b466816 Author: Matthias Andree AuthorDate: 2022-09-18 11:42:13 +0000 Commit: Matthias Andree CommitDate: 2022-09-18 11:42:48 +0000 security/putty*: clean up options and patches --- security/putty-nogtk/Makefile | 4 ++-- security/putty/Makefile | 4 ++-- security/putty/files/patch-network.c | 16 ---------------- security/putty/files/patch-pageant.c | 11 ----------- 4 files changed, 4 insertions(+), 31 deletions(-) diff --git a/security/putty-nogtk/Makefile b/security/putty-nogtk/Makefile index 9b5d7976bebe..968fce339c91 100644 --- a/security/putty-nogtk/Makefile +++ b/security/putty-nogtk/Makefile @@ -1,8 +1,8 @@ PKGNAMESUFFIX= -nogtk -OPTIONS_EXCLUDE= GTK2 GTK3 +OPTIONS_EXCLUDE= GTK3 -CONFLICTS_INSTALL= pssh putty putty-gtk2 +CONFLICTS_INSTALL= pssh* putty* MASTERDIR= ${.CURDIR}/../../security/putty diff --git a/security/putty/Makefile b/security/putty/Makefile index 86ede48a8a20..d6c0e6b3cd44 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -1,6 +1,6 @@ PORTNAME= putty DISTVERSION= 0.78~pre20220916.e1b73f0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security #MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \ # ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/ @@ -22,7 +22,7 @@ LICENSE_FILE= ${PATCH_WRKSRC}/LICENCE USES= cmake cpe perl5 pkgconfig USE_PERL5= build -CONFLICTS_INSTALL?= pssh putty-nogtk +CONFLICTS_INSTALL?= pssh* putty-nogtk* PLIST_FILES= bin/pageant \ bin/plink \ diff --git a/security/putty/files/patch-network.c b/security/putty/files/patch-network.c deleted file mode 100644 index 61a5b64dc8ab..000000000000 --- a/security/putty/files/patch-network.c +++ /dev/null @@ -1,16 +0,0 @@ ---- unix/network.c.orig 2022-09-15 23:42:29 UTC -+++ unix/network.c -@@ -11,8 +11,13 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include - #include -+#else -+#include - #include -+#endif - #include - #include - #include diff --git a/security/putty/files/patch-pageant.c b/security/putty/files/patch-pageant.c deleted file mode 100644 index e1361c40a7bb..000000000000 --- a/security/putty/files/patch-pageant.c +++ /dev/null @@ -1,11 +0,0 @@ ---- unix/pageant.c.orig 2022-09-15 23:42:29 UTC -+++ unix/pageant.c -@@ -330,7 +330,7 @@ void pageant_fork_and_print_env(bool retain_tty) - /* Get out of our previous process group, to avoid being - * blasted by passing signals. But keep our controlling tty, - * so we can keep checking to see if we still have one. */ -- setpgrp(); -+ setpgrp(0,0); - } else { - /* Do that, but also leave our entire session and detach from - * the controlling tty (if any). */