debian/changelog | 8 ++++++--
debian/patches/901_xterm_manpage.diff | 2 +-
debian/patches/902_windowops.diff | 15 +++++++++++++++
debian/patches/series | 1 +
debian/rules | 3 ++-
5 files changed, 25 insertions(+), 4 deletions(-)
New commits:
commit 333fee2056e0bb6ad52df7ad50c7f89d4c8fc396
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Nov 28 14:46:54 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 29906fd..20c530c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (251-1) UNRELEASED; urgency=low
+xterm (251-1) unstable; urgency=low
* New upstream release.
* Update copy of XTerm FAQ to revision 1.107 (dated 2009/11/11).
@@ -7,7 +7,7 @@ xterm (251-1) UNRELEASED; urgency=low
discussion with the security team, change the default for the new resource
to include all operations.
- -- Julien Cristau <jcris...@debian.org> Sat, 21 Nov 2009 14:51:13 +0100
+ -- Julien Cristau <jcris...@debian.org> Sat, 28 Nov 2009 14:46:51 +0100
xterm (250-1) unstable; urgency=low
commit 61ac010b58d743fa3045b215f0844212cf7d707c
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Nov 21 15:59:59 2009 +0100
Change the disallowedWindowOps default
Upstream introduced a new 'disallowedWindowOps' resource to fine-tune
which operations are affected by the 'allowWindowOps' setting. After
discussion with the security team, change the default for the new
resource to include all operations.
diff --git a/debian/changelog b/debian/changelog
index 899d5f5..29906fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ xterm (251-1) UNRELEASED; urgency=low
* New upstream release.
* Update copy of XTerm FAQ to revision 1.107 (dated 2009/11/11).
+ * Upstream introduced a new 'disallowedWindowOps' resource to fine-tune
+ which operations are affected by the 'allowWindowOps' setting. After
+ discussion with the security team, change the default for the new resource
+ to include all operations.
-- Julien Cristau <jcris...@debian.org> Sat, 21 Nov 2009 14:51:13 +0100
diff --git a/debian/patches/902_windowops.diff
b/debian/patches/902_windowops.diff
new file mode 100644
index 0000000..8d0820d
--- /dev/null
+++ b/debian/patches/902_windowops.diff
@@ -0,0 +1,15 @@
+Index: xterm/xterm.man
+===================================================================
+--- xterm.orig/xterm.man
++++ xterm/xterm.man
+@@ -2004,8 +2004,9 @@
+ from \fIdtterm\fP the operation number).
+ The default value is
+ .RS
+-20,21,SetXprop,SetSelection
++1,2,3,4,5,6,7,8,9,11,13,14,18,19,20,21,GetSelection,SetSelection,SetWinLines,SetXprop
+ .RE
++(i.e. no operations are allowed).
+ .IP
+ The names are listed below. \fIxterm\fP ignores capitalization, but
+ they are shown in mixed-case for clarity. Where a number can be used
diff --git a/debian/patches/series b/debian/patches/series
index 7150b37..0f04566 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
900_debian_xterm.diff
901_xterm_manpage.diff
+902_windowops.diff
904_fontops.diff
diff --git a/debian/rules b/debian/rules
index 21ae2b0..9f64a9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,8 @@ DESKTOP_FLAGS = --vendor debian \
# disable some unsafe operations
CFLAGS += \
-DDEF_ALLOW_FONT=False \
- -DDEF_ALLOW_TCAP=False
+ -DDEF_ALLOW_TCAP=False \
+
-DDEF_DISALLOWED_WINDOW=\\\"1,2,3,4,5,6,7,8,9,11,13,14,18,19,20,21,GetSelection,SetSelection,SetWinLines,SetXprop\\\"
.PHONY: configure
configure: $(STAMP_DIR)/configure
commit 5455773cc243b057e6b451ace127e2b012edc4f4
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Nov 21 15:56:01 2009 +0100
Refresh patch 901
diff --git a/debian/patches/901_xterm_manpage.diff
b/debian/patches/901_xterm_manpage.diff
index 0f9cb2b..10ec983 100644
--- a/debian/patches/901_xterm_manpage.diff
+++ b/debian/patches/901_xterm_manpage.diff
@@ -7,7 +7,7 @@ Index: xterm/xterm.man
===================================================================
--- xterm.orig/xterm.man
+++ xterm/xterm.man
-@@ -5077,10 +5077,10 @@
+@@ -5167,10 +5167,10 @@
.SH FILES
The actual pathnames given may differ on your system.
.TP 5
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
