rpms/eterm/devel Eterm-0.9.4-CVE-2008-1692.patch, NONE, 1.1 eterm.spec, 1.8, 1.9

[Terje Røsten (terjeros)]

Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18346

Modified Files:
	eterm.spec 
Added Files:
	Eterm-0.9.4-CVE-2008-1692.patch 
Log Message:
* Tue Apr  8 2008 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-10
- Closing CVE-2008-1692


Eterm-0.9.4-CVE-2008-1692.patch:

--- NEW FILE Eterm-0.9.4-CVE-2008-1692.patch ---
diff -ruN eterm-0.9.4.0debian1.original/src/startup.c eterm-0.9.4.0debian1/src/startup.c
--- eterm-0.9.4.0debian1.original/src/startup.c	2006-08-22 20:23:12.000000000 +0200
+++ eterm-0.9.4.0debian1/src/startup.c	2008-03-28 13:51:44.000000000 +0100
@@ -95,11 +95,7 @@
     init_libast();
 
     /* Open display, get options/resources and create the window */
-    if (getenv("DISPLAY") == NULL) {
-        display_name = STRDUP(":0");
-    } else {
-        display_name = STRDUP(getenv("DISPLAY"));
-    }
+    display_name = NULL;
 
     /* This MUST be called before any other Xlib functions */
 #ifdef SPIFOPT_SETTING_PREPARSE
@@ -116,7 +112,9 @@
     privileges(REVERT);
 #endif
     if (!Xdisplay && !(Xdisplay = XOpenDisplay(display_name))) {
-        libast_print_error("can't open display %s\n", display_name);
+        libast_print_error("can't open display %s\n", display_name?display_name:
+			getenv("DISPLAY")?getenv("DISPLAY"):
+			"as no --display given and DISPLAY not set");
         exit(EXIT_FAILURE);
     }
     XSetErrorHandler((XErrorHandler) xerror_handler);


Index: eterm.spec
===================================================================
RCS file: /cvs/extras/rpms/eterm/devel/eterm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eterm.spec	9 Feb 2008 20:36:04 -0000	1.8
+++ eterm.spec	8 Apr 2008 08:42:46 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Enlightened terminal emulator
 Name: eterm
 Version: 0.9.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD
 Group: User Interface/Desktops
 Source0: http://www.eterm.org/download/Eterm-%{version}.tar.gz
@@ -9,6 +9,7 @@
 Source2: %{name}.png
 Patch1: Eterm-0.9.4-no-rpath.patch
 Patch2: Eterm-0.9.4-automake-1.10.patch
+Patch3: Eterm-0.9.4-CVE-2008-1692.patch
 URL: http://www.eterm.org/
 Requires: imlib2
 BuildRequires: imlib2-devel libast-devel libXmu-devel 
@@ -30,6 +31,7 @@
 %setup -a 1 -q -n Eterm-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # Touching Makefile.am
@@ -98,6 +100,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Tue Apr  8 2008 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-10
+- Closing CVE-2008-1692
+
 * Sat Feb  9 2008 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-9
 - Rebuild