From 9a81ca20e79859fa7a473b4dd7642337e9b7bb386c0833fada9e93ad33d572a3 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Fri, 19 Jul 2013 16:30:54 +0000 Subject: [PATCH] Accepting request 183771 from home:sbrabec:branches:X11:Utilities - Update to version 5.43: * many fixes and improvements, see Revisions for more. * Fix potential crash (CVE-2013-4143, bnc#829859) - Remove ancient Provides/Obsoletes. - Verify GPG signature. OBS-URL: https://build.opensuse.org/request/show/183771 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xlockmore?expand=0&rev=18 --- xlockmore-5.34.tar.bz2 | 3 --- xlockmore-5.43.tar.bz2 | 3 +++ xlockmore-5.43.tar.bz2.asc | 7 +++++++ xlockmore.changes | 9 +++++++++ xlockmore.keyring | 34 ++++++++++++++++++++++++++++++++++ xlockmore.spec | 10 ++++++---- 6 files changed, 59 insertions(+), 7 deletions(-) delete mode 100644 xlockmore-5.34.tar.bz2 create mode 100644 xlockmore-5.43.tar.bz2 create mode 100644 xlockmore-5.43.tar.bz2.asc create mode 100644 xlockmore.keyring diff --git a/xlockmore-5.34.tar.bz2 b/xlockmore-5.34.tar.bz2 deleted file mode 100644 index 432ea28..0000000 --- a/xlockmore-5.34.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f83275b86ac2ab0a6c793a3d028040e41e42bbf924adc27b995be29e94ff4264 -size 1955203 diff --git a/xlockmore-5.43.tar.bz2 b/xlockmore-5.43.tar.bz2 new file mode 100644 index 0000000..352ce1b --- /dev/null +++ b/xlockmore-5.43.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29911f21aaf682aa61f358ca36dadf20091ad919d19b4d55e3f4c8503ab266d0 +size 1965448 diff --git a/xlockmore-5.43.tar.bz2.asc b/xlockmore-5.43.tar.bz2.asc new file mode 100644 index 0000000..b7020cb --- /dev/null +++ b/xlockmore-5.43.tar.bz2.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.13 (Cygwin) + +iEYEABECAAYFAlHi5UsACgkQzxWXBzd5Ga68hgCeOTLLUl8+/dZPsnFVoAYU6A34 +bLwAn0l+67TkkSAhVPoaJ8uN90R9ji9a +=qibt +-----END PGP SIGNATURE----- diff --git a/xlockmore.changes b/xlockmore.changes index 3b97bfd..65c7589 100644 --- a/xlockmore.changes +++ b/xlockmore.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jul 18 17:14:27 CEST 2013 - sbrabec@suse.cz + +- Update to version 5.43: + * many fixes and improvements, see Revisions for more. + * Fix potential crash (CVE-2013-4143, bnc#829859) +- Remove ancient Provides/Obsoletes. +- Verify GPG signature. + ------------------------------------------------------------------- Mon Apr 22 20:07:48 UTC 2013 - dimstar@opensuse.org diff --git a/xlockmore.keyring b/xlockmore.keyring new file mode 100644 index 0000000..bdc5dd7 --- /dev/null +++ b/xlockmore.keyring @@ -0,0 +1,34 @@ +pub 1024D/377919AE 2007-09-14 +uid David A Bagley +sub 2048g/92A6F423 2007-09-14 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.19 (GNU/Linux) + +mQGiBEbqo4ERBACGlNq5BP8AamzO5UzR5j5bpF+C0cvhhdoZ7Qv6mBvphNmO52AL +tNsYynV8+BeatNQrUVZqzNMiWwMYDcMdvHQHpdTz0LeZsCumaM1OKE5Pm55NWMNj +KhKUeQGQQsSFIVk4UvQaI0lyKv/oJhlhYQ1LYOkjQIMX+nfcdbgm1AApiwCglmW9 +tR6SGBbzioHuX0PQ4z2ZWt0D/1KZYdvbGjpv3JcJ+4VJ9C+TTp9mJXIY1S1tBNep +CmP5UTNA9QH7qrLDetVnhto4kxHUEHS8h84+0HsZgudR7kq2TVzNSsQte8rEMZzF +W/nMs896cuii9dKdlRHefdp9vx1WyIPryTIGsKziE7co4UhBUHyJv516Za0pFMgv +pUTUA/9u6npFpBU2naAL2yFMiZxzOfGdKw80RWrkMXwJcHNzvSCvcPbB8tgsGzWs +S1ooU8sp2TOoaF2CN68Sc0vo2IrT+bcv83CymQwOh2ELPyKC0dbvoF0CxOOTC+g+ +MaSmwSM5NPoBBginb4yt6Cn6bmpy8UaKweIFzWIW1BMQqql5C7QgRGF2aWQgQSBC +YWdsZXkgPGJhZ2xleWRAdHV4Lm9yZz6IYAQTEQIAIAUCRuqjgQIbAwYLCQgHAwIE +FQIIAwQWAgMBAh4BAheAAAoJEM8Vlwc3eRmujIUAoIHmqtMOavNrQ5SGyXcIs8mu +9ZYPAJ43O0SxXjFjEaE+ojNBIi8aixBQSrkCDQRG6qOPEAgA1yejdLOYnhmoAjRm +DejtlWLuy/S3vB+HNpLEBVXn5sy2B2z5WI0EwthRyLjTFAlNBdNFv5YJ3cYBoVtJ +myv/VrPafLSidAzLTjQXwFJkKvTG0hh5lXINp8nXov7YBEjr1nXOPTzhf4SBT0rI +sy4b73M/WnJplHe7CcmCofYKazuiTn3wKbPdRO841YR54/i9akQHE2dhDxAHF2lX +yIfc78C0QCsmcb4v7NZpCZ4AXgQnfLubdqC9mC0zoNJWZ7UHzg1GqSWr4Qwk7RS5 +5A9iB5QVmeNCFZ393RSXdePhG/xPSXbmUeg6XbIbHkd0LAc1Ne+JKctQHYx0XEVm +tb36LwADBQf/aF9zPi3kSlSyjOk2xNTwbykxgNV6DNqrd87qnR2E7eduiFYqcc5x +7VA//e+edVWFg5ze2E/O7jGE+zx05CIyYGHGIFhXrq/LQ3CBkVF9WivD1ivsAv+U +7DRCAGorysyD8e2eLrEMVzCbPV3y7y4ardE2Zh+LcWv5s9Chg51r05cxwd92/x0g +L1PLgBd5S5DDUN53CdPWZEXinDZQWfNZlJnOeJhm9PN5X3F5sYUVpem5EqO6/8XP +G5SSgogcJvAtonbNC/YGIDZWQSGvI/jiEshG56JqFidOuEInDsrkpQQZADK3Apr/ +xj28JtKW8aJESSdHpOdUhLero4dFygGJK4hJBBgRAgAJBQJG6qOPAhsMAAoJEM8V +lwc3eRmue70An21cv2PQZFtnIzqmOOPLGYWa/3yCAJ9K4v3NKbQDPgo2ldLaBw8g +WaIUlw== +=8RT5 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/xlockmore.spec b/xlockmore.spec index 672c03b..0df4dd4 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -17,7 +17,7 @@ Name: xlockmore -Version: 5.34 +Version: 5.43 Release: 0 Summary: Screen Saver and Locker for the X Window System License: GPL-2.0+ and MIT @@ -27,6 +27,8 @@ Source: %{name}-%{version}.tar.bz2 Source1: xlock.pamd Source2: xlock-wrapper Source3: xlock-wrapper_xorg6 +Source4: %{name}-%{version}.tar.bz2.asc +Source5: %{name}.keyring # apply even patches when X.org < 7.0 else apply odd patches Patch1: %{name}-bitmaps.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -43,12 +45,11 @@ BuildRequires: freeglut-devel BuildRequires: freetype2-devel BuildRequires: ftgl-devel BuildRequires: gcc-c++ +BuildRequires: gpg-offline BuildRequires: libXdmcp-devel BuildRequires: libXt-devel BuildRequires: libdrm-devel BuildRequires: pkg-config -Provides: xlock -Obsoletes: xlock BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -68,6 +69,7 @@ saver until a password is entered. %define _xorg7_prefix /usr %prep +%gpg_verify %{S:4} %setup -q chmod -x README docs/Revisions %patch1 @@ -118,7 +120,7 @@ rm -rf %{buildroot} %files %defattr(-, root, root) %doc %{_xorg7_mandir}/man1/xlock.1x.gz -%doc README docs/cell_automata docs/Purify docs/Revisions docs/TODO +%doc README docs/3d.howto docs/Purify docs/Revisions docs/TODO docs/cell_automata %config %{_sysconfdir}/pam.d/xlock %{_prefix}/%{_xorg7libshare}/X11/app-defaults %{_prefix}/%{_xorg7bin}/xlock