Upgrade ffmpeg010 to version 0.10.14 as of 2014-06-29.

Among the fixes are an integer overflow in lzo, corresponding
to CVE-2014-4610.

5 files changed, 25 insertions, 62 deletions

diff --git a/multimedia/ffmpeg010/Makefile b/multimedia/ffmpeg010/Makefile
index 0ef4cd89d72..1eccc1fd342 100644
--- a/multimedia/ffmpeg010/Makefile
+++ b/multimedia/ffmpeg010/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2014/07/04 10:27:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2014/07/09 12:48:59 he Exp $
 
-PKGNAME=	ffmpeg010-20130731.${DISTVERSION}
-PKGREVISION=	2
+PKGNAME=	ffmpeg010-20140629.${DISTVERSION}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software
+LICENSE=	gnu-lgpl-v2.1
 
 USE_GCC_RUNTIME=	yes
 
diff --git a/multimedia/ffmpeg010/Makefile.common b/multimedia/ffmpeg010/Makefile.common
index 2882822edb5..fa61ae88a20 100644
--- a/multimedia/ffmpeg010/Makefile.common
+++ b/multimedia/ffmpeg010/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2014/07/04 10:27:43 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.10 2014/07/09 12:48:59 he Exp $
 # used by multimedia/ffmpeg010/Makefile
 
 DISTNAME=	ffmpeg-${DISTVERSION:S/-//g}
@@ -6,7 +6,7 @@ CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.bz2
 
-DISTVERSION=	0.10.8
+DISTVERSION=	0.10.14
 PATCHDIR=	${.CURDIR}/../../multimedia/ffmpeg010/patches
 
 HAS_CONFIGURE=	YES
diff --git a/multimedia/ffmpeg010/distinfo b/multimedia/ffmpeg010/distinfo
index ba694e953c1..c4b8fc38652 100644
--- a/multimedia/ffmpeg010/distinfo
+++ b/multimedia/ffmpeg010/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.10 2014/06/27 17:58:09 drochner Exp $
+$NetBSD: distinfo,v 1.11 2014/07/09 12:48:59 he Exp $
 
-SHA1 (ffmpeg-0.10.8.tar.bz2) = 23b6713b5a403feab4bf57f9363353312ba77995
-RMD160 (ffmpeg-0.10.8.tar.bz2) = 1916b6fab6ec3f32d0f0f54d7964adf6f2852e57
-Size (ffmpeg-0.10.8.tar.bz2) = 5782880 bytes
-SHA1 (patch-CVE-2014-4610) = e70bb36823edae0a00aa557453328e43c850e954
+SHA1 (ffmpeg-0.10.14.tar.bz2) = 6fc91f763f49a4614fdef11b53210a3a2dc1f839
+RMD160 (ffmpeg-0.10.14.tar.bz2) = 2b56cd37ef595b773880bb1553faf541aea9c9ea
+Size (ffmpeg-0.10.14.tar.bz2) = 5786281 bytes
 SHA1 (patch-aa) = b30c822e03bb1766181d7b8b8d4122c196fd1d16
 SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f
 SHA1 (patch-ap) = b67db14f412bbca036b5e6573df68b64ac5dabc2
-SHA1 (patch-configure) = edc359ba50cdc90ad3ce7529f72e07970b679303
+SHA1 (patch-configure) = 3c275a594dc18eb60236f8a80dcd627ce4671e1a
 SHA1 (patch-doc_Makefile) = d74bcf7139e298ed1ce9b6efc32b00b45eea7f24
 SHA1 (patch-libavformat_nutdec.c) = eb16a4d2757bfc13a745cc62fab7711897bdeb30
diff --git a/multimedia/ffmpeg010/patches/patch-CVE-2014-4610 b/multimedia/ffmpeg010/patches/patch-CVE-2014-4610
deleted file mode 100644
index ecf3d379887..00000000000
--- a/multimedia/ffmpeg010/patches/patch-CVE-2014-4610
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-CVE-2014-4610,v 1.1 2014/06/27 17:58:09 drochner Exp $
-
---- libavutil/lzo.c.orig	2014-06-27 17:34:06.000000000 +0000
-+++ libavutil/lzo.c
-@@ -20,6 +20,7 @@
-  */
- 
- #include "avutil.h"
-+#include "avassert.h"
- #include "common.h"
- /// Avoid e.g. MPlayers fast_memcpy, it slows things down here.
- #undef memcpy
-@@ -62,7 +63,13 @@ static inline int get_byte(LZOContext *c
- static inline int get_len(LZOContext *c, int x, int mask) {
-     int cnt = x & mask;
-     if (!cnt) {
--        while (!(x = get_byte(c))) cnt += 255;
-+        while (!(x = get_byte(c))) {
-+	    if (cnt >= INT_MAX - 1000) {
-+		c->error |= AV_LZO_ERROR;
-+		break;
-+	    }
-+	    cnt += 255;
-+	}
-         cnt += mask + x;
-     }
-     return cnt;
-@@ -88,6 +95,7 @@ static inline int get_len(LZOContext *c,
- static inline void copy(LZOContext *c, int cnt) {
-     register const uint8_t *src = c->in;
-     register uint8_t *dst = c->out;
-+    av_assert0(cnt >= 0);
-     if (cnt > c->in_end - src) {
-         cnt = FFMAX(c->in_end - src, 0);
-         c->error |= AV_LZO_INPUT_DEPLETED;
-@@ -120,6 +128,7 @@ static inline void memcpy_backptr(uint8_
-  */
- static inline void copy_backptr(LZOContext *c, int back, int cnt) {
-     register uint8_t *dst = c->out;
-+    av_assert0(cnt > 0);
-     if (dst - c->out_start < back) {
-         c->error |= AV_LZO_INVALID_BACKPTR;
-         return;
diff --git a/multimedia/ffmpeg010/patches/patch-configure b/multimedia/ffmpeg010/patches/patch-configure
index 3c086e3b89b..eb8b34a13b0 100644
--- a/multimedia/ffmpeg010/patches/patch-configure
+++ b/multimedia/ffmpeg010/patches/patch-configure
@@ -1,8 +1,15 @@
-$NetBSD: patch-configure,v 1.3 2012/11/28 15:50:03 ryoon Exp $
+$NetBSD: patch-configure,v 1.4 2014/07/09 12:48:59 he Exp $
 
---- configure.orig	2012-06-09 20:09:44.000000000 +0000
+Several fixes:
+ - Enable pic on all non-i386 archs
+ - Use a more portable endianness-test
+ - Improve test of texi2html
+ - Disable symbol versioning test
+ - Always provide a run-path during linking
+
+--- configure.orig	2014-06-29 01:31:38.000000000 +0000
 +++ configure
-@@ -2604,6 +2604,11 @@ case $target_os in
+@@ -2614,6 +2614,11 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -14,7 +21,7 @@ $NetBSD: patch-configure,v 1.3 2012/11/28 15:50:03 ryoon Exp $
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          ;;
-@@ -2835,10 +2840,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -2845,10 +2850,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF
  
@@ -31,7 +38,7 @@ $NetBSD: patch-configure,v 1.3 2012/11/28 15:50:03 ryoon Exp $
  
  if enabled alpha; then
  
-@@ -3195,7 +3203,7 @@ else
+@@ -3203,7 +3211,7 @@ else
  fi
  enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
  
@@ -40,7 +47,7 @@ $NetBSD: patch-configure,v 1.3 2012/11/28 15:50:03 ryoon Exp $
  makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
  
  check_header linux/fb.h
-@@ -3291,6 +3299,7 @@ check_ldflags -Wl,--warn-common
+@@ -3306,6 +3314,7 @@ check_ldflags -Wl,--warn-common
  check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil
  test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
  
@@ -48,7 +55,7 @@ $NetBSD: patch-configure,v 1.3 2012/11/28 15:50:03 ryoon Exp $
  echo "X{};" > $TMPV
  if test_ldflags -Wl,--version-script,$TMPV; then
      append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -3303,6 +3312,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+@@ -3318,6 +3327,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
  void ff_foo(void) {}
  EOF
  fi
@@ -56,7 +63,7 @@ $NetBSD: patch-configure,v 1.3 2012/11/28 15:50:03 ryoon Exp $
  
  if [ -n "$optflags" ]; then
      add_cflags $optflags
-@@ -3726,7 +3736,7 @@ Version: $version
+@@ -3743,7 +3753,7 @@ Version: $version
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts: