Bug#740919: xterm: clears $SHELL from environment at startup

2014-03-07 Thread Thorsten Glaser
On Thu, 6 Mar 2014, Thomas Dickey wrote:

> ok I fixed the regression (as well as another one which doesn't affect
> Debian, but Fedora), and uploaded #303

OK, thanks. I’ve built me my own package, and can confirm
that it fixes this problem.

bye,
//mirabilos
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-235
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/alpine.deb.2.10.1403071007460.9...@tglase.lan.tarent.de



Bug#740919: xterm: clears $SHELL from environment at startup

2014-03-07 Thread Thomas Dickey
On Fri, Mar 07, 2014 at 10:08:15AM +0100, Thorsten Glaser wrote:
> On Thu, 6 Mar 2014, Thomas Dickey wrote:
> 
> > ok I fixed the regression (as well as another one which doesn't affect
> > Debian, but Fedora), and uploaded #303
> 
> OK, thanks. I’ve built me my own package, and can confirm
> that it fixes this problem.

no problem (report bugs)

-- 
Thomas E. Dickey 
http://invisible-island.net
ftp://invisible-island.net


signature.asc
Description: Digital signature


Working on an upstream Xwrapper replacement.

2014-03-07 Thread Hans de Goede
Hi All,

This is a heads-up that I'm working on a suid wrapper for Xorg as part of
upstream development.

This work is related to:
https://fedoraproject.org/wiki/Changes/XorgWithoutRootRights

The wrapper is intended to allow non kms drivers (ie the nvidia binary
driver and the vesa driver) to keep working, and for systems which
run X without root rights be default it is 100% optionally.

In response to my first RFC posting of the wrapper Alan Coopersmith
pointed me to the Debian Xwrapper.

I've done a quick analysis of the Debian Xwrapper here:
http://lists.x.org/archives/xorg-devel/2014-March/040885.html

And I've decided to borrow most (but not not all) ideas from it,
combining them with the necessary detection of if root rights
are needed I need for:
https://fedoraproject.org/wiki/Changes/XorgWithoutRootRights

The config-file format should be 100% compatible to what Debian
uses now, I've added a new needs_root_rights config file
directive, which can be used to override the detection if root
rights are necessary.  If Debian changes the default
needs_root_rights value in the wrapper from -1 to 1 (until
Debian switches to running X as non root by default) this should
be a drop in replacement. Note if Debian decides to switch,
please patch the default in the c file, don't go adding a
line for this to the config file, that will bite you later
if you try to move to running X without root rights by default.

Please take a look at the latest version and let me know what you
think:
http://lists.x.org/archives/xorg-devel/2014-March/040916.html

I would like the upstream version to be usable for Debian too,
so any feedback is welcome.

Regards,

Hans


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/5319a4f7.1000...@redhat.com



Bug#740919: marked as done (xterm: clears $SHELL from environment at startup)

2014-03-07 Thread Debian Bug Tracking System
Your message dated Fri, 07 Mar 2014 17:34:33 +
with message-id 
and subject line Bug#740919: fixed in xterm 303-1
has caused the Debian Bug report #740919,
regarding xterm: clears $SHELL from environment at startup
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
740919: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740919
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: xterm
Version: 302-1
Severity: important

Hi *,

I’ve got a script that dumps the contents of the environment at
startup to syslog, and just used it to investigate a user-visible
problem. tl;dr: the output of xterm -e dumpargs differs between
screen 301-1 (Debian) and 302-1 (Debian; no idea if this bug is
also upstream):

Among the usual differences like $PGRP and $WINDOWID I have:

--- x1  2014-03-06 09:28:26.356676132 +0100
+++ x2  2014-03-06 09:28:26.092672608 +0100
@@ -31,8 +31,8 @@
 typeset PWD=/home/tglase
 typeset -x QUILT_PATCHES=-
-typeset -i -x -U RANDOM=15871
+typeset -i -x -U RANDOM=565
 typeset -i SECONDS=0
-typeset -x SHELL=
+typeset -x SHELL=/bin/mksh
 typeset -x SIRCNICK='mira|AO'
 typeset -x SIRCSERVER=127.0.0.1:s7000
 typeset -x SSH_AGENT_PID=3511
@@ -52,12 +52,12 @@
 typeset -x USER=tglase
 typeset -i -U USER_ID=2339
 typeset -x VISUAL=/usr/bin/jupp
-typeset -x WINDOWID=25165837
+typeset -x WINDOWID=33554445
 typeset -x WINDOWPATH=7
 typeset -x 
XDG_SESSION_COOKIE=87bd0826b5c41524a188f458494f992f-1393518574.144306-436980184
 typeset -x XDM_MANAGED='method=classic'
 typeset -x XTERM_LOCALE=en_GB.UTF-8
 typeset -x XTERM_SHELL=/usr/local/bin/dumpargs
-typeset -x XTERM_VERSION='XTerm(302)'
+typeset -x XTERM_VERSION='XTerm(301)'
 typeset -x _=/usr/bin/xterm
 args(0) 0:/usr/local/bin/dumpargs


