commit 88918f46788b23c80062c48756369e8c0b6b1ce1
Author: Markus Teich <markus.teich_AT_stusta.mhn.de>
Date: Tue Mar 28 00:32:31 2017 +0200
fix latest slock pam patch format
diff --git a/tools.suckless.org/slock/patches/slock-pam_auth-20161126-9909280.diff b/tools.suckless.org/slock/patches/slock-pam_auth-20161126-9909280.diff
index d8b6c84..136f4b5 100644
--- a/tools.suckless.org/slock/patches/slock-pam_auth-20161126-9909280.diff
+++ b/tools.suckless.org/slock/patches/slock-pam_auth-20161126-9909280.diff
_AT_@ -1,15 +1,8 @@
-Author: Jan Christoph Ebersbach <jceb_AT_e-jc.de>
-URL:
http://tools.suckless.org/slock/patches/pam_auth
-Replaces shadow support with PAM authentication support.
-
-Change variable `pam_service` in `config.def.h` to the corresponding PAM
-service. The default configuration is for ArchLinux's `login` service.
-
-Index: slock-patches/slock/config.def.h
-===================================================================
---- slock-patches.orig/slock/config.def.h
-+++ slock-patches/slock/config.def.h
-_AT_@ -6,7 +6,11 @@ static const char *colorname[NUMCOLS] =
+diff --git a/config.def.h b/config.def.h
+index 9855e21..19e7f62 100644
+--- a/config.def.h
++++ b/config.def.h
+_AT_@ -6,7 +6,11 @@ static const char *colorname[NUMCOLS] = {
[INIT] = "black", /* after initialization */
[INPUT] = "#005577", /* during input */
[FAILED] = "#CC3333", /* wrong password */
_AT_@ -21,10 +14,10 @@ Index: slock-patches/slock/config.def.h
+
+/* PAM service that's used for authentication */
+static const char* pam_service = "login";
-Index: slock-patches/slock/config.mk
-===================================================================
---- slock-patches.orig/slock/config.mk
-+++ slock-patches/slock/config.mk
+diff --git a/config.mk b/config.mk
+index 74429ae..6e82074 100644
+--- a/config.mk
++++ b/config.mk
_AT_@ -12,7 +12,7 @@ X11LIB = /usr/X11R6/lib
# includes and libs
_AT_@ -34,10 +27,10 @@ Index: slock-patches/slock/config.mk
# flags
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H
-Index: slock-patches/slock/slock.c
-===================================================================
---- slock-patches.orig/slock/slock.c
-+++ slock-patches/slock/slock.c
+diff --git a/slock.c b/slock.c
+index 5ae738c..3a8da42 100644
+--- a/slock.c
++++ b/slock.c
_AT_@ -18,16 +18,22 @@
#include <X11/keysym.h>
#include <X11/Xlib.h>
_AT_@ -102,7 +95,7 @@ Index: slock-patches/slock/slock.c
return hash;
}
-_AT_@ -129,11 +162,12 @@ readpw(Display *dpy, struct xrandr *rr,
+_AT_@ -129,11 +162,12 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
const char *hash)
{
XRRScreenChangeNotifyEvent *rre;
_AT_@ -117,7 +110,7 @@ Index: slock-patches/slock/slock.c
len = 0;
running = 1;
-_AT_@ -160,10 +194,26 @@ readpw(Display *dpy, struct xrandr *rr,
+_AT_@ -160,10 +194,26 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
case XK_Return:
passwd[len] = '
Received on Tue Mar 28 2017 - 00:32:33 CEST