commit i3lock for openSUSE:Factory
Hello community,
here is the log from the commit of package i3lock for openSUSE:Factory checked
in at 2020-09-14 12:29:47
Comparing /work/SRC/openSUSE:Factory/i3lock (Old)
and /work/SRC/openSUSE:Factory/.i3lock.new.4249 (New)
Package is "i3lock"
Mon Sep 14 12:29:47 2020 rev:18 rq:834025 version:2.12
Changes:
--- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2020-06-07
21:37:54.005370550 +0200
+++ /work/SRC/openSUSE:Factory/.i3lock.new.4249/i3lock.changes 2020-09-14
12:31:00.113200946 +0200
@@ -1,0 +2,9 @@
+Mon Sep 7 13:25:22 UTC 2020 - Dominique Leuenberger
+
+- Install pam configuration to /usr/etc/pam.d on suse_version >=
+ 1500 (https://en.opensuse.org/openSUSE:Packaging_UsrEtc#pam.2Fpam-config).
+- Add pre/posttrans scripts to ensure user modified
+ /etc/pam.d/i3lock survives our move to /usr/etc (and user
+ modification in /etc/pam.d wins over /usr/etc/pam.d)
+
+---
Other differences:
--
++ i3lock.spec ++
--- /var/tmp/diff_new_pack.PBb1DG/_old 2020-09-14 12:31:01.177201624 +0200
+++ /var/tmp/diff_new_pack.PBb1DG/_new 2020-09-14 12:31:01.181201627 +0200
@@ -74,6 +74,21 @@
install -D -m0644 %{name}.1 "%{buildroot}%{_mandir}/man1/%{name}.1"
install -D -m0644 %{SOURCE2}
%{buildroot}%{_datadir}/i3lock-xlock-compat/i3lock-icon.png
install -m0755 %{SOURCE3} %{buildroot}/%{_bindir}/xlock
+%if 0%{?suse_version} >= 1550
+mkdir -p %{buildroot}%{_distconfdir}
+mv %{buildroot}%{_sysconfdir}/pam.d %{buildroot}%{_distconfdir}
+%endif
+
+%pre
+for i in pam.d/i3lock ; do
+ test -f /etc/${i}.rpmsave && mv -v /etc/${i}.rpmsave /etc/${i}.rpmsave.old
||:
+done
+
+%posttrans
+# Migration to /usr/etc.
+for i in pam.d/i3lock ; do
+ test -f /etc/${i}.rpmsave && mv -v /etc/${i}.rpmsave /etc/${i} ||:
+done
%files xlock-compat
%{_bindir}/xlock
@@ -82,7 +97,11 @@
%files
%license LICENSE
%doc CHANGELOG README.md
+%if 0%{?suse_version} >= 1550
+%{_distconfdir}/pam.d/%{name}
+%else
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
+%endif
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1%{?ext_man}
commit i3lock for openSUSE:Factory
Hello community,
here is the log from the commit of package i3lock for openSUSE:Factory checked
in at 2020-06-07 21:37:15
Comparing /work/SRC/openSUSE:Factory/i3lock (Old)
and /work/SRC/openSUSE:Factory/.i3lock.new.3606 (New)
Package is "i3lock"
Sun Jun 7 21:37:15 2020 rev:17 rq:812068 version:2.12
Changes:
--- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2020-02-04
19:56:04.621416918 +0100
+++ /work/SRC/openSUSE:Factory/.i3lock.new.3606/i3lock.changes 2020-06-07
21:37:54.005370550 +0200
@@ -1,0 +2,14 @@
+Sat Jun 6 11:57:02 UTC 2020 - Matthias Eliasson
+
+- update to 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
+- run spec-cleaner
+ * Remove Gropus
+- add patch 0001-unlock_indicator.c-fix-build-failure-against-gcc-10.patch
+ to fix builds with gcc10
+
+---
Old:
i3lock-2.11.1.tar.bz2
New:
0001-unlock_indicator.c-fix-build-failure-against-gcc-10.patch
i3lock-2.12.tar.bz2
Other differences:
--
++ i3lock.spec ++
--- /var/tmp/diff_new_pack.Mg80Oa/_old 2020-06-07 21:37:54.809373099 +0200
+++ /var/tmp/diff_new_pack.Mg80Oa/_new 2020-06-07 21:37:54.809373099 +0200
@@ -20,16 +20,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
Name: i3lock
-Version:2.11.1
+Version:2.12
Release:0
Summary:Screen Locker for the i3 Window Manager
License:BSD-3-Clause
-Group: System/GUI/Other
URL:https://i3wm.org/i3lock/
Source: https://i3wm.org/i3lock/%{name}-%{version}.tar.bz2
# borrowed from gnome-icon-theme
Source2:i3lock-icon.png
Source3:xlock.sh
+# PATCH-FIX-UPSTREAM
0001-unlock_indicator.c-fix-build-failure-against-gcc-10.patch gh#i3/i3lock#259
+Patch0: 0001-unlock_indicator.c-fix-build-failure-against-gcc-10.patch
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: make
@@ -50,7 +51,6 @@
%package xlock-compat
Summary:Xlock-compatibility script which calls i3lock
-Group: System/GUI/Other
Requires: ImageMagick
Requires: xdpyinfo
Conflicts: xlockmore
@@ -61,12 +61,12 @@
i3lock instead of xlock with them.
%prep
-%setup -q
+%autosetup -p 1
%build
%configure
export CFLAGS="%{optflags}"
-make %{?_smp_mflags}
+%make_build
%install
%make_install
++ 0001-unlock_indicator.c-fix-build-failure-against-gcc-10.patch ++
>From 3daf34bb03841f8e201ceb14b7124945d4c18bb8 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers
Date: Sat, 25 Jan 2020 11:28:36 +
Subject: [PATCH] unlock_indicator.c: fix build failure against gcc-10
On gcc-10 (and gcc-9 -fno-common) build fails as:
```
CCLD i3lock
ld: i3lock-unlock_indicator.o:i3lock/unlock_indicator.c:38:
multiple definition of `input_position'; i3lock-i3lock.o:i3lock/i3lock.c:69:
first defined here
ld: i3lock-unlock_indicator.o:(.bss+0x102): multiple definition of
`__odr_asan.input_position'; i3lock-i3lock.o:(.bss+0x92b): first defined here
```
gcc-10 will change the default from -fcommon to fno-common:
https://gcc.gnu.org/PR85678.
The error also happens if CFLAGS=-fno-common passed explicitly.
Reported-by: Hans de Graaff
Bug: https://bugs.gentoo.org/706286
Signed-off-by: Sergei Trofimovich
---
unlock_indicator.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/unlock_indicator.c b/unlock_indicator.c
index 8ff8173..d6237ed 100644
--- a/unlock_indicator.c
+++ b/unlock_indicator.c
@@ -35,7 +35,7 @@ extern bool debug_mode;
/* The current position in the input buffer. Useful to determine if any
* characters of the password have already been entered or not. */
-int input_position;
+extern int input_position;
/* The lock window. */
extern xcb_window_t win;
++ i3lock-2.11.1.tar.bz2 -> i3lock-2.12.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/i3lock-2.11.1/CHANGELOG new/i3lock-2.12/CHANGELOG
--- old/i3lock-2.11.1/CHANGELOG 2018-10-18 08:27:19.0 +0200
+++ new/i3lock-2.12/CHANGELOG 2019-07-21 11:14:54.0 +0200
@@ -1,3 +1,11 @@
+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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/i3lock-2.11.1/I3LOCK_VERSION
new/i3lock-
commit i3lock for openSUSE:Factory
Hello community, here is the log from the commit of package i3lock for openSUSE:Factory checked in at 2020-02-04 19:55:59 Comparing /work/SRC/openSUSE:Factory/i3lock (Old) and /work/SRC/openSUSE:Factory/.i3lock.new.26092 (New) Package is "i3lock" Tue Feb 4 19:55:59 2020 rev:16 rq:769891 version:2.11.1 Changes: --- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2018-10-25 09:11:06.802333928 +0200 +++ /work/SRC/openSUSE:Factory/.i3lock.new.26092/i3lock.changes 2020-02-04 19:56:04.621416918 +0100 @@ -1,0 +2,6 @@ +Mon Feb 3 13:56:55 UTC 2020 - Dominique Leuenberger + +- Drop libudev1 BuildRequires: buildrequiring a library (and not a + relevant devel package) can't ever be correct. + +--- Other differences: -- ++ i3lock.spec ++ --- /var/tmp/diff_new_pack.J7KQ4g/_old 2020-02-04 19:56:05.877417650 +0100 +++ /var/tmp/diff_new_pack.J7KQ4g/_new 2020-02-04 19:56:05.877417650 +0100 @@ -1,7 +1,7 @@ # # spec file for package i3lock # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany. # Copyright (c) 2012 Pascal Bleser # @@ -32,7 +32,6 @@ Source3:xlock.sh BuildRequires: gcc BuildRequires: glibc-devel -BuildRequires: libudev1 BuildRequires: make BuildRequires: pam-devel BuildRequires: pkgconfig
commit i3lock for openSUSE:Factory
Hello community,
here is the log from the commit of package i3lock for openSUSE:Factory checked
in at 2018-10-25 09:11:05
Comparing /work/SRC/openSUSE:Factory/i3lock (Old)
and /work/SRC/openSUSE:Factory/.i3lock.new (New)
Package is "i3lock"
Thu Oct 25 09:11:05 2018 rev:15 rq:644105 version:2.11.1
Changes:
--- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2018-02-14
10:52:55.558867843 +0100
+++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2018-10-25
09:11:06.802333928 +0200
@@ -1,0 +2,18 @@
+Tue Oct 23 21:37:22 UTC 2018 - Avindra Goolcharan
+
+- update to 2.11.1
+ * fix dist tarball by including I3LOCK_VERSION
+- includes 2.11
+ * 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)
+ * Don’t unnecessarily check the xcb_connect return value, it is
+known never to be NULL
+ * Fix memory leak when grabbing fails
+ * Respect Xft.dpi for determining the unlock indicator’s scale factor
+ * Discard pending password verification attempts when a new
+password is entered
+ * Switch to autotools
+- run spec-cleaner
+
+---
Old:
i3lock-2.10.tar.bz2
New:
i3lock-2.11.1.tar.bz2
Other differences:
--
++ i3lock.spec ++
--- /var/tmp/diff_new_pack.50cgE5/_old 2018-10-25 09:11:07.562333473 +0200
+++ /var/tmp/diff_new_pack.50cgE5/_new 2018-10-25 09:11:07.562333473 +0200
@@ -14,18 +14,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
Name: i3lock
-Version:2.10
+Version:2.11.1
Release:0
Summary:Screen Locker for the i3 Window Manager
License:BSD-3-Clause
Group: System/GUI/Other
-Url:https://i3wm.org/i3lock/
+URL:https://i3wm.org/i3lock/
Source: https://i3wm.org/i3lock/%{name}-%{version}.tar.bz2
# borrowed from gnome-icon-theme
Source2:i3lock-icon.png
@@ -40,6 +40,7 @@
BuildRequires: pkgconfig(libev)
BuildRequires: pkgconfig(xcb-atom)
BuildRequires: pkgconfig(xcb-image)
+BuildRequires: pkgconfig(xcb-xrm)
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
BuildRequires: pkgconfig(xkbcommon-x11)
@@ -64,6 +65,7 @@
%setup -q
%build
+%configure
export CFLAGS="%{optflags}"
make %{?_smp_mflags}
@@ -76,12 +78,13 @@
%files xlock-compat
%{_bindir}/xlock
-%{_datadir}/i3lock-xlock-compat
+%{_datadir}/%{name}-xlock-compat
%files
-%doc CHANGELOG LICENSE README.md
+%license LICENSE
+%doc CHANGELOG README.md
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1%{ext_man}
+%{_mandir}/man1/%{name}.1%{?ext_man}
%changelog
++ i3lock-2.10.tar.bz2 -> i3lock-2.11.1.tar.bz2 ++
20668 lines of diff (skipped)
commit i3lock for openSUSE:Factory
Hello community,
here is the log from the commit of package i3lock for openSUSE:Factory checked
in at 2018-02-14 10:52:53
Comparing /work/SRC/openSUSE:Factory/i3lock (Old)
and /work/SRC/openSUSE:Factory/.i3lock.new (New)
Package is "i3lock"
Wed Feb 14 10:52:53 2018 rev:14 rq:576423 version:2.10
Changes:
--- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2017-11-27
22:18:34.242287195 +0100
+++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2018-02-14
10:52:55.558867843 +0100
@@ -1,0 +2,6 @@
+Wed Feb 7 03:34:56 UTC 2018 - avin...@opensuse.org
+
+- switch to https urls
+- cleanup spec file
+
+---
Other differences:
--
++ i3lock.spec ++
--- /var/tmp/diff_new_pack.OTu4E1/_old 2018-02-14 10:52:56.182845383 +0100
+++ /var/tmp/diff_new_pack.OTu4E1/_new 2018-02-14 10:52:56.182845383 +0100
@@ -1,7 +1,7 @@
#
# spec file for package i3lock
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany.
# Copyright (c) 2012 Pascal Bleser
#
@@ -25,8 +25,8 @@
Summary:Screen Locker for the i3 Window Manager
License:BSD-3-Clause
Group: System/GUI/Other
-Url:http://i3wm.org/i3lock/
-Source: http://i3wm.org/i3lock/i3lock-%{version}.tar.bz2
+Url:https://i3wm.org/i3lock/
+Source: https://i3wm.org/i3lock/%{name}-%{version}.tar.bz2
# borrowed from gnome-icon-theme
Source2:i3lock-icon.png
Source3:xlock.sh
@@ -65,19 +65,12 @@
%build
export CFLAGS="%{optflags}"
-make %{?_smp_mflags} \
-PREFIX="%{_prefix}" \
-SYSCONFDIR="%{_sysconfdir}"
+make %{?_smp_mflags}
%install
-export CFLAGS="%{optflags}"
-make \
-PREFIX="%{_prefix}" \
-SYSCONFDIR="%{_sysconfdir}" \
-DESTDIR=%{buildroot} \
-install
+%make_install
-install -D -m0644 i3lock.1 "%{buildroot}%{_mandir}/man1/i3lock.1"
+install -D -m0644 %{name}.1 "%{buildroot}%{_mandir}/man1/%{name}.1"
install -D -m0644 %{SOURCE2}
%{buildroot}%{_datadir}/i3lock-xlock-compat/i3lock-icon.png
install -m0755 %{SOURCE3} %{buildroot}/%{_bindir}/xlock
@@ -88,7 +81,7 @@
%files
%doc CHANGELOG LICENSE README.md
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
-%{_bindir}/i3lock
-%{_mandir}/man1/i3lock.1*
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1%{ext_man}
%changelog
commit i3lock for openSUSE:Factory
Hello community,
here is the log from the commit of package i3lock for openSUSE:Factory checked
in at 2017-11-27 22:18:27
Comparing /work/SRC/openSUSE:Factory/i3lock (Old)
and /work/SRC/openSUSE:Factory/.i3lock.new (New)
Package is "i3lock"
Mon Nov 27 22:18:27 2017 rev:13 rq:545890 version:2.10
Changes:
--- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2017-11-09
14:07:55.168986994 +0100
+++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2017-11-27
22:18:34.242287195 +0100
@@ -1,0 +2,12 @@
+Sun Nov 26 15:52:11 UTC 2017 - aavind...@gmail.com
+
+- update to 2.10
+ * Only use -lpam when not on OpenBSD
+ * locale: treat empty string same as unset
+ * Fix overwrite of getopt optind
+ * Immediately hide the unlock indicator after ESC / C-u
+ * 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
+
+---
Old:
i3lock-2.9.1.tar.bz2
New:
i3lock-2.10.tar.bz2
Other differences:
--
++ i3lock.spec ++
--- /var/tmp/diff_new_pack.pC0YNk/_old 2017-11-27 22:18:34.738269193 +0100
+++ /var/tmp/diff_new_pack.pC0YNk/_new 2017-11-27 22:18:34.742269048 +0100
@@ -20,7 +20,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
Name: i3lock
-Version:2.9.1
+Version:2.10
Release:0
Summary:Screen Locker for the i3 Window Manager
License:BSD-3-Clause
++ i3lock-2.9.1.tar.bz2 -> i3lock-2.10.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/i3lock-2.9.1/CHANGELOG new/i3lock-2.10/CHANGELOG
--- old/i3lock-2.9.1/CHANGELOG 2017-06-21 18:18:26.0 +0200
+++ new/i3lock-2.10/CHANGELOG 2017-11-25 08:15:59.0 +0100
@@ -1,3 +1,13 @@
+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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/i3lock-2.9.1/Makefile new/i3lock-2.10/Makefile
--- old/i3lock-2.9.1/Makefile 2017-06-21 18:18:26.0 +0200
+++ new/i3lock-2.10/Makefile2017-11-25 08:15:59.0 +0100
@@ -15,9 +15,8 @@
CFLAGS += -pipe
CFLAGS += -Wall
CPPFLAGS += -D_GNU_SOURCE
-CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-xinerama xcb-atom xcb-image
xcb-xkb xkbcommon xkbcommon-x11)
-LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-xinerama xcb-atom xcb-image
xcb-xkb xkbcommon xkbcommon-x11)
-LIBS += -lpam
+CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-xinerama xcb-randr xcb-atom
xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-xinerama xcb-randr xcb-atom
xcb-image xcb-xkb xkbcommon xkbcommon-x11)
LIBS += -lev
LIBS += -lm
@@ -32,10 +31,10 @@
ifeq ($(wildcard .git),)
# not in git repository
VERSION := $(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat
$(TOPDIR)/I3LOCK_VERSION | cut -d '-' -f 1)
-I3LOCK_VERSION:="2.9.1 (2017-06-21)"
+I3LOCK_VERSION:="2.10 (2017-11-25)"
else
VERSION:=$(shell git describe --tags --abbrev=0)
-I3LOCK_VERSION:="2.9.1 (2017-06-21)"
+I3LOCK_VERSION:="2.10 (2017-11-25)"
endif
CPPFLAGS += -DVERSION=\"${I3LOCK_VERSION}\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/i3lock-2.9.1/README.md new/i3lock-2.10/README.md
--- old/i3lock-2.9.1/README.md 2017-06-21 18:18:26.0 +0200
+++ new/i3lock-2.10/README.md 2017-11-25 08:15:59.0 +0100
@@ -26,6 +26,7 @@
- libpam-dev
- libcairo-dev
- libxcb-xinerama
+- libxcb-randr
- libev
- libx11-dev
- libx11-xcb-dev
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/i3lock-2.9.1/i3lock.c new/i3lock-2.10/i3lock.c
--- old/i3lock-2.9.1/i3lock.c 2017-06-21 18:18:26.0 +0200
+++ new/i3lock-2.10/i3lock.c2017-11-25 08:15:59.0 +0100
@@ -35,12 +35,14 @@
#ifdef __OpenBSD__
#include /* explicit_bzero(3) */
#endif
+#include
+#include
#include "i3lock.h"
#include "xcb.h"
#include "cursors.h"
#include "unlock_indicator.h"
-#include "xinerama.h"
+#include "randr.h"
#define TSTAMP_N_SECS(n) (n * 1.0)
#define TSTAMP_N_MINS(n)
commit i3lock for openSUSE:Factory
Hello community, here is the log from the commit of package i3lock for openSUSE:Factory checked in at 2017-11-09 14:07:52 Comparing /work/SRC/openSUSE:Factory/i3lock (Old) and /work/SRC/openSUSE:Factory/.i3lock.new (New) Package is "i3lock" Thu Nov 9 14:07:52 2017 rev:12 rq:540023 version:2.9.1 Changes: --- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2017-09-12 19:53:21.236295499 +0200 +++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2017-11-09 14:07:55.168986994 +0100 @@ -1,0 +2,5 @@ +Wed Nov 8 15:04:10 CET 2017 - ku...@suse.de + +- Remove obsolete pam-modules requires + +--- Other differences: -- ++ i3lock.spec ++ --- /var/tmp/diff_new_pack.3N7uPO/_old 2017-11-09 14:07:55.668968773 +0100 +++ /var/tmp/diff_new_pack.3N7uPO/_new 2017-11-09 14:07:55.672968628 +0100 @@ -35,7 +35,6 @@ BuildRequires: libudev1 BuildRequires: make BuildRequires: pam-devel -BuildRequires: pam-modules BuildRequires: pkgconfig BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(libev) @@ -43,7 +42,6 @@ BuildRequires: pkgconfig(xcb-image) BuildRequires: pkgconfig(xkbcommon) >= 0.5.0 BuildRequires: pkgconfig(xkbcommon-x11) -Requires: pam-modules %description i3lock is a simple screen locker like slock. After starting it, you will see a
commit i3lock for openSUSE:Factory
Hello community,
here is the log from the commit of package i3lock for openSUSE:Factory checked
in at 2017-09-12 19:53:20
Comparing /work/SRC/openSUSE:Factory/i3lock (Old)
and /work/SRC/openSUSE:Factory/.i3lock.new (New)
Package is "i3lock"
Tue Sep 12 19:53:20 2017 rev:11 rq:521157 version:2.9.1
Changes:
--- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2017-06-28
10:36:25.022268150 +0200
+++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2017-09-12
19:53:21.236295499 +0200
@@ -1,0 +2,8 @@
+Tue Sep 5 03:10:56 UTC 2017 - aavind...@gmail.com
+
+- update to 2.9.1
+- Fix version number mechanism
+- Revert the fix for composited notifications, as it causes more issues than
+ it solves:
+
+---
Old:
i3lock-2.9.tar.bz2
New:
i3lock-2.9.1.tar.bz2
Other differences:
--
++ i3lock.spec ++
--- /var/tmp/diff_new_pack.JTyBhm/_old 2017-09-12 19:53:22.888063252 +0200
+++ /var/tmp/diff_new_pack.JTyBhm/_new 2017-09-12 19:53:22.892062689 +0200
@@ -20,7 +20,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
Name: i3lock
-Version:2.9
+Version:2.9.1
Release:0
Summary:Screen Locker for the i3 Window Manager
License:BSD-3-Clause
@@ -44,7 +44,6 @@
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
BuildRequires: pkgconfig(xkbcommon-x11)
Requires: pam-modules
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
i3lock is a simple screen locker like slock. After starting it, you will see a
@@ -85,12 +84,10 @@
install -m0755 %{SOURCE3} %{buildroot}/%{_bindir}/xlock
%files xlock-compat
-%defattr(-,root,root)
%{_bindir}/xlock
%{_datadir}/i3lock-xlock-compat
%files
-%defattr(-,root,root)
%doc CHANGELOG LICENSE README.md
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%{_bindir}/i3lock
++ i3lock-2.9.tar.bz2 -> i3lock-2.9.1.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/i3lock-2.9/CHANGELOG new/i3lock-2.9.1/CHANGELOG
--- old/i3lock-2.9/CHANGELOG2017-05-26 09:51:55.0 +0200
+++ new/i3lock-2.9.1/CHANGELOG 2017-06-21 18:18:26.0 +0200
@@ -1,3 +1,11 @@
+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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/i3lock-2.9/Makefile new/i3lock-2.9.1/Makefile
--- old/i3lock-2.9/Makefile 2017-05-26 09:51:55.0 +0200
+++ new/i3lock-2.9.1/Makefile 2017-06-21 18:18:26.0 +0200
@@ -15,8 +15,9 @@
CFLAGS += -pipe
CFLAGS += -Wall
CPPFLAGS += -D_GNU_SOURCE
-CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-composite xcb-xinerama
xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
-LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-composite xcb-xinerama xcb-atom
xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-xinerama xcb-atom xcb-image
xcb-xkb xkbcommon xkbcommon-x11)
+LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-xinerama xcb-atom xcb-image
xcb-xkb xkbcommon xkbcommon-x11)
+LIBS += -lpam
LIBS += -lev
LIBS += -lm
@@ -31,10 +32,10 @@
ifeq ($(wildcard .git),)
# not in git repository
VERSION := $(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat
$(TOPDIR)/I3LOCK_VERSION | cut -d '-' -f 1)
- I3LOCK_VERSION := '$(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat
$(TOPDIR)/I3LOCK_VERSION)'
+I3LOCK_VERSION:="2.9.1 (2017-06-21)"
else
VERSION:=$(shell git describe --tags --abbrev=0)
- I3LOCK_VERSION:="$(shell git describe --tags --always) ($(shell git log
--pretty=format:%cd --date=short -n1))"
+I3LOCK_VERSION:="2.9.1 (2017-06-21)"
endif
CPPFLAGS += -DVERSION=\"${I3LOCK_VERSION}\"
@@ -62,6 +63,6 @@
[ ! -e i3lock-${VERSION}.tar.bz2 ] || rm i3lock-${VERSION}.tar.bz2
mkdir i3lock-${VERSION}
cp *.c *.h i3lock.1 i3lock.pam Makefile LICENSE README.md CHANGELOG
i3lock-${VERSION}
- sed -e 's/^I3LOCK_VERSION:=\(.*\)/I3LOCK_VERSION:=$(shell /bin/echo
'${I3LOCK_VERSION}' | sed
's/\\//g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile >
i3lock-${VERSION}/Makefile
+ sed -e 's/^\s*I3LOCK_VERSION:=\(.*\)/I3LOCK_VERSION:=$(shell /bin/echo
'${I3LOCK_VERSION}' | sed
's/\\//g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile >
i3lock-${VERSION}/Makefile
tar cfj i3lock-${VERSION}.tar.bz2 i3lock-${VERSION}
commit i3lock for openSUSE:Factory
Hello community,
here is the log from the commit of package i3lock for openSUSE:Factory checked
in at 2017-06-28 10:36:24
Comparing /work/SRC/openSUSE:Factory/i3lock (Old)
and /work/SRC/openSUSE:Factory/.i3lock.new (New)
Package is "i3lock"
Wed Jun 28 10:36:24 2017 rev:10 rq:505642 version:2.9
Changes:
--- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2017-01-10
10:44:06.894000680 +0100
+++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2017-06-28
10:36:25.022268150 +0200
@@ -1,0 +2,23 @@
+Sun Jun 11 07:09:22 UTC 2017 - mimi...@gmail.com
+
+- drop i3lock-2.5-use-unix2_chkpwd.diff
+- use default pam config - drop i3lock.pam
+
+---
+Sat Jun 10 13:34:49 UTC 2017 - mimi...@gmail.com
+
+- update to 2.9
+- refresh i3lock-2.5-use-unix2_chkpwd.diff
+* Removed obsolete inactivity timeout
+* 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
+
+---
Old:
i3lock-2.5-use-unix2_chkpwd.diff
i3lock-2.8.tar.bz2
i3lock.pam
New:
i3lock-2.9.tar.bz2
Other differences:
--
++ i3lock.spec ++
--- /var/tmp/diff_new_pack.xzKrOE/_old 2017-06-28 10:36:25.582188936 +0200
+++ /var/tmp/diff_new_pack.xzKrOE/_new 2017-06-28 10:36:25.586188370 +0200
@@ -1,7 +1,7 @@
#
# spec file for package i3lock
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany.
# Copyright (c) 2012 Pascal Bleser
#
@@ -19,42 +19,32 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
-
Name: i3lock
-Version:2.8
+Version:2.9
Release:0
Summary:Screen Locker for the i3 Window Manager
License:BSD-3-Clause
Group: System/GUI/Other
+Url:http://i3wm.org/i3lock/
Source: http://i3wm.org/i3lock/i3lock-%{version}.tar.bz2
-Source1:i3lock.pam
# borrowed from gnome-icon-theme
Source2:i3lock-icon.png
Source3:xlock.sh
-# PATCH-FEATURE-OPENSUSE i3lock-2.5-use-unix2_chkpwd.diff --
seife+...@b1-systems.com
-Patch1: i3lock-2.5-use-unix2_chkpwd.diff
-Url:http://i3wm.org/i3lock/
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: cairo-devel
BuildRequires: gcc
-BuildRequires: glib2-devel
BuildRequires: glibc-devel
-BuildRequires: libev-devel
-%if 0%{?suse_version} > 1310
-# /usr/lib64/libEGL.so.1 now requires libudev.so.1, might be a packaging error
BuildRequires: libudev1
-%endif
BuildRequires: make
BuildRequires: pam-devel
+BuildRequires: pam-modules
BuildRequires: pkgconfig
BuildRequires: pkgconfig(cairo)
+BuildRequires: pkgconfig(libev)
BuildRequires: pkgconfig(xcb-atom)
-BuildRequires: pkgconfig(xkbcommon-x11)
-Requires: pam-modules
-BuildRequires: pam-modules
BuildRequires: pkgconfig(xcb-image)
-BuildRequires: pkgconfig(xcb-keysyms)
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
+BuildRequires: pkgconfig(xkbcommon-x11)
+Requires: pam-modules
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
i3lock is a simple screen locker like slock. After starting it, you will see a
@@ -69,36 +59,29 @@
Conflicts: xlockmore
%description xlock-compat
-This package provides a script /usr/bin/xlock which calls i3lock to lock your
screen.
+This package provides a script %{_bindir}/xlock which calls i3lock to lock
your screen.
This is handy for hard-coded screen-saver invocations e.g. in XFCE4, so you
can use
i3lock instead of xlock with them.
%prep
%setup -q
-%patch1 -p1
%build
export CFLAGS="%{optflags}"
make %{?_smp_mflags} \
-USE_UNIX2_CHKPWD=1 \
PREFIX="%{_prefix}" \
SYSCONFDIR="%{_sysconfdir}"
%install
export CFLAGS="%{optflags}"
make \
-USE_UNIX2_CHKPWD=1 \
PREFIX="%{_prefix}" \
SYSCONFDIR="%{_sysconfdir}" \
-DESTDIR="%{buildroot}" \
+DESTDIR=%{buildroot} \
install
-rm "%{buildroot}%{_sysconfdir}/pam.d/i3lock"
-install -m0644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/pam.d/%{name}"
-
install -D -m0644 i3lock.1 "%{buildroot}%{_mandir}/man1/i3lock.1"
-
-install -D -m0644 %{SOURCE2}
%{buildroot}/usr/share/i3lock-xlock-compat/i3lock-icon.png
+i
commit i3lock for openSUSE:Factory
Hello community,
here is the log from the commit of package i3lock for openSUSE:Factory checked
in at 2016-04-30 23:31:11
Comparing /work/SRC/openSUSE:Factory/i3lock (Old)
and /work/SRC/openSUSE:Factory/.i3lock.new (New)
Package is "i3lock"
Changes:
--- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2015-05-15
07:43:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2016-04-30
23:31:16.0 +0200
@@ -1,0 +2,18 @@
+Tue Apr 26 12:25:06 UTC 2016 - mimi...@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
+
+---
Old:
i3lock-2.6.tar.bz2
New:
i3lock-2.7.tar.bz2
Other differences:
--
++ i3lock.spec ++
--- /var/tmp/diff_new_pack.0YQZ2A/_old 2016-04-30 23:31:17.0 +0200
+++ /var/tmp/diff_new_pack.0YQZ2A/_new 2016-04-30 23:31:17.0 +0200
@@ -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
#
@@ -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
@@ -54,7 +54,7 @@
BuildRequires: pam-modules
BuildRequires: pkgconfig(xcb-image)
BuildRequires: pkgconfig(xcb-keysyms)
-BuildRequires: pkgconfig(xkbcommon)
+BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
%description
i3lock is a simple screen locker like slock. After starting it, you will see a
@@ -62,7 +62,7 @@
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 @@
%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*
++ i3lock-2.5-use-unix2_chkpwd.diff ++
--- /var/tmp/diff_new_pack.0YQZ2A/_old 2016-04-30 23:31:17.0 +0200
+++ /var/tmp/diff_new_pack.0YQZ2A/_new 2016-04-30 23:31:17.0 +0200
@@ -3,14 +3,14 @@
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 @@
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
#include
#include
@@ -33,7 +33,7 @@
#include
#include
#include
-@@ -28,6 +30,13 @@
+@@ -30,6 +32,13 @@
#include
#include
@@ -47,7 +47,7 @@
#include "i3lock.h"
#include "xcb.h"
#include "cursors.h"
-@@ -40,7 +49,9 @@ char color[7] = "ff";
+@@ -51,7 +60,9 @@ int inactivity_timeout = 30;
uint32_t last_r
commit i3lock for openSUSE:Factory
Hello community, here is the log from the commit of package i3lock for openSUSE:Factory checked in at 2015-05-15 07:43:23 Comparing /work/SRC/openSUSE:Factory/i3lock (Old) and /work/SRC/openSUSE:Factory/.i3lock.new (New) Package is "i3lock" Changes: --- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2015-01-20 12:39:13.0 +0100 +++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2015-05-15 07:43:30.0 +0200 @@ -1,0 +2,5 @@ +Sat May 9 18:24:38 UTC 2015 - mplus...@suse.com + +- Add missing dependency on xdpyinfo (boo#930330) + +--- Other differences: -- ++ i3lock.spec ++ --- /var/tmp/diff_new_pack.cMlAQG/_old 2015-05-15 07:43:30.0 +0200 +++ /var/tmp/diff_new_pack.cMlAQG/_new 2015-05-15 07:43:30.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package i3lock # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany. # Copyright (c) 2012 Pascal Bleser # @@ -65,6 +65,7 @@ Summary:xlock-compatibility script which calls i3lock Group: System/GUI/Other Requires: ImageMagick +Requires: xdpyinfo Conflicts: xlockmore %description xlock-compat
commit i3lock for openSUSE:Factory
Hello community,
here is the log from the commit of package i3lock for openSUSE:Factory checked
in at 2015-01-20 12:36:16
Comparing /work/SRC/openSUSE:Factory/i3lock (Old)
and /work/SRC/openSUSE:Factory/.i3lock.new (New)
Package is "i3lock"
Changes:
--- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2014-03-31
20:43:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2015-01-20
12:39:13.0 +0100
@@ -1,0 +2,21 @@
+Mon Jan 19 03:34:30 UTC 2015 - p.drou...@gmail.com
+
+- Update to version 2.6
+ * NEW DEPENDENCY: use libxkbcommon-x11 instead of libX11
+This helps us get rid of all code that directly uses libX11
+ * Use cairo_status_to_string for descriptive errors.
+ * Add `-e` option to not validate empty password.
+ * Bugfix: update the initial keyboard modifier state (Thanks lee, Ran)
+ * Re-raise i3lock when obscured in a separate process
+ * Turn on the screen on successful authentication
+ * Delay to turn off the screen after wrong passwd
+ * Discard half-entered passwd after some inactivity
+ * Ignore empty passwd after repeated Enter keypress
+ * Scale the unlock indicator (for retina displays)
+- Replace xorg-x11-devel with pkgconfig(xkbcommon-x11); follow
+ upstream changes
+- Add pkgconfig(cairo) and pkgconfig(xcb-atom) requirements; new
+ upstream dependencies
+- Remove redundant %clean section
+
+---
Old:
i3lock-2.5.tar.bz2
New:
i3lock-2.6.tar.bz2
Other differences:
--
++ i3lock.spec ++
--- /var/tmp/diff_new_pack.ilCcm0/_old 2015-01-20 12:39:14.0 +0100
+++ /var/tmp/diff_new_pack.ilCcm0/_new 2015-01-20 12:39:14.0 +0100
@@ -1,8 +1,7 @@
-# vim: set sw=4 ts=4 et nu:
#
# spec file for package i3lock
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany.
# Copyright (c) 2012 Pascal Bleser
#
@@ -22,7 +21,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
Name: i3lock
-Version:2.5
+Version:2.6
Release:0
Summary:Screen Locker for the i3 Window Manager
License:BSD-3-Clause
@@ -48,7 +47,9 @@
BuildRequires: make
BuildRequires: pam-devel
BuildRequires: pkgconfig
-BuildRequires: xorg-x11-devel
+BuildRequires: pkgconfig(cairo)
+BuildRequires: pkgconfig(xcb-atom)
+BuildRequires: pkgconfig(xkbcommon-x11)
Requires: pam-modules
BuildRequires: pam-modules
BuildRequires: pkgconfig(xcb-image)
@@ -99,13 +100,10 @@
install -D -m0644 %{SOURCE2}
%{buildroot}/usr/share/i3lock-xlock-compat/i3lock-icon.png
install -m0755 %{SOURCE3} %{buildroot}/%{_bindir}/xlock
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
%files xlock-compat
%defattr(-,root,root)
%{_bindir}/xlock
-/usr/share/i3lock-xlock-compat
+%{_datadir}/i3lock-xlock-compat
%files
%defattr(-,root,root)
++ i3lock-2.5-use-unix2_chkpwd.diff ++
--- /var/tmp/diff_new_pack.ilCcm0/_old 2015-01-20 12:39:14.0 +0100
+++ /var/tmp/diff_new_pack.ilCcm0/_new 2015-01-20 12:39:14.0 +0100
@@ -7,32 +7,32 @@
index 2633bef..27a471b 100644
--- a/Makefile
+++ b/Makefile
-@@ -13,7 +13,11 @@ CFLAGS += -Wall
+@@ -13,7 +13,11 @@
CPPFLAGS += -D_GNU_SOURCE
- CFLAGS += $(shell pkg-config --cflags cairo xcb-dpms xcb-xinerama xcb-atom
xkbcommon xkbfile x11 x11-xcb)
- LIBS += $(shell pkg-config --libs cairo xcb-dpms xcb-xinerama xcb-atom
xcb-image xkbcommon xkbfile x11 x11-xcb)
+ 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
LIBS += -lpam
+endif
LIBS += -lev
+ LIBS += -lm
- FILES:=$(wildcard *.c)
diff --git a/i3lock.c b/i3lock.c
index 5a87999..70842c6 100644
--- a/i3lock.c
+++ b/i3lock.c
-@@ -16,7 +16,9 @@
+@@ -17,7 +17,9 @@
#include
#include
#include
+#ifndef USE_UNIX2_CHKPWD
#include
+#endif
- #include
#include
#include
+ #include
@@ -28,6 +30,13 @@
#include
#include
@@ -57,7 +57,7 @@
int input_position = 0;
/* Holds the password you enter (in UTF-8). */
static char password[512];
-@@ -195,11 +206,68 @@ static void input_done(void) {
+@@ -226,6 +228,62 @@
pam_state = STATE_PAM_VERIFY;
redraw_screen();
@@ -120,12 +120,15 @@
if (pam_authenticate(pam_handle, 0) == PAM_SUCCESS) {
DEBUG("successfully authenticated\n");
clear_password_memory();
+@@ -234,7 +292,
commit i3lock for openSUSE:Factory
Hello community,
here is the log from the commit of package i3lock for openSUSE:Factory checked
in at 2014-03-31 20:43:14
Comparing /work/SRC/openSUSE:Factory/i3lock (Old)
and /work/SRC/openSUSE:Factory/.i3lock.new (New)
Package is "i3lock"
Changes:
--- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2014-02-18
20:24:38.0 +0100
+++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2014-03-31
20:43:27.0 +0200
@@ -1,0 +2,6 @@
+Thu Mar 20 15:36:04 UTC 2014 - seife+...@b1-systems.com
+
+- add i3lock-xlock-compat package which provides /usr/bin/xlock
+ for drop-in replacement in e.g. xflock4
+
+---
New:
i3lock-icon.png
xlock.sh
Other differences:
--
++ i3lock.spec ++
--- /var/tmp/diff_new_pack.z8NqwW/_old 2014-03-31 20:43:28.0 +0200
+++ /var/tmp/diff_new_pack.z8NqwW/_new 2014-03-31 20:43:28.0 +0200
@@ -29,6 +29,9 @@
Group: System/GUI/Other
Source: http://i3wm.org/i3lock/i3lock-%{version}.tar.bz2
Source1:i3lock.pam
+# borrowed from gnome-icon-theme
+Source2:i3lock-icon.png
+Source3:xlock.sh
# PATCH-FEATURE-OPENSUSE i3lock-2.5-use-unix2_chkpwd.diff --
seife+...@b1-systems.com
Patch1: i3lock-2.5-use-unix2_chkpwd.diff
Url:http://i3wm.org/i3lock/
@@ -57,6 +60,17 @@
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
+Group: System/GUI/Other
+Requires: ImageMagick
+Conflicts: xlockmore
+
+%description xlock-compat
+This package provides a script /usr/bin/xlock which calls i3lock to lock your
screen.
+This is handy for hard-coded screen-saver invocations e.g. in XFCE4, so you
can use
+i3lock instead of xlock with them.
+
%prep
%setup -q
%patch1 -p1
@@ -82,9 +96,17 @@
install -D -m0644 i3lock.1 "%{buildroot}%{_mandir}/man1/i3lock.1"
+install -D -m0644 %{SOURCE2}
%{buildroot}/usr/share/i3lock-xlock-compat/i3lock-icon.png
+install -m0755 %{SOURCE3} %{buildroot}/%{_bindir}/xlock
+
%clean
%{?buildroot:%__rm -rf "%{buildroot}"}
+%files xlock-compat
+%defattr(-,root,root)
+%{_bindir}/xlock
+/usr/share/i3lock-xlock-compat
+
%files
%defattr(-,root,root)
%doc CHANGELOG LICENSE README
++ xlock.sh ++
#!/bin/bash
#
XY=$(xdpyinfo |awk '/dimensions:/{print $2;exit}')
CACHEFILE=${HOME}/.cache/xlock-sim/lock-$XY.png
ICON=/usr/share/i3lock-xlock-compat/i3lock-icon.png
if ! test -e $CACHEFILE || test $ICON -nt $CACHEFILE; then
install -d ${HOME}/.cache/xlock-sim
convert $ICON -background none -gravity center -extent $XY $CACHEFILE
fi
# not totally black, so that we can see something is happening even if convert
failed
exec /usr/bin/i3lock -n -c 44 -i $CACHEFILE
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit i3lock for openSUSE:Factory
Hello community,
here is the log from the commit of package i3lock for openSUSE:Factory checked
in at 2014-02-18 20:24:37
Comparing /work/SRC/openSUSE:Factory/i3lock (Old)
and /work/SRC/openSUSE:Factory/.i3lock.new (New)
Package is "i3lock"
Changes:
--- /work/SRC/openSUSE:Factory/i3lock/i3lock.changes2013-04-29
13:57:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2014-02-18
20:24:38.0 +0100
@@ -1,0 +2,33 @@
+Mon Feb 17 08:01:39 UTC 2014 - seife+...@b1-systems.com
+
+- readd the pam config file, which is still needed by unix2_chkpwd
+ (I should read the man page more thoroughly next time)
+
+---
+Sat Feb 15 13:51:41 UTC 2014 - seife+...@b1-systems.com
+
+- add patch to use unix2_chkpwd instead of pam directly (which
+ would need to make i3lock sgid shadow to work for non-root)
+ * i3lock-2.5-use-unix2_chkpwd.diff
+
+---
+Sat Feb 15 10:45:46 UTC 2014 - seife+...@b1-systems.com
+
+- update to version 2.5:
+ * NEW DEPENDENCY: Use libxkbcommon for input handling
+This makes input handling much better for many edge cases.
+ * Bugfix: fix argument parsing on ARM (s/char/int/)
+ * Bugfix: free(reply) to avoid memory leak
+ * Bugfix: Use ev_loop_fork after fork, fixes forking on kqueue based OSes
+ * Bugfix: Fix centering the indicator in the no-xinerama case
+ * promote the "could not load image" message from debug to normal
+ * s/pam_message/pam_response/ (Thanks Tucos)
+ * remove support for NOLIBCAIRO, cairo-xcb is widespread by now
+ * Allow XKB_KEY_XF86ScreenSaver as synonym for enter
+This keysym is generated on convertible tablets by pressing a hardware
+lock/unlock button.
+ * Allow passwordless PAM conversations (e.g. fingerprint)
+ * Add ctrl+u password reset
+ * Set window name to i3lock
+
+---
Old:
i3lock-2.4.1.tar.bz2
New:
i3lock-2.5-use-unix2_chkpwd.diff
i3lock-2.5.tar.bz2
Other differences:
--
++ i3lock.spec ++
--- /var/tmp/diff_new_pack.0duHcT/_old 2014-02-18 20:24:39.0 +0100
+++ /var/tmp/diff_new_pack.0duHcT/_new 2014-02-18 20:24:39.0 +0100
@@ -2,7 +2,8 @@
#
# spec file for package i3lock
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany.
# Copyright (c) 2012 Pascal Bleser
#
# All modifications and additions to the file contributed by third parties
@@ -21,13 +22,15 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
Name: i3lock
-Version:2.4.1
+Version:2.5
Release:0
Summary:Screen Locker for the i3 Window Manager
License:BSD-3-Clause
Group: System/GUI/Other
Source: http://i3wm.org/i3lock/i3lock-%{version}.tar.bz2
Source1:i3lock.pam
+# PATCH-FEATURE-OPENSUSE i3lock-2.5-use-unix2_chkpwd.diff --
seife+...@b1-systems.com
+Patch1: i3lock-2.5-use-unix2_chkpwd.diff
Url:http://i3wm.org/i3lock/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cairo-devel
@@ -35,6 +38,10 @@
BuildRequires: glib2-devel
BuildRequires: glibc-devel
BuildRequires: libev-devel
+%if 0%{?suse_version} > 1310
+# /usr/lib64/libEGL.so.1 now requires libudev.so.1, might be a packaging error
+BuildRequires: libudev1
+%endif
BuildRequires: make
BuildRequires: pam-devel
BuildRequires: pkgconfig
@@ -43,6 +50,7 @@
BuildRequires: pam-modules
BuildRequires: pkgconfig(xcb-image)
BuildRequires: pkgconfig(xcb-keysyms)
+BuildRequires: pkgconfig(xkbcommon)
%description
i3lock is a simple screen locker like slock. After starting it, you will see a
@@ -51,22 +59,19 @@
%prep
%setup -q
+%patch1 -p1
%build
export CFLAGS="%{optflags}"
make %{?_smp_mflags} \
-%if 0%{?suse_version} < 1220
-NOLIBCAIRO=1 \
-%endif
+USE_UNIX2_CHKPWD=1 \
PREFIX="%{_prefix}" \
SYSCONFDIR="%{_sysconfdir}"
%install
export CFLAGS="%{optflags}"
make \
-%if 0%{?suse_version} < 1220
-NOLIBCAIRO=1 \
-%endif
+USE_UNIX2_CHKPWD=1 \
PREFIX="%{_prefix}" \
SYSCONFDIR="%{_sysconfdir}" \
DESTDIR="%{buildroot}" \
++ i3lock-2.5-use-unix2_chkpwd.diff ++
Author: Stefan Seyfried
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 @@ CFLAGS += -Wall
CPPFLAGS += -D_GNU_SOURCE
CFLAGS += $(shell
