# HG changeset patch
# User Darren Salt <[EMAIL PROTECTED]>
# Date 1172442582 0
# Node ID 671d134b2b1f5795f1e715e0db75638f5bb69175
# Parent 670c371b657713b9b59186844277f8268c698330
# Parent 3e5cb046702753584565972c825181072b5420cf
Merge what was to be 0.5.8-2 (before the security issue came up) for 0.5.8-3.
diff -r 671d134b2b1f5795f1e715e0db75638f5bb69175 -r
670c371b657713b9b59186844277f8268c698330 debian/changelog
--- a/debian/changelog Sun Feb 25 22:29:42 2007 +0000
+++ b/debian/changelog Sun Feb 25 21:34:45 2007 +0000
@@ -1,30 +1,49 @@ gxine (0.5.8-2) unstable; urgency=medium
-gxine (0.5.8-2) unstable; urgency=medium
-
- * Various fixes, targetted for inclusion in etch, hence the urgency.
- None are actually RC.
+gxine (0.5.8-3) unstable; urgency=medium
+
+ * Various fixes, targetted for inclusion in etch.
* Patches backported from hg head:
+ Important:
- Say something useful if the stream couldn't be opened or demux failed.
- - Fix a hang should gxine try to report an error.
+ Without this, you'll see "Unknown error" for demux failures and missing
+ or inaccessible files.
+ - Fix a hang should gxine try to report an error while starting up.
- gdk_threads_leave() was called once too many if xine_open() failed.
- Reinstate the GDK thread locking around the error display code (due to
the error hang fix causing a different error hang).
+ - Fix a bug in the HTTP handler (sscanf discarded string).
+ Without this, gcc reports the following:
+ http.c: In function ‘http_open’:
+ http.c:502: warning: too many arguments for format
+ and the string won't be written to the buffer.
+ Normal:
- - Fixes for when closing the "about" dbox.
+ - Fixes for when closing the "about" box. (SF bug 1576681)
+ Needed to cope well with changes in GtkAboutDialog (GNOME bug 333360).
- Stop repeated errors in case of failure to open the logo image.
- - Fix a bug in the HTTP handler (sscanf discarded string).
+ This is not expected to be triggered with etch's libxine1.
+ Minor:
- Delay signal attachment to avoid possible GTK warnings during startup.
- - German translation updates, related to other changes in this patch set.
- Stop xscreensaver from blanking the screen while running in
- full-screen mode. (Ubuntu 64135)
-
- * Define XSSCMD (xscreensaver-command) at build time, else build will fail.
- * Enabled the watchdog code: kills gxine if it gets stuck for 30 seconds.
- Due to some of the above patches, I don't expect this code to be invoked.
-
- -- Darren Salt <[EMAIL PROTECTED]> Sat, 25 Nov 2006 14:51:54 +0000
+ full-screen mode. (Ubuntu bug 64135)
+ - Translation fixups for the xscreensaver patch.
+
+ * Define XSSCMD (xscreensaver-command) at build time, else build will fail
+ due to the xscreensaver patch and the lack of a build-dep on xscreensaver.
+
+ -- Darren Salt <[EMAIL PROTECTED]> Sun, 25 Feb 2007 22:21:59 +0000
+
+gxine (0.5.8-2) unstable; urgency=high
+
+ * SECURITY FIX (local exploit) (closes: #405876)
+ This version fixes a potential buffer overflow in gxine's server
+ component and in gxine_client. This overflow would occur were $HOME
+ sufficiently long - 94 bytes or more would cause socket creation or
+ connection failure, and 242 bytes or more would cause a segfault or
+ possible arbitrary code execution.
+ * Enabled the watchdog code (which will kill gxine if it gets stuck for
+ 30 seconds).
+
+ -- Darren Salt <[EMAIL PROTECTED]> Sun, 07 Jan 2007 19:32:05 +0000
gxine (0.5.8-1) unstable; urgency=low
diff -r 671d134b2b1f5795f1e715e0db75638f5bb69175 -r
670c371b657713b9b59186844277f8268c698330 debian/control
--- a/debian/control Sun Feb 25 22:29:42 2007 +0000
+++ b/debian/control Sun Feb 25 21:34:45 2007 +0000
@@ -3,7 +3,7 @@ Priority: optional
Priority: optional
Maintainer: Siggi Langauf <[EMAIL PROTECTED]>
Uploaders: Darren Salt <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), libxine-dev (>= 1.0), libgtk2.0-dev,
libxaw7-dev, libxtst-dev, libmozjs-dev | libsmjs-dev, liblircclient-dev,
libdbus-glib-1-dev | dbus-glib-1-dev, dpatch
+Build-Depends: debhelper (>> 4.0.0), dpatch, libxine-dev (>= 1.0),
libgtk2.0-dev, libxaw7-dev, libxtst-dev, libmozjs-dev | libsmjs-dev,
liblircclient-dev, libdbus-glib-1-dev | dbus-glib-1-dev
Standards-Version: 3.7.2
Package: gxine
diff -r 671d134b2b1f5795f1e715e0db75638f5bb69175 -r
670c371b657713b9b59186844277f8268c698330 debian/patches/00list
--- a/debian/patches/00list Sun Feb 25 22:29:42 2007 +0000
+++ b/debian/patches/00list Sun Feb 25 21:34:45 2007 +0000
@@ -1,3 +1,4 @@ 01-poke-xscreensaver
+01_prevent_local_exploit
01-poke-xscreensaver
02-close-about-dbox
03-improve-error-reporting
diff -r 671d134b2b1f5795f1e715e0db75638f5bb69175 -r
670c371b657713b9b59186844277f8268c698330
debian/patches/01_prevent_local_exploit.dpatch
--- a/debian/patches/01_prevent_local_exploit.dpatch Sun Feb 25 22:29:42
2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_prevent_local_exploit.dpatch by <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: SECURITY FIX (local exploit)
-## DP: This version fixes a potential buffer overflow in gxine's server
-## DP: component and in gxine_client. This overflow would occur were $HOME
-## DP: sufficiently long - 94 bytes or more would cause socket creation or
-## DP: connection failure, and 242 bytes or more would cause a segfault or
-## DP: possible arbitrary code execution.
-
[EMAIL PROTECTED]@
-diff -urNad gxine-0.5.8-deb~/src/client.c gxine-0.5.8-deb/src/client.c
---- gxine-0.5.8-deb~/src/client.c 2007-01-07 03:08:48.000000000 +0000
-+++ gxine-0.5.8-deb/src/client.c 2007-01-07 19:28:15.984461996 +0000
-@@ -70,6 +70,11 @@
-
- /* server filename */
- snprintf (filename, sizeof (filename), SOCKET_FILENAME, getenv ("HOME"));
-+ if (strlen (filename) >= sizeof (cli_adr.u.sun_path))
-+ {
-+ fputs (_("socket: name too long - cannot connect\n"), stderr);
-+ exit (EXIT_FAILURE);
-+ }
-
- g_print (_("Connecting to %s...\n"), filename);
-
-diff -urNad gxine-0.5.8-deb~/src/server.c gxine-0.5.8-deb/src/server.c
---- gxine-0.5.8-deb~/src/server.c 2007-01-07 03:08:48.000000000 +0000
-+++ gxine-0.5.8-deb/src/server.c 2007-01-07 19:28:43.748688602 +0000
-@@ -187,7 +187,14 @@
- {
- char filename[FILENAME_MAX];
- snprintf (filename, sizeof (filename), SOCKET_FILENAME, getenv ("HOME"));
-- gxsocket = make_socket (filename);
-+ if (strlen (filename) >= sizeof (((struct sockaddr_un *)0)->sun_path))
-+ {
-+ fputs (_("server: name too long - gxine_client will not be able to
connect\n"),
-+ stderr);
-+ gxsocket = -1;
-+ }
-+ else
-+ gxsocket = make_socket (filename);
- }
-
- void server_start (void)
-@@ -244,6 +251,8 @@
-
- /* server filename */
- snprintf (filename, PATH_MAX, SOCKET_FILENAME, getenv ("HOME"));
-+ if (strlen (filename) >= sizeof (cli_adr.u.sun_path))
-+ return 0; /* no point in printing anything... */
-
- logprintf ("server: trying to connect to already running instance of gxine
(%s)...\n",
- filename);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
