From 139f6475acf009f12bbf94cbbb329c48a7db5644 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Fri, 8 Dec 2006 18:47:41 +0000
Subject: minor cleanup: -remove obsolete WRKSRC definition -the http overflow
 (CVE-2006-2802) was fixed upstream

---
 multimedia/xine-lib/Makefile.common  |  3 +--
 multimedia/xine-lib/distinfo         |  3 +--
 multimedia/xine-lib/patches/patch-az | 14 --------------
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 multimedia/xine-lib/patches/patch-az

(limited to 'multimedia')

diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index ec48a03c7df..9c763a17f06 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2006/12/08 09:24:26 abs Exp $
+# $NetBSD: Makefile.common,v 1.37 2006/12/08 18:47:41 drochner Exp $
 #
 
 DISTNAME=		xine-lib-${XINE_LIB_VER}
@@ -22,7 +22,6 @@ USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	libtool libtool-nofpic
 PKGCONFIG_OVERRIDE=	misc/libxine.pc.in
 USE_TOOLS+=		autoconf gmake msgfmt pkg-config
-WRKSRC=			${WRKDIR}/xine-lib-1.1.3
 
 CONFIGURE_ARGS+=	--with-w32-path='${PREFIX}/lib/win32'
 CONFIGURE_ARGS+=	--without-external-ffmpeg --disable-ffmpegtest
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 4c88876f950..cbe4b6616bf 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2006/12/08 09:24:26 abs Exp $
+$NetBSD: distinfo,v 1.39 2006/12/08 18:47:41 drochner Exp $
 
 SHA1 (xine-lib-1.1.3.tar.gz) = c0886910ddb1afa1a72572decf12c0251bba40bf
 RMD160 (xine-lib-1.1.3.tar.gz) = 8e28638385ea48e7d4d4d702573ca92c4eca77c8
@@ -20,7 +20,6 @@ SHA1 (patch-ap) = c84a3ca97a4615a1b389f49847c0eefe0ee0478f
 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
 SHA1 (patch-av) = ff076273416fa701da325aa5060503ecb16a9ed1
 SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
-SHA1 (patch-az) = baa10413ae31ad5309180c662da774d64f614b49
 SHA1 (patch-bd) = 2f0f39512d185377cca1ebaf4e891d518a1c14d0
 SHA1 (patch-be) = 04eb23f58cb96dab4b7c7120092364915ebaf330
 SHA1 (patch-bg) = 83f97ad77c8295fcaf78a7ea7fe9c4f87efd80d0
diff --git a/multimedia/xine-lib/patches/patch-az b/multimedia/xine-lib/patches/patch-az
deleted file mode 100644
index 78f95fc1fc9..00000000000
--- a/multimedia/xine-lib/patches/patch-az
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-az,v 1.2 2006/12/08 09:24:26 abs Exp $
-
---- src/input/input_http.c.orig	2006-11-30 10:54:18.000000000 +0000
-+++ src/input/input_http.c
-@@ -789,7 +789,8 @@ static int http_plugin_open (input_plugi
-   while (!done) {
-     /* fprintf (stderr, "input_http: read...\n"); */
- 
--    if (_x_io_tcp_read (this->stream, this->fh, &this->buf[len], 1) <= 0) {
-+    if (len == sizeof(this->buf) ||
-+        _x_io_tcp_read (this->stream, this->fh, &this->buf[len], 1) <= 0) {
-       return -5;
-     }
- 
-- 
cgit v1.2.3