audio/flac: update to 1.3.4

This release mostly fixes (security related) bugs.

MFH:		2022Q1
Security:	e1440c6-95af-11ec-b320-f8b156b6dcc8

5 files changed, 5 insertions, 87 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 422615f18901..420c0e2c8d96 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,8 +1,7 @@
 # Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 
 PORTNAME=	flac
-PORTVERSION=	1.3.3
-PORTREVISION=	1
+PORTVERSION=	1.3.4
 CATEGORIES=	audio
 MASTER_SITES=	https://downloads.xiph.org/releases/flac/ \
 		https://ftp.osuosl.org/pub/xiph/releases/flac/
@@ -17,7 +16,7 @@ LICENSE_FILE_GFDL=	${WRKSRC}/COPYING.FDL
 
 LIB_DEPENDS=	libogg.so:audio/libogg
 
-USES=		autoreconf compiler:c11 cpe iconv libtool pathfix pkgconfig tar:xz
+USES=		compiler:c11 cpe iconv libtool pathfix pkgconfig tar:xz
 
 CPE_VENDOR=	flac_project
 
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index 21e84ab78d75..14605fa2f22b 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565699962
-SHA256 (flac-1.3.3.tar.xz) = 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748
-SIZE (flac-1.3.3.tar.xz) = 1044472
+TIMESTAMP = 1645726425
+SHA256 (flac-1.3.4.tar.xz) = 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737
+SIZE (flac-1.3.4.tar.xz) = 1038356
diff --git a/audio/flac/files/patch-configure.ac b/audio/flac/files/patch-configure.ac
deleted file mode 100644
index 5b1c9b1a05d5..000000000000
--- a/audio/flac/files/patch-configure.ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.ac.orig	2019-08-04 08:26:40 UTC
-+++ configure.ac
-@@ -69,7 +69,7 @@ AC_C_INLINE
- AC_C_VARARRAYS
- AC_C_TYPEOF
- 
--AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h])
-+AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h sys/auxv.h])
- 
- XIPH_C_BSWAP32
- XIPH_C_BSWAP16
-@@ -104,6 +104,8 @@ AC_CHECK_TYPES(socklen_t, [], [])
- dnl check for getopt in standard library
- dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] )
- AC_CHECK_FUNCS(getopt_long, [], [])
-+
-+AC_CHECK_FUNCS([getauxval elf_aux_info])
- 
- AC_CHECK_SIZEOF(void*,1)
- 
diff --git a/audio/flac/files/patch-src_libFLAC_bitreader.c b/audio/flac/files/patch-src_libFLAC_bitreader.c
deleted file mode 100644
index 463343e0d428..000000000000
--- a/audio/flac/files/patch-src_libFLAC_bitreader.c
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/xiph/flac/commit/2e7931c27eb15e387da440a37f12437e35b22dd4
-
---- src/libFLAC/bitreader.c.orig	2021-05-08 16:06:17 UTC
-+++ src/libFLAC/bitreader.c
-@@ -864,7 +864,7 @@ incomplete_lsbs:
- 			cwords = br->consumed_words;
- 			words = br->words;
- 			ucbits = FLAC__BITS_PER_WORD - br->consumed_bits;
--			b = br->buffer[cwords] << br->consumed_bits;
-+			b = cwords < br->capacity ? br->buffer[cwords] << br->consumed_bits : 0;
- 		} while(cwords >= words && val < end);
- 	}
- 
diff --git a/audio/flac/files/patch-src_libFLAC_cpu.c b/audio/flac/files/patch-src_libFLAC_cpu.c
deleted file mode 100644
index 4615f3970ad7..000000000000
--- a/audio/flac/files/patch-src_libFLAC_cpu.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/libFLAC/cpu.c.orig	2018-08-20 08:17:21 UTC
-+++ src/libFLAC/cpu.c
-@@ -53,7 +53,7 @@
- #define dfprintf(file, format, ...)
- #endif
- 
--#if defined FLAC__CPU_PPC
-+#if defined(HAVE_SYS_AUXV_H)
- #include <sys/auxv.h>
- #endif
- 
-@@ -236,7 +236,10 @@ x86_cpu_info (FLAC__CPUInfo *info)
- static void
- ppc_cpu_info (FLAC__CPUInfo *info)
- {
--#if defined FLAC__CPU_PPC
-+	info->ppc.arch_2_07 = false;
-+	info->ppc.arch_3_00 = false;
-+
-+#if defined(FLAC__CPU_PPC)
- #ifndef PPC_FEATURE2_ARCH_3_00
- #define PPC_FEATURE2_ARCH_3_00		0x00800000
- #endif
-@@ -245,14 +248,21 @@ ppc_cpu_info (FLAC__CPUInfo *info)
- #define PPC_FEATURE2_ARCH_2_07		0x80000000
- #endif
- 
-+#if defined(HAVE_GETAUXVAL)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_3_00) {
- 		info->ppc.arch_3_00 = true;
- 	} else if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) {
- 		info->ppc.arch_2_07 = true;
- 	}
--#else
--	info->ppc.arch_2_07 = false;
--	info->ppc.arch_3_00 = false;
-+#elif defined(HAVE_ELF_AUX_INFO)
-+	long hwcaps;
-+	elf_aux_info(AT_HWCAP2, &hwcaps, sizeof(hwcaps));
-+	if (hwcaps & PPC_FEATURE2_ARCH_3_00) {
-+		info->ppc.arch_3_00 = true;
-+	} else if (hwcaps & PPC_FEATURE2_ARCH_2_07) {
-+		info->ppc.arch_2_07 = true;
-+	}
-+#endif
- #endif
- }
-