From 2e5f4dd3979ab699cd64b7b3feb58fd131eebe70 Mon Sep 17 00:00:00 2001
From: bernd <bernd@openbsd.org>
Date: Sat, 22 Apr 2006 18:37:28 +0000
Subject: [PATCH] Fix some format string vulnerabilities and bump PKGNAME.
 http://www.open-security.org/advisories/16

from NetBSD

ok jakemsr@
---
 multimedia/xine-ui/Makefile                   |  3 +-
 .../xine-ui/patches/patch-src_xitk_main_c     | 30 +++++++++++++++++++
 .../patch-src_xitk_xine-toolkit_xitk_c        | 12 ++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 multimedia/xine-ui/patches/patch-src_xitk_main_c
 create mode 100644 multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_xitk_c

diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 8d7e1a3db5d..b2b86beb59f 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2006/03/24 22:46:37 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.2 2006/04/22 18:37:28 bernd Exp $
 
 COMMENT=		"multimedia player"
 
 DISTNAME=		xine-ui-0.99.4
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		multimedia
 
 HOMEPAGE=		http://xinehq.de/
diff --git a/multimedia/xine-ui/patches/patch-src_xitk_main_c b/multimedia/xine-ui/patches/patch-src_xitk_main_c
new file mode 100644
index 00000000000..22cd20d5b4a
--- /dev/null
+++ b/multimedia/xine-ui/patches/patch-src_xitk_main_c
@@ -0,0 +1,30 @@
+$OpenBSD: patch-src_xitk_main_c,v 1.1 2006/04/22 18:37:28 bernd Exp $
+--- src/xitk/main.c.orig	Sun Jul 24 04:40:37 2005
++++ src/xitk/main.c	Sat Apr 22 11:49:42 2006
+@@ -456,7 +456,7 @@ static void print_formatted(char *title,
+   int          len;
+   char        *blanks = "     ";
+ 
+-  printf(title);
++  printf("%s", title);
+   
+   sprintf(buffer, "%s", blanks);
+   plugin = *plugins++;
+@@ -469,7 +469,7 @@ static void print_formatted(char *title,
+       sprintf(buffer, "%s%s%s", buffer, (strlen(buffer) == strlen(blanks)) ? "" : ", ", plugin);
+     }
+     else {
+-      printf(buffer);
++      printf("%s", buffer);
+       printf(",\n");
+       snprintf(buffer, sizeof(buffer), "%s%s", blanks, plugin);
+     }
+@@ -478,7 +478,7 @@ static void print_formatted(char *title,
+   }
+   
+   if(strlen(buffer))
+-    printf(buffer);
++    printf("%s", buffer);
+   
+   printf(".\n\n");
+ }
diff --git a/multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_xitk_c b/multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_xitk_c
new file mode 100644
index 00000000000..5a7948f4948
--- /dev/null
+++ b/multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_xitk_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_xitk_xine-toolkit_xitk_c,v 1.1 2006/04/22 18:37:28 bernd Exp $
+--- src/xitk/xine-toolkit/xitk.c.orig	Sat May 21 00:02:05 2005
++++ src/xitk/xine-toolkit/xitk.c	Sat Apr 22 11:49:42 2006
+@@ -1877,7 +1877,7 @@ void xitk_init(Display *display, XColor 
+   sprintf(buffer, "%s%s", buffer, " ]-");
+ 
+   if(verbosity)
+-    printf(buffer);
++    printf("%s", buffer);
+ 
+   gXitk->wm_type = xitk_check_wm(display);
+