From a9dc31f0a8186ab3c8c113f21d2cc24b36b73aa5d72599b255a187cd58ae2e38 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 26 Nov 2012 15:32:49 +0000 Subject: [PATCH 1/2] - Patch #287 - 2012/11/25 * fix a case where in_put() loop could continue when it has found an X event rather than the pty, causing the pty-read to be delayed (patch by Balazs Kezes). * add option to pointerMode resource and corresponding control sequences to allow text-cursor to remain hidden if the pointer leaves/enters the window via accelerator keys. Ordinary motion within the window restores the pointer (prompted by patch by Balazs Kezes). * remove special case of modifiers for the Mode_switch and XK_ISO_Level3_Shift from patch #223. Verified that the conflict which this was intended to resolve does not happen for normal compose- or modeswitch-handling (prompted by patch by Balazs Kezes, Debian #638694). * modify the handling of focus-change events to ignore those whose detail is NotifyPointer, since those are sent in addition to focus-change events directed to the old/new windows having focus (prompted by patch by Balazs Kezes to prevent the urgency-hint from being reset in this scenario). * modify description of iconName in manpage to make it clearer that this resource does not specify the filename of an icon (discussion with Ian Collier). * modify iconHint resource to allow suppressing the built-in icon by setting this to "none" (discussion with Ian Collier). * make -iconic option work with the toolbar configuration. * correct initialization of window manager hints used to set the icon-pixmap. That detail from patch #282 overwrote state used to control the -iconic command-line option (report by Ian Collier). * fix paste64 feature for the case where the selection comes from the current terminal. The selection callback can happen after the reply OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=57 --- xterm-286.tgz | 3 -- xterm-287.tgz | 3 ++ xterm-286.tgz.asc => xterm-287.tgz.asc | 6 ++-- xterm.changes | 39 ++++++++++++++++++++++++++ xterm.spec | 2 +- 5 files changed, 46 insertions(+), 7 deletions(-) delete mode 100644 xterm-286.tgz create mode 100644 xterm-287.tgz rename xterm-286.tgz.asc => xterm-287.tgz.asc (61%) diff --git a/xterm-286.tgz b/xterm-286.tgz deleted file mode 100644 index 06aed37..0000000 --- a/xterm-286.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46306ac3cf3ff998e80eeef7e6c1a3af9a4bda4777a3c6c5c1f1bb4355c466e0 -size 1102357 diff --git a/xterm-287.tgz b/xterm-287.tgz new file mode 100644 index 0000000..388761b --- /dev/null +++ b/xterm-287.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5645b5963d01d15f62fb9071f743b58e4d158581f19f411bf14422519363956 +size 1103402 diff --git a/xterm-286.tgz.asc b/xterm-287.tgz.asc similarity index 61% rename from xterm-286.tgz.asc rename to xterm-287.tgz.asc index 38fdffe..bde7d76 100644 --- a/xterm-286.tgz.asc +++ b/xterm-287.tgz.asc @@ -2,7 +2,7 @@ Version: GnuPG v1.4.10 (GNU/Linux) Comment: See http://invisible-island.net/public/public.html for info -iEYEABECAAYFAlCPGqcACgkQcCNT4Pfkjtu4tACfZz3389sBWPCz1QC69VaHj9/u -7RIAoKMtUoK5lqaXq0yAd7tRZZQ24w6X -=t1qe +iEYEABECAAYFAlCywOAACgkQcCNT4PfkjtsLUgCdE2jii2jxep7iUE/sZ71/IFDs +8c8An06y2zDeI3milWUPgWILv5gTmfbC +=p6R8 -----END PGP SIGNATURE----- diff --git a/xterm.changes b/xterm.changes index 607027f..7c9debf 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Mon Nov 26 15:00:14 UTC 2012 - meissner@suse.com + +- Patch #287 - 2012/11/25 + * fix a case where in_put() loop could continue when it has found an + X event rather than the pty, causing the pty-read to be delayed + (patch by Balazs Kezes). + * add option to pointerMode resource and corresponding control + sequences to allow text-cursor to remain hidden if the pointer + leaves/enters the window via accelerator keys. Ordinary motion + within the window restores the pointer (prompted by patch by Balazs + Kezes). + * remove special case of modifiers for the Mode_switch and + XK_ISO_Level3_Shift from patch #223. Verified that the conflict + which this was intended to resolve does not happen for normal + compose- or modeswitch-handling (prompted by patch by Balazs Kezes, + Debian #638694). + * modify the handling of focus-change events to ignore those whose + detail is NotifyPointer, since those are sent in addition to + focus-change events directed to the old/new windows having focus + (prompted by patch by Balazs Kezes to prevent the urgency-hint from + being reset in this scenario). + * modify description of iconName in manpage to make it clearer that + this resource does not specify the filename of an icon (discussion + with Ian Collier). * modify iconHint resource to allow suppressing + the built-in icon by setting this to "none" (discussion with Ian + Collier). + * make -iconic option work with the toolbar configuration. + * correct initialization of window manager hints used to set the + icon-pixmap. That detail from patch #282 overwrote state used to + control the -iconic command-line option (report by Ian Collier). + * fix paste64 feature for the case where the selection comes from the + current terminal. The selection callback can happen after the reply + is partly built, making it necessary to flush the reply-buffer to + keep things in the proper order (report by Ailin Nemui). + * reject command-line options which are longer than the options in + xterm's table, to avoid mismatches (Redhat #875305). + * correct attribution for patch #282 changes. + ------------------------------------------------------------------- Tue Oct 30 12:04:34 UTC 2012 - pcerny@suse.com diff --git a/xterm.spec b/xterm.spec index 7d0efd3..d320f12 100644 --- a/xterm.spec +++ b/xterm.spec @@ -47,7 +47,7 @@ Provides: xorg-x11:/usr/X11R6/bin/xterm %if 0%{?suse_version} > 1210 Requires: luit %endif -Version: 286 +Version: 287 Release: 0 Summary: The basic X terminal program License: MIT From 0bad87aa7eeb7de6e31e032d5e53c66c85a521bc35e84577c78f95319967a553 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 3 Dec 2012 14:40:38 +0000 Subject: [PATCH 2/2] Accepting request 143940 from home:sbrabec:gpg-offline-verify Verify GPG signature: Perform build-time offline GPG verification. Please verify that included keyring matches your needs. For manipulation with the offline keyring, please use gpg-offline tool from openSUSE:Factory, devel-tools-building or Base:System. See the man page and/or /usr/share/doc/packages/gpg-offline/PACKAGING.HOWTO. If you need to build your package for older products and don't want to mess spec file with ifs, please follow PACKAGING.HOWTO: you can link or aggregate gpg-offline from devel:tools:building or use following trick with "osc meta prjconf": --- Cut here ---- %if 0%{?suse_version} <= 1220 Substitute: gpg-offline %endif Macros: %gpg_verify(dnf) \ %if 0%{?suse_version} > 1220\ echo "WARNING: Using %%gpg_verify macro from prjconf, not from gpg-offline package."\ gpg-offline --directory="%{-d:%{-d*}}%{!-d:%{_sourcedir}}" --package="%{-n:%{-n*}}%{!-n:%{name}}""%{-f: %{-f*}}" --verify %{**}\ %else\ echo "WARNING: Dummy prjconf macro. gpg-offline is not available, skipping %{**} GPG signature verification!"\ %endif\ %nil ----------------- OBS-URL: https://build.opensuse.org/request/show/143940 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=58 --- xterm.changes | 5 +++++ xterm.keyring | 28 ++++++++++++++++++++++++++++ xterm.spec | 3 +++ 3 files changed, 36 insertions(+) create mode 100644 xterm.keyring diff --git a/xterm.changes b/xterm.changes index 7c9debf..6c5ce54 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 27 20:03:03 CET 2012 - sbrabec@suse.cz + +- Verify GPG signatures. + ------------------------------------------------------------------- Mon Nov 26 15:00:14 UTC 2012 - meissner@suse.com diff --git a/xterm.keyring b/xterm.keyring new file mode 100644 index 0000000..ec216e5 --- /dev/null +++ b/xterm.keyring @@ -0,0 +1,28 @@ +pub 1024D/F7E48EDB 2004-01-05 +uid Thomas Dickey +sub 1024g/E4374AE1 2004-01-05 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.19 (GNU/Linux) + +mQGiBD/4r7IRBADFuacEqf9fye+NQSm7xjNP705aq75VrUd2hJyPmSiFUIyQEfc4 +4GQXGdFg+/Apq4iq/50/8pR8YXOKwP5OE69emEp7IxjST41orGUk5ZwcnlSkaruN +WLTe/lN3e0oOIVbYig1lUbU5IxZu03KfNg2DZ9JiZdNBlzlqx1+oFlWFLwCg3awg +EfOUfbe4kVxNrsnxaCJYJ38EAMRVyUOfhkm9l0YuiC4ebOHrdmn9jFVW+XZPZDeb +8DcyTBNrgvVTnEmrNzVJgOyZIW+uraBVitak+No1kwXvC/i0kZEzYqfG87EdJSfe +OV7axIRisiTrcbZdRJ3CBDtGvLqJ9OuGFHPQmntnZfhiwJTR79hepndEQYyV5eQb +oQ+aA/0bI+/odyRDefc9HF1EhOcz8E76QP+VlvUfIDUJrmwv/3gLZ968HACOe0DE ++bcUockLJxoNwQFwCQPjm5S2+Ba2uY4hRhOA+MResZWlPouoosay2ADfiU7pdBCx +nbcLAuezgnZg4jcXvLl1QiAihxaEI2jqgZBnnierWzqRzRZM4LQrVGhvbWFzIERp +Y2tleSA8ZGlja2V5QGludmlzaWJsZS1pc2xhbmQubmV0PoheBBMRAgAeBQI/+K+y +AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEHAjU+D35I7bejEAnRYLqlswwk+F ++pWcppXLnsskhTfSAKCrg23hTwzaaW9mlbmDavid+QQu3bkBDQQ/+K+0EAQAjTl1 +EeUt5EUq8tiGBq+KtFo3TxIdJKBtVFQ4btETdF23dkZ1o1642GmF7JJgn6PKUcJD +UlHhUO4IEcpHABAiU4HweoWh8yT/yaA9AXqRKcJpMQ5bEGoooHBIg0Uh8ahG6Q1c +HzgsGOaOK9YzFSvSIRXryMlrh1oITzvwEkXRfOcAAwcD/iRaNtGYaS05FwaaVvm0 +Eexhhw2JzSaRP6PY3r/BGmgPVG9Uk9huk+Yk/pdW9Pa3KRj37ANK2svfwHx9A077 +Ma9GoupZ/rjP01WO0ur8tzC7KsqCep9m33K9kdAeJZ0Ud+AwsnAEy/Q1XZin/jUU +5L1lzko010LXY9CqdrmCXhaqiEkEGBECAAkFAj/4r7QCGwwACgkQcCNT4Pfkjtuu +ngCg2es41JEYaarCcT+gFpyM0WCqAU8An3L0pkO4wtZ8SejpHa7WSR9M54xd +=VWbi +-----END PGP PUBLIC KEY BLOCK----- diff --git a/xterm.spec b/xterm.spec index d320f12..ba38606 100644 --- a/xterm.spec +++ b/xterm.spec @@ -21,6 +21,7 @@ Name: xterm BuildRequires: fontpackages-devel %endif BuildRequires: freetype2-devel +BuildRequires: gpg-offline BuildRequires: ncurses-devel BuildRequires: update-desktop-files %if 0%{?suse_version} > 1130 @@ -62,6 +63,7 @@ Source6: terminal.png %define vttest_version 20120506 Source7: ftp://invisible-island.net/vttest/vttest-%vttest_version.tgz Source10: ftp://invisible-island.net/vttest/vttest-%vttest_version.tgz.asc +Source11: %name.keyring Source8: 20x20ja.bdf.bz2 Source9: 20x20ko.bdf.bz2 # Snoop for the escape sequence assignment of the keypad @@ -82,6 +84,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build This package contains the basic X.Org terminal program. %prep +%gpg_verify %{S:2} %{S:10} %setup -q -b7 %patch1 -p1 -b .xterm-settings %patch2 -p0 -b .xterm-sigwinch