lame: update to 3.100.

Many bug fixes and security fixes.

8 files changed, 12 insertions, 280 deletions

diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 5dd4f0b531b..1c303af2b7a 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2016/09/02 14:07:43 maya Exp $
+# $NetBSD: Makefile,v 1.80 2017/10/21 22:51:00 wiz Exp $
 
-DISTNAME=	lame-3.99.5
-PKGREVISION=	3
+DISTNAME=	lame-3.100
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lame/}
 
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index 3e6b9a218e6..98349e8658c 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.28 2016/09/02 14:30:34 maya Exp $
+$NetBSD: distinfo,v 1.29 2017/10/21 22:51:00 wiz Exp $
 
-SHA1 (lame-3.99.5.tar.gz) = 03a0bfa85713adcc6b3383c12e2cc68a9cfbf4c4
-RMD160 (lame-3.99.5.tar.gz) = 8a0990af918b635cc79eb27a3beafc6c0ee13a9f
-SHA512 (lame-3.99.5.tar.gz) = ce62d7eb9fc8c53c343374ded30f11153a296910f0be7e649197bca7412c6660aad1aa6143d56b750f866229eb492cf7bb4f682535c383fb4aa57d7077d8b4d8
-Size (lame-3.99.5.tar.gz) = 1445348 bytes
-SHA1 (patch-ab) = e356b7614cfd4a2012f66926fe58a717dcc130f3
+SHA1 (lame-3.100.tar.gz) = 64c53b1a4d493237cef5e74944912cd9f98e618d
+RMD160 (lame-3.100.tar.gz) = e467c1f9458ca6878cd46e89fffce8970b9ea936
+SHA512 (lame-3.100.tar.gz) = 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
+Size (lame-3.100.tar.gz) = 1524133 bytes
+SHA1 (patch-ab) = ee5b570e8800aefdaffe94a6ed072fa7b62fba6b
 SHA1 (patch-ad) = fa14817f765a61f046a96a1b556e2c8203fc27ad
-SHA1 (patch-configure) = eabfd5c2fb68a7687f28d184dac75511772eef9a
-SHA1 (patch-configure.in) = 6ca01d610b94a402f2c2b351aa901a5072f3a0cb
-SHA1 (patch-frontend_get__audio.c) = c6df7a003d07e916c5129d45322c708f09b524e8
-SHA1 (patch-libmp3lame_lame.c) = bdc403ff8a1a7d5a6082b4d214fd43df99b1344e
-SHA1 (patch-libmp3lame_util.c) = b327113542f6ea7c9ec6af96a63635275335d364
diff --git a/audio/lame/patches/patch-ab b/audio/lame/patches/patch-ab
index f67fcd2a734..dbb2cf14bcc 100644
--- a/audio/lame/patches/patch-ab
+++ b/audio/lame/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.10 2011/11/29 20:26:48 wiz Exp $
+$NetBSD: patch-ab,v 1.11 2017/10/21 22:51:00 wiz Exp $
 
---- doc/html/Makefile.in.orig	2011-04-20 12:53:27.000000000 +0000
+--- doc/html/Makefile.in.orig	2017-10-13 20:21:58.000000000 +0000
 +++ doc/html/Makefile.in
-@@ -215,7 +215,7 @@ top_builddir = @top_builddir@
+@@ -298,7 +298,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign ansi2knr
+ AUTOMAKE_OPTIONS = foreign
  pkgdocdir = $(docdir)/$(PACKAGE)
 -pkghtmldir = $(pkgdocdir)/html
 +pkghtmldir = $(pkgdocdir)
