From nobody Wed Jul 12 07:33:49 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 4R18cZ15BSz4mYRM; Wed, 12 Jul 2023 07:33: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 4R18cZ0fwhz4DnG; Wed, 12 Jul 2023 07:33:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689147230; 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=O2LLx4y7jjYVDJV1GGMZf3DOHaqIwsTs1Hvji/tFt/I=; b=RgDddZFvgHrehjB5b7N5u5tLefK8gVy4kup/U2LcPhCfw9oEDWAaaRGmNOx1+CZK4hYyFy WGhgrYng3ppfiZOQgxFJDHy5VqXrQIEmCE7BtEGZZk1xe6s50JKjwWnGbaasnbub2VnlcO FAQYdh1/vhKgaO+yh5hJPpW0VbYeF4FsGxlbaFEojOWJ6OFan9liNtezhRL+RXPnY/z4e1 XgNue7ESlX7gQ2MiJpOwsmKINNX7FaRiOwJyHDJzY5NUvD/NXH5sYc9QnyHnPN1AY89tyx D+AJSoF2GYS92yc5G4iAFinqitkrodUjR7Aq8MWua5uYL8ofDqCAhYAUkIKJjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689147230; 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=O2LLx4y7jjYVDJV1GGMZf3DOHaqIwsTs1Hvji/tFt/I=; b=ZS1MHwNiNbUpzxZUXOJc0hwYpQaUw2WPLRw+jjj5aPnTTwIXBfYbnH0vF60k+asGAaMj4V g2JTvmM32UQ/NsUWnWzMZHTHwQ18byuDD8dleAxnhxuAvlHyjDCfaZ9r7H5fqEd/LqHXOq Di6wh6v57gJvQ86N24DG4M5Tx20j6l+WVwX+VCIx9ycIor06/8c/AILwdE+YMkWxq5ST88 HyFAhafZrObdGoFN6Ety0lm6MvDbFT8lBHWMAIOJd0H28JKgturCMnxKQKZpGgcmV84Q4C PDFMZjTJU+6SS54AXslm+zp1uHJ3wnMWKTweLshWgJyXnwvu1EeXyhr9bupEEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689147230; a=rsa-sha256; cv=none; b=MVsTufDzRqeZdGHIJgvRxYtVCEVTj4KK084AgaB6YVlHXx5w4/z2QzGyFiIw+6paEB0P/C 0P2wnEnOaxPdQhU9eQDOeU2xrLtMJFRiSNzzdd/+GQW+kj986k69bT/d+nMyx6hU58yYbA XV12br/VaTrnDfimOU3COWyvJ1qINozKZOBymKL0PWhhXaGA2ijwGnCui4slz2i1zm6c5f epRblHi4ik9IFcjIAAwzccQdgrTbY7wYHHPtszVR7nJjJoLe4tAnAG3R89BIw1lTCGGqVS ec+qJqeqZm2BKCLgdaz+TaFrCanwbZ9m9JBlNBrBPsbXO3a9O6jQCJcveH5pSA== 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 4R18cY6rWvz10xx; Wed, 12 Jul 2023 07:33:49 +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 36C7Xnhu047900; Wed, 12 Jul 2023 07:33:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C7Xn5U047899; Wed, 12 Jul 2023 07:33:49 GMT (envelope-from git) Date: Wed, 12 Jul 2023 07:33:49 GMT Message-Id: <202307120733.36C7Xn5U047899@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: fa9ae456a4a7 - 2023Q3 - i3lock: remove the setuid bit 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: fa9ae456a4a71ca0677756f6f7424d1812079c24 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa9ae456a4a71ca0677756f6f7424d1812079c24 commit fa9ae456a4a71ca0677756f6f7424d1812079c24 Author: Baptiste Daroussin AuthorDate: 2023-07-12 07:24:06 +0000 Commit: Baptiste Daroussin CommitDate: 2023-07-12 07:33:46 +0000 i3lock: remove the setuid bit Following swaylock example, by using unix-selfauth-helper and pam_exec we can avoid requiring setuid bit on i3lock. Reported by: Mateusz Kocielski (cherry picked from commit b9050914a87578a38b52ad197cbbb34574eb03e7) --- deskutils/i3lock/Makefile | 11 +++++++++-- deskutils/i3lock/files/i3lock.pam.in | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/deskutils/i3lock/Makefile b/deskutils/i3lock/Makefile index 78a0426807db..a269e22cd3cc 100644 --- a/deskutils/i3lock/Makefile +++ b/deskutils/i3lock/Makefile @@ -1,5 +1,6 @@ PORTNAME= i3lock PORTVERSION= 2.13 +PORTREVISION= 1 CATEGORIES= deskutils x11 MASTER_SITES= http://i3wm.org/${PORTNAME}/ @@ -19,12 +20,17 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \ libxcb-util.so:x11/xcb-util \ libxcb-xrm.so:x11/xcb-util-xrm +RUN_DEPENDS= unix-selfauth-helper>0:security/unix-selfauth-helper + MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \ X11INC="${LOCALBASE}/include" CC="${CC}" \ MANDIR="${MANPREFIX}/man" -PLIST_FILES= "@(,,4755) bin/i3lock" \ - man/man1/i3lock.1.gz +PLIST_FILES= bin/i3lock \ + man/man1/i3lock.1.gz \ + etc/pam.d/i3lock + +SUB_FILES= i3lock.pam USES= gmake iconv localbase pkgconfig tar:bzip2 xorg LDFLAGS+= ${ICONV_LIB} @@ -41,6 +47,7 @@ OPTIONS_DEFINE= DOCS post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/i3lock @${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/i3lock + @${INSTALL_DATA} ${WRKDIR}/i3lock.pam ${STAGEDIR}${PREFIX}/etc/pam.d/i3lock post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/deskutils/i3lock/files/i3lock.pam.in b/deskutils/i3lock/files/i3lock.pam.in new file mode 100644 index 000000000000..942be88359ac --- /dev/null +++ b/deskutils/i3lock/files/i3lock.pam.in @@ -0,0 +1,7 @@ +# +# PAM configuration for the "i3lock" service. i3lock(1) only uses +# auth facilities. +# + +auth sufficient pam_exec.so return_prog_exit_status expose_authtok %%LOCALBASE%%/libexec/unix-selfauth-helper +auth include system