April 2016 - openSUSE Commits - openSUSE Mailing Lists

commit filezilla for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package filezilla for openSUSE:Factory checked in at 2016-04-30 23:31:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/filezilla (Old) and /work/SRC/openSUSE:Factory/.filezilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "filezilla" Changes: -------- --- /work/SRC/openSUSE:Factory/filezilla/filezilla.changes 2016-01-23 01:16:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.filezilla.new/filezilla.changes 2016-04-30 23:31:19.000000000 +0200 @@ -1,0 +2,93 @@ +Wed Apr 27 12:03:27 UTC 2016 - joerg.lorenzen(a)ki.tng.de + +- update to 3.17.0 + - *nix: Removed a label on the filter dialog that doesn't apply + to *nix builds. + - Fix compilation if Nettle is installed in a custom location. + - Fix potential issues with destruction order when closing + FileZilla. +- update to 3.17.0-rc1 + + Recursivly queuing local files for upload now displays the + progress below the local file list. + + MSW: Use dynamic TCP send buffer sizes to improve upload + speeds on high-latency connections. + + SFTP: Use hardware-accelerated AES on x86_64 CPUs if available + by using the AES implementation from Nettle instead of PuTTY. + + Building FileZilla now depends on the Nettle library, + version 3.1 or later. + + Building FileZilla now depends on libfilezilla >= 0.5.0 + (https://lib.filezilla-project.org/). + - MSW: The installer now warns if it detects old versions of + FileZilla outside of the installation directory. + - Improve compatibility with directory listings where midnight + is represented as 24:00:00 of the prior day. + - SFTP: Failed downloads due to write failures, e.g. due to a + full disk, no longer show up as successful. + - SFTP: Fix transfer failures if multiple transfers try to list + the same directory. + - SFTP: Updated PuTTY components. + - FTP over TLS: Debug logs now contain additional information + about the TLS handshake. +- Fixed putty-no_DATE_and_TIME_.patch. + +------------------------------------------------------------------- +Thu Mar 17 12:28:59 UTC 2016 - ecsos(a)opensuse.org + +- update to 3.16.1 + - Updated PuTTY components + - Updated translations + - Official binaries now link against GnuTLS 3.4.10 + - Official binaries now link against SQLite 3.11.1 +- update to 3.16.0 + + Make notification bubble on queue completion configurable + though the queue's context menu + + Selected queue completion action is now remembered, + excluding the system shutdown/sleep actions. + + Added new servertype to the Site Manager for servers using + MS-DOS style paths with forward slashes as separators + + Building FileZilla now depends on libfilezilla >= 0.4.0 + (https://lib.filezilla-project.org/). + - Fixes for network configuration wizard leading to incorrect + test result + - Small fix for remembering queue completion actions + +------------------------------------------------------------------- +Sun Feb 28 09:49:47 UTC 2016 - ecsos(a)opensuse.org + +- update to 3.15.0.2 + - Restore focused item if changing directory listing sort order + - Fix restoring the column widths of the failed transfers tab in + the queue when starting FileZilla +- update to 3.15.0.1 + - Fix for search dialog not displaying the results from the last + visited directory of a search +- update to 3.15.0 + - no changes for *nix +- update to 3.15.0-rc1 + - Fix regression from 3.16.0-beta1 where extra data being + appended to some downloaded files + - Fix setting initial pane sizes when creating new tabs + - Updated SFTP components from PuTTY + - Official binaries now link against GnuTLS 3.4.8 + - Official binaries now link against SQLite 3.10.2 +- update to 3.15.0-beta1 + - Building FileZilla now depends on libfilezilla 0.3.0 + (https://lib.filezilla-project.org/). + - Added support for downloading and deleting multiple unrelated + directories from the search dialog + - *nix: Vastly speed up line-ending conversion when downloading + files using the ASCII data type + - Improved compatibility with broken servers omitting the + mandatory 1yz reply to transfer commands + - Fix handling of SFTP keyfiles with non-ASCII characters in + their paths + - Add missing directory comparison checkbox to new bookmark + dialog + - Updated built-in pugixml + +- Drop filezilla-3.14.1_wxstring.patch: now in upstream +- Drop filezilla-3.14.1_xml.patch: now in upstream +- add BuildRequires libfilezilla +- add Requires libpugixml1 boo#966384 + +------------------------------------------------------------------- Old: ---- FileZilla_3.14.1_src.tar.bz2 filezilla-3.14.1_wxstring.patch filezilla-3.14.1_xml.patch New: ---- FileZilla_3.17.0_src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filezilla.spec ++++++ --- /var/tmp/diff_new_pack.nsBion/_old 2016-04-30 23:31:21.000000000 +0200 +++ /var/tmp/diff_new_pack.nsBion/_new 2016-04-30 23:31:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: filezilla -Version: 3.14.1 +Version: 3.17.0 Release: 0 Summary: A GUI FTP and SFTP Client License: GPL-2.0+ @@ -28,10 +28,6 @@ Patch0: putty-no_DATE_and_TIME_.patch # PATCH-FIX-OPENSUSE filezilla-3.5.3-buildinfo-no-date.patch Patch1: filezilla-3.5.3-buildinfo-no-date.patch -# PATCH-FIX-UPSTREAM filezilla-3.14.1_wxstring.patch -Patch2: filezilla-3.14.1_wxstring.patch -# PATCH-FIX-UPSTREAM filezilla-3.14.1_xml.patch -Patch3: filezilla-3.14.1_xml.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes @@ -44,10 +40,14 @@ BuildRequires: xdg-utils BuildRequires: pkgconfig(cppunit) BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(gnutls) >= 3.1.12 +# filezilla-team use BuildRequires: pkgconfig(gnutls) >= 3.4.10 +BuildRequires: pkgconfig(gnutls) >= 3.2.15 BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(libfilezilla) >= 0.5.0 BuildRequires: pkgconfig(libidn) -BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(nettle) >= 3.1 +# filezilla-team use BuildRequires: pkgconfig(sqlite3) >= 3.11.1 +BuildRequires: pkgconfig(sqlite3) >= 3.7.8 Recommends: %{name}-lang %if 0%{?suse_version} <= 1320 # FileZilla requires C++14 support. @@ -55,6 +55,8 @@ %else BuildRequires: gcc-c++ %endif +# See boo#966384 filezilla fails to start +Requires: libpugixml1 >= 1.7 %description FileZilla is a modern and powerful FTP client. @@ -79,9 +81,7 @@ %prep %setup -q %patch0 -%patch1 -%patch2 -p1 -%patch3 -p1 +%patch1 -p1 # Fix invalid translation locales: cd locales @@ -89,7 +89,6 @@ bg_BG\ ca_ES@valencia\ cs_CZ\ - da_DK\ fa_IR\ fi_FI\ gl_ES\ @@ -99,19 +98,23 @@ ja_JP\ km_KH\ ko_KR\ + lo_LA\ lt_LT\ lv_LV\ mk_MK\ nb_NO\ nn_NO\ pl_PL\ + pt_BR\ pt_PT\ ro_RO\ - sl_SI\ sk_SK\ + sl_SI\ th_TH\ uk_UA\ - vi_VN; + vi_VN\ + zh_CN\ + zh_TW; do mv -iv $LOC.po ${LOC/_??}.po done ++++++ FileZilla_3.14.1_src.tar.bz2 -> FileZilla_3.17.0_src.tar.bz2 ++++++ ++++ 231034 lines of diff (skipped) ++++++ filezilla-3.5.3-buildinfo-no-date.patch ++++++ --- /var/tmp/diff_new_pack.nsBion/_old 2016-04-30 23:31:24.000000000 +0200 +++ /var/tmp/diff_new_pack.nsBion/_new 2016-04-30 23:31:24.000000000 +0200 @@ -1,7 +1,6 @@ -Index: src/interface/buildinfo.cpp -=================================================================== ---- src/interface/buildinfo.cpp.orig -+++ src/interface/buildinfo.cpp +diff -Pdpru filezilla-3.15.0.2.orig/src/interface/buildinfo.cpp filezilla-3.15.0.2/src/interface/buildinfo.cpp +--- filezilla-3.15.0.2.orig/src/interface/buildinfo.cpp 2016-02-05 09:54:46.000000000 +0100 ++++ filezilla-3.15.0.2/src/interface/buildinfo.cpp 2016-02-28 10:34:54.027652361 +0100 @@ -10,7 +10,7 @@ wxString CBuildInfo::GetBuildDateString( { // Get build date. Unfortunately it is in the ugly Mmm dd yyyy format. @@ -19,4 +18,4 @@ + return wxString(_T(""), wxConvLocal); } - CDateTime CBuildInfo::GetBuildDate() + fz::datetime CBuildInfo::GetBuildDate() ++++++ putty-no_DATE_and_TIME_.patch ++++++ --- /var/tmp/diff_new_pack.nsBion/_old 2016-04-30 23:31:24.000000000 +0200 +++ /var/tmp/diff_new_pack.nsBion/_new 2016-04-30 23:31:24.000000000 +0200 @@ -11,10 +11,10 @@ #else --char ver[] = "Unidentified build, " __DATE__ " " __TIME__; --char sshver[] = "PuTTY-Local: " __DATE__ " " __TIME__; -+char ver[] = "FileZilla"; -+char sshver[] = "PuTTY-FileZilla"; +-const char ver[] = "Unidentified build, " __DATE__ " " __TIME__; +-const char sshver[] = "PuTTY-Local: " __DATE__ " " __TIME__; ++const char ver[] = "FileZilla"; ++const char sshver[] = "PuTTY-FileZilla"; #endif

1 0

commit wrk for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package wrk for openSUSE:Factory checked in at 2016-04-30 23:31:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wrk (Old) and /work/SRC/openSUSE:Factory/.wrk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wrk" Changes: -------- --- /work/SRC/openSUSE:Factory/wrk/wrk.changes 2016-01-28 17:23:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wrk.new/wrk.changes 2016-04-30 23:31:18.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Apr 27 11:13:53 UTC 2016 - mpluskal(a)suse.com + +- Update to 4.0.2 + * Send hostname using TLS SNI. + * Add optional WITH_OPENSSL and WITH_LUAJIT to use system libs. + * Bundle OpenSSL 1.0.2. + * delay() can return milliseconds to delay sending next request. +- Use pretty source name +- Refresh wrk-3.1.2_distrofixes.patch + +------------------------------------------------------------------- Old: ---- 4.0.1.tar.gz New: ---- wrk-4.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wrk.spec ++++++ --- /var/tmp/diff_new_pack.Xey2b0/_old 2016-04-30 23:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.Xey2b0/_new 2016-04-30 23:31:19.000000000 +0200 @@ -17,16 +17,18 @@ Name: wrk -Version: 4.0.1 +Version: 4.0.2 Release: 0 Summary: Modern HTTP benchmarking tool License: Apache-2.0 Group: Productivity/Networking/Web/Utilities Url: https://github.com/wg/wrk -Source: https://github.com/wg/wrk/archive/%{version}.tar.gz +Source: https://github.com/wg/wrk/archive/%{version}.tar.gz#/%{name}-%{version}.tar… Patch0: wrk-3.1.2_distrofixes.patch -BuildRequires: openssl-devel BuildRequires: pkg-config +BuildRequires: pkgconfig +#BuildRequires: pkgconfig(luajit) +BuildRequires: pkgconfig(openssl) BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: aarch64 ppc ppc64 ppc64le @@ -37,15 +39,17 @@ An optional LuaJIT script can perform HTTP request generation, response processing, and custom reporting. Several example scripts are located in -scripts/ +scripts. %prep %setup -q %patch0 %build -make %{?_smp_mflags} -C deps/luajit/src BUILDMODE=static CCOPT="%{optflags} -fomit-frame-pointer" -make %{?_smp_mflags} OPTFLAGS="%{optflags}" +# current luajit in TW seems to be broken +# sed -i 's|luajit-2.0|luajit-5_1-2.0|g' src/* +# make %{?_smp_mflags} OPTFLAGS="%{optflags}" WITH_OPENSSL=/usr WITH_LUAJIT=/usr +make %{?_smp_mflags} OPTFLAGS="%{optflags}" WITH_OPENSSL=%{_prefix} %install install -D -m 0755 wrk %{buildroot}%{_bindir}/wrk ++++++ wrk-3.1.2_distrofixes.patch ++++++ --- /var/tmp/diff_new_pack.Xey2b0/_old 2016-04-30 23:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.Xey2b0/_new 2016-04-30 23:31:19.000000000 +0200 @@ -3,34 +3,18 @@ --- Makefile.orig +++ Makefile @@ -1,4 +1,4 @@ --CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT +-CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT +CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT $(OPTFLAGS) - LIBS := -lpthread -lm -lcrypto -lssl + LIBS := -lpthread -lm -lssl -lcrypto TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) -@@ -49,8 +49,7 @@ $(ODIR)/bytecode.o: src/wrk.lua - @$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@' +@@ -66,8 +66,7 @@ $(ODIR)/version.o: + @echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ - $(ODIR)/%.o : %.c - @echo CC $< - @$(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< - $(LDIR)/libluajit.a: - @echo Building LuaJIT... -Index: deps/luajit/src/Makefile -=================================================================== ---- deps/luajit/src/Makefile.orig -+++ deps/luajit/src/Makefile -@@ -559,9 +559,9 @@ endif - endif - endif + # Dependencies --Q= @ -+#Q= @ - E= @echo --#Q= -+Q= - #E= @: - - ##############################################################################

1 0

commit ndctl for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package ndctl for openSUSE:Factory checked in at 2016-04-30 23:31:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ndctl (Old) and /work/SRC/openSUSE:Factory/.ndctl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ndctl" Changes: -------- --- /work/SRC/openSUSE:Factory/ndctl/ndctl.changes 2016-04-05 10:43:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ndctl.new/ndctl.changes 2016-04-30 23:31:17.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Apr 27 11:47:49 UTC 2016 - jthumshirn(a)suse.com + +- NVDIMM is not defined for any CPU architecture other than x86_64 at the + moment. + +------------------------------------------------------------------- +Sun Apr 24 06:43:26 UTC 2016 - jengelh(a)inai.de + +- RPM group and description update + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ndctl.spec ++++++ --- /var/tmp/diff_new_pack.cmAjFN/_old 2016-04-30 23:31:18.000000000 +0200 +++ /var/tmp/diff_new_pack.cmAjFN/_new 2016-04-30 23:31:18.000000000 +0200 @@ -23,13 +23,14 @@ Name: ndctl Version: 52 -Release: 1%{?dist} +Release: 1 Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory) License: GPL-2.0 Group: Hardware/Other Url: https://github.com/pmem/ndctl # Snapshot tarball can be created using: ./make-git-shapshot.sh [gitcommit] Source0: %{name}-%{version}.tar.gz +ExclusiveArch: x86_64 BuildRequires: asciidoc BuildRequires: autoconf @@ -43,30 +44,35 @@ BuildRequires: pkgconfig(uuid) %description -Utility library for managing the "libnvdimm" subsystem. The "libnvdimm" -subsystem defines a kernel device model and control message interface for -platform NVDIMM resources like those defined by the ACPI 6.0 NFIT (NVDIMM -Firmware Interface Table). - +Utility library for managing the "libnvdimm" subsystem, used for +platform NVDIMM resources like those defined by the ACPI 6.0 NFIT +(NVDIMM Firmware Interface Table). %package -n %dname Summary: Development files for libndctl License: LGPL-2.1+ -Group: Development/Libraries/Other -Requires: %{lname}%{?_isa} = %{version}-%{release} +Group: Development/Libraries/C and C++ +Requires: %lname = %version-%release %description -n %dname +Utility library for managing the "libnvdimm" subsystem, which defines +a kernel device model and control message interface for platform +NVDIMM resources like those defined by the ACPI 6.0 NFIT (NVDIMM +Firmware Interface Table). + The %{name}-devel package contains libraries and header files for developing applications that use %{name}. - %package -n %lname Summary: Management library for "libnvdimm" subsystem devices (Non-volatile Memory) License: LGPL-2.1+ Group: System/Libraries %description -n %lname -Libraries for %{name}. +Utility library for managing the "libnvdimm" subsystem, which defines +a kernel device model and control message interface for platform +NVDIMM resources like those defined by the ACPI 6.0 NFIT (NVDIMM +Firmware Interface Table). %prep %setup @@ -79,7 +85,7 @@ %install %make_install -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +find "%buildroot" -type f -name "*.la" -delete %check make check

1 0

commit i3lock for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

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.changes 2015-05-15 07:43:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.i3lock.new/i3lock.changes 2016-04-30 23:31:16.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Apr 26 12:25:06 UTC 2016 - mimi.vx(a)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.000000000 +0200 +++ /var/tmp/diff_new_pack.0YQZ2A/_new 2016-04-30 23:31:17.000000000 +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 <pascal.bleser(a)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 @@ -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.000000000 +0200 +++ /var/tmp/diff_new_pack.0YQZ2A/_new 2016-04-30 23:31:17.000000000 +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 <xcb/dpms.h> #include <err.h> #include <assert.h> @@ -33,7 +33,7 @@ #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 @@ #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 @@ 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 @@ 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 @@ 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 @@ /* * 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 @@ /* * 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 @@ 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)); ++++++ i3lock-2.6.tar.bz2 -> i3lock-2.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.6/CHANGELOG new/i3lock-2.7/CHANGELOG --- old/i3lock-2.6/CHANGELOG 2014-07-18 20:25:02.000000000 +0200 +++ new/i3lock-2.7/CHANGELOG 2015-05-20 09:17:06.000000000 +0200 @@ -1,3 +1,19 @@ +2015-05-20 i3lock 2.7 + + • Die when the X11 connection breaks during runtime (Thanks Eduan) + • Implement logging the number of failed attempts (Thanks koebi) + • Ignore password validation is pam is in wrong state (Thanks Neodyblue) + • Get current user with getpwuid() instead of using $ENV{USER} (Thanks Martin) + • Add support for Compose and dead-keys with libxkbcommon. + Requires libxkbcommon ≥ 0.5.0 (Thanks Daniel) + • Format the source using clang-format. + • Refresh pam credentials on successful authentication (for Kerberos and the + like) (Thanks James) + • List pressed modifiers on failed authentication (Thanks Deiz, Alexandre) + • Only redraw the screen if the unlock indicator is actually used + (Thanks Ingo) + • Make pkg-config configurable for cross-compilation (Thanks Nikolay) + 2014-07-18 i3lock 2.6 • NEW DEPENDENCY: use libxkbcommon-x11 instead of libX11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.6/Makefile new/i3lock-2.7/Makefile --- old/i3lock-2.6/Makefile 2014-07-18 20:25:02.000000000 +0200 +++ new/i3lock-2.7/Makefile 2015-05-20 09:17:06.000000000 +0200 @@ -1,18 +1,19 @@ INSTALL=install PREFIX=/usr SYSCONFDIR=/etc +PKG_CONFIG=pkg-config # 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) -$(error "pkg-config was not found") +ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null 1>/dev/null || echo 1),1) +$(error "$(PKG_CONFIG) was not found") endif CFLAGS += -std=c99 CFLAGS += -pipe 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) LIBS += -lpam LIBS += -lev LIBS += -lm @@ -20,8 +21,8 @@ FILES:=$(wildcard *.c) FILES:=$(FILES:.c=.o) -VERSION:=2.6 -GIT_VERSION:="2.6 (2014-07-18)" +VERSION:=2.7 +GIT_VERSION:="2.7 (2015-05-20)" CPPFLAGS += -DVERSION=\"${GIT_VERSION}\" .PHONY: install clean uninstall @@ -47,7 +48,7 @@ [ ! -d i3lock-${VERSION} ] || rm -rf i3lock-${VERSION} [ ! -e i3lock-${VERSION}.tar.bz2 ] || rm i3lock-${VERSION}.tar.bz2 mkdir i3lock-${VERSION} - cp *.c *.h i3lock.1 i3lock.pam Makefile LICENSE README CHANGELOG i3lock-${VERSION} + cp *.c *.h i3lock.1 i3lock.pam Makefile LICENSE README.md CHANGELOG i3lock-${VERSION} sed -e 's/^GIT_VERSION:=$.*$/GIT_VERSION:=$(shell /bin/echo '${GIT_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=$.*$/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile tar cfj i3lock-${VERSION}.tar.bz2 i3lock-${VERSION} rm -rf i3lock-${VERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.6/README new/i3lock-2.7/README --- old/i3lock-2.6/README 2014-07-18 20:25:02.000000000 +0200 +++ new/i3lock-2.7/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -i3lock - improved screen locker -=============================== -i3lock is a simple screen locker like slock. After starting it, you will -see a white screen (you can configure the color/an image). You can return -to your screen by entering your password. - -Many little improvements have been made to i3lock over time: - -- i3lock forks, so you can combine it with an alias to suspend to RAM - (run "i3lock && echo mem > /sys/power/state" to get a locked screen - after waking up your computer from suspend to RAM) - -- You can specify either a background color or a PNG image which will be - displayed while your screen is locked. - -- You can specify whether i3lock should bell upon a wrong password. - -- i3lock uses PAM and therefore is compatible with LDAP etc. - -Requirements ------------- -- pkg-config -- libxcb -- libxcb-util -- libpam-dev -- libcairo-dev -- libxcb-xinerama -- libev -- libx11-dev -- libx11-xcb-dev -- libxkbfile-dev -- libxkbcommon >= 0.4.0 -- libxkbcommon-x11 >= 0.4.0 - -Running i3lock -------------- -Simply invoke the 'i3lock' command. To get out of it, enter your password and -press enter. - -Upstream --------- -Please submit patches to http://cr.i3wm.org/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.6/README.md new/i3lock-2.7/README.md --- old/i3lock-2.6/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/i3lock-2.7/README.md 2015-05-20 09:17:06.000000000 +0200 @@ -0,0 +1,42 @@ +i3lock - improved screen locker +=============================== +i3lock is a simple screen locker like slock. After starting it, you will +see a white screen (you can configure the color/an image). You can return +to your screen by entering your password. + +Many little improvements have been made to i3lock over time: + +- i3lock forks, so you can combine it with an alias to suspend to RAM + (run "i3lock && echo mem > /sys/power/state" to get a locked screen + after waking up your computer from suspend to RAM) + +- You can specify either a background color or a PNG image which will be + displayed while your screen is locked. + +- You can specify whether i3lock should bell upon a wrong password. + +- i3lock uses PAM and therefore is compatible with LDAP etc. + +Requirements +------------ +- pkg-config +- libxcb +- libxcb-util +- libpam-dev +- libcairo-dev +- libxcb-xinerama +- libev +- libx11-dev +- libx11-xcb-dev +- libxkbfile-dev +- libxkbcommon >= 0.5.0 +- libxkbcommon-x11 >= 0.5.0 + +Running i3lock +------------- +Simply invoke the 'i3lock' command. To get out of it, enter your password and +press enter. + +Upstream +-------- +Please submit pull requests to https://github.com/i3/i3lock diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.6/cursors.h new/i3lock-2.7/cursors.h --- old/i3lock-2.6/cursors.h 2014-07-18 20:25:02.000000000 +0200 +++ new/i3lock-2.7/cursors.h 2015-05-20 09:17:06.000000000 +0200 @@ -1,8 +1,8 @@ #ifndef _CURSORS_H #define _CURSORS_H -#define CURS_NONE 0 -#define CURS_WIN 1 +#define CURS_NONE 0 +#define CURS_WIN 1 #define CURS_DEFAULT 2 #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.6/i3lock.1 new/i3lock-2.7/i3lock.1 --- old/i3lock-2.6/i3lock.1 2014-07-18 20:25:02.000000000 +0200 +++ new/i3lock-2.7/i3lock.1 2015-05-20 09:17:06.000000000 +0200 @@ -29,6 +29,7 @@ .RB [\|\-u\|] .RB [\|\-e\|] .RB [\|\-I\|] +.RB [\|\-f\|] .SH DESCRIPTION .B i3lock @@ -115,6 +116,15 @@ put a laptop to sleep and bounce on resume or if you happen to wake up your computer with the enter key. +.TP +.B \-f, \-\-show-failed-attempts +Show the number of failed attempts, if any. + +.TP +.B \-\-debug +Enables debug logging. +Note, that this will log the password used for authentication to stdout. + .SH SEE ALSO .IR xautolock(1) \- use i3lock as your screen saver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.6/i3lock.c new/i3lock-2.7/i3lock.c --- old/i3lock-2.6/i3lock.c 2014-07-18 20:25:02.000000000 +0200 +++ new/i3lock-2.7/i3lock.c 2015-05-20 09:17:06.000000000 +0200 @@ -1,13 +1,15 @@ /* * vim:ts=4:sw=4:expandtab * - * © 2010-2013 Michael Stapelberg + * © 2010 Michael Stapelberg * * See LICENSE for licensing information * */ #include <stdio.h> #include <stdlib.h> +#include <pwd.h> +#include <sys/types.h> #include <string.h> #include <unistd.h> #include <stdbool.h> @@ -23,6 +25,7 @@ #include <ev.h> #include <sys/mman.h> #include <xkbcommon/xkbcommon.h> +#include <xkbcommon/xkbcommon-compose.h> #include <xkbcommon/xkbcommon-x11.h> #include <cairo.h> #include <cairo/cairo-xcb.h> @@ -56,6 +59,7 @@ bool debug_mode = false; static bool dpms = false; bool unlock_indicator = true; +char *modifier_string = NULL; static bool dont_fork = false; struct ev_loop *main_loop; static struct ev_timer *clear_pam_wrong_timeout; @@ -64,10 +68,14 @@ static struct ev_timer *discard_passwd_timeout; extern unlock_state_t unlock_state; extern pam_state_t pam_state; +int failed_attempts = 0; +bool show_failed_attempts = false; static struct xkb_state *xkb_state; static struct xkb_context *xkb_context; static struct xkb_keymap *xkb_keymap; +static struct xkb_compose_table *xkb_compose_table; +static struct xkb_compose_state *xkb_compose_state; static uint8_t xkb_base_event; static uint8_t xkb_base_error; @@ -77,7 +85,7 @@ bool skip_repeated_empty_password = false; /* isutf, u8_dec © 2005 Jeff Bezanson, public domain */ -#define isutf(c) (((c) & 0xC0) != 0x80) +#define isutf(c) (((c)&0xC0) != 0x80) /* * Decrements i to point to the previous unicode glyph @@ -134,6 +142,30 @@ } /* + * Loads the XKB compose table from the given locale. + * + */ +static bool load_compose_table(const char *locale) { + xkb_compose_table_unref(xkb_compose_table); + + if ((xkb_compose_table = xkb_compose_table_new_from_locale(xkb_context, locale, 0)) == NULL) { + fprintf(stderr, "[i3lock] xkb_compose_table_new_from_locale failed\n"); + return false; + } + + struct xkb_compose_state *new_compose_state = xkb_compose_state_new(xkb_compose_table, 0); + if (new_compose_state == NULL) { + fprintf(stderr, "[i3lock] xkb_compose_state_new failed\n"); + return false; + } + + xkb_compose_state_unref(xkb_compose_state); + xkb_compose_state = new_compose_state; + + return true; +} + +/* * Clears the memory which stored the password to be a bit safer against * cold-boot attacks. * @@ -150,7 +182,7 @@ vpassword[c] = c + (int)beep; } -ev_timer* start_timer(ev_timer *timer_obj, ev_tstamp timeout, ev_callback_t callback) { +ev_timer *start_timer(ev_timer *timer_obj, ev_tstamp timeout, ev_callback_t callback) { if (timer_obj) { ev_timer_stop(main_loop, timer_obj); ev_timer_set(timer_obj, timeout, 0.); @@ -167,7 +199,7 @@ return timer_obj; } -ev_timer* stop_timer(ev_timer *timer_obj) { +ev_timer *stop_timer(ev_timer *timer_obj) { if (timer_obj) { ev_timer_stop(main_loop, timer_obj); free(timer_obj); @@ -186,6 +218,12 @@ unlock_state = STATE_STARTED; redraw_screen(); + /* Clear modifier string. */ + if (modifier_string != NULL) { + free(modifier_string); + modifier_string = NULL; + } + /* Now free this timeout. */ STOP_TIMER(clear_pam_wrong_timeout); } @@ -202,10 +240,12 @@ /* Hide the unlock indicator after a bit if the password buffer is * empty. */ - START_TIMER(clear_indicator_timeout, 1.0, clear_indicator_cb); - unlock_state = STATE_BACKSPACE_ACTIVE; - redraw_screen(); - unlock_state = STATE_KEY_PRESSED; + if (unlock_indicator) { + START_TIMER(clear_indicator_timeout, 1.0, clear_indicator_cb); + unlock_state = STATE_BACKSPACE_ACTIVE; + redraw_screen(); + unlock_state = STATE_KEY_PRESSED; + } } static void turn_off_monitors_cb(EV_P_ ev_timer *w, int revents) { @@ -232,15 +272,60 @@ /* Turn the screen on, as it may have been turned off * on release of the 'enter' key. */ turn_monitors_on(); + + /* PAM credentials should be refreshed, this will for example update any kerberos tickets. + * Related to credentials pam_end() needs to be called to cleanup any temporary + * credentials like kerberos /tmp/krb5cc_pam_* files which may of been left behind if the + * refresh of the credentials failed. */ + pam_setcred(pam_handle, PAM_REFRESH_CRED); + pam_end(pam_handle, PAM_SUCCESS); + exit(0); } if (debug_mode) fprintf(stderr, "Authentication failure\n"); + /* Get state of Caps and Num lock modifiers, to be displayed in + * STATE_PAM_WRONG state */ + xkb_mod_index_t idx, num_mods; + const char *mod_name; + + num_mods = xkb_keymap_num_mods(xkb_keymap); + + for (idx = 0; idx < num_mods; idx++) { + if (!xkb_state_mod_index_is_active(xkb_state, idx, XKB_STATE_MODS_EFFECTIVE)) + continue; + + mod_name = xkb_keymap_mod_get_name(xkb_keymap, idx); + if (mod_name == NULL) + continue; + + /* Replace certain xkb names with nicer, human-readable ones. */ + if (strcmp(mod_name, XKB_MOD_NAME_CAPS) == 0) + mod_name = "Caps Lock"; + else if (strcmp(mod_name, XKB_MOD_NAME_ALT) == 0) + mod_name = "Alt"; + else if (strcmp(mod_name, XKB_MOD_NAME_NUM) == 0) + mod_name = "Num Lock"; + else if (strcmp(mod_name, XKB_MOD_NAME_LOGO) == 0) + mod_name = "Win"; + + char *tmp; + if (modifier_string == NULL) { + if (asprintf(&tmp, "%s", mod_name) != -1) + modifier_string = tmp; + } else if (asprintf(&tmp, "%s, %s", modifier_string, mod_name) != -1) { + free(modifier_string); + modifier_string = tmp; + } + } + pam_state = STATE_PAM_WRONG; + failed_attempts += 1; clear_input(); - redraw_screen(); + if (unlock_indicator) + redraw_screen(); /* Clear this state after 2 seconds (unless the user enters another * password during that time). */ @@ -284,60 +369,86 @@ char buffer[128]; int n; bool ctrl; + bool composed = false; ksym = xkb_state_key_get_one_sym(xkb_state, event->detail); - ctrl = xkb_state_mod_name_is_active(xkb_state, "Control", XKB_STATE_MODS_DEPRESSED); + ctrl = xkb_state_mod_name_is_active(xkb_state, XKB_MOD_NAME_CTRL, XKB_STATE_MODS_DEPRESSED); /* The buffer will be null-terminated, so n >= 2 for 1 actual character. */ memset(buffer, '\0', sizeof(buffer)); - n = xkb_keysym_to_utf8(ksym, buffer, sizeof(buffer)); - switch (ksym) { - case XKB_KEY_Return: - case XKB_KEY_KP_Enter: - case XKB_KEY_XF86ScreenSaver: - if (skip_without_validation()) { - clear_input(); - return; + if (xkb_compose_state && xkb_compose_state_feed(xkb_compose_state, ksym) == XKB_COMPOSE_FEED_ACCEPTED) { + switch (xkb_compose_state_get_status(xkb_compose_state)) { + case XKB_COMPOSE_NOTHING: + break; + case XKB_COMPOSE_COMPOSING: + return; + case XKB_COMPOSE_COMPOSED: + /* xkb_compose_state_get_utf8 doesn't include the terminating byte in the return value + * as xkb_keysym_to_utf8 does. Adding one makes the variable n consistent. */ + n = xkb_compose_state_get_utf8(xkb_compose_state, buffer, sizeof(buffer)) + 1; + ksym = xkb_compose_state_get_one_sym(xkb_compose_state); + composed = true; + break; + case XKB_COMPOSE_CANCELLED: + xkb_compose_state_reset(xkb_compose_state); + return; } - password[input_position] = '\0'; - unlock_state = STATE_KEY_PRESSED; - redraw_screen(); - input_done(); - skip_repeated_empty_password = true; - return; - default: - skip_repeated_empty_password = false; + } + + if (!composed) { + n = xkb_keysym_to_utf8(ksym, buffer, sizeof(buffer)); } switch (ksym) { - case XKB_KEY_u: - if (ctrl) { - DEBUG("C-u pressed\n"); - clear_input(); + case XKB_KEY_Return: + case XKB_KEY_KP_Enter: + case XKB_KEY_XF86ScreenSaver: + if (pam_state == STATE_PAM_WRONG) + return; + + if (skip_without_validation()) { + clear_input(); + return; + } + password[input_position] = '\0'; + unlock_state = STATE_KEY_PRESSED; + redraw_screen(); + input_done(); + skip_repeated_empty_password = true; return; - } - break; + default: + skip_repeated_empty_password = false; + } - case XKB_KEY_Escape: - clear_input(); - return; + switch (ksym) { + case XKB_KEY_u: + if (ctrl) { + DEBUG("C-u pressed\n"); + clear_input(); + return; + } + break; - case XKB_KEY_BackSpace: - if (input_position == 0) + case XKB_KEY_Escape: + clear_input(); return; - /* decrement input_position to point to the previous glyph */ - u8_dec(password, &input_position); - password[input_position] = '\0'; + case XKB_KEY_BackSpace: + if (input_position == 0) + return; + + /* decrement input_position to point to the previous glyph */ + u8_dec(password, &input_position); + password[input_position] = '\0'; - /* Hide the unlock indicator after a bit if the password buffer is + /* Hide the unlock indicator after a bit if the password buffer is * empty. */ - START_TIMER(clear_indicator_timeout, 1.0, clear_indicator_cb); - unlock_state = STATE_BACKSPACE_ACTIVE; - redraw_screen(); - unlock_state = STATE_KEY_PRESSED; - return; + START_TIMER(clear_indicator_timeout, 1.0, clear_indicator_cb); + unlock_state = STATE_BACKSPACE_ACTIVE; + redraw_screen(); + unlock_state = STATE_KEY_PRESSED; + return; } if ((input_position + 8) >= sizeof(password)) @@ -358,17 +469,20 @@ return; /* store it in the password array as UTF-8 */ - memcpy(password+input_position, buffer, n-1); - input_position += n-1; + memcpy(password + input_position, buffer, n - 1); + input_position += n - 1; DEBUG("current password = %.*s\n", input_position, password); - unlock_state = STATE_KEY_ACTIVE; - redraw_screen(); - unlock_state = STATE_KEY_PRESSED; + if (unlock_indicator) { + unlock_state = STATE_KEY_ACTIVE; + redraw_screen(); + unlock_state = STATE_KEY_PRESSED; + + struct ev_timer *timeout = NULL; + START_TIMER(timeout, TSTAMP_N_SECS(0.25), redraw_timeout); + STOP_TIMER(clear_indicator_timeout); + } - struct ev_timer *timeout = NULL; - START_TIMER(timeout, TSTAMP_N_SECS(0.25), redraw_timeout); - STOP_TIMER(clear_indicator_timeout); START_TIMER(discard_passwd_timeout, TSTAMP_N_MINS(3), discard_passwd_cb); } @@ -382,9 +496,9 @@ * */ static void handle_visibility_notify(xcb_connection_t *conn, - xcb_visibility_notify_event_t *event) { + xcb_visibility_notify_event_t *event) { if (event->state != XCB_VISIBILITY_UNOBSCURED) { - uint32_t values[] = { XCB_STACK_MODE_ABOVE }; + uint32_t values[] = {XCB_STACK_MODE_ABOVE}; xcb_configure_window(conn, event->window, XCB_CONFIG_WINDOW_STACK_MODE, values); xcb_flush(conn); } @@ -409,7 +523,7 @@ xcb_xkb_new_keyboard_notify_event_t new_keyboard_notify; xcb_xkb_map_notify_event_t map_notify; xcb_xkb_state_notify_event_t state_notify; - } *event = (union xkb_event*)gevent; + } *event = (union xkb_event *)gevent; DEBUG("process_xkb_event for device %d\n", event->any.deviceID); @@ -482,8 +596,7 @@ * */ static int conv_callback(int num_msg, const struct pam_message **msg, - struct pam_response **resp, void *appdata_ptr) -{ + struct pam_response **resp, void *appdata_ptr) { if (num_msg == 0) return 1; @@ -534,9 +647,12 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) { xcb_generic_event_t *event; + if (xcb_connection_has_error(conn)) + errx(EXIT_FAILURE, "X11 connection broke, did your server terminate?\n"); + while ((event = xcb_poll_for_event(conn)) != NULL) { if (event->response_type == 0) { - xcb_generic_error_t *error = (xcb_generic_error_t*)event; + xcb_generic_error_t *error = (xcb_generic_error_t *)event; if (debug_mode) fprintf(stderr, "X11 Error received! sequence 0x%x, error_code = %d\n", error->sequence, error->error_code); @@ -549,7 +665,7 @@ switch (type) { case XCB_KEY_PRESS: - handle_key_press((xcb_key_press_event_t*)event); + handle_key_press((xcb_key_press_event_t *)event); break; case XCB_KEY_RELEASE: @@ -562,7 +678,7 @@ break; case XCB_VISIBILITY_NOTIFY: - handle_visibility_notify(conn, (xcb_visibility_notify_event_t*)event); + handle_visibility_notify(conn, (xcb_visibility_notify_event_t *)event); break; case XCB_MAP_NOTIFY: @@ -609,18 +725,17 @@ /* We need to know about the window being obscured or getting destroyed. */ xcb_change_window_attributes(conn, window, XCB_CW_EVENT_MASK, - (uint32_t[]){ - XCB_EVENT_MASK_VISIBILITY_CHANGE | - XCB_EVENT_MASK_STRUCTURE_NOTIFY - }); + (uint32_t[]){ + XCB_EVENT_MASK_VISIBILITY_CHANGE | + XCB_EVENT_MASK_STRUCTURE_NOTIFY}); xcb_flush(conn); DEBUG("Watching window 0x%08x\n", window); while ((event = xcb_wait_for_event(conn)) != NULL) { if (event->response_type == 0) { - xcb_generic_error_t *error = (xcb_generic_error_t*)event; + xcb_generic_error_t *error = (xcb_generic_error_t *)event; DEBUG("X11 Error received! sequence 0x%x, error_code = %d\n", - error->sequence, error->error_code); + error->sequence, error->error_code); free(event); continue; } @@ -629,16 +744,16 @@ DEBUG("Read event of type %d\n", type); switch (type) { case XCB_VISIBILITY_NOTIFY: - handle_visibility_notify(conn, (xcb_visibility_notify_event_t*)event); + handle_visibility_notify(conn, (xcb_visibility_notify_event_t *)event); break; case XCB_UNMAP_NOTIFY: - DEBUG("UnmapNotify for 0x%08x\n", (((xcb_unmap_notify_event_t*)event)->window)); - if (((xcb_unmap_notify_event_t*)event)->window == window) + DEBUG("UnmapNotify for 0x%08x\n", (((xcb_unmap_notify_event_t *)event)->window)); + if (((xcb_unmap_notify_event_t *)event)->window == window) exit(EXIT_SUCCESS); break; case XCB_DESTROY_NOTIFY: - DEBUG("DestroyNotify for 0x%08x\n", (((xcb_destroy_notify_event_t*)event)->window)); - if (((xcb_destroy_notify_event_t*)event)->window == window) + DEBUG("DestroyNotify for 0x%08x\n", (((xcb_destroy_notify_event_t *)event)->window)); + if (((xcb_destroy_notify_event_t *)event)->window == window) exit(EXIT_SUCCESS); break; default: @@ -650,6 +765,7 @@ } int main(int argc, char *argv[]) { + struct passwd *pw; char *username; char *image_path = NULL; int ret; @@ -663,7 +779,7 @@ {"beep", no_argument, NULL, 'b'}, {"dpms", no_argument, NULL, 'd'}, {"color", required_argument, NULL, 'c'}, - {"pointer", required_argument, NULL , 'p'}, + {"pointer", required_argument, NULL, 'p'}, {"debug", no_argument, NULL, 0}, {"help", no_argument, NULL, 'h'}, {"no-unlock-indicator", no_argument, NULL, 'u'}, @@ -671,74 +787,78 @@ {"tiling", no_argument, NULL, 't'}, {"ignore-empty-password", no_argument, NULL, 'e'}, {"inactivity-timeout", required_argument, NULL, 'I'}, - {NULL, no_argument, NULL, 0} - }; + {"show-failed-attempts", no_argument, NULL, 'f'}, + {NULL, no_argument, NULL, 0}}; - if ((username = getenv("USER")) == NULL) - errx(EXIT_FAILURE, "USER environment variable not set, please set it.\n"); + if ((pw = getpwuid(getuid())) == NULL) + err(EXIT_FAILURE, "getpwuid() failed"); + if ((username = pw->pw_name) == NULL) + errx(EXIT_FAILURE, "pw->pw_name is NULL.\n"); - char *optstring = "hvnbdc:p:ui:teI:"; + char *optstring = "hvnbdc:p:ui:teI:f"; while ((o = getopt_long(argc, argv, optstring, longopts, &optind)) != -1) { switch (o) { - case 'v': - errx(EXIT_SUCCESS, "version " VERSION " © 2010-2012 Michael Stapelberg"); - case 'n': - dont_fork = true; - break; - case 'b': - beep = true; - break; - case 'd': - dpms = true; - break; - case 'I': { - int time = 0; - if (sscanf(optarg, "%d", &time) != 1 || time < 0) - errx(EXIT_FAILURE, "invalid timeout, it must be a positive integer\n"); - inactivity_timeout = time; - break; - } - case 'c': { - char *arg = optarg; + case 'v': + errx(EXIT_SUCCESS, "version " VERSION " © 2010 Michael Stapelberg"); + case 'n': + dont_fork = true; + break; + case 'b': + beep = true; + break; + case 'd': + dpms = true; + break; + case 'I': { + int time = 0; + if (sscanf(optarg, "%d", &time) != 1 || time < 0) + errx(EXIT_FAILURE, "invalid timeout, it must be a positive integer\n"); + inactivity_timeout = time; + break; + } + case 'c': { + char *arg = optarg; - /* Skip # if present */ - if (arg[0] == '#') - arg++; + /* Skip # if present */ + if (arg[0] == '#') + arg++; - if (strlen(arg) != 6 || sscanf(arg, "%06[0-9a-fA-F]", color) != 1) - errx(EXIT_FAILURE, "color is invalid, it must be given in 3-byte hexadecimal format: rrggbb\n"); + if (strlen(arg) != 6 || sscanf(arg, "%06[0-9a-fA-F]", color) != 1) + errx(EXIT_FAILURE, "color is invalid, it must be given in 3-byte hexadecimal format: rrggbb\n"); - break; - } - case 'u': - unlock_indicator = false; - break; - case 'i': - image_path = strdup(optarg); - break; - case 't': - tile = true; - break; - case 'p': - if (!strcmp(optarg, "win")) { - curs_choice = CURS_WIN; - } else if (!strcmp(optarg, "default")) { - curs_choice = CURS_DEFAULT; - } else { - errx(EXIT_FAILURE, "i3lock: Invalid pointer type given. Expected one of \"win\" or \"default\".\n"); + break; } - break; - case 'e': - ignore_empty_password = true; - break; - case 0: - if (strcmp(longopts[optind].name, "debug") == 0) - debug_mode = true; - break; - default: - errx(EXIT_FAILURE, "Syntax: i3lock [-v] [-n] [-b] [-d] [-c color] [-u] [-p win|default]" - " [-i image.png] [-t] [-e] [-I]" - ); + case 'u': + unlock_indicator = false; + break; + case 'i': + image_path = strdup(optarg); + break; + case 't': + tile = true; + break; + case 'p': + if (!strcmp(optarg, "win")) { + curs_choice = CURS_WIN; + } else if (!strcmp(optarg, "default")) { + curs_choice = CURS_DEFAULT; + } else { + errx(EXIT_FAILURE, "i3lock: Invalid pointer type given. Expected one of \"win\" or \"default\".\n"); + } + break; + case 'e': + ignore_empty_password = true; + break; + case 0: + if (strcmp(longopts[optind].name, "debug") == 0) + debug_mode = true; + break; + case 'f': + show_failed_attempts = true; + break; + default: + errx(EXIT_FAILURE, "Syntax: i3lock [-v] [-n] [-b] [-d] [-c color] [-u] [-p win|default]" + " [-i image.png] [-t] [-e] [-I] [-f]"); } } @@ -769,13 +889,13 @@ errx(EXIT_FAILURE, "Could not connect to X11, maybe you need to set DISPLAY?"); if (xkb_x11_setup_xkb_extension(conn, - XKB_X11_MIN_MAJOR_XKB_VERSION, - XKB_X11_MIN_MINOR_XKB_VERSION, - 0, - NULL, - NULL, - &xkb_base_event, - &xkb_base_error) != 1) + XKB_X11_MIN_MAJOR_XKB_VERSION, + XKB_X11_MIN_MINOR_XKB_VERSION, + 0, + NULL, + NULL, + &xkb_base_event, + &xkb_base_error) != 1) errx(EXIT_FAILURE, "Could not setup XKB extension."); static const xcb_xkb_map_part_t required_map_parts = @@ -806,6 +926,19 @@ if (!load_keymap()) errx(EXIT_FAILURE, "Could not load keymap"); + const char *locale = getenv("LC_ALL"); + if (!locale) + locale = getenv("LC_CTYPE"); + if (!locale) + locale = getenv("LANG"); + if (!locale) { + if (debug_mode) + fprintf(stderr, "Can't detect your locale, fallback to C\n"); + locale = "C"; + } + + load_compose_table(locale); + xinerama_init(); xinerama_query_screens(); @@ -829,7 +962,7 @@ last_resolution[1] = screen->height_in_pixels; xcb_change_window_attributes(conn, screen->root, XCB_CW_EVENT_MASK, - (uint32_t[]){ XCB_EVENT_MASK_STRUCTURE_NOTIFY }); + (uint32_t[]){XCB_EVENT_MASK_STRUCTURE_NOTIFY}); if (image_path) { /* Create a pixmap to render on, fill it with the background color */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.6/i3lock.h new/i3lock-2.7/i3lock.h --- old/i3lock-2.6/i3lock.h 2014-07-18 20:25:02.000000000 +0200 +++ new/i3lock-2.7/i3lock.h 2015-05-20 09:17:06.000000000 +0200 @@ -5,9 +5,10 @@ * This is important because xautolock (for example) closes stdout/stderr by * default, so just printing something to stdout will lead to the data ending * up on the X11 socket (!). */ -#define DEBUG(fmt, ...) do { \ - if (debug_mode) \ - printf("[i3lock-debug] " fmt, ##__VA_ARGS__); \ -} while (0) +#define DEBUG(fmt, ...) \ + do { \ + if (debug_mode) \ + printf("[i3lock-debug] " fmt, ##__VA_ARGS__); \ + } while (0) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.6/unlock_indicator.c new/i3lock-2.7/unlock_indicator.c --- old/i3lock-2.6/unlock_indicator.c 2014-07-18 20:25:02.000000000 +0200 +++ new/i3lock-2.7/unlock_indicator.c 2015-05-20 09:17:06.000000000 +0200 @@ -1,7 +1,7 @@ /* * vim:ts=4:sw=4:expandtab * - * © 2010-2014 Michael Stapelberg + * © 2010 Michael Stapelberg * * See LICENSE for licensing information * @@ -9,6 +9,7 @@ #include <stdbool.h> #include <stdlib.h> #include <stdio.h> +#include <string.h> #include <math.h> #include <xcb/xcb.h> #include <ev.h> @@ -44,6 +45,9 @@ /* Whether the unlock indicator is enabled (defaults to true). */ extern bool unlock_indicator; +/* List of pressed modifiers, or NULL if none are pressed. */ +extern char *modifier_string; + /* A Cairo surface containing the specified image (-i), if any. */ extern cairo_surface_t *img; @@ -52,6 +56,11 @@ /* The background color to use (in hex). */ extern char color[7]; +/* Whether the failed attempts should be displayed. */ +extern bool show_failed_attempts; +/* Number of failed unlock attempts. */ +extern int failed_attempts; + /******************************************************************************* * Variables defined in xcb.c. ******************************************************************************/ @@ -146,10 +155,10 @@ * (currently verifying, wrong password, or default) */ switch (pam_state) { case STATE_PAM_VERIFY: - cairo_set_source_rgba(ctx, 0, 114.0/255, 255.0/255, 0.75); + cairo_set_source_rgba(ctx, 0, 114.0 / 255, 255.0 / 255, 0.75); break; case STATE_PAM_WRONG: - cairo_set_source_rgba(ctx, 250.0/255, 0, 0, 0.75); + cairo_set_source_rgba(ctx, 250.0 / 255, 0, 0, 0.75); break; default: cairo_set_source_rgba(ctx, 0, 0, 0, 0.75); @@ -159,13 +168,13 @@ switch (pam_state) { case STATE_PAM_VERIFY: - cairo_set_source_rgb(ctx, 51.0/255, 0, 250.0/255); + cairo_set_source_rgb(ctx, 51.0 / 255, 0, 250.0 / 255); break; case STATE_PAM_WRONG: - cairo_set_source_rgb(ctx, 125.0/255, 51.0/255, 0); + cairo_set_source_rgb(ctx, 125.0 / 255, 51.0 / 255, 0); break; case STATE_PAM_IDLE: - cairo_set_source_rgb(ctx, 51.0/255, 125.0/255, 0); + cairo_set_source_rgb(ctx, 51.0 / 255, 125.0 / 255, 0); break; } cairo_stroke(ctx); @@ -185,6 +194,11 @@ /* Display a (centered) text of the current PAM state. */ char *text = NULL; + /* We don't want to show more than a 3-digit number. */ + char buf[4]; + + cairo_set_source_rgb(ctx, 0, 0, 0); + cairo_set_font_size(ctx, 28.0); switch (pam_state) { case STATE_PAM_VERIFY: text = "verifying…"; @@ -193,6 +207,16 @@ text = "wrong!"; break; default: + if (show_failed_attempts && failed_attempts > 0) { + if (failed_attempts > 999) { + text = "> 999"; + } else { + snprintf(buf, sizeof(buf), "%d", failed_attempts); + text = buf; + } + cairo_set_source_rgb(ctx, 1, 0, 0); + cairo_set_font_size(ctx, 32.0); + } break; } @@ -200,9 +224,6 @@ cairo_text_extents_t extents; double x, y; - cairo_set_source_rgb(ctx, 0, 0, 0); - cairo_set_font_size(ctx, 28.0); - cairo_text_extents(ctx, text, &extents); x = BUTTON_CENTER - ((extents.width / 2) + extents.x_bearing); y = BUTTON_CENTER - ((extents.height / 2) + extents.y_bearing); @@ -212,6 +233,21 @@ cairo_close_path(ctx); } + if (pam_state == STATE_PAM_WRONG && (modifier_string != NULL)) { + cairo_text_extents_t extents; + double x, y; + + cairo_set_font_size(ctx, 14.0); + + cairo_text_extents(ctx, modifier_string, &extents); + x = BUTTON_CENTER - ((extents.width / 2) + extents.x_bearing); + y = BUTTON_CENTER - ((extents.height / 2) + extents.y_bearing) + 28.0; + + cairo_move_to(ctx, x, y); + cairo_show_text(ctx, modifier_string); + cairo_close_path(ctx); + } + /* After the user pressed any valid key or the backspace key, we * highlight a random part of the unlock indicator to confirm this * keypress. */ @@ -227,10 +263,10 @@ highlight_start + (M_PI / 3.0)); if (unlock_state == STATE_KEY_ACTIVE) { /* For normal keys, we use a lighter green. */ - cairo_set_source_rgb(ctx, 51.0/255, 219.0/255, 0); + cairo_set_source_rgb(ctx, 51.0 / 255, 219.0 / 255, 0); } else { /* For backspace, we use red. */ - cairo_set_source_rgb(ctx, 219.0/255, 51.0/255, 0); + cairo_set_source_rgb(ctx, 219.0 / 255, 51.0 / 255, 0); } cairo_stroke(ctx); @@ -287,7 +323,7 @@ */ void redraw_screen(void) { xcb_pixmap_t bg_pixmap = draw_image(last_resolution); - xcb_change_window_attributes(conn, win, XCB_CW_BACK_PIXMAP, (uint32_t[1]){ bg_pixmap }); + xcb_change_window_attributes(conn, win, XCB_CW_BACK_PIXMAP, (uint32_t[1]){bg_pixmap}); /* XXX: Possible optimization: Only update the area in the middle of the * screen instead of the whole screen. */ xcb_clear_area(conn, 0, win, 0, 0, last_resolution[0], last_resolution[1]); @@ -303,6 +339,7 @@ void clear_indicator(void) { if (input_position == 0) { unlock_state = STATE_STARTED; - } else unlock_state = STATE_KEY_PRESSED; + } else + unlock_state = STATE_KEY_PRESSED; redraw_screen(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.6/unlock_indicator.h new/i3lock-2.7/unlock_indicator.h --- old/i3lock-2.6/unlock_indicator.h 2014-07-18 20:25:02.000000000 +0200 +++ new/i3lock-2.7/unlock_indicator.h 2015-05-20 09:17:06.000000000 +0200 @@ -2,18 +2,18 @@ #define _UNLOCK_INDICATOR_H typedef enum { - STATE_STARTED = 0, /* default state */ - STATE_KEY_PRESSED = 1, /* key was pressed, show unlock indicator */ - STATE_KEY_ACTIVE = 2, /* a key was pressed recently, highlight part + STATE_STARTED = 0, /* default state */ + STATE_KEY_PRESSED = 1, /* key was pressed, show unlock indicator */ + STATE_KEY_ACTIVE = 2, /* a key was pressed recently, highlight part of the unlock indicator. */ - STATE_BACKSPACE_ACTIVE = 3 /* backspace was pressed recently, highlight + STATE_BACKSPACE_ACTIVE = 3 /* backspace was pressed recently, highlight part of the unlock indicator in red. */ } unlock_state_t; typedef enum { - STATE_PAM_IDLE = 0, /* no PAM interaction at the moment */ - STATE_PAM_VERIFY = 1, /* currently verifying the password via PAM */ - STATE_PAM_WRONG = 2 /* the password was wrong */ + STATE_PAM_IDLE = 0, /* no PAM interaction at the moment */ + STATE_PAM_VERIFY = 1, /* currently verifying the password via PAM */ + STATE_PAM_WRONG = 2 /* the password was wrong */ } pam_state_t; xcb_pixmap_t draw_image(uint32_t* resolution); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.6/xcb.c new/i3lock-2.7/xcb.c --- old/i3lock-2.6/xcb.c 2014-07-18 20:25:02.000000000 +0200 +++ new/i3lock-2.7/xcb.c 2015-05-20 09:17:06.000000000 +0200 @@ -1,7 +1,7 @@ /* * vim:ts=4:sw=4:expandtab * - * © 2010-2012 Michael Stapelberg + * © 2010 Michael Stapelberg * * xcb.c: contains all functions which use XCB to talk to X11. Mostly wrappers * around the rather complicated/ugly parts of the XCB API. @@ -28,25 +28,25 @@ #define curs_invisible_height 8 static unsigned char curs_invisible_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; #define curs_windows_width 11 #define curs_windows_height 19 static unsigned char curs_windows_bits[] = { - 0xfe, 0x07, 0xfc, 0x07, 0xfa, 0x07, 0xf6, 0x07, 0xee, 0x07, 0xde, 0x07, - 0xbe, 0x07, 0x7e, 0x07, 0xfe, 0x06, 0xfe, 0x05, 0x3e, 0x00, 0xb6, 0x07, - 0x6a, 0x07, 0x6c, 0x07, 0xde, 0x06, 0xdf, 0x06, 0xbf, 0x05, 0xbf, 0x05, - 0x7f, 0x06 }; + 0xfe, 0x07, 0xfc, 0x07, 0xfa, 0x07, 0xf6, 0x07, 0xee, 0x07, 0xde, 0x07, + 0xbe, 0x07, 0x7e, 0x07, 0xfe, 0x06, 0xfe, 0x05, 0x3e, 0x00, 0xb6, 0x07, + 0x6a, 0x07, 0x6c, 0x07, 0xde, 0x06, 0xdf, 0x06, 0xbf, 0x05, 0xbf, 0x05, + 0x7f, 0x06}; #define mask_windows_width 11 #define mask_windows_height 19 static unsigned char mask_windows_bits[] = { - 0x01, 0x00, 0x03, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x1f, 0x00, 0x3f, 0x00, - 0x7f, 0x00, 0xff, 0x00, 0xff, 0x01, 0xff, 0x03, 0xff, 0x07, 0x7f, 0x00, - 0xf7, 0x00, 0xf3, 0x00, 0xe1, 0x01, 0xe0, 0x01, 0xc0, 0x03, 0xc0, 0x03, - 0x80, 0x01 }; + 0x01, 0x00, 0x03, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x1f, 0x00, 0x3f, 0x00, + 0x7f, 0x00, 0xff, 0x00, 0xff, 0x01, 0xff, 0x03, 0xff, 0x07, 0x7f, 0x00, + 0xf7, 0x00, 0xf3, 0x00, 0xe1, 0x01, 0xe0, 0x01, 0xc0, 0x03, 0xc0, 0x03, + 0x80, 0x01}; static uint32_t get_colorpixel(char *hex) { char strgroups[3][3] = {{hex[0], hex[1], '\0'}, @@ -67,7 +67,6 @@ for (depth_iter = xcb_screen_allowed_depths_iterator(screen); depth_iter.rem; xcb_depth_next(&depth_iter)) { - for (visual_iter = xcb_depth_visuals_iterator(depth_iter.data); visual_iter.rem; xcb_visualtype_next(&visual_iter)) { @@ -82,7 +81,7 @@ return NULL; } -xcb_pixmap_t create_bg_pixmap(xcb_connection_t *conn, xcb_screen_t *scr, u_int32_t* resolution, char *color) { +xcb_pixmap_t create_bg_pixmap(xcb_connection_t *conn, xcb_screen_t *scr, u_int32_t *resolution, char *color) { xcb_pixmap_t bg_pixmap = xcb_generate_id(conn); xcb_create_pixmap(conn, scr->root_depth, bg_pixmap, scr->root, resolution[0], resolution[1]); @@ -90,9 +89,9 @@ /* Generate a Graphics Context and fill the pixmap with background color * (for images that are smaller than your screen) */ xcb_gcontext_t gc = xcb_generate_id(conn); - uint32_t values[] = { get_colorpixel(color) }; + uint32_t values[] = {get_colorpixel(color)}; xcb_create_gc(conn, gc, bg_pixmap, XCB_GC_FOREGROUND, values); - xcb_rectangle_t rect = { 0, 0, resolution[0], resolution[1] }; + xcb_rectangle_t rect = {0, 0, resolution[0], resolution[1]}; xcb_poly_fill_rectangle(conn, bg_pixmap, gc, 1, &rect); xcb_free_gc(conn, gc); @@ -124,12 +123,12 @@ xcb_create_window(conn, XCB_COPY_FROM_PARENT, - win, /* the window id */ + win, /* the window id */ scr->root, /* parent == root */ 0, 0, scr->width_in_pixels, scr->height_in_pixels, /* dimensions */ - 0, /* border = 0, we draw our own */ + 0, /* border = 0, we draw our own */ XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_WINDOW_CLASS_COPY_FROM_PARENT, /* copy visual from parent */ mask, @@ -188,8 +187,7 @@ XCB_GRAB_MODE_ASYNC, /* keyboard mode */ XCB_NONE, /* confine_to = in which window should the cursor stay */ cursor, /* we change the cursor to whatever the user wanted */ - XCB_CURRENT_TIME - ); + XCB_CURRENT_TIME); if ((preply = xcb_grab_pointer_reply(conn, pcookie, NULL)) && preply->status == XCB_GRAB_STATUS_SUCCESS) { @@ -204,12 +202,11 @@ while (tries-- > 0) { kcookie = xcb_grab_keyboard( conn, - true, /* report events */ - screen->root, /* grab the root window */ + true, /* report events */ + screen->root, /* grab the root window */ XCB_CURRENT_TIME, XCB_GRAB_MODE_ASYNC, /* process events as normal, do not require sync */ - XCB_GRAB_MODE_ASYNC - ); + XCB_GRAB_MODE_ASYNC); if ((kreply = xcb_grab_keyboard_reply(conn, kcookie, NULL)) && kreply->status == XCB_GRAB_STATUS_SUCCESS) { @@ -230,8 +227,8 @@ xcb_pixmap_t mask; xcb_cursor_t cursor; - unsigned char* curs_bits; - unsigned char* mask_bits; + unsigned char *curs_bits; + unsigned char *mask_bits; int curs_w, curs_h; switch (choice) { @@ -278,9 +275,9 @@ cursor, bitmap, mask, - 65535,65535,65535, - 0,0,0, - 0,0); + 65535, 65535, 65535, + 0, 0, 0, + 0, 0); xcb_free_pixmap(conn, bitmap); xcb_free_pixmap(conn, mask); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i3lock-2.6/xinerama.c new/i3lock-2.7/xinerama.c --- old/i3lock-2.6/xinerama.c 2014-07-18 20:25:02.000000000 +0200 +++ new/i3lock-2.7/xinerama.c 2015-05-20 09:17:06.000000000 +0200 @@ -1,7 +1,7 @@ /* * vim:ts=4:sw=4:expandtab * - * © 2010-2012 Michael Stapelberg + * © 2010 Michael Stapelberg * * See LICENSE for licensing information * @@ -82,8 +82,8 @@ xr_resolutions[screen].width = screen_info[screen].width; xr_resolutions[screen].height = screen_info[screen].height; DEBUG("found Xinerama screen: %d x %d at %d x %d\n", - screen_info[screen].width, screen_info[screen].height, - screen_info[screen].x_org, screen_info[screen].y_org); + screen_info[screen].width, screen_info[screen].height, + screen_info[screen].x_org, screen_info[screen].y_org); } free(reply);

1 0

commit lshw for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package lshw for openSUSE:Factory checked in at 2016-04-30 23:31:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lshw (Old) and /work/SRC/openSUSE:Factory/.lshw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lshw" Changes: -------- --- /work/SRC/openSUSE:Factory/lshw/lshw.changes 2015-08-01 11:35:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lshw.new/lshw.changes 2016-04-30 23:31:14.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Apr 26 19:39:38 UTC 2016 - mpluskal(a)suse.com + +- Update to B.02.18 + * no changelog available +- Use pkgconfig style dependencies +- Update dependencies +- Build gui and cli at same time +- Drop no longer needed patches + * lshw-gcc43.patch + * lshw-stack-corruption.patch + +------------------------------------------------------------------- Old: ---- lshw-B.02.17.tar.gz lshw-gcc43.patch lshw-stack-corruption.patch New: ---- lshw-B.02.18.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lshw.spec ++++++ --- /var/tmp/diff_new_pack.tkPa6a/_old 2016-04-30 23:31:15.000000000 +0200 +++ /var/tmp/diff_new_pack.tkPa6a/_new 2016-04-30 23:31:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lshw # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 Pascal Bleser <pascal.bleser(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: lshw -Version: B.02.17 +Version: B.02.18 Release: 0 Summary: HardWare LiSter License: GPL-2.0 @@ -27,18 +27,24 @@ Source: http://ezix.org/software/files/lshw-%{version}.tar.gz Source1: lshw.desktop.in Source2: lshw.png -Patch1: lshw-gcc43.patch -Patch2: lshw-stack-corruption.patch BuildRequires: gcc-c++ -BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: hicolor-icon-theme -BuildRequires: libglade2-devel BuildRequires: libpng-devel -BuildRequires: libstdc++-devel -BuildRequires: pango-devel -BuildRequires: sqlite3-devel +BuildRequires: pkg-config BuildRequires: update-desktop-files -BuildRequires: zlib-devel +BuildRequires: pkgconfig(gail) >= 2.4.0 +BuildRequires: pkgconfig(gdk-2.0) >= 2.4.0 +BuildRequires: pkgconfig(gdk-x11-2.0) >= 2.4.0 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0 +BuildRequires: pkgconfig(gtk+-unix-print-2.0) >= 2.4.0 +BuildRequires: pkgconfig(gtk+-x11-2.0) >= 2.4.0 +BuildRequires: pkgconfig(libglade-2.0) +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(pangocairo) +BuildRequires: pkgconfig(pangoft2) +BuildRequires: pkgconfig(pangoxft) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(zlib) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,6 +65,10 @@ Group: Hardware/Other Requires: %{name} = %{version}-%{release} Requires: hicolor-icon-theme +Requires(post): hicolor-icon-theme +Requires(post): update-desktop-files +Requires(postun): hicolor-icon-theme +Requires(postun): update-desktop-files %description gui lshw (Hardware Lister) is a small tool to provide detailed informaton on the @@ -76,8 +86,6 @@ %prep %setup -q -%patch1 -%patch2 %build make %{?_smp_mflags} \ @@ -89,32 +97,11 @@ CC="gcc" \ RPM_OPT_FLAGS="%{optflags}" \ STRIP=touch \ - all - -make %{?_smp_mflags} \ - PREFIX="%{_prefix}" \ - SBINDIR="%{_sbindir}" \ - MANDIR="%{_mandir}" \ - DATADIR="%{_datadir}" \ - CXX="g++" \ - CC="gcc" \ - RPM_OPT_FLAGS="%{optflags}" \ - STRIP=touch \ + all \ gui %install -make %{?_smp_flags} \ - DESTDIR=%{buildroot} \ - PREFIX="%{_prefix}" \ - SBINDIR="%{_sbindir}" \ - MANDIR="%{_mandir}" \ - DATADIR="%{_datadir}" \ - CXX="g++" \ - CC="gcc" \ - OPTFLAGS="%{optflags}" \ - install - -make %{?_smp_flags} \ +make %{?_smp_mflags} \ DESTDIR=%{buildroot} \ PREFIX="%{_prefix}" \ SBINDIR="%{_sbindir}" \ @@ -123,6 +110,7 @@ CXX="g++" \ CC="gcc" \ OPTFLAGS="%{optflags}" \ + install \ install-gui install -d "%{buildroot}%{_datadir}/applications" @@ -145,7 +133,7 @@ %files -f lshw.lang %defattr(-,root,root,0755) -%doc README COPYING docs/TODO docs/Changelog docs/lshw.xsd +%doc README.md COPYING docs/TODO docs/Changelog docs/lshw.xsd %attr(0755,root,root) %{_sbindir}/lshw %dir %{_datadir}/lshw %{_datadir}/lshw/*.txt ++++++ lshw-B.02.17.tar.gz -> lshw-B.02.18.tar.gz ++++++ ++++ 490414 lines of diff (skipped)

1 0

commit freshplayerplugin for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package freshplayerplugin for openSUSE:Factory checked in at 2016-04-30 23:31:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freshplayerplugin (Old) and /work/SRC/openSUSE:Factory/.freshplayerplugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "freshplayerplugin" Changes: -------- --- /work/SRC/openSUSE:Factory/freshplayerplugin/freshplayerplugin.changes 2016-01-01 19:49:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.freshplayerplugin.new/freshplayerplugin.changes 2016-04-30 23:31:13.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Apr 26 16:10:00 UTC 2016 - hpj(a)urpla.net + +- Update to v0.3.5: + * video: try /dev/video* instead of /dev/v4l/by-path/* + * network: fix byte order in PPB_NetAddress + * network: partially implement PPB_HostResolver;1.0 and + PPB_UDPSocket;1.2 + * mics: keep task order in PPB_MessageLoop + +- refresh clean patch + +------------------------------------------------------------------- Old: ---- freshplayerplugin-0.3.4.tar.gz New: ---- freshplayerplugin-0.3.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freshplayerplugin.spec ++++++ --- /var/tmp/diff_new_pack.AtEHIo/_old 2016-04-30 23:31:14.000000000 +0200 +++ /var/tmp/diff_new_pack.AtEHIo/_new 2016-04-30 23:31:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package freshplayerplugin # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %bcond_with restricted %bcond_with gtk3 Name: freshplayerplugin -Version: 0.3.4 +Version: 0.3.5 Release: 0 Summary: PPAPI2NPAPI compatibility layer License: MIT ++++++ clean.patch ++++++ ++++ 1300 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/freshplayerplugin/clean.patch ++++ and /work/SRC/openSUSE:Factory/.freshplayerplugin.new/clean.patch ++++++ freshplayerplugin-0.3.4.tar.gz -> freshplayerplugin-0.3.5.tar.gz ++++++ ++++ 3075 lines of diff (skipped)

1 0

commit mysql-community-server for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at 2016-04-30 23:31:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old) and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mysql-community-server" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.changes 2016-02-05 00:32:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.changes 2016-04-30 23:31:10.000000000 +0200 @@ -1,0 +2,26 @@ +Mon Apr 25 12:33:26 UTC 2016 - kstreitova(a)suse.com + +- update to 5.6.30 + * changes + http://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-30.html + http://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-29.html + * fixed CVEs: + CVE-2016-0705, CVE-2016-0639, CVE-2015-3194, CVE-2016-0640, + CVE-2016-2047, CVE-2016-0644, CVE-2016-0646, CVE-2016-0647, + CVE-2016-0648, CVE-2016-0649, CVE-2016-0650, CVE-2016-0665, + CVE-2016-0666, CVE-2016-0641, CVE-2016-0642, CVE-2016-0655, + CVE-2016-0661, CVE-2016-0668, CVE-2016-0643 + * fix [bnc#962779], [bnc#959724] +- don't delete the log data when migration fails +- add 'log-error' and 'secure-file-priv' configuration options + (added via configuration-tweaks.tar.bz2) [bsc#963810] + * add '/etc/my.cnf.d/error_log.conf' that specifies + 'log-error = /var/log/mysql/mysqld.log'. If no path is set, the error + log is written to '/var/lib/mysql/$HOSTNAME.err', which is not picked + up by logrotate. + * add '/etc/my.cnf.d/secure_file_priv.conf' which specifies that + 'LOAD DATA', 'SELECT ... INTO' and 'LOAD FILE()' will only work with + files in the directory specified by 'secure-file-priv' option + (='/var/lib/mysql-files'). + +------------------------------------------------------------------- Old: ---- mysql-5.6.28.tar.gz New: ---- mysql-5.6.30.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ --- /var/tmp/diff_new_pack.34qi5C/_old 2016-04-30 23:31:12.000000000 +0200 +++ /var/tmp/diff_new_pack.34qi5C/_new 2016-04-30 23:31:12.000000000 +0200 @@ -36,7 +36,9 @@ %endif %if 0%{build_extras} > 0 %define with_jemalloc 1 -%define with_oqgraph 1 +#temporarily disable OQGraph (see MDEV-9479) +#%define with_oqgraph 1 +%define with_oqgraph 0 %define with_cassandra 1 %else %define with_jemalloc 0 @@ -44,7 +46,7 @@ %define with_cassandra 0 %endif Name: mysql-community-server -Version: 5.6.28 +Version: 5.6.30 Release: 0 Summary: Server part of %{pretty_name} License: SUSE-GPL-2.0-with-FLOSS-exception @@ -487,6 +489,13 @@ mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} +# Remove unused services for mariadb_101 +%if "%{extra_provides}" == "mariadb_101" +rm -f %{buildroot}'%{_libexecdir}/systemd/system/mariadb.service' +rm -f %{buildroot}'%{_libexecdir}/systemd/system/mariadb@.service' +rm -f %{buildroot}'%{_libexecdir}/systemd/system/mariadb(a)bootstrap.service.d/use_galera_new_cluster.conf' +%endif + # Generate various filelists filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_ssl_rsa_setup mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager mroonga resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat tokuft_logprint tokuftdump >mysql.files @@ -621,6 +630,9 @@ # Unwanted packaged stuff rm -rf '%{buildroot}'%{_datadir}/mysql/{solaris,SELinux} +# Create the directory specified in 'secure-file-priv' option +mkdir -p '%{buildroot}'/var/lib/mysql-files + %check cd build @@ -768,6 +780,23 @@ %dir %{_libdir}/mysql/plugin %{_libdir}/mysql/plugin/[!d]*.so %ghost %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} +%dir %attr(0750, mysql, mysql) /var/lib/mysql-files +# Pack files for mariadb_101 +%if "%{extra_provides}" == "mariadb_101" +%{_bindir}/galera_new_cluster +%{_bindir}/mariadb-service-convert +%dir %{_datadir}/mysql/policy +%dir %{_datadir}/mysql/policy/apparmor +%{_datadir}/mysql/policy/apparmor/README +%{_datadir}/mysql/policy/apparmor/usr.sbin.mysqld* +%dir %{_datadir}/mysql/policy/selinux +%{_datadir}/mysql/policy/selinux/README +%{_datadir}/mysql/policy/selinux/mariadb-server.* +%dir %{_datadir}/mysql/systemd +%{_datadir}/mysql/systemd/mariadb.service +%{_datadir}/mysql/systemd/mariadb@.service +%{_datadir}/mysql/systemd/use_galera_new_cluster.conf +%endif %files errormessages -f errormessages.files %defattr(-, root, root) ++++++ configuration-tweaks.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/error_log.cnf new/error_log.cnf --- old/error_log.cnf 1970-01-01 01:00:00.000000000 +0100 +++ new/error_log.cnf 2016-04-25 14:30:21.000000000 +0200 @@ -0,0 +1,8 @@ +# If log-error is not set, mysqld will write to +# /var/lib/mysql/$HOSTNAME.err +# which is not beneficial for rotating the log file if it grows +# in size. + +[mysqld] +log-error = /var/log/mysql/mysqld.log + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/secure_file_priv.cnf new/secure_file_priv.cnf --- old/secure_file_priv.cnf 1970-01-01 01:00:00.000000000 +0100 +++ new/secure_file_priv.cnf 2016-04-25 14:30:21.000000000 +0200 @@ -0,0 +1,2 @@ +[server] +secure_file_priv = /var/lib/mysql-files ++++++ mysql-5.6.28.tar.gz -> mysql-5.6.30.tar.gz ++++++ /work/SRC/openSUSE:Factory/mysql-community-server/mysql-5.6.28.tar.gz /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-5.6.30.tar.gz differ: char 5, line 1 ++++++ mysql-patches.tar.bz2 ++++++ ++++++ mysql-systemd-helper ++++++ --- /var/tmp/diff_new_pack.34qi5C/_old 2016-04-30 23:31:12.000000000 +0200 +++ /var/tmp/diff_new_pack.34qi5C/_new 2016-04-30 23:31:12.000000000 +0200 @@ -124,8 +124,11 @@ # Cleanup echo "Final cleanup" - rm -rf "$protected" "/var/run/mysql/protecteddir.$INSTANCE" - [[ -z "$up_ok" ]] || die "Something failed during upgrade, please check logs" + if [[ -z "$up_ok" ]]; then + rm -rf "$protected" "/var/run/mysql/protecteddir.$INSTANCE" + else + die "Something failed during upgrade, please check logs" + fi fi }

1 0

commit xdg-app for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package xdg-app for openSUSE:Factory checked in at 2016-04-30 23:31:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdg-app (Old) and /work/SRC/openSUSE:Factory/.xdg-app.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xdg-app" Changes: -------- --- /work/SRC/openSUSE:Factory/xdg-app/xdg-app.changes 2016-04-16 22:08:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xdg-app.new/xdg-app.changes 2016-04-30 23:31:07.000000000 +0200 @@ -1,0 +2,29 @@ +Wed Apr 20 11:19:06 UTC 2016 - dimstar(a)opensuse.org + +- Update to version 0.5.2: + + The way locale extensions work has changed. Now we build a + single extension for all locales, but we allow you to specify a + subset of it during installation and update time using the + --subpath commandline flag. The main reason for this is that + the many extensions didn't scale, both in technical terms + (large ostree summary file size), but also in terms of the UI + listing hundreds of uninteresting things. + + We no longer use sizes in the commit objects to get installed + and download size, instead we store some extra metadata in the + summary file. This allows us to get much faster access to + these, as with recent ostree versions we can cache the summary + file. + + New command xdg-app build-sign that lets you sign a commit at + any time. + + New argument xdg-app build --force-clean that removes + pre-existing build dirs. + + xdg-app run now uses the "current" version as the default if + you specify no branch or arch. It used to default to the + "master" branch. This will default to the last installed + version, but can be changed with xdg-app make-current. + + Added config-opts to the build-options in xdg-app-builder. This + allows you to extend the configure flags in an arch dependent + way. + + Documentation updates. + +------------------------------------------------------------------- Old: ---- xdg-app-0.5.1.tar.xz New: ---- xdg-app-0.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-app.spec ++++++ --- /var/tmp/diff_new_pack.zM4a8u/_old 2016-04-30 23:31:08.000000000 +0200 +++ /var/tmp/diff_new_pack.zM4a8u/_new 2016-04-30 23:31:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: xdg-app -Version: 0.5.1 +Version: 0.5.2 Release: 0 Summary: Manage OSTree based application bundles License: LGPL-2.1+ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.zM4a8u/_old 2016-04-30 23:31:08.000000000 +0200 +++ /var/tmp/diff_new_pack.zM4a8u/_new 2016-04-30 23:31:08.000000000 +0200 @@ -5,7 +5,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="submodules">enable</param> <param name="changesgenerate">enable</param> - <param name="revision">refs/tags/0.5.1</param> + <param name="revision">refs/tags/0.5.2</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.zM4a8u/_old 2016-04-30 23:31:08.000000000 +0200 +++ /var/tmp/diff_new_pack.zM4a8u/_new 2016-04-30 23:31:08.000000000 +0200 @@ -3,4 +3,4 @@ <param name="url">https://github.com/alexlarsson/xdg-app.git</param> <param name="changesrevision">4f73eaf10b7059fa81ed489bb9f0798d03f4f7ce</param></service><service name="tar_scm"> <param name="url">git://anongit.freedesktop.org/xdg-app/xdg-app</param> - <param name="changesrevision">619e1f1025851179dee3e616000e5de2ccde9412</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">8d6ba78a1d24a52a05173aefda636f68aa45f2c7</param></service></servicedata> \ No newline at end of file ++++++ xdg-app-0.5.1.tar.xz -> xdg-app-0.5.2.tar.xz ++++++ ++++ 2674 lines of diff (skipped)

1 0

commit mkvtoolnix for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package mkvtoolnix for openSUSE:Factory checked in at 2016-04-30 23:31:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkvtoolnix (Old) and /work/SRC/openSUSE:Factory/.mkvtoolnix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkvtoolnix" Changes: -------- --- /work/SRC/openSUSE:Factory/mkvtoolnix/mkvtoolnix.changes 2016-03-31 13:03:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkvtoolnix.new/mkvtoolnix.changes 2016-04-30 23:31:04.000000000 +0200 @@ -1,0 +2,21 @@ +Mon Apr 25 17:38:18 UTC 2016 - rpm(a)fthiessen.de + +- Update to new upstream release 9.1.0: +* mkvmerge: bug fix: AVC/h.264: fixed handling of interlaced frames + with bottom field first. + bug fix: mkvmerge will no longer abort reading a Matroska file + with a structural error right before the first cluster. + bug fix: the "text_subtitles" property of the JSON/verbose + identification modes was always set to true for all subtitle + tracks, even for those that aren't text subtitles (VobSub, PG). + bug fix: the language code signaled in the MPEG TS PMT is taken + into account when selecting the character encoding to use + during decoding of the teletext subtitles, not just the + "national character set" stored in the teletext page headers. +* MKVToolNix GUI: bug fix: Fixed huge memory consumption in the + JSON library by updating said JSON library. + bug fix: In merge-tool: when adding playlists the GUI won't ask + the user whether or not to scan if there's only a single + playlist in that directory. + +------------------------------------------------------------------- Old: ---- mkvtoolnix-9.0.1.tar.xz New: ---- mkvtoolnix-9.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkvtoolnix.spec ++++++ --- /var/tmp/diff_new_pack.JipwSx/_old 2016-04-30 23:31:05.000000000 +0200 +++ /var/tmp/diff_new_pack.JipwSx/_new 2016-04-30 23:31:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: mkvtoolnix -Version: 9.0.1 +Version: 9.1.0 Release: 0 Summary: Tools to Create, Alter, and Inspect Matroska Files License: GPL-2.0+ ++++++ mkvtoolnix-9.0.1.tar.xz -> mkvtoolnix-9.1.0.tar.xz ++++++ ++++ 135484 lines of diff (skipped)

1 0

commit postgrey for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package postgrey for openSUSE:Factory checked in at 2016-04-30 23:31:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postgrey (Old) and /work/SRC/openSUSE:Factory/.postgrey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postgrey" Changes: -------- --- /work/SRC/openSUSE:Factory/postgrey/postgrey.changes 2016-01-07 00:24:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.postgrey.new/postgrey.changes 2016-04-30 23:31:03.000000000 +0200 @@ -2 +2,7 @@ -Mon Dec 14 15:24:07 UTC 2016 - benedikt.schindler(a)gsx.de +Sun Apr 24 18:01:19 UTC 2016 - wr(a)rosenauer.org + +- installing sysconfig via fillup macro was lost in systemd migration + (boo#976963) + +------------------------------------------------------------------- +Mon Dec 14 15:24:07 UTC 2015 - benedikt.schindler(a)gsx.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgrey.spec ++++++ --- /var/tmp/diff_new_pack.HfU1D8/_old 2016-04-30 23:31:04.000000000 +0200 +++ /var/tmp/diff_new_pack.HfU1D8/_new 2016-04-30 23:31:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package postgrey # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -53,6 +53,7 @@ BuildRequires: systemd %systemd_requires %endif +Requires(post): %fillup_prereq %description Postgrey is a Postfix policy server implementing greylisting. When a @@ -129,6 +130,7 @@ %post %if 0%{?suse_version} > 1210 %service_add_post %{name}.service +%fillup_only %else %{fillup_and_insserv %{name}} %endif

1 0