From c454d6541444b8458fbcff1c973d76ca9bee563a Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 13 Mar 2024 06:04:13 +0000 Subject: [PATCH] i3lock: update to 2.14.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2022-06-21 i3lock 2.14.1 • unlock indicator: display only caps lock and num lock, not all modifiers like shift (which can leak information about your password to bystanders) 2022-05-28 i3lock 2.14 • Change default background color to #a3a3a3 See https://github.com/i3/i3lock/pull/300 for extensive discussion and rationale for this change. • Recommend using xss-lock to start i3lock in the README and i3lock.1 man page. xss-lock is the best way to ensure your screen truly is locked before your computer suspends. • Display modifier key warning before unlocking, too, not just on failed attempts like before. • Switch build system from autotools to meson. 2020-10-27 i3lock 2.13 • Throw error when trying to start on Wayland • Use explicit_bzero() where available, not just on OpenBSD • avoid pixmap allocations in the redraw path • make --debug output go to stderr • unlock_indicator.c: fix build failure against gcc-10 • fix: call pam_end in cleanup in main, not in event loop • set _NET_WM_BYPASS_COMPOSITOR hint to avoid flickering 2019-07-21 i3lock 2.12 • remove stray \n from error messages • capitalize unlock indicator contents • set WM_CLASS property • reference modifier as “Super”, not “Win” • add --raw option to read image as raw bytes 2018-10-18 i3lock 2.11.1 • Fix dist tarball by including I3LOCK_VERSION 2018-10-10 i3lock 2.11 • Switch to autotools • Display an error when backspace is pressed without any input • Print an error when a non-PNG file is opened (i3lock only supports PNG files) (Thanks eplanet) • Don’t unnecessarily check the xcb_connect return value, it is known never to be NULL (Thanks SegFault42) • Fix memory leak when grabbing fails (Thanks karulont) • Respect Xft.dpi for determining the unlock indicator’s scale factor • Discard pending password verification attempts when a new password is entered (Thanks layus) 2017-11-25 i3lock 2.10 • Only use -lpam when not on OpenBSD (Thanks Kaashif) • locale: treat empty string same as unset (Thanks Ran) • Fix overwrite of getopt optind (Thanks jakob) • Immediately hide the unlock indicator after ESC / C-u (Thanks Orestis) • Measure wall-clock time instead of CPU time for “locking” indicator. • SetInputFocus to the i3lock window to force-close context menus • Use RandR for learning about attached monitors 2017-06-21 i3lock 2.9.1 • Fix version number mechanism (for --version) • Revert the fix for composited notifications, as it causes more issues than it solves: https://github.com/i3/i3lock/issues/130 https://github.com/i3/i3lock/issues/128 2017-05-26 i3lock 2.9 • i3lock.1: use signal names without SIG prefix • Removed obsolete inactivity timeout • Added version files for release tarball. • Set font face • Automatically unlock (without having to press ) one attempt which was entered while authenticating • Stop leaking the image_path dup • Displaying locking message when grabbing the pointer/keyboard • Display error message when locking failed • Add Enter on C-m • Change input slices to be exactly pi/3 in size instead of slightly more • Fix covering of composited notifications using the XComposite extension • Remove last traces of DPMS • Use bsd_auth(3) instead of PAM on OpenBSD • Restore intended behaviour and don't use mlock(2) on OpenBSD. --- x11/i3lock/Makefile | 32 +++++++++++++++---------------- x11/i3lock/distinfo | 9 ++++----- x11/i3lock/patches/patch-Makefile | 29 ---------------------------- 3 files changed, 19 insertions(+), 51 deletions(-) delete mode 100644 x11/i3lock/patches/patch-Makefile diff --git a/x11/i3lock/Makefile b/x11/i3lock/Makefile index d518aa55176f..a1283df4a296 100644 --- a/x11/i3lock/Makefile +++ b/x11/i3lock/Makefile @@ -1,30 +1,23 @@ -# $NetBSD: Makefile,v 1.11 2023/11/14 14:03:13 wiz Exp $ -# +# $NetBSD: Makefile,v 1.12 2024/03/13 06:04:13 wiz Exp $ -DISTNAME= i3lock-2.8 -PKGREVISION= 7 +DISTNAME= i3lock-2.14.1 CATEGORIES= x11 MASTER_SITES= https://i3wm.org/i3lock/ -EXTRACT_SUFX= .tar.bz2 +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://i3wm.org/i3lock/ COMMENT= Slightly improved screen locker based on slock LICENSE= modified-bsd -USE_TOOLS+= gmake pkg-config -USE_LANGUAGES= c99 +USE_TOOLS+= pkg-config +USE_LANGUAGES= c +FORCE_C_STD= c99 -MAKE_FLAGS+= PREFIX=${PREFIX} -MAKE_FLAGS+= EGDIR=${EGDIR} -MAKE_FLAGS+= MANDIR=${PKGMANDIR} - -EGDIR= ${PREFIX}/share/examples/${PKGBASE} +INSTALLATION_DIRS+= share/examples/i3lock/pam.d CPPFLAGS.SunOS+= -Du_int32_t=uint32_t -MESSAGE_SUBST+= EGDIR=${EGDIR} - BUILD_DEFS+= SYSCONFBASE .include "../../mk/bsd.prefs.mk" @@ -32,21 +25,25 @@ BUILD_DEFS+= SYSCONFBASE .if ${OPSYS} == "NetBSD" SUBST_CLASSES+= pam SUBST_STAGE.pam= pre-configure -SUBST_FILES.pam+= i3lock.pam +SUBST_FILES.pam+= pam/i3lock SUBST_SED.pam+= -e "s,login,system,g" .elif ${OPSYS} == "Linux" SUBST_CLASSES+= pam SUBST_STAGE.pam= pre-configure -SUBST_FILES.pam+= i3lock.pam +SUBST_FILES.pam+= pam/i3lock SUBST_SED.pam+= -e "s,login,system-auth,g" .endif .if ${UNPRIVILEGED:tl} != "yes" -CONF_FILES+= ${PREFIX}/share/examples/${PKGBASE}/pam.d/i3lock \ +CONF_FILES+= ${PREFIX}/share/examples/i3lock/pam.d/i3lock \ ${SYSCONFBASE}/pam.d/i3lock SPECIAL_PERMS+= bin/i3lock ${SETUID_ROOT_PERMS} .endif +post-install: + ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/pam.d/i3lock ${DESTDIR}${PREFIX}/share/examples/i3lock/pam.d/ + +.include "../../devel/meson/build.mk" .include "../../devel/libev/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" @@ -54,5 +51,6 @@ SPECIAL_PERMS+= bin/i3lock ${SETUID_ROOT_PERMS} .include "../../x11/xcb-util/buildlink3.mk" .include "../../x11/xcb-util-image/buildlink3.mk" .include "../../x11/xcb-util-keysyms/buildlink3.mk" +.include "../../x11/xcb-util-xrm/buildlink3.mk" .include "../../mk/pam.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/i3lock/distinfo b/x11/i3lock/distinfo index f5c755e096c5..4a3e673b78e2 100644 --- a/x11/i3lock/distinfo +++ b/x11/i3lock/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.4 2021/10/26 11:33:54 nia Exp $ +$NetBSD: distinfo,v 1.5 2024/03/13 06:04:13 wiz Exp $ -BLAKE2s (i3lock-2.8.tar.bz2) = ab4d280cd640462a9c5eb610e03efde1098261c1d35b6d9389bb164734caaed4 -SHA512 (i3lock-2.8.tar.bz2) = b0f2f2837e275ffb2874aec75cd5d7c69864f8861de5e3e6090a2bf9254a14f8bc141256b0faac3e30111f9612e97cc087efde0da939854fac975a87deb06e3f -Size (i3lock-2.8.tar.bz2) = 19884 bytes -SHA1 (patch-Makefile) = 20653b964ce099c0b9daba433a07d2b5b0f1bac3 +BLAKE2s (i3lock-2.14.1.tar.xz) = 5d274c03288fb5a5394eab0132163b18766e28691d1f1895baebc6b92c97b297 +SHA512 (i3lock-2.14.1.tar.xz) = 63b6bd73f66654fe52639434f7d3da64006144ec2ed685ba8683186730d4cc2c10d5aa66174f965030030243f59afaf6def3ff732f710ae441410218f84d6deb +Size (i3lock-2.14.1.tar.xz) = 28756 bytes diff --git a/x11/i3lock/patches/patch-Makefile b/x11/i3lock/patches/patch-Makefile deleted file mode 100644 index 36d906657129..000000000000 --- a/x11/i3lock/patches/patch-Makefile +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-Makefile,v 1.1 2016/06/11 23:00:14 kamil Exp $ - -Install example configuration into EGDIR. -Install man-page. - ---- Makefile.orig 2015-05-20 07:17:06.000000000 +0000 -+++ Makefile -@@ -2,6 +2,7 @@ INSTALL=install - PREFIX=/usr - SYSCONFDIR=/etc - PKG_CONFIG=pkg-config -+MANDIR=share/man - - # Check if pkg-config is installed, we need it for building CFLAGS/LIBS - ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null 1>/dev/null || echo 1),1) -@@ -37,9 +38,11 @@ clean: - - install: all - $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin -- $(INSTALL) -d $(DESTDIR)$(SYSCONFDIR)/pam.d -+ $(INSTALL) -d $(DESTDIR)$(EGDIR)/pam.d -+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 - $(INSTALL) -m 755 i3lock $(DESTDIR)$(PREFIX)/bin/i3lock -- $(INSTALL) -m 644 i3lock.pam $(DESTDIR)$(SYSCONFDIR)/pam.d/i3lock -+ $(INSTALL) -m 644 i3lock.pam $(DESTDIR)$(EGDIR)/pam.d/i3lock -+ $(INSTALL) -m 644 i3lock.1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/i3lock.1 - - uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/i3lock