pool/i3lock
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 391689 from home:mimi_vx:branches:X11:windowmanagers

Browse Source 
- update to 2.7
- refresh i3lock-2.5-use-unix2_chkpwd.diff 
* Die when the X11 connection breaks during runtime
* Implement logging the number of failed attempts
* Ignore password validation is pam is in wrong state
* Get current user with getpwuid() instead of using $ENV{USER}
* Add support for Compose and dead-keys with libxkbcommon.
   Requires libxkbcommon ≥ 0.5.0
* Format the source using clang-format.
* Refresh pam credentials on successful authentication (for Kerberos and the
   like)
* List pressed modifiers on failed authentication
* Only redraw the screen if the unlock indicator is actually used
* Make pkg-config configurable for cross-compilation

OBS-URL: https://build.opensuse.org/request/show/391689
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/i3lock?expand=0&rev=13
This commit is contained in:
Ondřej Súkup 2016-04-26 12:51:26 +00:00 committed by Git OBS Bridge
parent 5e98b2a455
commit 836861a8b7
5 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
i3lock-2.5-use-unix2_chkpwd.diff
View File

@ -3,14 +3,14 @@ Date: Sat Feb 15 14:20:27 2014 +0100
add the option to use unix2_chkpwd instead of needing setgid shadow
diff --git a/Makefile b/Makefile
index 2633bef..27a471b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,11 @@
Index: i3lock-2.7/Makefile
===================================================================
--- i3lock-2.7.orig/Makefile
+++ i3lock-2.7/Makefile
@@ -14,7 +14,11 @@ CFLAGS += -Wall
CPPFLAGS += -D_GNU_SOURCE
CFLAGS += $(shell pkg-config --cflags cairo xcb-dpms xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
LIBS += $(shell pkg-config --libs cairo xcb-dpms xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-dpms xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-dpms xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+ifeq ($(USE_UNIX2_CHKPWD),1)
+CFLAGS += -DUSE_UNIX2_CHKPWD=1
+else
@ -19,11 +19,11 @@ index 2633bef..27a471b 100644
LIBS += -lev
LIBS += -lm
diff --git a/i3lock.c b/i3lock.c
index 5a87999..70842c6 100644
--- a/i3lock.c
+++ b/i3lock.c
@@ -17,7 +17,9 @@
Index: i3lock-2.7/i3lock.c
===================================================================
--- i3lock-2.7.orig/i3lock.c
+++ i3lock-2.7/i3lock.c
@@ -19,7 +19,9 @@
#include <xcb/dpms.h>
#include <err.h>
#include <assert.h>
@ -33,7 +33,7 @@ index 5a87999..70842c6 100644
#include <getopt.h>
#include <string.h>
#include <ev.h>
@@ -28,6 +30,13 @@
@@ -30,6 +32,13 @@
#include <cairo.h>
#include <cairo/cairo-xcb.h>
@ -47,7 +47,7 @@ index 5a87999..70842c6 100644
#include "i3lock.h"
#include "xcb.h"
#include "cursors.h"
@@ -40,7 +49,9 @@ char color[7] = "ffffff";
@@ -51,7 +60,9 @@ int inactivity_timeout = 30;
uint32_t last_resolution[2];
xcb_window_t win;
static xcb_cursor_t cursor;
@ -57,7 +57,7 @@ index 5a87999..70842c6 100644
int input_position = 0;
/* Holds the password you enter (in UTF-8). */
static char password[512];
@@ -226,6 +228,62 @@
@@ -266,6 +277,62 @@ static void input_done(void) {
pam_state = STATE_PAM_VERIFY;
redraw_screen();
@ -120,8 +120,8 @@ index 5a87999..70842c6 100644
if (pam_authenticate(pam_handle, 0) == PAM_SUCCESS) {
DEBUG("successfully authenticated\n");
clear_password_memory();
@@ -234,7 +292,7 @@
turn_monitors_on();
@@ -282,7 +349,7 @@ static void input_done(void) {
exit(0);
}
-
@ -129,7 +129,7 @@ index 5a87999..70842c6 100644
if (debug_mode)
fprintf(stderr, "Authentication failure\n");
@@ -398,6 +466,7 @@ void handle_screen_resize(void) {
@@ -591,6 +658,7 @@ void handle_screen_resize(void) {
redraw_screen();
}
@ -137,7 +137,7 @@ index 5a87999..70842c6 100644
/*
* Callback function for PAM. We only react on password request callbacks.
*
@@ -429,6 +498,7 @@ static int conv_callback(int num_msg, const struct pam_message **msg,
@@ -621,6 +689,7 @@ static int conv_callback(int num_msg, co
return 0;
}
@ -145,8 +145,8 @@ index 5a87999..70842c6 100644
/*
* This callback is only a dummy, see xcb_prepare_cb and xcb_check_cb.
@@ -516,8 +586,10 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) {
int main(int argc, char *argv[]) {
@@ -768,8 +837,10 @@ int main(int argc, char *argv[]) {
struct passwd *pw;
char *username;
char *image_path = NULL;
+#ifndef USE_UNIX2_CHKPWD
@ -156,7 +156,7 @@ index 5a87999..70842c6 100644
int curs_choice = CURS_NONE;
int o;
int optind = 0;
@@ -597,10 +669,12 @@ int main(int argc, char *argv[]) {
@@ -866,10 +937,12 @@ int main(int argc, char *argv[]) {
* the unlock indicator upon keypresses. */
srand(time(NULL));

3
i3lock-2.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c02d899fefc66bc36e47b305251363861400541f3925a21a94c66cee9055402a
size 17972

3
i3lock-2.7.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6882183ed0eca439e3ad1ae3e9d48b4d0a0b6f075e3850b46bf84aec97538fe2
size 19490

18
i3lock.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Apr 26 12:25:06 UTC 2016 - mimi.vx@gmail.com
- update to 2.7
- refresh i3lock-2.5-use-unix2_chkpwd.diff
* Die when the X11 connection breaks during runtime
* Implement logging the number of failed attempts
* Ignore password validation is pam is in wrong state
* Get current user with getpwuid() instead of using $ENV{USER}
* Add support for Compose and dead-keys with libxkbcommon.
Requires libxkbcommon ≥ 0.5.0
* Format the source using clang-format.
* Refresh pam credentials on successful authentication (for Kerberos and the
like)
* List pressed modifiers on failed authentication
* Only redraw the screen if the unlock indicator is actually used
* Make pkg-config configurable for cross-compilation
-------------------------------------------------------------------
Sat May 9 18:24:38 UTC 2015 - mpluskal@suse.com

8
i3lock.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package i3lock
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany.
# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
#
@ -21,7 +21,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
Name: i3lock
Version: 2.6
Version: 2.7
Release: 0
Summary: Screen Locker for the i3 Window Manager
License: BSD-3-Clause
@ -62,7 +62,7 @@ white screen (you can configure the color/an image). You can return to your
screen by entering your password.
%package xlock-compat
Summary: xlock-compatibility script which calls i3lock
Summary: Xlock-compatibility script which calls i3lock
Group: System/GUI/Other
Requires: ImageMagick
Requires: xdpyinfo
@ -108,7 +108,7 @@ install -m0755 %{SOURCE3} %{buildroot}/%{_bindir}/xlock
%files
%defattr(-,root,root)
%doc CHANGELOG LICENSE README
%doc CHANGELOG LICENSE README.md
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%{_bindir}/i3lock
%doc %{_mandir}/man1/i3lock.1*