User story: I use “xterm -e screen” (basically) to start GNU screen,
which then has “shell "-${SHELL}"” in ~/.screenrc which should really
really not be empty. Also, xterm IMHO has no business touching that
part of my environment.


-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (100, 
'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.13-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/lksh

Versions of packages xterm depends on:
ii  libc6   2.18-4
ii  libfontconfig1  2.11.0-5
ii  libice6 2:1.0.8-2
ii  libtinfo5   5.9+20140118-1
ii  libutempter01.1.5-4
ii  libx11-62:1.6.2-1
ii  libxaw7 2:1.0.12-1
ii  libxft2 2.3.1-2
ii  libxmu6 2:1.1.1-1
ii  libxpm4 1:3.5.10-1
ii  libxt6  1:1.1.4-1
ii  xbitmaps1.1.1-2

Versions of packages xterm recommends:
ii  x11-utils  7.7+1

Versions of packages xterm suggests:
pn  xfonts-cyrillic  

-- no debconf information
--- End Message ---
--- Begin Message ---
Source: xterm
Source-Version: 303-1

We believe that the bug you reported is fixed in the latest version of
xterm, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 740...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Sven Joachim  (supplier of updated xterm package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Fri, 07 Mar 2014 18:23:50 +0100
Source: xterm
Binary: xterm
Architecture: source i386
Version: 303-1
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force 
Changed-By: Sven Joachim 
Description: 
 xterm  - X terminal emulator
Closes: 740919
Changes: 
 xterm (303-1) unstable; urgency=low
 .
   * New upstream release.
 - Fix a regression in xterm 302 relating to interaction of SHELL
   and XTERM_SHELL variables (Closes: #740919).
Checksums-Sha1: 
 f0e6cb545320888dfed14f0ed6a2f2a2a4d8addf 2076 xterm_303-1.dsc
 e25b3d75272b41daa82cf9a75ad03d735f8381ad 1129416 xterm_303.orig.tar.gz
 1ba8c0a40450928be92e00d19193d7cd4a9370a4 95175 xterm_303-1.diff.gz
 4f6a1761f50f3bc3da49b0606777496ee0b10694 584736 xterm_303-1_i386.deb
Checksums-Sha256: 
 63737ec701625bac786dd5745d061842496bd19692a54f57331512ef3eae554b 2076 
xterm_303-1.dsc
 8af29987bda9b77205ebf6233aaa5c347e5f240

xterm: Changes to 'refs/tags/xterm-303-1'

2014-03-07 Thread Sven Joachim
Tag 'xterm-303-1' created by Sven Joachim  at 2014-03-07 17:28 
+

Tagging upload of xterm 303-1 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABCgAGBQJTGgHHAAoJEDsQbnGNazGsp2EQAI/cIETUUdQOPrvcLOGtX1HA
yOxRha0eUwyFCaqEFTvah439F4tRLoRCnVAJn95O9G1Pep62l12yU8202SwXqWmm
tUHJ/vWAR/j3Vxcfgj/O+KUXIAMWKyeGdD7oGcDMkUvR99a1jrswrCsPUzpweGyT
pmPNRNx0GxYzeuhSgHqb5ImcfW6XIzwrrFZ2D2eXnUYiACr0EnM9Esz86YFqIXop
/kai9eV+pReEO0j+XzghDyg9JYlTgH2rTDtCmYEOBC7Z9ZtR8W8etkIrkLGff//Y
yNR/9qplrlSSOej7SDORTCTbvm0xpuHGODWXOXRN3qkhVOvjdpVEzXogLMDnYbUm
NsBD94+hszVABg0+kq9aj5J2fMDZFXjxBWoXGX75ty5GC9STAbMF9lvUhWlBhOxq
v4QND4u/KMrXPD1NBDOPB8a0RhsAR6flqcF4QUbXWdGqaBpMB3Ui47XVPd70M+rK
enuZA8mBG8o2qiba7s+dBs+1gdjiYb9YjC0w9xOGVwmjjqS0mp2RNHKqmV7rNuHF
g0/5TrQ3Zi9bMf9pD/wQkoCSsDZm20OV/3/peIh4+5fo9mOb93V5kK2t2fG/HzrR
SS+oz4Fty/Zng5qDJuJ+LsGIcxB8Li2W/Cs27lUBHTkEiHhi3TIINg6njrgms203
UqzVelnDKo71JJuMNszL
=NUzC
-END PGP SIGNATURE-

Changes since xterm-302-1:
Sven Joachim (5):
  Imported Upstream version 303
  Merge branch 'upstream-unstable' into debian-unstable
  New upstream release
  Close bug #740919
  Upload to unstable

---
 MANIFEST |2 -
 THANKS   |6 ++-
 debian/changelog |8 
 main.c   |   48 
 misc.c   |   60 +++
 package/debian/changelog |6 +++
 package/freebsd/Makefile |2 -
 package/xterm.spec   |4 +-
 version.h|6 +--
 xterm.log.html   |   29 -
 xterm.man|   79 +--
 11 files changed, 198 insertions(+), 52 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wlyb7-00080h...@moszumanska.debian.org



xterm: Changes to 'debian-unstable'

2014-03-07 Thread Sven Joachim
 MANIFEST |2 -
 THANKS   |6 ++-
 debian/changelog |8 
 main.c   |   48 
 misc.c   |   60 +++
 package/debian/changelog |6 +++
 package/freebsd/Makefile |2 -
 package/xterm.spec   |4 +-
 version.h|6 +--
 xterm.log.html   |   29 -
 xterm.man|   79 +--
 11 files changed, 198 insertions(+), 52 deletions(-)

New commits:
commit 8cba09e1dc0e325bfa1436799b3938d2c9f23631
Author: Sven Joachim 
Date:   Fri Mar 7 18:24:17 2014 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index f453a39..84d93d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xterm (303-1) UNRELEASED; urgency=low
+xterm (303-1) unstable; urgency=low
 
   * New upstream release.
 - Fix a regression in xterm 302 relating to interaction of SHELL
   and XTERM_SHELL variables (Closes: #740919).
 
- -- Sven Joachim   Fri, 07 Mar 2014 18:00:40 +0100
+ -- Sven Joachim   Fri, 07 Mar 2014 18:23:50 +0100
 
 xterm (302-1) unstable; urgency=low
 

commit 853f2664048c0306c6ad8e8d2c557b7f3ea85943
Author: Sven Joachim 
Date:   Fri Mar 7 18:04:43 2014 +0100

Close bug #740919

The submitter already confirmed his problem fixed, although there is
still an issue with SHELL pointing to a shell not present in
/etc/shells.

diff --git a/debian/changelog b/debian/changelog
index 405dfa1..f453a39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xterm (303-1) UNRELEASED; urgency=low
 
   * New upstream release.
+- Fix a regression in xterm 302 relating to interaction of SHELL
+  and XTERM_SHELL variables (Closes: #740919).
 
  -- Sven Joachim   Fri, 07 Mar 2014 18:00:40 +0100
 

commit ba9ece3a5cc4a4694c44178d02f96bf3c6c4d0c8
Author: Sven Joachim 
Date:   Fri Mar 7 18:00:56 2014 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 6857162..405dfa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (303-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Sven Joachim   Fri, 07 Mar 2014 18:00:40 +0100
+
 xterm (302-1) unstable; urgency=low
 
   * New upstream release.

commit 95e6e9e31c13949dfaed09cedf61b6bdbbf97eb9
Author: Sven Joachim 
Date:   Fri Mar 7 17:49:03 2014 +0100

Imported Upstream version 303

diff --git a/MANIFEST b/MANIFEST
index bc11abb..7cc89db 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-302, version xterm-302
+MANIFEST for xterm-303, version xterm-303
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/THANKS b/THANKS
index a38ebf9..1b83740 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.11 2013/08/08 08:24:07 tom Exp $
+-- $XTermId: THANKS,v 1.12 2014/03/03 19:31:41 tom Exp $
 -- vile:txtmode fk=8bit
 There's no AUTHORS file in this distribution; it would be redundant since
 I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -13,6 +13,7 @@ Here's a list from xterm.log.html of people who have 
contributed changes.
 Adam M Costello
 Adam Sulmicki
 Ailin Nemui
+Al Poole
 Alan Coopersmith
 Alex Hornung
 Alexander Pohoyda
@@ -23,6 +24,7 @@ Andreas Schwab
 Andres Perera
 Andrew Sumner
 Andrew Tipton
+Andrey Panov
 Andries E Brouwer
 Anton Kovalenko
 Balazs Kezes
@@ -155,6 +157,7 @@ Rob Braun
 Robert Brady
 Robert Earl
 Robin Cutshaw
+Romain Francois
 Ross Combs
 Ross Paterson
 Ryan Johnson
@@ -184,6 +187,7 @@ Tomohiro Kubota
 Tor Lillqvist
 Torrey Lyons
 Victor Stinner
+Vincent Lefevre
 Werner Lemberg
 Will Day
 Zdenek Sekera
diff --git a/main.c b/main.c
index 6157068..c644e7a 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.748 2014/03/03 01:15:27 tom Exp $ */
+/* $XTermId: main.c,v 1.751 2014/03/07 02:35:39 tom Exp $ */
 
 /*
  * Copyright 2002-2013,2014 by Thomas E. Dickey
@@ -1203,6 +1203,9 @@ static OptionHelp xtermOptions[] = {
 { "-/+rw", "turn on/off reverse wraparound" },
 { "-/+s",  "turn on/off multiscroll" },
 { "-/+sb", "turn on/off scrollbar" },
+#if OPT_REPORT_COLORS
+{ "-report-colors","report colors as they are allocated" },
+#endif
 #if OPT_REPORT_FONTS
 { "-report-fonts", "report fonts as loaded to stdout" },
 #endif
@@ -3149,9 +3152,37 @@ find_utmp(struct UTMP_STR *tofind)
 #define USE_NO_DEV_TTY 0
 #endif
 
+static int
+same_leaf(char *a, char *b)
+{
+char *p = x_basename(a);
+char *q = x_basename(b);
+return !strcmp(p, q);
+}
+
+/*
+ * "good enough" (inode wouldn't port to Cygwin)
+ */
+static int
+same_file(const char *a, const char *b)
+{
+struct sta

xterm: Changes to 'pristine-tar'

2014-03-07 Thread Sven Joachim
 xterm_303.orig.tar.gz.delta |binary
 xterm_303.orig.tar.gz.id|1 +
 2 files changed, 1 insertion(+)

New commits:
commit b5c11f1d169360566865e846bef71ecde60c7466
Author: Sven Joachim 
Date:   Fri Mar 7 17:49:04 2014 +0100

pristine-tar data for xterm_303.orig.tar.gz

diff --git a/xterm_303.orig.tar.gz.delta b/xterm_303.orig.tar.gz.delta
new file mode 100644
index 000..bdd0cd1
Binary files /dev/null and b/xterm_303.orig.tar.gz.delta differ
diff --git a/xterm_303.orig.tar.gz.id b/xterm_303.orig.tar.gz.id
new file mode 100644
index 000..643ef9b
--- /dev/null
+++ b/xterm_303.orig.tar.gz.id
@@ -0,0 +1 @@
+bd11b13d140ee059267ee831221d81e08abb1af9


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wlyb2-0007x6...@moszumanska.debian.org



xterm_303-1_i386.changes ACCEPTED into unstable

2014-03-07 Thread Debian FTP Masters


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Fri, 07 Mar 2014 18:23:50 +0100
Source: xterm
Binary: xterm
Architecture: source i386
Version: 303-1
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force 
Changed-By: Sven Joachim 
Description: 
 xterm  - X terminal emulator
Closes: 740919
Changes: 
 xterm (303-1) unstable; urgency=low
 .
   * New upstream release.
 - Fix a regression in xterm 302 relating to interaction of SHELL
   and XTERM_SHELL variables (Closes: #740919).
Checksums-Sha1: 
 f0e6cb545320888dfed14f0ed6a2f2a2a4d8addf 2076 xterm_303-1.dsc
 e25b3d75272b41daa82cf9a75ad03d735f8381ad 1129416 xterm_303.orig.tar.gz
 1ba8c0a40450928be92e00d19193d7cd4a9370a4 95175 xterm_303-1.diff.gz
 4f6a1761f50f3bc3da49b0606777496ee0b10694 584736 xterm_303-1_i386.deb
Checksums-Sha256: 
 63737ec701625bac786dd5745d061842496bd19692a54f57331512ef3eae554b 2076 
xterm_303-1.dsc
 8af29987bda9b77205ebf6233aaa5c347e5f2407310b62ac9ba92a658257f058 1129416 
xterm_303.orig.tar.gz
 8efe28bb42912cc9963656b2e185b07101d6c9e8b69f7dc94c37a5d95ab0945c 95175 
xterm_303-1.diff.gz
 5e2f4cea3219fa45aae7ffcbc234604344b3c6f1d8c5305f59c942fbe1cc14a7 584736 
xterm_303-1_i386.deb
Files: 
 f67a9202e9c29fe853cb797b8e8b1fbc 2076 x11 optional xterm_303-1.dsc
 48f6d49b2b6b6933d501d767cbed9254 1129416 x11 optional xterm_303.orig.tar.gz
 cee6c3e3afa93031cac5dcb06877d3bc 95175 x11 optional xterm_303-1.diff.gz
 96f086e67938ff7ad199d7a11aad9a4c 584736 x11 optional xterm_303-1_i386.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBCgAGBQJTGgF+AAoJEDsQbnGNazGsPIcP/igJgCbI0Gx06phO2GGwBkGi
vSORubNgPCHcFg/4E/2PHm7M43wICTai3Q92lmcFu8a91uH9udZ1HXD131P/4Xwd
MuQoS+X0l9POyKlNekF2eoKCLnyOaM69BopF43R2NSgn6J0/IhNIp5T+1T/Sz+Vv
6yWX3lcCvkRRTansEeA7XzMwPKxEJJsEqNTb5EEJ5b5IgjsjG8Ai3MSbB+0GOcyv
rlkOLHSVKkO3cyqX5S70TlNBtTDTAYg32WkUOzeVd6kcMofepgHXSpQ+vrmvjp3g
ivJrWhrREqMVufysUemehpbxkguWd1iYQOEOUdbazWi9ziheBajVYA914xbu+vpW
JJwo2yXnzHCOHIUuxcGlkFegOT5NZf7TZlTMMu05Df8CrxpofG3Po0XuB44ud828
eq5FEICLUHm/fwoK0cXBsYr1681y1phDn29zZnZRVXBtvfkdc9LepeWbtL5Y3dkY
E/Z/oeP5wpHzvwbq/EpNXwdBA8JqUFR+aMqfCWDt518N9k4WT7Z/sc9pSjgLmJXr
SInSdP5yjvDtPv3c9U1EsQuL3EH+8sO2kp/t0377ufeqwMd0/kATJoPuwNMKdqDY
wk4Jnvoqtg9nz0XtA7F/Mw1bP0rBcVb1pYVvAjdz88zkpah3aAiGWtlrF2RufhGt
qIOUtCHaAMTxM1FA7lrm
=VA3w
-END PGP SIGNATURE-


Thank you for your contribution to Debian.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wlyfj-0005o9...@franck.debian.org



xterm: Changes to 'upstream-unstable'

2014-03-07 Thread Sven Joachim
 MANIFEST |2 -
 THANKS   |6 ++-
 main.c   |   48 
 misc.c   |   60 +++
 package/debian/changelog |6 +++
 package/freebsd/Makefile |2 -
 package/xterm.spec   |4 +-
 version.h|6 +--
 xterm.log.html   |   29 -
 xterm.man|   79 +--
 10 files changed, 190 insertions(+), 52 deletions(-)

New commits:
commit 95e6e9e31c13949dfaed09cedf61b6bdbbf97eb9
Author: Sven Joachim 
Date:   Fri Mar 7 17:49:03 2014 +0100

Imported Upstream version 303

diff --git a/MANIFEST b/MANIFEST
index bc11abb..7cc89db 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-302, version xterm-302
+MANIFEST for xterm-303, version xterm-303
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/THANKS b/THANKS
index a38ebf9..1b83740 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.11 2013/08/08 08:24:07 tom Exp $
+-- $XTermId: THANKS,v 1.12 2014/03/03 19:31:41 tom Exp $
 -- vile:txtmode fk=8bit
 There's no AUTHORS file in this distribution; it would be redundant since
 I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -13,6 +13,7 @@ Here's a list from xterm.log.html of people who have 
contributed changes.
 Adam M Costello
 Adam Sulmicki
 Ailin Nemui
+Al Poole
 Alan Coopersmith
 Alex Hornung
 Alexander Pohoyda
@@ -23,6 +24,7 @@ Andreas Schwab
 Andres Perera
 Andrew Sumner
 Andrew Tipton
+Andrey Panov
 Andries E Brouwer
 Anton Kovalenko
 Balazs Kezes
@@ -155,6 +157,7 @@ Rob Braun
 Robert Brady
 Robert Earl
 Robin Cutshaw
+Romain Francois
 Ross Combs
 Ross Paterson
 Ryan Johnson
@@ -184,6 +187,7 @@ Tomohiro Kubota
 Tor Lillqvist
 Torrey Lyons
 Victor Stinner
+Vincent Lefevre
 Werner Lemberg
 Will Day
 Zdenek Sekera
diff --git a/main.c b/main.c
index 6157068..c644e7a 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.748 2014/03/03 01:15:27 tom Exp $ */
+/* $XTermId: main.c,v 1.751 2014/03/07 02:35:39 tom Exp $ */
 
 /*
  * Copyright 2002-2013,2014 by Thomas E. Dickey
@@ -1203,6 +1203,9 @@ static OptionHelp xtermOptions[] = {
 { "-/+rw", "turn on/off reverse wraparound" },
 { "-/+s",  "turn on/off multiscroll" },
 { "-/+sb", "turn on/off scrollbar" },
+#if OPT_REPORT_COLORS
+{ "-report-colors","report colors as they are allocated" },
+#endif
 #if OPT_REPORT_FONTS
 { "-report-fonts", "report fonts as loaded to stdout" },
 #endif
@@ -3149,9 +3152,37 @@ find_utmp(struct UTMP_STR *tofind)
 #define USE_NO_DEV_TTY 0
 #endif
 
+static int
+same_leaf(char *a, char *b)
+{
+char *p = x_basename(a);
+char *q = x_basename(b);
+return !strcmp(p, q);
+}
+
+/*
+ * "good enough" (inode wouldn't port to Cygwin)
+ */
+static int
+same_file(const char *a, const char *b)
+{
+struct stat asb;
+struct stat bsb;
+int result = 0;
+
+if ((stat(a, &asb) == 0)
+   && (stat(b, &bsb) == 0)
+   && ((asb.st_mode & S_IFMT) == S_IFREG)
+   && ((bsb.st_mode & S_IFMT) == S_IFREG)
+   && (asb.st_mtime == bsb.st_mtime)
+   && (asb.st_size == bsb.st_size)) {
+   result = 1;
+}
+return result;
+}
+
 /*
  * Only set $SHELL for paths found in the standard location.
- * ...or if $SHELL happens to give an absolute pathname to an executable.
  */
 static Boolean
 validShell(const char *pathname)
@@ -3179,6 +3210,9 @@ validShell(const char *pathname)
TRACE(("...test \"%s\"\n", q));
if (!strcmp(q, pathname)) {
result = True;
+   } else if (same_leaf(q, (char *) pathname) &&
+  same_file(q, pathname)) {
+   result = True;
}
free(r);
}
@@ -4577,7 +4611,7 @@ spawnXTerm(XtermWidget xw)
 * program rather than choosing between $SHELL and "/bin/sh".
 */
if (validShell(explicit_shname)) {
-   xtermSetenv("SHELL", shell_path = explicit_shname);
+   xtermSetenv("SHELL", explicit_shname);
} else if (validProgram(shell_path = x_getenv("SHELL"))) {
if (!validShell(shell_path)) {
xtermUnsetenv("SHELL");
@@ -4595,11 +4629,13 @@ spawnXTerm(XtermWidget xw)
 * Set $XTERM_SHELL, which is not necessarily a valid shell, but
 * is executable.
 */
-   if (explicit_shname != 0 && access(explicit_shname, X_OK) == 0) {
-   free(shell_path);
+   if (validProgram(explicit_shname)) {
shell_path =

Processing of xterm_303-1_i386.changes

2014-03-07 Thread Debian FTP Masters
xterm_303-1_i386.changes uploaded successfully to localhost
along with the files:
  xterm_303-1.dsc
  xterm_303.orig.tar.gz
  xterm_303-1.diff.gz
  xterm_303-1_i386.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wlybp-0004cs...@franck.debian.org



mesa: Changes to 'debian-experimental'

2014-03-07 Thread Julien Cristau
 debian/changelog  |4 ++--
 debian/control|   32 
 debian/mesa-opencl-icd.install.in |2 ++
 debian/rules  |3 +++
 4 files changed, 39 insertions(+), 2 deletions(-)

New commits:
commit 0260251c1e4ea26e6bf6d597cef90fafae422ee4
Author: Julien Cristau 
Date:   Fri Mar 7 22:40:23 2014 +0100

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index a78dd52..c34f774 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.1.0-1) UNRELEASED; urgency=low
+mesa (10.1.0-1) experimental; urgency=low
 
   [ Andreas Boll ]
   * Disable dri3 on !linux
@@ -10,7 +10,7 @@ mesa (10.1.0-1) UNRELEASED; urgency=low
   [ Sven Joachim ]
   * Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri.
 
- -- Andreas Boll   Mon, 03 Mar 2014 12:39:45 +0100
+ -- Julien Cristau   Fri, 07 Mar 2014 22:16:32 +0100
 
 mesa (10.1.0~rc2-1) experimental; urgency=medium
 

commit 7f57081a8e1e7152f1480eccb60cffdf1c1c3e83
Author: Julien Cristau 
Date:   Fri Mar 7 22:16:20 2014 +0100

Disable opencl on kfreebsd per aboll

diff --git a/debian/control b/debian/control
index c280496..ed08431 100644
--- a/debian/control
+++ b/debian/control
@@ -41,8 +41,8 @@ Build-Depends:
  llvm-3.4-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (>= 1.2.0) [linux-any],
- libclang-3.4-dev [linux-any kfreebsd-any],
- libclc-dev [linux-any kfreebsd-any],
+ libclang-3.4-dev [linux-any],
+ libclc-dev [linux-any],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
 Homepage: http://mesa3d.sourceforge.net/
@@ -789,7 +789,7 @@ Description: Debugging symbols for the Mesa VDPAU video 
acceleration drivers
 
 Package: mesa-opencl-icd
 Section: libs
-Architecture: linux-any kfreebsd-any
+Architecture: linux-any
 Depends:
  libclc-r600,
  ocl-icd-libopencl1,
@@ -805,7 +805,7 @@ Description: free implementation of the OpenCL API -- ICD 
runtime
 Package: mesa-opencl-icd-dbg
 Section: debug
 Priority: extra
-Architecture: linux-any kfreebsd-any
+Architecture: linux-any
 Depends:
  mesa-opencl-icd (= ${binary:Version}),
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 4dac588..481ea7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,6 +70,9 @@ else
EGL_DISPLAYS += drm
 # Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
EGL_DISPLAYS += wayland
+# < aboll> opencl needs gallium-pipe-loader which needs udev
+# so no opencl for kbsd
+   confflags_GALLIUM += --enable-opencl --enable-opencl-icd
 ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += nouveau
 endif
@@ -106,7 +109,6 @@ else
confflags_DIRECT_RENDERING = --enable-driglx-direct
confflags_OPENVG = --enable-openvg --enable-gallium-egl
confflags_GALLIUM += --enable-vdpau
-   confflags_GALLIUM += --enable-opencl --enable-opencl-icd
 endif
 confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
 confflags_GLES = --enable-gles1 --enable-gles2

commit d637474b442df21f6e2b5bf4d642bf3649b1a23c
Author: Julian Wollrath 
Date:   Wed Mar 5 19:14:58 2014 +0100

Bug#717500: [PATCH] Enable OpenCL support

v2: Add "Provides: opencl-icd"
v3: Andreas Boll 
- Add "Priority: extra" to debug package
- Enable build on kfreebsd
- Rename package to mesa-opencl-icd
- Fix rules/confflags to disable building on hurd

Signed-off-by: Andreas Boll 

diff --git a/debian/control b/debian/control
index c49cd58..c280496 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,8 @@ Build-Depends:
  llvm-3.4-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (>= 1.2.0) [linux-any],
+ libclang-3.4-dev [linux-any kfreebsd-any],
+ libclc-dev [linux-any kfreebsd-any],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
 Homepage: http://mesa3d.sourceforge.net/
@@ -785,4 +787,34 @@ Description: Debugging symbols for the Mesa VDPAU video 
acceleration drivers
  .
  This package contains the debugging symbols for the VDPAU drivers.
 
+Package: mesa-opencl-icd
+Section: libs
+Architecture: linux-any kfreebsd-any
+Depends:
+ libclc-r600,
+ ocl-icd-libopencl1,
+ ${shlibs:Depends},
+ ${misc:Depends},
+Provides: opencl-icd
+Description: free implementation of the OpenCL API -- ICD runtime
+ This package contains the mesa implementation of the OpenCL (Open Compute
+ Language) library, which is intended for use with an ICD loader. OpenCL
+ provides a standardized interface for computational analysis on graphical
+ processing units.
+
+Package: mesa-opencl-icd-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any kfreebsd-any
+Depends:
+ mesa-opencl-icd (= ${

mesa: Changes to 'refs/tags/mesa-10.1.0-1'

2014-03-07 Thread Julien Cristau
Tag 'mesa-10.1.0-1' created by Julien Cristau  at 
2014-03-07 21:40 +

Tagging upload of mesa 10.1.0-1 to experimental.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJTGjzKAAoJEDEBgAUJBeQMw68QALoSOFSuqyQM2UqsYhMDOt28
KUfSfGGPCuSO9K15jvZI11qH117dq37+TrP0ggV6xmwYRI2BUu5CZKTXLwl7jpAa
odKcXcWfftyTKWzHdMNNluGdF7v+vLMUmTOPeMMGqdGoPvujJeBUDYzDP7sHGrUC
gmK8h/WUNd2ago6lvMpF72a8Wc/Idy/mXO0wLrq8KZ4OLm6tOIlrDPrhhyw9O75c
fXS5hKU1svarawdx56IVkdnbmah9YTS/uT/Wn+pg8zX7EvsyRh766T7QhlZ/Fwpk
XqHA5V3/u6nHOrVKkHVm1CsVSxNZSmixDZBbyTyxat4n+gWfRk9dBS7wk9uCvyuW
C9PdCRkE7uDRh/Busw/7oHLzfLT98lXt7bU2orOh0zX+yLlq9j2B2brfszmPmQWv
gWxTkvXLaYhSvuJDJymIDrBSxoCsYNf5oGbqUPSGF2veCNsXxboEey7zWMD+2iI5
DYwG/OiQed4XdU01E8GKJjhoZacyvKIxPAXODiz1fLcwUNFpy1SD+gF0XJ1NfVZh
N96Hpkha+WRTF+5GRgsBeiTjCjXxJVsUSr/vm5UHGdSvAMe8aT8IEj9Zqt9U7BQd
W9p7o53XEBtNskbnEyEFLQ35Q3iXhFtC+op5gx8FoHIEBMW2UAnxRfu4tdDybb26
npV3d+4B72UzbeWVlPFj
=+JX8
-END PGP SIGNATURE-

Changes since mesa-10.1.0-rc2-1:
Andreas Boll (7):
  Disable dri3 on !linux
  Enable building drivers for libvdpau1
  Merge tag 'mesa-10.1' into debian-experimental
  New upstream release
  Drop 01-hurd.diff, upstream in 10.1.0
  Fix typo
  Next attempt to fix FTBFS on hurd

Anuj Phogat (1):
  i965: Fix the region's pitch condition to use blitter

Brian Paul (21):
  svga: refactor some shader code
  svga: check shader size against max command buffer size
  svga: replace out-of-temps assertion with debug warning
  svga: split / update svga3d header files
  svga: update dumping code with new GBS commands, etc
  svga: update svga_winsys interface for GBS
  svga: add new GBS commands
  svga: add svga_have_gb_objects/dma() functions
  svga: update constant buffer code for GBS
  svga: update shader code for GBS
  svga: add helpers for tracking rendering to textures
  svga: track which textures are rendered to
  svga: adjust adjustment for point coordinates
  svga: remove a couple unneeded assertions
  svga: add new helper functions for GBS buffers
  svga: update buffer code for GBS
  svga: update texture code for GBS
  svga/winsys: implement GBS support
  gallium/pipebuffer: change pb_cache_manager_create() size_factor to float
  mesa: do depth/stencil format conversion in glGetTexImage
  mesa: add unpacking code for MESA_FORMAT_Z32_FLOAT_S8X24_UINT

Chris Forbes (2):
  i965: Widen sampler key bitfields for 32 samplers
  i965: Validate (and resolve) all the bound textures.

Christian König (1):
  st/vdpau: add flush on unmap

Christoph Bumiller (1):
  nv50/ir/ra: fix SpillCodeInserter::offsetSlot usage

Emil Velikov (2):
  nv50: correctly calculate the number of vertical blocks during transfer 
map
  dri/i9*5: correctly calculate the amount of system memory

Francisco Jerez (1):
  i965/vec4: Add non-mutating helper functions to modify src_reg::swizzle 
and ::negate.

Fredrik Höglund (2):
  glx: Fix the default values for GLXFBConfig attributes
  glx: Fix the GLXFBConfig attrib sort priorities

Ian Romanick (4):
  i915: Only allow 8 vertex texture units
  i915: Allocate the sys_buffer using _mesa_align_malloc
  mesa: Bump version to 10.1-rc3
  mesa: Bump version to 10.1 (final)

Ilia Mirkin (1):
  nv50: make sure to clear _all_ layers of all attachments

Julian Wollrath (1):
  Bug#717500: [PATCH] Enable OpenCL support

Julien Cristau (3):
  glx/dri2: fix build failure on HURD
  Disable opencl on kfreebsd per aboll
  Upload to experimental

Kenneth Graunke (5):
  i965/vec4: Add a brw->gen >= 6 assertion in three-source emitters.
  i965/vec4: Handle ir_triop_lrp on Gen4-5 as well.
  i965: Stop lowering ir_triop_lrp.
  glsl: Delete LRP_TO_ARITH lowering pass flag.
  i965: Don't try to dump shader source for fixed-function FS programs.

Maarten Lankhorst (3):
  Merge tag 'mesa-10.1-rc3' into debian-experimental
  New upstream release.
  drop upstreamed patches

Marek Olšák (1):
  vdpau: flush the context before exporting the surface v2

Matt Turner (2):
  glsl: Add is_horizontal() method to ir_expression.
  glsl: Don't vectorize horizontal expressions.

Petri Latvala (1):
  i965: Allocate vec4_visitor's uniform_size and uniform_vector_size arrays 
dynamically.

Sven Joachim (1):
  Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri

Thomas Hellstrom (5):
  pipebuffer, winsys: Add a size match parameter to the cached buffer 
manager
  gallium/pipebuffer: Add a cache buffer manager bypass mask
  gallium/util: Add flush/map debug utility code
  svga/winsys: Propagate surface shared information to the winsys
  winsys/svga: Avoid calling drm getparam for max surface size on older 
kernels

Tom Stellard (1):
  r600g/compute: PIPE_CAP_COMPUTE should be false for pre-evergreen GPUs

---
 VERSION   

Processing of mesa_10.1.0-1_amd64.changes

2014-03-07 Thread Debian FTP Masters
mesa_10.1.0-1_amd64.changes uploaded successfully to localhost
along with the files:
  mesa_10.1.0-1.dsc
  mesa_10.1.0.orig.tar.gz
  mesa_10.1.0-1.diff.gz
  libgl1-mesa-swx11_10.1.0-1_amd64.deb
  libgl1-mesa-swx11-dbg_10.1.0-1_amd64.deb
  libgl1-mesa-swx11-dev_10.1.0-1_amd64.deb
  libxatracker2_10.1.0-1_amd64.deb
  libxatracker2-dbg_10.1.0-1_amd64.deb
  libxatracker-dev_10.1.0-1_amd64.deb
  libgbm1_10.1.0-1_amd64.deb
  libgbm1-dbg_10.1.0-1_amd64.deb
  libgbm-dev_10.1.0-1_amd64.deb
  libegl1-mesa_10.1.0-1_amd64.deb
  libegl1-mesa-dbg_10.1.0-1_amd64.deb
  libegl1-mesa-dev_10.1.0-1_amd64.deb
  libegl1-mesa-drivers_10.1.0-1_amd64.deb
  libegl1-mesa-drivers-dbg_10.1.0-1_amd64.deb
  libopenvg1-mesa_10.1.0-1_amd64.deb
  libopenvg1-mesa-dbg_10.1.0-1_amd64.deb
  libopenvg1-mesa-dev_10.1.0-1_amd64.deb
  libgles1-mesa_10.1.0-1_amd64.deb
  libgles1-mesa-dbg_10.1.0-1_amd64.deb
  libgles1-mesa-dev_10.1.0-1_amd64.deb
  libgles2-mesa_10.1.0-1_amd64.deb
  libgles2-mesa-dbg_10.1.0-1_amd64.deb
  libgles2-mesa-dev_10.1.0-1_amd64.deb
  libglapi-mesa_10.1.0-1_amd64.deb
  libglapi-mesa-dbg_10.1.0-1_amd64.deb
  libgl1-mesa-glx_10.1.0-1_amd64.deb
  libgl1-mesa-glx-dbg_10.1.0-1_amd64.deb
  libgl1-mesa-dri_10.1.0-1_amd64.deb
  libgl1-mesa-dri-dbg_10.1.0-1_amd64.deb
  libgl1-mesa-dev_10.1.0-1_amd64.deb
  mesa-common-dev_10.1.0-1_amd64.deb
  libosmesa6_10.1.0-1_amd64.deb
  libosmesa6-dev_10.1.0-1_amd64.deb
  mesa-vdpau-drivers_10.1.0-1_amd64.deb
  mesa-vdpau-drivers-dbg_10.1.0-1_amd64.deb
  mesa-opencl-icd_10.1.0-1_amd64.deb
  mesa-opencl-icd-dbg_10.1.0-1_amd64.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wm34u-0002fs...@franck.debian.org



mesa_10.1.0-1_amd64.changes is NEW

2014-03-07 Thread Debian FTP Masters
binary:mesa-opencl-icd-dbg is NEW.
binary:mesa-opencl-icd is NEW.
binary:mesa-vdpau-drivers is NEW.
binary:mesa-vdpau-drivers-dbg is NEW.

Your package contains new components which requires manual editing of
the override file.  It is ok otherwise, so please be patient.  New
packages are usually added to the override file about once a week.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wm38f-0003cc...@franck.debian.org