From nobody Tue Mar 29 22:13:18 2022 X-Original-To: dev-commits-ports-main@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 3C6B01A51AC0; Tue, 29 Mar 2022 22:13:19 +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 4KSkNH19QTz3t2X; Tue, 29 Mar 2022 22:13:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648591999; 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=dc5HuKRp1KhHfHGTHVB+EQkTeEMFgOMw3X6m54RHqMU=; b=W75tyUYSivhIe6TlAPncvRhV4A5GPGmjajvp1QnQux8FWZZUky4BpVt5xH5UAMfgGgogUE hhkLvfqrCtHL+GemD8Y7v6h8HpOztuxSfM3mQKbppKWR1HwuizBYB2ka8oLg7DpFwYQrjN uEqPgBSeVl7JG3Hpv6JlnjN4JUX+ABXTziOM5z+53+IYZeuz8D6qzPHpYZRyZRPqTpfwMd 9myGjpfAeSgQQCaLfG91Beft+Qtdo2P9AKbp7c0BCudGJVTp+x24JsIj4UtZOIGHinjzLG y2xJ30p6DLZuQeYqrHZqqb8xuc2ii0T+E9jNqg6cIUGAa8fQiqsIsLAqqegzfg== 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 07A6626ED5; Tue, 29 Mar 2022 22:13:19 +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 22TMDIq5092428; Tue, 29 Mar 2022 22:13:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TMDIBj092427; Tue, 29 Mar 2022 22:13:18 GMT (envelope-from git) Date: Tue, 29 Mar 2022 22:13:18 GMT Message-Id: <202203292213.22TMDIBj092427@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 61ebb668c105 - main - sysutils/screen: Varioius fixups List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61ebb668c105081e004d2d742d7051133001977f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648591999; 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=dc5HuKRp1KhHfHGTHVB+EQkTeEMFgOMw3X6m54RHqMU=; b=PeFJ97ScMgfO+68uLXTK/m67WIXcj1UYMc42FAj0KsJT4gb+CmBA/GDierRVq99qWjX6fG 9cWSOL7KqTbzp0R7pJFVThA2evO3VHNlYcxF8hJ8jwyDr2Labmyw0eXaicllH2LL2v1wBN 2EN92aAIhfMa220CQWDoGhYMQ4FZ0SOJmLXjvOieyN6hJbu6do6F1ItfhtmR5qipfzST9n 1f0XLwmDHH5ygnCoIcG1VTo8KNkXeIBGQbwsz/oxjjdpWS1DPn2D85aSWbICh99IdmmxAj 7tCJHmFIntTugaQH+VQyVPC11aTykV3Nx3ySAZpfDtv8l4/8s9a2+271ahLDrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648591999; a=rsa-sha256; cv=none; b=uF2wu+MAHWW7TWNutTiXEyhLITiywvZUMzVClhgnSbCDNver18dCm+MPZCZ2qaOpaM/VgD xct8bnITNQ6MRxFe6MWO5yq2YgmP6LPCZI4blJ8DQxBEx5Beggez2d5F6x5gF6nZsdaL6x ThdcTuZfU5tw8H4t79E58EO9f7PuG8wOQ4FO5Y6sudxDddIzltwzSyklkUYxolRr4Ilfv5 eZFn4qN2ZCINOHCcaVgC3BL7obLa6QdYN0YkrJpsynsUBPkesBVt9Ze2NMld79rvADvROM NdAREbRnzRh5S4mbatvA/i6JhCUlbdF3DWeIZx9NWJXO53hVC71l7MAw2BN+Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=61ebb668c105081e004d2d742d7051133001977f commit 61ebb668c105081e004d2d742d7051133001977f Author: Cy Schubert AuthorDate: 2022-03-29 22:06:20 +0000 Commit: Cy Schubert CommitDate: 2022-03-29 22:13:14 +0000 sysutils/screen: Varioius fixups Make interprets PLIST variable names too. Choose a variable name different enough not to be interpreted by make. Fix a typo. Use default executable permissions of 555, same as if permissions weren't set in the first place. We're only interested in the setuid bit. This requries a PORTREVISION bump. --- sysutils/screen/Makefile | 6 +++--- sysutils/screen/pkg-plist | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 9cbb1c74af4d..a5b9136a910e 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -2,7 +2,7 @@ PORTNAME= screen PORTVERSION= 4.9.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= GNU \ ftp://ftp.gnu.org/gnu/screen/ \ @@ -30,8 +30,8 @@ SOCKETS_DESC= Use new (4.2.1+) sockets for IPC (default) NAMED_PIPES_DESC= Use legacy (4.0.3) named pipes for IPC (override) SYSTEM_SCREENRC_DESC= Install system screenrc with helpful status line MULTIUSER_DESC= Install setuid-root screen to support multiuser -MULTIUSER_PLIST_SUB= MULTIUSER="@(,,4755) " -MULTUSER_PLIST_SUB_OFF= MULTIUSER="@(,,0755) " +MULTIUSER_PLIST_SUB= MULTISUID="@(,,4555) " +MULTIUSER_PLIST_SUB_OFF=MULTISUID="@(,,0555) " NCURSES_DEFAULT_DESC= Depend on ncurses (ports if installed, otherwise base) NCURSES_BASE_DESC= Depend on ncurses in base NCURSES_PORT_DESC= Depend on devel/ncurses in ports diff --git a/sysutils/screen/pkg-plist b/sysutils/screen/pkg-plist index 9d8d35c8a19e..e03f87d0ccc1 100644 --- a/sysutils/screen/pkg-plist +++ b/sysutils/screen/pkg-plist @@ -1,5 +1,5 @@ bin/screen -%%MULTIUSER%%bin/screen-4.9.0 +%%MULTISUID%%bin/screen-4.9.0 man/man1/screen.1.gz %%DATADIR%%/utf8encodings/01 %%DATADIR%%/utf8encodings/02