diff --git a/audio/lame/patches/patch-configure b/audio/lame/patches/patch-configure
deleted file mode 100644
index 00b101a248a..00000000000
--- a/audio/lame/patches/patch-configure
+++ /dev/null
@@ -1,184 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2016/09/02 14:30:06 maya Exp $
-
-initscr is a curses function, not termcap.
-
-test if we can compile SSE at configure, don't just
-assume that we can because we have xmmintrin.h
-
---- configure.orig	2012-02-28 18:54:37.000000000 +0000
-+++ configure
-@@ -11922,7 +11922,6 @@ for ac_header in \
- 		 sys/soundcard.h \
- 		 sys/time.h \
- 		 unistd.h \
--		 xmmintrin.h \
- 		 linux/soundcard.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -11936,6 +11935,30 @@ fi
- 
- done
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking working SSE intrinsics" >&5
-+$as_echo_n "checking working SSE intrinsics... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <xmmintrin.h>
-+int
-+main ()
-+{
-+_mm_sfence();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+$as_echo "#define HAVE_XMMINTRIN_H 1" >>confdefs.h
-+
-+     ac_cv_header_xmmintrin_h=yes
-+else
-+  ac_cv_header_xmmintrin_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_header_xmmintrin_h}" >&5
-+$as_echo "${ac_cv_header_xmmintrin_h}" >&6; }
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
- $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-@@ -13602,9 +13625,9 @@ fi
- 
- done
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -ltermcap" >&5
--$as_echo_n "checking for initscr in -ltermcap... " >&6; }
--if ${ac_cv_lib_termcap_initscr+:} false; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
-+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
-+if ${ac_cv_lib_termcap_tgetent+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -13618,33 +13641,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- #ifdef __cplusplus
- extern "C"
- #endif
--char initscr ();
-+char tgetent ();
- int
- main ()
- {
--return initscr ();
-+return tgetent ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_termcap_initscr=yes
-+  ac_cv_lib_termcap_tgetent=yes
- else
--  ac_cv_lib_termcap_initscr=no
-+  ac_cv_lib_termcap_tgetent=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_initscr" >&5
--$as_echo "$ac_cv_lib_termcap_initscr" >&6; }
--if test "x$ac_cv_lib_termcap_initscr" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
-+$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
-+if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
-   HAVE_TERMCAP="termcap"
- fi
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
--$as_echo_n "checking for initscr in -lcurses... " >&6; }
--if ${ac_cv_lib_curses_initscr+:} false; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
-+$as_echo_n "checking for tgetent in -lcurses... " >&6; }
-+if ${ac_cv_lib_curses_tgetent+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -13658,33 +13681,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- #ifdef __cplusplus
- extern "C"
- #endif
--char initscr ();
-+char tgetent ();
- int
- main ()
- {
--return initscr ();
-+return tgetent ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_curses_initscr=yes
-+  ac_cv_lib_curses_tgetent=yes
- else
--  ac_cv_lib_curses_initscr=no
-+  ac_cv_lib_curses_tgetent=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5
--$as_echo "$ac_cv_lib_curses_initscr" >&6; }
--if test "x$ac_cv_lib_curses_initscr" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5
-+$as_echo "$ac_cv_lib_curses_tgetent" >&6; }
-+if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
-   HAVE_TERMCAP="curses"
- fi
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
--$as_echo_n "checking for initscr in -lncurses... " >&6; }
--if ${ac_cv_lib_ncurses_initscr+:} false; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-+$as_echo_n "checking for tgetent in -lncurses... " >&6; }
-+if ${ac_cv_lib_ncurses_tgetent+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -13698,27 +13721,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- #ifdef __cplusplus
- extern "C"
- #endif
--char initscr ();
-+char tgetent ();
- int
- main ()
- {
--return initscr ();
-+return tgetent ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_ncurses_initscr=yes
-+  ac_cv_lib_ncurses_tgetent=yes
- else
--  ac_cv_lib_ncurses_initscr=no
-+  ac_cv_lib_ncurses_tgetent=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
--$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
--if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-+$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-+if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
-   HAVE_TERMCAP="ncurses"
- fi
- 
diff --git a/audio/lame/patches/patch-configure.in b/audio/lame/patches/patch-configure.in
deleted file mode 100644
index 525cd3891d5..00000000000
--- a/audio/lame/patches/patch-configure.in
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-configure.in,v 1.1 2013/10/10 10:49:30 roy Exp $
-
-initscr is a curses function, not termcap.
-
---- configure.in.orig	2013-10-10 10:45:45.000000000 +0000
-+++ configure.in
-@@ -372,9 +372,9 @@ dnl Checks for libraries.
- 
- AC_CHECK_HEADERS(termcap.h)
- AC_CHECK_HEADERS(ncurses/termcap.h)
--AC_CHECK_LIB(termcap, initscr, HAVE_TERMCAP="termcap")
--AC_CHECK_LIB(curses, initscr, HAVE_TERMCAP="curses")
--AC_CHECK_LIB(ncurses, initscr, HAVE_TERMCAP="ncurses")
-+AC_CHECK_LIB(termcap, tgetent, HAVE_TERMCAP="termcap")
-+AC_CHECK_LIB(curses, tgetent, HAVE_TERMCAP="curses")
-+AC_CHECK_LIB(ncurses, tgetent, HAVE_TERMCAP="ncurses")
- 
- AM_ICONV
-  
diff --git a/audio/lame/patches/patch-frontend_get__audio.c b/audio/lame/patches/patch-frontend_get__audio.c
deleted file mode 100644
index bebe4dfa54e..00000000000
--- a/audio/lame/patches/patch-frontend_get__audio.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-frontend_get__audio.c,v 1.1 2015/02/27 19:49:16 snj Exp $
-
-https://bugs.debian.org/777159
-
---- frontend/get_audio.c.orig	2012-02-14 02:35:58.000000000 -0800
-+++ frontend/get_audio.c	2015-02-27 11:15:11.000000000 -0800
-@@ -1448,6 +1448,10 @@ parse_wave_header(lame_global_flags * gf
-         else {
-             (void) lame_set_in_samplerate(gfp, global_reader.input_samplerate);
-         }
-+        /* avoid division by zero */
-+        if (bits_per_sample < 1)
-+            return -1;
-+
-         global. pcmbitwidth = bits_per_sample;
-         global. pcm_is_unsigned_8bit = 1;
-         global. pcm_is_ieee_float = (format_tag == WAVE_FORMAT_IEEE_FLOAT ? 1 : 0);
diff --git a/audio/lame/patches/patch-libmp3lame_lame.c b/audio/lame/patches/patch-libmp3lame_lame.c
deleted file mode 100644
index 2ed3d9c6299..00000000000
--- a/audio/lame/patches/patch-libmp3lame_lame.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-libmp3lame_lame.c,v 1.1 2015/02/27 19:49:16 snj Exp $
-
-https://bugs.debian.org/778703
-
---- libmp3lame/lame.c.orig	2011-10-18 14:51:20.000000000 -0700
-+++ libmp3lame/lame.c	2015-02-27 11:06:06.000000000 -0800
-@@ -822,6 +822,12 @@ lame_init_params(lame_global_flags * gfp
-     }
- #endif
- 
-+    if (gfp->samplerate_in < 0 || gfp->num_channels < 0) {
-+        freegfc(gfc);
-+        gfp->internal_flags = NULL;
-+        return -1;
-+    }
-+
-     cfg->disable_reservoir = gfp->disable_reservoir;
-     cfg->lowpassfreq = gfp->lowpassfreq;
-     cfg->highpassfreq = gfp->highpassfreq;
diff --git a/audio/lame/patches/patch-libmp3lame_util.c b/audio/lame/patches/patch-libmp3lame_util.c
deleted file mode 100644
index 099638f7a42..00000000000
--- a/audio/lame/patches/patch-libmp3lame_util.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-libmp3lame_util.c,v 1.1 2015/02/27 19:49:16 snj Exp $
-
-https://bugs.debian.org/778529
-
---- libmp3lame/util.c.orig	2012-01-10 11:55:55.000000000 -0800
-+++ libmp3lame/util.c	2015-02-27 11:25:26.000000000 -0800
-@@ -26,6 +26,7 @@
- # include <config.h>
- #endif
- 
-+#include <float.h>
- #include "lame.h"
- #include "machine.h"
- #include "encoder.h"
-@@ -544,7 +545,7 @@ fill_buffer_resample(lame_internal_flags
-     if (bpc > BPC)
-         bpc = BPC;
- 
--    intratio = (fabs(resample_ratio - floor(.5 + resample_ratio)) < .0001);
-+    intratio = (fabs(resample_ratio - floor(.5 + resample_ratio)) < FLT_EPSILON);
-     fcn = 1.00 / resample_ratio;
-     if (fcn > 1.00)
-         fcn = 1.00;