slock

My slock fork
git clone https://git.kausban.com/slock/raw/.git
Log | Files | Refs | README

commit b95b4fec486390de7d56df38d6aa67cbe766644b
parent 9748ed2deb13f0d698df5e0fd3670cddcb770afb
Author: kausban <[email protected]>
Date:   Mon, 19 Dec 2022 18:45:59 +0100

v1.5. remove backspace patch.

Diffstat:
M.SRCINFO | 10++++------
MPKGBUILD | 9+++------
Dbackspace.patch | 30------------------------------
3 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO @@ -1,20 +1,18 @@ pkgbase = slock pkgdesc = A simple screen locker for X - pkgver = 1.4 - pkgrel = 6 + pkgver = 1.5 + pkgrel = 1 url = https://tools.suckless.org/slock arch = x86_64 groups = modified license = MIT depends = libxext depends = libxrandr - source = https://dl.suckless.org/tools/slock-1.4.tar.gz - source = backspace.patch + source = https://dl.suckless.org/tools/slock-1.5.tar.gz source = slock-pam_auth-20190207-35633d4.diff source = slock-message-20191215-post_pam.diff source = config.h - md5sums = f91dd5ba50ce7bd1842caeca067086a3 - md5sums = 20d46d8e70dfc80a2cd8467b461ac74d + md5sums = c147b00bda15ed6e2d61a45a91715048 md5sums = eddc691152663c3f623ad63649b93bc2 md5sums = 030f0ba0039750b67460f0b4b0ad147b md5sums = 3c7c2f5567299b01b28232ada132e28f diff --git a/PKGBUILD b/PKGBUILD @@ -3,21 +3,19 @@ pkgname=slock groups=('modified') -pkgver=1.4 -pkgrel=6 +pkgver=1.5 +pkgrel=1 pkgdesc="A simple screen locker for X" arch=('x86_64') url="https://tools.suckless.org/slock" license=('MIT') depends=('libxext' 'libxrandr') source=("https://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz" - "backspace.patch" "slock-pam_auth-20190207-35633d4.diff" "slock-message-20191215-post_pam.diff" "config.h") #source=("slock-$pkgver.tar.bz2::https://hg.suckless.org/slock/archive/$_pkgver.tar.gz") -md5sums=('f91dd5ba50ce7bd1842caeca067086a3' - '20d46d8e70dfc80a2cd8467b461ac74d' +md5sums=('c147b00bda15ed6e2d61a45a91715048' 'eddc691152663c3f623ad63649b93bc2' '030f0ba0039750b67460f0b4b0ad147b' '3c7c2f5567299b01b28232ada132e28f') @@ -27,7 +25,6 @@ prepare() { cp $srcdir/config.h config.h sed -i 's|static const char \*group = "nogroup";|static const char *group = "nobody";|' config.def.h sed -ri 's/((CPP|C|LD)FLAGS) =/\1 +=/g' config.mk - patch -p1 <../backspace.patch patch -p1 -i "${srcdir}/slock-pam_auth-20190207-35633d4.diff" patch -p1 -i "${srcdir}/slock-message-20191215-post_pam.diff" } diff --git a/backspace.patch b/backspace.patch @@ -1,30 +0,0 @@ -commit 35633d45672d14bd798c478c45d1a17064701aa9 -Author: Tobias Stoeckmann <[email protected]> -Date: Sat Mar 25 21:16:01 2017 +0100 - - Properly clear the last entered character - - When enter is pressed, passwd[len] will be set to '\0'. Pressing - backspace is supposed to remove the last entered character. - - But currently, the clearing has an off-by-one, as in setting - passwd[len] to '\0' just like enter would do. - - You can also verify it by imagining len=1 and that it's impossible to - clear passwd[0] by pressing backspace with the current code. - - Signed-off-by: Tobias Stoeckmann <[email protected]> - -diff --git a/slock.c b/slock.c -index d55eb3d..5ae738c 100644 ---- a/slock.c -+++ b/slock.c [email protected]@ -177,7 +177,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, - break; - case XK_BackSpace: - if (len) -- passwd[len--] = '\0'; -+ passwd[--len] = '\0'; - break; - default: - if (num && !iscntrl((int)buf[0]) &&