[Frugalware-darcs] frugalware-0.5: xine-ui-0.99.4-3siwenna1-i686

[voroskoi]

Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.5;a=darcs_commitdiff;h=20070210225324-dd049-d007ea81f80d93fbc943b352ac5d384a819398cb.gz;

[xine-ui-0.99.4-3siwenna1-i686
voroskoi <voroskoi at frugalware.org>**20070210225324
 secfix relbump, closes #1617
] {
addfile ./source/xapps/xine-ui/CVE-2007-0254.diff
addfile ./source/xapps/xine-ui/leak.diff
hunk ./source/xapps/xine-ui/CVE-2007-0254.diff 1
+--- xine-ui/src/xitk/errors.c	2005/02/07 18:16:28	1.32
++++ xine-ui/src/xitk/errors.c	2006/06/29 14:08:13	1.33
+@@ -17,7 +17,7 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+  *
+- * $Id: errors.c,v 1.32 2005/02/07 18:16:28 miguelfreitas Exp $
++ * $Id: errors.c,v 1.33 2006/06/29 14:08:13 dgp85 Exp $
+  *
+  * xine engine error handling/notification
+  *
+@@ -68,7 +68,7 @@
+ 						 _("Done"), _("More..."),
+ 						 NULL, _errors_display_log, 
+ 						 NULL, 400, ALIGN_CENTER,
+-						 message);
++						 "%s", message);
+ 
+   xitk_window_set_parent_window(xw, gGui->video_window);
+ 
+@@ -125,7 +125,7 @@
+     } else {
+       xitk_window_t *xw;
+ 
+-      xw = xitk_window_dialog_error(gGui->imlib_data, buf2);
++      xw = xitk_window_dialog_error(gGui->imlib_data, "%s", buf2);
+ 
+       if(!gGui->use_root_window && gGui->video_display == gGui->display) {
+         XLockDisplay(gGui->display);
+@@ -228,7 +228,7 @@
+     } else {
+       xitk_window_t *xw;
+ 
+-      xw = xitk_window_dialog_info(gGui->imlib_data, buf2);
++      xw = xitk_window_dialog_info(gGui->imlib_data, "%s", buf2);
+ 
+       if(!gGui->use_root_window && gGui->video_display == gGui->display) {
+         XLockDisplay(gGui->display);
+@@ -354,7 +354,7 @@
+                                                  _("Disable this warning."),
+                                                  checked, _dont_show_too_slow_again,
+ 						 NULL, 500, ALIGN_CENTER,
+-						 message);
++						 "%s", message);
+   if(!gGui->use_root_window && gGui->video_display == gGui->display) {
+     XLockDisplay(gGui->display);
+     XSetTransientForHint(gGui->display, xitk_window_get_window(xw), gGui->video_window);
hunk ./source/xapps/xine-ui/FrugalBuild 1
-# Last Modified: Thu, 27 Apr 2006 16:07:34 +0200
hunk ./source/xapps/xine-ui/FrugalBuild 6
-pkgrel=2
+pkgrel=3siwenna1
hunk ./source/xapps/xine-ui/FrugalBuild 8
+_F_sourceforge_dirname="xine"
+Finclude sourceforge
hunk ./source/xapps/xine-ui/FrugalBuild 15
-source=(http://heanet.dl.sourceforge.net/sourceforge/xine/$pkgname-$pkgver.tar.gz \
-	xine-ui-0.99.4-CVE-2006-1905.diff)
-sha1sums=('b982e5697f183559c216f9243b9410d61b9c58aa' \
-	  'c527cf014bb83f00ea080be03821e39970b4ba3b')
+source=($source xine-ui-0.99.4-CVE-2006-1905.diff CVE-2007-0254.diff leak.diff)
hunk ./source/xapps/xine-ui/FrugalBuild 17
+sha1sums=('b982e5697f183559c216f9243b9410d61b9c58aa'\
+          'c527cf014bb83f00ea080be03821e39970b4ba3b'\
+          '9fab4596fdbd66d90273403e22b54323fced98de'\
+          '78d23c380da0fc0d835f728f0a7d17dd67722e89')
hunk ./source/xapps/xine-ui/leak.diff 1
+Index: xine-ui-0.99.4/src/xitk/main.c
+===================================================================
+--- xine-ui-0.99.4.orig/src/xitk/main.c
++++ xine-ui-0.99.4/src/xitk/main.c
+@@ -375,6 +375,7 @@ static void xrm_parse(void) {
+   }
+   
+   (void) XrmMergeDatabases(server_rmdb, &rmdb);
++  if ( server_rmdb != rmdb ) XrmDestroyDatabase(server_rmdb);
+   
+   if((environment = getenv("XENVIRONMENT")) == NULL) {
+     int len;
+@@ -758,10 +759,11 @@ static xine_video_port_t *load_video_out
+ #ifdef HAVE_XINERAMA
+   if (XineramaQueryExtension(gGui->video_display, &dummy_event, &dummy_error)) {
+     int count = 1;
+-    XineramaQueryScreens(gGui->video_display, &count);
++    XineramaScreenInfo *info = XineramaQueryScreens(gGui->video_display, &count);
+     if (count > 1)
+       /* multihead -> assuming square pixels */
+       gGui->pixel_aspect = 1.0;
++    if ( info ) XFree(info);
+   }
+ #endif
+ 
}