From 1d4ee790afe5d01e0f9263d5c33eefbba616ebd8 Mon Sep 17 00:00:00 2001
From: salo <salo>
Date: Fri, 19 May 2006 13:32:55 +0000
Subject: Pullup ticket 1613 - requested by tron security fix for xine-lib

Revisions pulled up:
- pkgsrc/multimedia/xine-lib/Makefile			1.35, 1.36
- pkgsrc/multimedia/xine-lib/distinfo			1.28, 1.29
- pkgsrc/multimedia/xine-lib/patches/patch-at		1.3
- pkgsrc/multimedia/xine-lib/patches/patch-aw		1.3

   Module Name:		pkgsrc
   Committed By:	drochner
   Date:		Wed May  3 12:32:10 UTC 2006

   Modified Files:
   	pkgsrc/multimedia/xine-lib: Makefile distinfo
   Added Files:
   	pkgsrc/multimedia/xine-lib/patches: patch-aw

   Log Message:
   another missing mutex init
   bump PKGREVISION
---
   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Thu May 18 18:45:37 UTC 2006

   Modified Files:
   	pkgsrc/multimedia/xine-lib: Makefile distinfo
   Added Files:
   	pkgsrc/multimedia/xine-lib/patches: patch-at

   Log Message:
   Fix security problem reported in CVE-2006-1664.
   Bump package revision because of this fix.
---
 multimedia/xine-lib/Makefile         |  4 ++--
 multimedia/xine-lib/distinfo         |  4 +++-
 multimedia/xine-lib/patches/patch-at | 13 +++++++++++++
 multimedia/xine-lib/patches/patch-aw | 13 +++++++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 multimedia/xine-lib/patches/patch-at
 create mode 100644 multimedia/xine-lib/patches/patch-aw

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 9a01afc6888..fa094427bb5 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2006/02/05 23:10:18 joerg Exp $
+# $NetBSD: Makefile,v 1.31.2.1 2006/05/19 13:32:55 salo Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		5
+PKGREVISION=		8
 
 COMMENT=		Multimedia player library
 
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index ea523ea3b75..8bfa290a83d 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2006/01/25 20:06:33 tron Exp $
+$NetBSD: distinfo,v 1.27.2.1 2006/05/19 13:32:55 salo Exp $
 
 SHA1 (xine-lib-1.0.3a.tar.gz) = 2efe9bc3d85659731e8c679d2c60901a6101f17b
 RMD160 (xine-lib-1.0.3a.tar.gz) = 335abfaa46c4592a22246f75c3a455cd87b7cdc4
@@ -21,7 +21,9 @@ SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f
 SHA1 (patch-aq) = 6f486b79dcb14155f613df44b10ef8223b44167e
 SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30
 SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba
+SHA1 (patch-at) = 77bfc49591b50f3591b12c5f37a2a55d8ff8df66
 SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa
+SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
 SHA1 (patch-ba) = c4a5fbe9d88d21a90fe01359ace7831f2a865c86
 SHA1 (patch-bb) = 40978e50dcb060a2b8314b310a68684e62e90bc2
 SHA1 (patch-bd) = 5352293022da25b08598d42655af2524ff99b28a
diff --git a/multimedia/xine-lib/patches/patch-at b/multimedia/xine-lib/patches/patch-at
new file mode 100644
index 00000000000..2525f40e7d9
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.2.10.1 2006/05/19 13:32:55 salo Exp $
+
+--- src/xine-utils/list.c.orig	2004-12-20 21:38:24.000000000 +0000
++++ src/xine-utils/list.c	2006-05-18 12:04:23.000000000 +0100
+@@ -229,6 +229,8 @@
+   xine_node_t *node_cur;
+ 
+   node_cur = l->cur;
++  if (node_cur == NULL)
++    return;
+ 
+   if(node_cur->prev) {
+     node_cur->prev->next = node_cur->next;
diff --git a/multimedia/xine-lib/patches/patch-aw b/multimedia/xine-lib/patches/patch-aw
new file mode 100644
index 00000000000..245683c9e3b
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.2.12.1 2006/05/19 13:32:55 salo Exp $
+
+--- src/post/audio/upmix.c.orig	2006-05-03 14:21:23.000000000 +0200
++++ src/post/audio/upmix.c
+@@ -395,6 +395,8 @@ static post_plugin_t *upmix_open_plugin(
+   
+   _x_post_init(&this->post, 1, 0);
+ 
++  pthread_mutex_init(&this->lock, 0);
++
+   this->params.cut_off_freq = 100;
+   
+   port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output);
-- 
cgit v1.2.3