From b82bdd3f0ebd8ee1cb444bd450efce6fe7856b89 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 9 Aug 2019 11:31:00 -0700 Subject: [PATCH] flac: Update to 1.33 Some adjustments to the configure flags. Removed upstreamed patches. Added PKG_BUILD_PARALLEL for faster compilation. Signed-off-by: Rosen Penev --- libs/flac/Makefile | 19 +-- .../patches/001-no-docs-and-examples.patch | 6 +- libs/flac/patches/005-gcc_debug_options.patch | 16 --- libs/flac/patches/010-automake-compat.patch | 11 -- libs/flac/patches/010-utime.patch | 118 ++++++++++++++++++ libs/flac/patches/100-CVE-2017-6888.patch | 27 ---- 6 files changed, 132 insertions(+), 65 deletions(-) delete mode 100644 libs/flac/patches/005-gcc_debug_options.patch delete mode 100644 libs/flac/patches/010-automake-compat.patch create mode 100644 libs/flac/patches/010-utime.patch delete mode 100644 libs/flac/patches/100-CVE-2017-6888.patch diff --git a/libs/flac/Makefile b/libs/flac/Makefile index 47de71e32..954121076 100644 --- a/libs/flac/Makefile +++ b/libs/flac/Makefile @@ -8,21 +8,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=flac -PKG_VERSION:=1.3.2 -PKG_RELEASE:=2 +PKG_VERSION:=1.3.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://downloads.xiph.org/releases/flac/ -PKG_HASH:=91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f -PKG_MAINTAINER:=Ted Hess - -PKG_INSTALL:=1 +PKG_HASH:=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 +PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=GFDL-1.2 GPL-2 LGPL-2.1 BSD-3-Clause PKG_LICENSE_FILES:=README COPYING.FDL COPYING.GPL COPYING.LGPL COPYING.Xiph PKG_CPE_ID:=cpe:/a:flac_project:flac PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 PKG_REMOVE_FILES:=autogen.sh aclocal.m4 include $(INCLUDE_DIR)/package.mk @@ -37,15 +37,18 @@ endef CONFIGURE_ARGS += \ --disable-cpplibs \ --disable-sse \ - --disable-3dnow \ --disable-altivec \ --disable-doxgen-docs \ --disable-local-xmms-plugin \ --disable-xmms-plugin \ --disable-ogg \ --disable-oggtest \ + --disable-thorough-tests \ + --disable-examples \ + --disable-rpath \ $(if $(CONFIG_DEBUG),--enable-debug) \ - --enable-static + --enable-static \ + --without-pic TARGET_CFLAGS += $(FPIC) diff --git a/libs/flac/patches/001-no-docs-and-examples.patch b/libs/flac/patches/001-no-docs-and-examples.patch index 7c34288c3..c844771d8 100644 --- a/libs/flac/patches/001-no-docs-and-examples.patch +++ b/libs/flac/patches/001-no-docs-and-examples.patch @@ -4,11 +4,11 @@ ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = doc include m4 man src examples test build objs microbench +-SUBDIRS = doc include m4 man src test build objs microbench +SUBDIRS = include m4 src build objs - EXTRA_DIST = \ - COPYING.FDL \ + if EXAMPLES + SUBDIRS += examples --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,11 +30,6 @@ SUBDIRS = \ diff --git a/libs/flac/patches/005-gcc_debug_options.patch b/libs/flac/patches/005-gcc_debug_options.patch deleted file mode 100644 index ea7db8e14..000000000 --- a/libs/flac/patches/005-gcc_debug_options.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -386,10 +386,11 @@ fi - - if test "x$debug" = xtrue; then - CPPFLAGS="-DDEBUG $CPPFLAGS" -- CFLAGS="-g $CFLAGS" -+ CFLAGS=$(echo "$CFLAGS" | sed 's/-g[0-9]*//') -+ CFLAGS="-g3 $CFLAGS" - else - CPPFLAGS="-DNDEBUG $CPPFLAGS" -- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//') -+ CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g[0-9]*//') - CFLAGS="-O3 -funroll-loops $CFLAGS" - fi - diff --git a/libs/flac/patches/010-automake-compat.patch b/libs/flac/patches/010-automake-compat.patch deleted file mode 100644 index 83180480b..000000000 --- a/libs/flac/patches/010-automake-compat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -33,6 +33,8 @@ ACLOCAL_AMFLAGS = -I m4 - - SUBDIRS = include m4 src build objs - -+ACLOCAL_AMFLAGS = -I m4 -+ - EXTRA_DIST = \ - COPYING.FDL \ - COPYING.GPL \ diff --git a/libs/flac/patches/010-utime.patch b/libs/flac/patches/010-utime.patch new file mode 100644 index 000000000..0c1d17024 --- /dev/null +++ b/libs/flac/patches/010-utime.patch @@ -0,0 +1,118 @@ +Return-Path: +Received: from localhost.localdomain (76-14-106-55.rk.wavecable.com. [76.14.106.55]) + by smtp.gmail.com with ESMTPSA id f19sm148509170pfk.180.2019.08.09.13.01.06 + for + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Fri, 09 Aug 2019 13:01:06 -0700 (PDT) +From: Rosen Penev +To: flac-dev@xiph.org +Subject: [PATCH] Switch to utimensat for newer POSIX versions +Date: Fri, 9 Aug 2019 13:01:05 -0700 +Message-Id: <20190809200105.1443-1-rosenp@gmail.com> +X-Mailer: git-send-email 2.17.1 + +Some libcs like uClibc-ng can optionally disable deprecated functions. +utime is one of them. When done so, both the header and the function go +missing. + +This fixes flac_utime to work in such a situation. +--- + include/share/compat.h | 10 +++++++++- + src/libFLAC/metadata_iterators.c | 9 +++++++-- + src/share/grabbag/file.c | 9 +++++++-- + 3 files changed, 23 insertions(+), 5 deletions(-) + +diff --git a/include/share/compat.h b/include/share/compat.h +index f3041655..a063c083 100644 +--- a/include/share/compat.h ++++ b/include/share/compat.h +@@ -112,9 +112,13 @@ + #include /* for utime() */ + #endif + #else ++#if _POSIX_C_SOURCE >= 200809L ++#include ++#else + #include /* some flavors of BSD (like OS X) require this to get time_t */ + #include /* for utime() */ + #endif ++#endif + + #if defined _MSC_VER + # if _MSC_VER >= 1800 +@@ -160,11 +164,15 @@ + + #define flac_fopen fopen + #define flac_chmod chmod +-#define flac_utime utime + #define flac_unlink unlink + #define flac_rename rename + #define flac_stat stat + ++#if _POSIX_C_SOURCE >= 200809L ++#define flac_utime(a, b) utimensat (AT_FDCWD, a, *b, 0) ++#else ++#define flac_utime utime ++#endif + #endif + + #ifdef _WIN32 +diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c +index 352a6c7a..d5255eb9 100644 +--- a/src/libFLAC/metadata_iterators.c ++++ b/src/libFLAC/metadata_iterators.c +@@ -3422,13 +3422,18 @@ FLAC__bool get_file_stats_(const char *filename, struct flac_stat_s *stats) + + void set_file_stats_(const char *filename, struct flac_stat_s *stats) + { +- struct utimbuf srctime; +- + FLAC__ASSERT(0 != filename); + FLAC__ASSERT(0 != stats); + ++#if _POSIX_C_SOURCE >= 200809L ++ struct timespec srctime[2] = {}; ++ srctime[0].tv_sec = stats->st_atime; ++ srctime[1].tv_sec = stats->st_mtime; ++#else ++ struct utimbuf srctime; + srctime.actime = stats->st_atime; + srctime.modtime = stats->st_mtime; ++#endif + (void)flac_chmod(filename, stats->st_mode); + (void)flac_utime(filename, &srctime); + #if !defined _MSC_VER && !defined __BORLANDC__ && !defined __MINGW32__ +diff --git a/src/share/grabbag/file.c b/src/share/grabbag/file.c +index 2c67bebf..edd835a6 100644 +--- a/src/share/grabbag/file.c ++++ b/src/share/grabbag/file.c +@@ -27,7 +27,6 @@ + #include /* for _O_BINARY */ + #else + #include /* some flavors of BSD (like OS X) require this to get time_t */ +-#include /* for utime() */ + #endif + #if defined __EMX__ + #include /* for setmode(), O_BINARY */ +@@ -53,11 +52,17 @@ + void grabbag__file_copy_metadata(const char *srcpath, const char *destpath) + { + struct flac_stat_s srcstat; +- struct utimbuf srctime; + + if(0 == flac_stat(srcpath, &srcstat)) { ++#if _POSIX_C_SOURCE >= 200809L ++ struct timespec srctime[2] = {}; ++ srctime[0].tv_sec = srcstat.st_atime; ++ srctime[1].tv_sec = srcstat.st_mtime; ++#else ++ struct utimbuf srctime; + srctime.actime = srcstat.st_atime; + srctime.modtime = srcstat.st_mtime; ++#endif + (void)flac_chmod(destpath, srcstat.st_mode); + (void)flac_utime(destpath, &srctime); + } +-- +2.17.1 + diff --git a/libs/flac/patches/100-CVE-2017-6888.patch b/libs/flac/patches/100-CVE-2017-6888.patch deleted file mode 100644 index 3de0cc5d3..000000000 --- a/libs/flac/patches/100-CVE-2017-6888.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4f47b63e9c971e6391590caf00a0f2a5ed612e67 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Sat, 8 Apr 2017 18:34:49 +1000 -Subject: [PATCH] stream_decoder.c: Fix a memory leak - -Leak reported by Secunia Research. ---- - src/libFLAC/stream_decoder.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c -index 14d5fe7f..a5527511 100644 ---- a/src/libFLAC/stream_decoder.c -+++ b/src/libFLAC/stream_decoder.c -@@ -1759,6 +1759,9 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre - } - memset (obj->comments[i].entry, 0, obj->comments[i].length) ; - if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length)) { -+ /* Current i-th entry is bad, so we delete it. */ -+ free (obj->comments[i].entry) ; -+ obj->comments[i].entry = NULL ; - obj->num_comments = i; - goto skip; - } --- -2.17.0 -