From nobody Mon Nov 06 17:50:47 2023 X-Original-To: dev-commits-ports-branches@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 4SPJmR38L5z50S6f; Mon, 6 Nov 2023 17:50:47 +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 4SPJmR2hb9z4S1y; Mon, 6 Nov 2023 17:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699293047; 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=ntDZN4yw02Xe8jSzueAYkCqpkEgvI8yMTVCWnu6eOxM=; b=CAyi6j4uHcJVcsg12TIUmR2UKAiTphL2NJLceR+/5c/P94AmGWa6zdmgyP1LbsqZlfVC2b F+5X1kYIOReKjOkysbEnSWBlYdIriyja/T2hMQeUkPmwQFXW5DV3qvMMps0ZLjv3JtvalT U8xZk08eha6/UEBf1KOrsNpR37IrBWNLS31ee0L/Q2Bo7Iir9fpLbOEJKlteO3L3P7gKsQ cS2PBmddHVdSVkiitFE34WjGvNheW4El/9UShfAHjkQEEmCmfYiacJZq8Gkc7UvHB0/CxD G/myNFLAGPBglFlbM/x078SoL3dUjO50AaVpGZwCFDQuz9BH8Q0KohbigkpK+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699293047; 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=ntDZN4yw02Xe8jSzueAYkCqpkEgvI8yMTVCWnu6eOxM=; b=TCTCybGKfMXuHu4Y1zN1sHVmgOhDn4lbs77VWFqeG7I6sRCN1GQDJh22z9X2VlmOIVGTb9 PW7jqUG7iWlK4IFC8TkuMeXXr/pRdbqPn6iDbMfF06JJ3KtrY0VEd1wLK3QRoJiY6jw7Qa q7RPJMqEYlhn0FaKF3pQKzUpzSY7bgBlPqO/hzKICvyYH7FCOXsVLjP76Wf6hCCTEOoHem chKIjv0ubsQCsiLZeOxtK2Zcudxeh3qXknsMoCDGpXOxYCxZ08b7+E0xw5IvGjlsqs59Xj 9PZ3RI+AzqfBKh6oc/BP51HfN6yPJ8K5RyUUiXjwyPKiCW9OU9Rf98b+3yGKyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699293047; a=rsa-sha256; cv=none; b=assUYXs0gEW4ExwmbEcqXxf9tMaQXr+OXjHqHqH2pwNPkuLT1TZQM8kXHlt3rOtFTiaRQq vaX9Q+Jzb1OOErBJZZHAROPQVHkURNhRRkGzGDF3DUGbtwde9fBcB1DjxoNGYO/jXSP618 xweGeXdtZfJkrcfb0ClKPGQvSPl8IPshpeq4bmzE2ahrDOs4JZiHVku/Fi27jrNMmf6UDi EZFANs8o4mbnleuwxmZfKrtszfBKMv/528GbfWxM2i6ckycB2oUM/jTDD/K22KxvHZLVcd SS1mUsYqk20kk+i+XF6zW3sbbIWLMd54K/bb9OLKogMZEveRZsSPkuSnod0SSw== 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 4SPJmR1DTbz2bj; Mon, 6 Nov 2023 17:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6HolUc068274; Mon, 6 Nov 2023 17:50:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6Hol14068271; Mon, 6 Nov 2023 17:50:47 GMT (envelope-from git) Date: Mon, 6 Nov 2023 17:50:47 GMT Message-Id: <202311061750.3A6Hol14068271@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 1d96c7ebef90 - 2023Q4 - x11/i3lock-color: drop setuid bit via unix-selfauth-helper List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 1d96c7ebef903ee680ecd9232013c03826a658cc Auto-Submitted: auto-generated The branch 2023Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d96c7ebef903ee680ecd9232013c03826a658cc commit 1d96c7ebef903ee680ecd9232013c03826a658cc Author: Jan Beich AuthorDate: 2023-08-11 14:23:21 +0000 Commit: Jan Beich CommitDate: 2023-11-06 17:50:40 +0000 x11/i3lock-color: drop setuid bit via unix-selfauth-helper pam_helper was supposed to avoid setuid bit but wasn't actually hooked. PR: 273074 Approved by: maintainer timeout (3 months) (cherry picked from commit 43a873b0bccbeadef7f745f01ac7add5d365b59d) --- x11/i3lock-color/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/x11/i3lock-color/Makefile b/x11/i3lock-color/Makefile index f732ca37f0ec..348ee7cfaec6 100644 --- a/x11/i3lock-color/Makefile +++ b/x11/i3lock-color/Makefile @@ -1,6 +1,6 @@ PORTNAME= i3lock-color DISTVERSION= 2.13.c.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= fjachuf@gmail.com @@ -9,7 +9,6 @@ WWW= https://github.com/Raymo111/i3lock-color LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${LOCALBASE}/bin/pam_helper:security/pam_helper LIB_DEPENDS= libev.so:devel/libev \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ @@ -19,6 +18,7 @@ LIB_DEPENDS= libev.so:devel/libev \ libxcb-xrm.so:x11/xcb-util-xrm \ libxkbcommon.so:x11/libxkbcommon \ libxkbfile.so:x11/libxkbfile +RUN_DEPENDS= unix-selfauth-helper>0:security/unix-selfauth-helper USES= autoreconf gmake gnome iconv jpeg localbase pkgconfig tar:bzip2 xorg USE_CSTD= c99 @@ -38,7 +38,8 @@ LDFLAGS+= ${ICONV_LIB} CONFLICTS_INSTALL= i3lock -PLIST_FILES= "@(,,4755) bin/i3lock" \ +PLIST_FILES= bin/i3lock \ + etc/pam.d/i3lock \ man/man1/i3lock.1.gz OPTIONS_DEFINE= DOCS @@ -49,6 +50,8 @@ DOCS_PLIST_FILES= ${DOC_FILES:S|^|${DOCSDIR_REL}/|} post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/i3lock @${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/i3lock + @${LN} -s ${LOCALBASE}/etc/pam.d/unix-selfauth \ + ${STAGEDIR}${PREFIX}/etc/pam.d/i3lock post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}