maintenance update to flac 1.3.1, no significant user-visible changes
This commit is contained in:
naddy
parent
04d6554d64
commit
1e125076bc
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.45 2014/11/25 20:42:18 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.46 2015/01/10 15:50:58 naddy Exp $
|
||||
|
||||
COMMENT= free lossless audio codec
|
||||
|
||||
DISTNAME= flac-1.3.0
|
||||
REVISION= 1
|
||||
DISTNAME= flac-1.3.1
|
||||
CATEGORIES= audio archivers
|
||||
HOMEPAGE= https://www.xiph.org/flac/
|
||||
SHARED_LIBS += FLAC 10.0 # 11.0
|
||||
@ -11,7 +10,7 @@ SHARED_LIBS += FLAC++ 9.0 # 9.0
|
||||
|
||||
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
|
||||
|
||||
# GPLv2
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
MASTER_SITES= http://downloads.xiph.org/releases/flac/
|
||||
@ -28,7 +27,7 @@ BUILD_DEPENDS+= devel/nasm
|
||||
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--enable-sse \
|
||||
--disable-altivec \
|
||||
--disable-thorough-tests \
|
||||
--disable-xmms-plugin
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
@ -37,5 +36,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
post-install:
|
||||
cd ${PREFIX}/share/doc && mv ${DISTNAME} flac
|
||||
${SUBST_CMD} ${PREFIX}/man/man1/flac.1
|
||||
rm ${PREFIX}/man/man1/flac.1.beforesubst
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (flac-1.3.0.tar.xz) = +i1kqsH3fjHfuycK6wj1sy4nA2pSrRXmmnfjCVKAENw=
|
||||
SIZE (flac-1.3.0.tar.xz) = 1084256
|
||||
SHA256 (flac-1.3.1.tar.xz) = R3PACZ26dn2WP9khQyY74zjEhwIXLodUubxRA+/hxWw=
|
||||
SIZE (flac-1.3.1.tar.xz) = 941848
|
||||
|
||||
@ -1,12 +1,23 @@
|
||||
$OpenBSD: patch-configure,v 1.13 2013/05/31 14:34:27 naddy Exp $
|
||||
--- configure.orig Mon May 27 04:11:54 2013
|
||||
+++ configure Wed May 29 16:41:05 2013
|
||||
@@ -19807,7 +19807,7 @@ else
|
||||
$OpenBSD: patch-configure,v 1.14 2015/01/10 15:50:58 naddy Exp $
|
||||
--- configure.orig Thu Nov 27 03:46:58 2014
|
||||
+++ configure Sun Nov 30 21:44:45 2014
|
||||
@@ -19874,8 +19874,8 @@ if test "x$debug" = xtrue; then
|
||||
CFLAGS="-g $CFLAGS"
|
||||
else
|
||||
CPPFLAGS="-DNDEBUG $CPPFLAGS"
|
||||
if test "x$GCC" = xyes; then
|
||||
if test "x$user_cflags" = x; then
|
||||
- CFLAGS="-O3 -funroll-loops -Wall -W -Winline"
|
||||
+ CFLAGS="-Wall -W $CFLAGS"
|
||||
fi
|
||||
fi
|
||||
- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
|
||||
- CFLAGS="-O3 -funroll-loops $CFLAGS"
|
||||
+ #CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
|
||||
+ #CFLAGS="-O3 -funroll-loops $CFLAGS"
|
||||
fi
|
||||
|
||||
|
||||
@@ -20051,7 +20051,7 @@ rm -f core conftest.err conftest.$ac_objext \
|
||||
|
||||
fi
|
||||
|
||||
- if test "x$asm_optimisation$sse_os" = "xyesyes" ; then
|
||||
+ if false test "x$asm_optimisation$sse_os" = "xyesyes" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -msse2" >&5
|
||||
$as_echo_n "checking if $CC accepts -msse2... " >&6; }
|
||||
ac_add_cflags__old_cflags="$CFLAGS"
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-man_flac_1,v 1.3 2013/05/31 14:34:27 naddy Exp $
|
||||
--- man/flac.1.orig Sun May 26 05:30:33 2013
|
||||
+++ man/flac.1 Wed May 29 18:36:03 2013
|
||||
@@ -380,7 +380,7 @@ These flags can be used to invert the sense of the cor
|
||||
$OpenBSD: patch-man_flac_1,v 1.4 2015/01/10 15:50:58 naddy Exp $
|
||||
--- man/flac.1.orig Tue Nov 25 04:40:14 2014
|
||||
+++ man/flac.1 Sun Nov 30 20:59:42 2014
|
||||
@@ -384,7 +384,7 @@ These flags can be used to invert the sense of the cor
|
||||
.PP
|
||||
metaflac(1).
|
||||
metaflac(1)
|
||||
.PP
|
||||
-The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/libflac-doc/html\fR on Debian GNU/Linux systems.
|
||||
+The programs are documented fully by HTML format documentation, available in \fI${TRUEPREFIX}/share/doc/flac/html\fR.
|
||||
.SH "AUTHOR"
|
||||
.PP
|
||||
This manual page was written by Matt Zimmerman <mdz@debian.org> for the Debian GNU/Linux system (but may be used by others).
|
||||
This manual page was initially written by Matt Zimmerman <mdz@debian.org> for the Debian GNU/Linux system (but may be used by others). It has been kept up-to-date by the Xiph.org Foundation.
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
$OpenBSD: patch-src_libFLAC_stream_decoder_c,v 1.1 2014/11/25 20:42:18 naddy Exp $
|
||||
|
||||
CVE-2014-8962: Heap buffer read overflow when processing ID3V2 metadata
|
||||
CVE-2014-9028: Heap buffer write overflow in read_residual_partitioned_rice_
|
||||
|
||||
--- src/libFLAC/stream_decoder.c.orig Sun May 26 11:30:33 2013
|
||||
+++ src/libFLAC/stream_decoder.c Tue Nov 25 20:58:16 2014
|
||||
@@ -71,7 +71,7 @@ FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC =
|
||||
*
|
||||
***********************************************************************/
|
||||
|
||||
-static FLAC__byte ID3V2_TAG_[3] = { 'I', 'D', '3' };
|
||||
+static const FLAC__byte ID3V2_TAG_[3] = { 'I', 'D', '3' };
|
||||
|
||||
/***********************************************************************
|
||||
*
|
||||
@@ -1365,6 +1365,10 @@ FLAC__bool find_metadata_(FLAC__StreamDecoder *decoder
|
||||
id = 0;
|
||||
continue;
|
||||
}
|
||||
+
|
||||
+ if(id >= 3)
|
||||
+ return false;
|
||||
+
|
||||
if(x == ID3V2_TAG_[id]) {
|
||||
id++;
|
||||
i = 0;
|
||||
@@ -2705,7 +2709,8 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__Strea
|
||||
if(decoder->private_->frame.header.blocksize < predictor_order) {
|
||||
send_error_to_client_(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC);
|
||||
decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC;
|
||||
- return true;
|
||||
+ /* We have received a potentially malicious bt stream. All we can do is error out to avoid a heap overflow. */
|
||||
+ return false;
|
||||
}
|
||||
}
|
||||
else {
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-src_libFLAC_stream_encoder_c,v 1.1 2013/07/18 15:10:55 naddy Exp $
|
||||
|
||||
Fix an arithmetic overflow in the RICE2 partitioner.
|
||||
https://git.xiph.org/?p=flac.git;a=commit;h=6f7ec60c7e7f05f5ab0b1cf6b7b0945e44afcd4b
|
||||
|
||||
--- src/libFLAC/stream_encoder.c.orig Sun May 26 11:30:33 2013
|
||||
+++ src/libFLAC/stream_encoder.c Thu Jul 18 16:39:48 2013
|
||||
@@ -3784,7 +3784,7 @@ void precompute_partition_info_sums_(
|
||||
/* slightly pessimistic but still catches all common cases */
|
||||
/* WATCHOUT: "+ bps" is an assumption that the average residual magnitude will not be more than "bps" bits */
|
||||
if(FLAC__bitmath_ilog2(default_partition_samples) + bps < 32) {
|
||||
- FLAC__uint32 abs_residual_partition_sum;
|
||||
+ FLAC__uint64 abs_residual_partition_sum;
|
||||
|
||||
for(partition = residual_sample = 0; partition < partitions; partition++) {
|
||||
end += default_partition_samples;
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.14 2013/05/31 14:34:28 naddy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.15 2015/01/10 15:50:58 naddy Exp $
|
||||
@bin bin/flac
|
||||
@bin bin/metaflac
|
||||
include/FLAC/
|
||||
@ -23,7 +23,6 @@ lib/libFLAC++.la
|
||||
lib/libFLAC.a
|
||||
lib/libFLAC.la
|
||||
@lib lib/libFLAC.so.${LIBFLAC_VERSION}
|
||||
lib/pkgconfig/
|
||||
lib/pkgconfig/flac++.pc
|
||||
lib/pkgconfig/flac.pc
|
||||
@man man/man1/flac.1
|
||||
@ -35,37 +34,14 @@ share/doc/flac/
|
||||
share/doc/flac/FLAC.tag
|
||||
share/doc/flac/html/
|
||||
share/doc/flac/html/changelog.html
|
||||
share/doc/flac/html/comparison.html
|
||||
share/doc/flac/html/comparison__chopin_prelude_24.html
|
||||
share/doc/flac/html/comparison__dream_theater_600.html
|
||||
share/doc/flac/html/comparison__eddie_warner_titus.html
|
||||
share/doc/flac/html/comparison__fanfare_de_l_eventail_de_jeanne.html
|
||||
share/doc/flac/html/comparison__gloria_estefan_conga.html
|
||||
share/doc/flac/html/comparison__hand_in_my_pocket.html
|
||||
share/doc/flac/html/comparison__l_sub_raga_sivapriya.html
|
||||
share/doc/flac/html/comparison__laetatus_sum.html
|
||||
share/doc/flac/html/comparison__mummified_in_barbed_wire.html
|
||||
share/doc/flac/html/comparison__prokofiev_pcon3_3.html
|
||||
share/doc/flac/html/comparison__ravel_sq4_4.html
|
||||
share/doc/flac/html/comparison__scarlatti_k42.html
|
||||
share/doc/flac/html/comparison__tool_forty_six_and_2.html
|
||||
share/doc/flac/html/comparison__white_room.html
|
||||
share/doc/flac/html/comparison_all_cpudectime.html
|
||||
share/doc/flac/html/comparison_all_cpuenctime.html
|
||||
share/doc/flac/html/comparison_all_procdectime.html
|
||||
share/doc/flac/html/comparison_all_procenctime.html
|
||||
share/doc/flac/html/comparison_all_ratio.html
|
||||
share/doc/flac/html/developers.html
|
||||
share/doc/flac/html/documentation.html
|
||||
share/doc/flac/html/documentation_bugs.html
|
||||
share/doc/flac/html/documentation_example_code.html
|
||||
share/doc/flac/html/documentation_format_overview.html
|
||||
share/doc/flac/html/documentation_tasks.html
|
||||
share/doc/flac/html/documentation_tools.html
|
||||
share/doc/flac/html/documentation_tools_flac.html
|
||||
share/doc/flac/html/documentation_tools_metaflac.html
|
||||
share/doc/flac/html/documentation_tools_plugins.html
|
||||
share/doc/flac/html/download.html
|
||||
share/doc/flac/html/faq.html
|
||||
share/doc/flac/html/favicon.ico
|
||||
share/doc/flac/html/features.html
|
||||
@ -73,55 +49,8 @@ share/doc/flac/html/flac.css
|
||||
share/doc/flac/html/format.html
|
||||
share/doc/flac/html/id.html
|
||||
share/doc/flac/html/images/
|
||||
share/doc/flac/html/images/1x1.gif
|
||||
share/doc/flac/html/images/cafebug.gif
|
||||
share/doc/flac/html/images/hw/
|
||||
share/doc/flac/html/images/hw/Blackbird_Front_low3_325x87.jpg
|
||||
share/doc/flac/html/images/hw/MS300frontsmall_270x108.jpg
|
||||
share/doc/flac/html/images/hw/MediaBox_Frt_170x325.jpg
|
||||
share/doc/flac/html/images/hw/SB_Hero_Black_325x182.jpg
|
||||
share/doc/flac/html/images/hw/Sooloos-ControlOne_325x328.jpg
|
||||
share/doc/flac/html/images/hw/Z500_front_325x94.jpg
|
||||
share/doc/flac/html/images/hw/a2_01_325x252.jpg
|
||||
share/doc/flac/html/images/hw/arcus_325x135.jpg
|
||||
share/doc/flac/html/images/hw/bmp-1430_325x241.jpg
|
||||
share/doc/flac/html/images/hw/cs505_front_lrg_325x113.jpg
|
||||
share/doc/flac/html/images/hw/enus_3-4lft-hires_product_eva8000_325x127.jpg
|
||||
share/doc/flac/html/images/hw/escient_ProductLine_325x163.jpg
|
||||
share/doc/flac/html/images/hw/hifidelio_bl_front_Z_RGB_325x163.jpg
|
||||
share/doc/flac/html/images/hw/i-station-mini-dx_325x237.jpg
|
||||
share/doc/flac/html/images/hw/iwod-g10_325x257.jpg
|
||||
share/doc/flac/html/images/hw/knc_hr-2800_325x209.jpg
|
||||
share/doc/flac/html/images/hw/mediaready_prodmain_MRMCa_325x232.jpg
|
||||
share/doc/flac/html/images/hw/meizu_m6_325x206.jpg
|
||||
share/doc/flac/html/images/hw/musica_artwork_325x90.jpg
|
||||
share/doc/flac/html/images/hw/neodigits_x5000_325x124.jpg
|
||||
share/doc/flac/html/images/hw/onda-vx737_325x240.jpg
|
||||
share/doc/flac/html/images/hw/request_n_front_325x103.jpg
|
||||
share/doc/flac/html/images/hw/rio_karma_279x254.jpg
|
||||
share/doc/flac/html/images/hw/sonos_family_RGB_325x200.jpg
|
||||
share/doc/flac/html/images/hw/teclast-tl29_325x244.jpg
|
||||
share/doc/flac/html/images/hw/transporter_hero_grey_325x208.jpg
|
||||
share/doc/flac/html/images/hw/tvix-4000_325x204.jpg
|
||||
share/doc/flac/html/images/hw/vibez_nofm_combi_black_b_325x220.jpg
|
||||
share/doc/flac/html/images/logo100.gif
|
||||
share/doc/flac/html/images/logo.svg
|
||||
share/doc/flac/html/images/logo130.gif
|
||||
share/doc/flac/html/index.html
|
||||
share/doc/flac/html/itunes.html
|
||||
share/doc/flac/html/license.html
|
||||
share/doc/flac/html/links.html
|
||||
share/doc/flac/html/news.html
|
||||
share/doc/flac/html/ogg_mapping.html
|
||||
share/doc/flac/html/ru/
|
||||
share/doc/flac/html/ru/authors.html
|
||||
share/doc/flac/html/ru/comparison.html
|
||||
share/doc/flac/html/ru/developers.html
|
||||
share/doc/flac/html/ru/documentation.html
|
||||
share/doc/flac/html/ru/download.html
|
||||
share/doc/flac/html/ru/features.html
|
||||
share/doc/flac/html/ru/format.html
|
||||
share/doc/flac/html/ru/goals.html
|
||||
share/doc/flac/html/ru/id.html
|
||||
share/doc/flac/html/ru/index.html
|
||||
share/doc/flac/html/ru/links.html
|
||||
share/doc/flac/html/ru/news.html
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.29 2013/05/31 14:34:29 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.30 2015/01/10 15:50:58 naddy Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= XMMS input plugin for playing FLAC files
|
||||
|
||||
VERSION= 1.3.0
|
||||
VERSION= 1.3.1
|
||||
PKGNAME= xmms-flac-${VERSION}
|
||||
DISTNAME= flac-${VERSION}
|
||||
CATEGORIES= audio
|
||||
@ -18,8 +18,8 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
MASTER_SITES= http://downloads.xiph.org/releases/flac/
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
||||
WANTLIB= FLAC X11 Xext Xi gdk glib gmodule gtk m ogg \
|
||||
xcb xmms
|
||||
WANTLIB= FLAC X11 Xau Xdmcp Xext Xi gdk glib gmodule gtk m ogg \
|
||||
pthread-stubs xcb xmms
|
||||
|
||||
MODULES= devel/gettext
|
||||
LIB_DEPENDS= audio/xmms \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (flac-1.3.0.tar.xz) = +i1kqsH3fjHfuycK6wj1sy4nA2pSrRXmmnfjCVKAENw=
|
||||
SIZE (flac-1.3.0.tar.xz) = 1084256
|
||||
SHA256 (flac-1.3.1.tar.xz) = R3PACZ26dn2WP9khQyY74zjEhwIXLodUubxRA+/hxWw=
|
||||
SIZE (flac-1.3.1.tar.xz) = 941848
|
||||
|
||||
@ -1,12 +1,23 @@
|
||||
$OpenBSD: patch-configure,v 1.9 2013/05/31 14:34:30 naddy Exp $
|
||||
--- configure.orig Mon May 27 04:11:54 2013
|
||||
+++ configure Wed May 29 16:41:05 2013
|
||||
@@ -19807,7 +19807,7 @@ else
|
||||
$OpenBSD: patch-configure,v 1.10 2015/01/10 15:50:58 naddy Exp $
|
||||
--- configure.orig Thu Nov 27 03:46:58 2014
|
||||
+++ configure Sun Nov 30 21:44:45 2014
|
||||
@@ -19874,8 +19874,8 @@ if test "x$debug" = xtrue; then
|
||||
CFLAGS="-g $CFLAGS"
|
||||
else
|
||||
CPPFLAGS="-DNDEBUG $CPPFLAGS"
|
||||
if test "x$GCC" = xyes; then
|
||||
if test "x$user_cflags" = x; then
|
||||
- CFLAGS="-O3 -funroll-loops -Wall -W -Winline"
|
||||
+ CFLAGS="-Wall -W $CFLAGS"
|
||||
fi
|
||||
fi
|
||||
- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
|
||||
- CFLAGS="-O3 -funroll-loops $CFLAGS"
|
||||
+ #CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
|
||||
+ #CFLAGS="-O3 -funroll-loops $CFLAGS"
|
||||
fi
|
||||
|
||||
|
||||
@@ -20051,7 +20051,7 @@ rm -f core conftest.err conftest.$ac_objext \
|
||||
|
||||
fi
|
||||
|
||||
- if test "x$asm_optimisation$sse_os" = "xyesyes" ; then
|
||||
+ if false test "x$asm_optimisation$sse_os" = "xyesyes" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -msse2" >&5
|
||||
$as_echo_n "checking if $CC accepts -msse2... " >&6; }
|
||||
ac_add_cflags__old_cflags="$CFLAGS"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_plugin_xmms_Makefile_in,v 1.5 2013/05/31 14:34:30 naddy Exp $
|
||||
--- src/plugin_xmms/Makefile.in.orig Mon May 27 04:11:57 2013
|
||||
+++ src/plugin_xmms/Makefile.in Thu May 30 10:37:04 2013
|
||||
@@ -127,8 +127,7 @@ libxmms_flac_la_DEPENDENCIES = \
|
||||
$OpenBSD: patch-src_plugin_xmms_Makefile_in,v 1.6 2015/01/10 15:50:58 naddy Exp $
|
||||
--- src/plugin_xmms/Makefile.in.orig Thu Nov 27 03:47:01 2014
|
||||
+++ src/plugin_xmms/Makefile.in Sat Jan 10 14:44:50 2015
|
||||
@@ -156,8 +156,7 @@ libxmms_flac_la_DEPENDENCIES = \
|
||||
$(top_builddir)/src/share/grabbag/libgrabbag.la \
|
||||
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
|
||||
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
|
||||
@ -11,7 +11,7 @@ $OpenBSD: patch-src_plugin_xmms_Makefile_in,v 1.5 2013/05/31 14:34:30 naddy Exp
|
||||
am__objects_1 = charset.lo configure.lo fileinfo.lo http.lo plugin.lo \
|
||||
tag.lo
|
||||
am_libxmms_flac_la_OBJECTS = $(am__objects_1)
|
||||
@@ -360,8 +359,7 @@ libxmms_flac_la_LIBADD = \
|
||||
@@ -413,8 +412,7 @@ libxmms_flac_la_LIBADD = \
|
||||
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
|
||||
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
|
||||
$(top_builddir)/src/share/utf8/libutf8.la \
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-src_plugin_xmms_plugin_c,v 1.3 2013/05/31 14:34:30 naddy Exp $
|
||||
|
||||
Export symbol despite -fvisibility=hidden.
|
||||
|
||||
--- src/plugin_xmms/plugin.c.orig Sun May 26 05:30:33 2013
|
||||
+++ src/plugin_xmms/plugin.c Thu May 30 15:23:20 2013
|
||||
@@ -140,7 +140,7 @@ static FLAC__bool is_big_endian_host_;
|
||||
static unsigned bitrate_history_[BITRATE_HIST_SIZE];
|
||||
|
||||
|
||||
-InputPlugin *get_iplugin_info(void)
|
||||
+FLAC_API InputPlugin *get_iplugin_info(void)
|
||||
{
|
||||
flac_ip.description = g_strdup_printf("Reference FLAC Player v%s", FLAC__VERSION_STRING);
|
||||
return &flac_ip;
|
||||
Loading…
Reference in New Issue
Block a user