From nobody Wed Jul 26 16:22:37 2023 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 4R9zhG1RHNz4pXhc; Wed, 26 Jul 2023 16:22:38 +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 4R9zhG0KDrz4Nng; Wed, 26 Jul 2023 16:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690388558; 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=UEWQJZ/3mQTI72vD+eDDB7eBtemngDz2DhrR+gYg+6s=; b=gHOhPQ92P7QrdL3VHpy+Y47mkChYASQrNUe7Yro8Y9tkhwmJ8qJtVsUnnheINhaQdfUARK R+J3+WP0kbHDSYXfHpwn5tXCM5D+ClpVABY8/OtNcGLB6glGGEWJlIrWlmMTg/K2F2VoVC wXOAx85E1cRRKIapd2WCuRkC91kPY7K4StuT7S1tBhclk9PZuxJDdxoXOZ8LkcdV+ZCKx+ q6ayj766Z9mJLjKyF94kQbtSObGmZCicoxGTx/GeeH3MF5JcfK6PDPhMI21wDfP1Xkoa9t I9c5eb7lQ6yRhpUKHomKbuzemoUpJi8qXB9J7shsF6IVgN+BB057urmfkwrLBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690388558; 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=UEWQJZ/3mQTI72vD+eDDB7eBtemngDz2DhrR+gYg+6s=; b=U1bFsN1CvRuZsMc8G07x0hZva1vOx+EuwUU5h4M0ay0LZQrgS/rcdpPGOS72kEHZ3qC2XU s+eiailyaYCcCnAcQkzydoNi13UwsQaeOORyap7sx4lw/V9x08Fy8hXQB9WcEG9TYUQw8k Zto9W5IgwQvCPeKxUSvjZ4W0GItYm5zV3WDpJ1ANsAiOL3uLWY+lJgosfCOyfM1wTWn3gB GSV2tROkb3ITGIqdAu2PV4e91TWbgTzpMqUJTV++2S5EJdvwduiYhN8h73fub6KAt+09OX zSpP/TYNCgv+GBYzEPH9sTZf9XD5gM/U6Bklx6NBECofa2FdjQoDUcgJLCuOfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690388558; a=rsa-sha256; cv=none; b=AkbMx1HSCCfzE/n3TVT9OMz7Rh+F5OkkQhLsQYoDJMo+DzLplq/pSkFXiEOxiVID8vpBKM C1sC/vPztEOkygtuIVYggXDxiZ638D0fHpKfmLPjRoXb2GfK0tDlisGRjHZtWCSdJvlsRk i/gQekhQPFJEVHaots7nY4CJxlTA+VH1TIX36Xb3AJ0cRxsFpQZH4G3UDaT5pKDqZ+GJr3 pP3Prio3Q2BrWDJlZusQeiMS5Y28eI0tUQVMsmoBxnSkg5oieltQFX2oH89lt6dSxR6Io+ R6NGfhYMdl0bU/tkCIVaM7coW8WqY3Yh4n6LcH7d+BGe83/EcpqLPr8FQttJTw== 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 4R9zhF6WkYzpq8; Wed, 26 Jul 2023 16:22:37 +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 36QGMb28020706; Wed, 26 Jul 2023 16:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QGMbV0020705; Wed, 26 Jul 2023 16:22:37 GMT (envelope-from git) Date: Wed, 26 Jul 2023 16:22:37 GMT Message-Id: <202307261622.36QGMbV0020705@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 4f53b9995818 - main - x11/swaylock: simplify PAM config after ca20c3923e51 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f53b9995818ef74754578c352061dc8418d43de Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f53b9995818ef74754578c352061dc8418d43de commit 4f53b9995818ef74754578c352061dc8418d43de Author: Jan Beich AuthorDate: 2023-07-26 16:13:12 +0000 Commit: Jan Beich CommitDate: 2023-07-26 16:21:01 +0000 x11/swaylock: simplify PAM config after ca20c3923e51 --- x11/swaylock-effects/Makefile | 2 +- x11/swaylock/Makefile | 5 +---- x11/swaylock/files/patch-pam_swaylock | 5 ++--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/x11/swaylock-effects/Makefile b/x11/swaylock-effects/Makefile index b7d6cd6e5d5c..571c15d732ac 100644 --- a/x11/swaylock-effects/Makefile +++ b/x11/swaylock-effects/Makefile @@ -1,6 +1,6 @@ DISTVERSIONPREFIX= v DISTVERSION= 1.6.11 -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -effects COMMENT= Screen locker for Wayland with fancy effects diff --git a/x11/swaylock/Makefile b/x11/swaylock/Makefile index aef0628feb1a..a14765f1b5b9 100644 --- a/x11/swaylock/Makefile +++ b/x11/swaylock/Makefile @@ -1,7 +1,7 @@ PORTNAME= swaylock DISTVERSIONPREFIX?= v DISTVERSION?= 1.7.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org @@ -44,8 +44,5 @@ post-patch: @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build -# Respect LOCALBASE for unix-selfauth-helper - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \ - ${WRKSRC}/pam/${PORTNAME} .include diff --git a/x11/swaylock/files/patch-pam_swaylock b/x11/swaylock/files/patch-pam_swaylock index 19908bfed564..baff8e6b5776 100644 --- a/x11/swaylock/files/patch-pam_swaylock +++ b/x11/swaylock/files/patch-pam_swaylock @@ -6,7 +6,7 @@ so try authenticating via setuid helper first. --- pam/swaylock.orig 2019-01-29 19:48:00 UTC +++ pam/swaylock -@@ -1,6 +1,7 @@ +@@ -1,6 +1,6 @@ # -# PAM configuration file for the swaylock screen locker. By default, it includes -# the 'login' configuration file (see /etc/pam.d/login) @@ -15,5 +15,4 @@ so try authenticating via setuid helper first. # -auth include login -+auth sufficient pam_exec.so return_prog_exit_status expose_authtok /usr/local/libexec/unix-selfauth-helper -+auth include system ++auth include unix-selfauth