Added patches to avoid printf() with non-literal format string and to replace tmpnam() use with mkstemp().

Package-Manager: portage-2.0.51.22-r2

5 files changed, 76 insertions, 9 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index f65664a4b0a4..8b523d9489aa 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/gxine
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.42 2005/08/01 18:54:06 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.43 2005/08/01 20:50:50 flameeyes Exp $
+
+  01 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gxine-0.4.6-literals.patch, +files/gxine-0.4.6-mkstemp.patch,
+  gxine-0.4.6.ebuild:
+  Added patches to avoid printf() with non-literal format string and to
+  replace tmpnam() use with mkstemp().
 
   01 Aug 2005; Joseph Jezak <josejx@gentoo.org> gxine-0.4.5.ebuild:
   Marked ppc stable for bug #100841.
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index fd4b79b57246..a032e3fba3b5 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 acc22302b0156c7ad88f05d13ee1fe3e ChangeLog 5999
-MD5 73bd3a950acb566960c18a9848782e20 gxine-0.4.5.ebuild 1512
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 612dd2a5b9ea379008933c7202ed0c23 gxine-0.4.6.ebuild 1537
 MD5 ded6b9e7aa7bd8af986c44be6f6672f0 gxine-0.4.1-r1.ebuild 1469
+MD5 73bd3a950acb566960c18a9848782e20 gxine-0.4.5.ebuild 1512
+MD5 5f82ed23c901af96d9dfbe63be5b5e88 ChangeLog 6260
+MD5 3340a7a88fa99e73b35bdeba837de10e gxine-0.4.6.ebuild 1626
 MD5 0b50a3889d71fe54fb9249c53257d9d6 files/gxine-0.4.1-menu-fix.patch 873
 MD5 a5dc1655a0734939aaf026899e7c97a8 files/gxine-0.4.4-secfix.patch 515
-MD5 fb579db8b42db43fb5c027ca8c78e951 files/digest-gxine-0.4.5 64
 MD5 69140a1cb8cc6acb6ffdca76e9301493 files/digest-gxine-0.4.1-r1 64
+MD5 fb579db8b42db43fb5c027ca8c78e951 files/digest-gxine-0.4.5 64
 MD5 f2e455a1b17385f10fa014eb9c7e14e3 files/digest-gxine-0.4.6 64
+MD5 8860a875faf80dd138c80c99b9d3375d files/gxine-0.4.6-literals.patch 541
+MD5 6681123d68137e59a504366751791a87 files/gxine-0.4.6-mkstemp.patch 1198
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC7m/PcsIHjyDViGQRApeGAKCGa0oO9G5BI6FqULO8b8HgLRdGpgCgicvD
-QzKP9Y/t2dGrhG0onlaen28=
-=gcJd
+iD8DBQFC7otZj5H05b2HAEkRAnKoAKCYCdiGDnr9xiGNRRuMMS29MukZjQCgl3zz
+Oo+SHth8mLfyQ60YJtJqh8M=
+=21Jp
 -----END PGP SIGNATURE-----
diff --git a/media-video/gxine/files/gxine-0.4.6-literals.patch b/media-video/gxine/files/gxine-0.4.6-literals.patch
new file mode 100644
index 000000000000..7135c02c9cc6
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.4.6-literals.patch
@@ -0,0 +1,12 @@
+diff -ur gxine-0.4.6/src/post.c gxine-0.4.6-literals/src/post.c
+--- gxine-0.4.6/src/post.c	2005-05-19 02:25:43.000000000 +0200
++++ gxine-0.4.6-literals/src/post.c	2005-08-01 21:47:19.613011536 +0200
+@@ -432,7 +432,7 @@
+ {
+   const gxine_post_t *info = g_object_get_data (G_OBJECT(widget), "post");
+   memset (info->params + param->offset, 0, param->size);
+-  snprintf (info->params + param->offset, param->size,
++  snprintf (info->params + param->offset, param->size, "%s",
+ 	    gtk_editable_get_chars (widget, 0, -1));
+   return FALSE;
+ }
diff --git a/media-video/gxine/files/gxine-0.4.6-mkstemp.patch b/media-video/gxine/files/gxine-0.4.6-mkstemp.patch
new file mode 100644
index 000000000000..f84fb60fed81
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.4.6-mkstemp.patch
@@ -0,0 +1,43 @@
+diff -x '*~' -ur gxine-0.4.6/src/client.c gxine-0.4.6-mkstemp/src/client.c
+--- gxine-0.4.6/src/client.c	2005-03-17 01:55:23.000000000 +0100
++++ gxine-0.4.6-mkstemp/src/client.c	2005-08-01 22:35:54.497881680 +0200
+@@ -47,11 +47,11 @@
+ 
+ int main (int argc, char **argv) {
+ 
+-  int                fd;
++  int                fd, tfd;
+   struct sockaddr_un cli_adr, serv_adr;
+   int                length = sizeof(struct sockaddr_un);
+   char               filename [1024];
+-  char              *tstr;
++  char               *tstr;
+   int		     ret = 0;
+ 
+   signal (SIGPIPE, sigpipe);
+@@ -66,10 +66,14 @@
+   /* initialize the client address structure */
+   memset (&cli_adr, 0, sizeof (cli_adr));
+   cli_adr.sun_family = AF_UNIX;
+-  tstr = tmpnam (NULL);
+-  strcpy (cli_adr.sun_path, tstr);
+-  
++  tstr = strdup("/tmp/gxine_XXXXXX");
++  if ( (tfd = mkstemp(tstr)) < 0 ) {
++    perror ("mkstemp");
++    exit (EXIT_FAILURE);
++  }
++  close(tfd);
+   unlink (tstr);
++  strncpy(cli_adr.sun_path, tstr, 107);
+ 
+   /* bind the socket to the client's address */
+   if (bind (fd, (struct sockaddr*) &cli_adr, length) < 0) {
+@@ -139,6 +143,7 @@
+   close(fd);
+ 
+   unlink (tstr);
++  free(tstr);
+ 
+   return ret;
+ }
diff --git a/media-video/gxine/gxine-0.4.6.ebuild b/media-video/gxine/gxine-0.4.6.ebuild
index 8bb2dad6316a..e22cac70eb8e 100644
--- a/media-video/gxine/gxine-0.4.6.ebuild
+++ b/media-video/gxine/gxine-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.6.ebuild,v 1.1 2005/07/31 10:07:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.6.ebuild,v 1.2 2005/08/01 20:50:50 flameeyes Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -28,6 +28,10 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-literals.patch
+	epatch ${FILESDIR}/${P}-mkstemp.patch
 
 	# Fix icon as per icon theme specs.
 	sed -i -e 's:gxine-logo.png:gxine:' ${S}/gxine.desktop