summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorwiz <wiz>2007-07-03 19:53:00 +0000
committerwiz <wiz>2007-07-03 19:53:00 +0000
commit988ee8a55006181833719e3b35f0edeb35890c5c (patch)
tree0d451b557d4361ab9168740d1bd64677858e3d83 /multimedia
parentbf10e81d3a0b2a28ec674d9f2fad5b1234e86233 (diff)
downloadpkgsrc-988ee8a55006181833719e3b35f0edeb35890c5c.tar.gz
Update to 1.1.3:
Changes since 1.1.2: xvidcore library * Fixed a potential vulnerability in mbcoding.c reported by Trixter Jack at Secunia (was already in patch-ac)
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xvidcore/Makefile5
-rw-r--r--multimedia/xvidcore/distinfo9
-rw-r--r--multimedia/xvidcore/patches/patch-ac48
3 files changed, 6 insertions, 56 deletions
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index e67ca53fd3a..87894524ccd 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2007/06/26 11:45:16 lkundrak Exp $
+# $NetBSD: Makefile,v 1.29 2007/07/03 19:53:00 wiz Exp $
-DISTNAME= xvidcore-1.1.2
-PKGREVISION= 1
+DISTNAME= xvidcore-1.1.3
CATEGORIES= multimedia
MASTER_SITES= http://downloads.xvid.org/downloads/
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/xvidcore/distinfo b/multimedia/xvidcore/distinfo
index ffb905d3dcf..cbf937b556d 100644
--- a/multimedia/xvidcore/distinfo
+++ b/multimedia/xvidcore/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.17 2007/06/26 15:31:34 tron Exp $
+$NetBSD: distinfo,v 1.18 2007/07/03 19:53:00 wiz Exp $
-SHA1 (xvidcore-1.1.2.tar.bz2) = a524c18f34133dc83b7be90abda7d0ae4ab3b7fb
-RMD160 (xvidcore-1.1.2.tar.bz2) = bc3dfbd176ece5f54bbd72f1e655eba4da9baeb4
-Size (xvidcore-1.1.2.tar.bz2) = 626741 bytes
+SHA1 (xvidcore-1.1.3.tar.bz2) = 7a945c245851e115bc107aa621f72d775a5d1adb
+RMD160 (xvidcore-1.1.3.tar.bz2) = f890a2ef58be5362aa1d2894e748ef11a0c7bba8
+Size (xvidcore-1.1.3.tar.bz2) = 625974 bytes
SHA1 (patch-aa) = 593ae63ddb5ec646d7f531b99783de64a9d6ceb3
SHA1 (patch-ab) = 19306e1db22eeb58e703b1b416b019c0d2c4a694
-SHA1 (patch-ac) = 14a89ffb15c5817ad1958d7e5246abdd33e3727c
diff --git a/multimedia/xvidcore/patches/patch-ac b/multimedia/xvidcore/patches/patch-ac
deleted file mode 100644
index f2053db81a1..00000000000
--- a/multimedia/xvidcore/patches/patch-ac
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/06/26 15:31:34 tron Exp $
-
-This is believed to fix CVE-2007-3329.
-Though there is no more information about the vulnerability apart from function names,
-it seems that coeff is the only index that could point out of bounds causing harm
-and only these three functions share this code.
-
---- ../../src/bitstream/mbcoding.c.orig 2007-06-26 13:38:17.000000000 +0200
-+++ ../../src/bitstream/mbcoding.c
-@@ -1073,12 +1073,10 @@ get_intra_block(Bitstream * bs,
- }
- coeff += run;
-
--#ifdef _DEBUG
- if(coeff>=64) {
- DPRINTF(XVID_DEBUG_ERROR,"error: overflow in coefficient index\n");
- return;
- }
--#endif
-
- block[scan[coeff]] = level;
-
-@@ -1121,12 +1119,10 @@ get_inter_block_h263(
- }
- p += run;
-
--#ifdef _DEBUG
- if(p>=64) {
- DPRINTF(XVID_DEBUG_ERROR,"error: overflow in coefficient index\n");
- return;
- }
--#endif
-
- if (level < 0) {
- level = level*quant_m_2 - quant_add;
-@@ -1163,12 +1159,10 @@ get_inter_block_mpeg(
- }
- p += run;
-
--#ifdef _DEBUG
- if(p>=64) {
- DPRINTF(XVID_DEBUG_ERROR,"error: overflow in coefficient index\n");
- return;
- }
--#endif
-
- if (level < 0) {
- level = ((2 * -level + 1) * matrix[scan[p]] * quant) >> 4;