From nobody Sat Mar 01 09:04:40 2025 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 4Z4fKN5xYBz5p54f; Sat, 01 Mar 2025 09:04:40 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z4fKN4NRmz4LYl; Sat, 01 Mar 2025 09:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740819880; 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=sMwe+zNcFROivcoI3UBkILpMx+IwUut4WOI22gULgPk=; b=GD69GXQ+yguMWD57nlrhZEW5/l2lNMsJfvURht44oBNIzPE2lRGV/MKk2d/ZiuU7I2gNdN jVodvbjSRKhwvmhGm/poj4BK9PqygyisIbgOrNqrk/AOsbJUO7kOSoa3J7bV3Ab/wcDPqs 9rvdzBGGNQBjiPhjeSrA8T6cc/higbFRAe1X2M+GImTyB/tnLVXvNvpa7uobfMawxjJpAd QABpW8tuGuEhSxA6efp8kulI7jPiRAErmuSs1oOP4i07vnLoELzunVWDYN/gpuH5h0lqUV Ynb3NaG57AnhYu7Rm+sM0kG28vM2zJiIr6g2DhI65v1lpkcCDaA4O2psA9midw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740819880; a=rsa-sha256; cv=none; b=rkGPyo84+iWJc1obYr1uaM4cGbLJjZ09BC/+hrcDF1YMZVuXhHaMmEKDv2Ouvp/gKMX69z ZgsAYJB5h559GtbvUovNfbP9Z4XoWKqPhTsG5SV2FSh3V206uEu/DPHKKkS9k9zfaj3DQM 0P86IIEytm7qJzlEmjvt2VZAh3T1PF+RuibRmcQl6/EQe3sh2XdeGL8bgiOmfpcz0Erj4A WZIHZOkN5J+6sDzyOUmNVCTc219poIOgOtP8c6kpsieAB9tQ9sC7wXYIFyVHzVWpzNMOlK Y6GJ/TBLTQrBOed9YDIgwbHUJHmcjcoeQzTakasH1ohIRQkVkOA+3yf0d9G7fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740819880; 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=sMwe+zNcFROivcoI3UBkILpMx+IwUut4WOI22gULgPk=; b=ZWou7/vidmBYRHU5pPu6jr5OHBX2nvrIscFQ/TuX3jT25xsF6aVNJvhdgq7MEf0U5cUEba GbBlb0jfG47jI1AMehYdTTEolhBJWr0xH4r1WJtS2/DNgJb1FG0HuzZEXN2BQdWQQyO6dy Eu+fMr+hBebyxcSOcCuE4H7M50cb3iUnskiO5fY+oEoLWRr9ntgQZA905G8XGoyXkIzZ7W SHHYrOWpXZxLwzcdZ7xHvobOcFTzjXD70ubJBZY0BRup7CqyNS5istzKhgZPljxiT3ATIF aUQAcFTmFPoftjGPd80CT643shFmnJQL64ojI7COzSxtOupUZbYtUC6g8alFvw== 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 4Z4fKN3yLmz17Zg; Sat, 01 Mar 2025 09:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52194efn027907; Sat, 1 Mar 2025 09:04:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52194edZ027904; Sat, 1 Mar 2025 09:04:40 GMT (envelope-from git) Date: Sat, 1 Mar 2025 09:04:40 GMT Message-Id: <202503010904.52194edZ027904@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 2c2787637219 - main - security/vlock: Remove CACASAVER option 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c2787637219ae5583d550a00639892593043a90 Auto-Submitted: auto-generated The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c2787637219ae5583d550a00639892593043a90 commit 2c2787637219ae5583d550a00639892593043a90 Author: Ganael LAPLANCHE AuthorDate: 2025-03-01 09:01:41 +0000 Commit: Ganael LAPLANCHE CommitDate: 2025-03-01 09:04:32 +0000 security/vlock: Remove CACASAVER option Caca module does not build with new libcaca anymore (and fixing build leads to a crashing module). Also, simplify MASTER_SITES as upstream is not available anymore. --- security/vlock/Makefile | 18 ++++-------------- security/vlock/pkg-plist | 1 - 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/security/vlock/Makefile b/security/vlock/Makefile index 2e7d93fd683b..482cad0075aa 100644 --- a/security/vlock/Makefile +++ b/security/vlock/Makefile @@ -2,8 +2,7 @@ PORTNAME= vlock PORTVERSION= 2.2.3 PORTREVISION= 5 CATEGORIES= security -MASTER_SITES= http://cthulhu.c3d2.de/~toidinamai/vlock/archive/ \ - LOCAL/martymac +MASTER_SITES= LOCAL/martymac MAINTAINER= martymac@FreeBSD.org COMMENT= Locks a terminal @@ -15,26 +14,21 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --enable-plugins --enable-pam \ --prefix=${PREFIX} \ --mandir=${PREFIX}/share/man \ - --with-modules="${VLOCKMODULES}" \ + --with-modules="all.so new.so" \ --with-scripts="${VLOCKSCRIPTS}" \ - VLOCK_GROUP="nobody" \ - EXTRA_CFLAGS="-I${LOCALBASE}/include" \ - EXTRA_LDFLAGS="-L${LOCALBASE}/lib" + VLOCK_GROUP="nobody" USES= gmake USE_CSTD= gnu99 -OPTIONS_DEFINE= ROOTPWD VLOCKSCRIPTS CACASAVER DOCS +OPTIONS_DEFINE= ROOTPWD VLOCKSCRIPTS DOCS OPTIONS_DEFAULT= ROOTPWD OPTIONS_SUB= yes ROOTPWD_DESC= Enable unlock using root password ROOTPWD_CONFIGURE_ENABLE= root-password VLOCKSCRIPTS_DESC= Install sample hook scripts -CACASAVER_DESC= Enable libcaca screensaver -CACASAVER_LIB_DEPENDS= libcaca.so:graphics/libcaca # Default scripts/modules VLOCKSCRIPTS= -VLOCKMODULES= all.so new.so # Vlock special group VLOCK_GRP= vlock @@ -49,10 +43,6 @@ PORTDOCS= ChangeLog PLUGINS README README.X11 SECURITY TODO VLOCKSCRIPTS+= amarok.sh example_script.sh mplayer.sh .endif -.if ${PORT_OPTIONS:MCACASAVER} -VLOCKMODULES+= caca.so -.endif - post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} diff --git a/security/vlock/pkg-plist b/security/vlock/pkg-plist index 8164bf5ccdca..b925c3847d4f 100644 --- a/security/vlock/pkg-plist +++ b/security/vlock/pkg-plist @@ -6,7 +6,6 @@ share/man/man8/vlock-main.8.gz %%VLOCKSCRIPTS%%lib/vlock/scripts/example_script %%VLOCKSCRIPTS%%lib/vlock/scripts/mplayer lib/vlock/modules/all.so -%%CACASAVER%%lib/vlock/modules/caca.so @mode 4711 sbin/vlock-main @mode