From a9b30f9664395542410095d85f845c0025d8b37d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 26 Aug 2019 16:31:29 -0500 Subject: [PATCH 01/24] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From a66cc4a31434fb1bfa3583397efe7ddbb926b680 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 14 Dec 2019 15:44:07 -0700 Subject: [PATCH 02/24] Fix narrowing convesion problem caught by gcc-10 --- gcc10.patch | 411 ++++++++++++++++++++++++++++++++++++++++++++++++++ libmp4v2.spec | 6 +- 2 files changed, 416 insertions(+), 1 deletion(-) create mode 100644 gcc10.patch diff --git a/gcc10.patch b/gcc10.patch new file mode 100644 index 0000000..bd18636 --- /dev/null +++ b/gcc10.patch @@ -0,0 +1,411 @@ +diff -Nrup a/libutil/Utility.cpp b/libutil/Utility.cpp +--- a/libutil/Utility.cpp 2015-04-24 09:37:49.000000000 -0600 ++++ b/libutil/Utility.cpp 2019-09-24 12:39:23.669103515 -0600 +@@ -531,26 +531,26 @@ Utility::process_impl() + printHelp( false, false ); + return SUCCESS; + +- case LC_DEBUG: ++ case int(LC_DEBUG): + debugUpdate( std::strtoul( prog::optarg, NULL, 0 ) ); + break; + +- case LC_VERBOSE: ++ case int(LC_VERBOSE): + { + const uint32_t level = std::strtoul( prog::optarg, NULL, 0 ); + _verbosity = ( level < 4 ) ? level : 3; + break; + } + +- case LC_HELP: ++ case int(LC_HELP): + printHelp( true, false ); + return SUCCESS; + +- case LC_VERSION: ++ case int(LC_VERSION): + printVersion( false ); + return SUCCESS; + +- case LC_VERSIONX: ++ case int(LC_VERSIONX): + printVersion( true ); + return SUCCESS; + +diff -Nrup a/util/mp4art.cpp b/util/mp4art.cpp +--- a/util/mp4art.cpp 2015-04-24 09:37:49.000000000 -0600 ++++ b/util/mp4art.cpp 2019-09-24 12:32:35.078171912 -0600 +@@ -377,11 +377,11 @@ ArtUtility::utility_option( int code, bo + handled = true; + + switch( code ) { +- case LC_ART_ANY: ++ case int(LC_ART_ANY): + _artFilter = numeric_limits::max(); + break; + +- case LC_ART_INDEX: ++ case int(LC_ART_INDEX): + { + istringstream iss( prog::optarg ); + iss >> _artFilter; +@@ -390,29 +390,29 @@ ArtUtility::utility_option( int code, bo + break; + } + +- case LC_LIST: ++ case int(LC_LIST): + _action = &ArtUtility::actionList; + break; + +- case LC_ADD: ++ case int(LC_ADD): + _action = &ArtUtility::actionAdd; + _artImageFile = prog::optarg; + if( _artImageFile.empty() ) + return herrf( "invalid image file: empty-string\n" ); + break; + +- case LC_REMOVE: ++ case int(LC_REMOVE): + _action = &ArtUtility::actionRemove; + break; + +- case LC_REPLACE: ++ case int(LC_REPLACE): + _action = &ArtUtility::actionReplace; + _artImageFile = prog::optarg; + if( _artImageFile.empty() ) + return herrf( "invalid image file: empty-string\n" ); + break; + +- case LC_EXTRACT: ++ case int(LC_EXTRACT): + _action = &ArtUtility::actionExtract; + break; + +diff -Nrup a/util/mp4chaps.cpp b/util/mp4chaps.cpp +--- a/util/mp4chaps.cpp 2015-04-24 09:37:49.000000000 -0600 ++++ b/util/mp4chaps.cpp 2019-09-24 12:35:24.121316167 -0600 +@@ -634,32 +634,32 @@ ChapterUtility::utility_option( int code + + switch( code ) { + case 'A': +- case LC_CHPT_ANY: ++ case int(LC_CHPT_ANY): + _ChapterType = MP4ChapterTypeAny; + break; + + case 'Q': +- case LC_CHPT_QT: ++ case int(LC_CHPT_QT): + _ChapterType = MP4ChapterTypeQt; + break; + + case 'N': +- case LC_CHPT_NERO: ++ case int(LC_CHPT_NERO): + _ChapterType = MP4ChapterTypeNero; + break; + + case 'C': +- case LC_CHPT_COMMON: ++ case int(LC_CHPT_COMMON): + _ChapterFormat = CHPT_FMT_COMMON; + break; + + case 'l': +- case LC_CHP_LIST: ++ case int(LC_CHP_LIST): + _action = &ChapterUtility::actionList; + break; + + case 'e': +- case LC_CHP_EVERY: ++ case int(LC_CHP_EVERY): + { + istringstream iss( prog::optarg ); + iss >> _ChaptersEvery; +@@ -675,7 +675,7 @@ ChapterUtility::utility_option( int code + _action = &ChapterUtility::actionExport; + break; + +- case LC_CHP_EXPORT: ++ case int(LC_CHP_EXPORT): + _action = &ChapterUtility::actionExport; + /* currently not supported since the chapters of n input files would be written to one chapter file + _ChapterFile = prog::optarg; +@@ -690,7 +690,7 @@ ChapterUtility::utility_option( int code + _action = &ChapterUtility::actionImport; + break; + +- case LC_CHP_IMPORT: ++ case int(LC_CHP_IMPORT): + _action = &ChapterUtility::actionImport; + /* currently not supported since the chapters of n input files would be read from one chapter file + _ChapterFile = prog::optarg; +@@ -702,12 +702,12 @@ ChapterUtility::utility_option( int code + break; + + case 'c': +- case LC_CHP_CONVERT: ++ case int(LC_CHP_CONVERT): + _action = &ChapterUtility::actionConvert; + break; + + case 'r': +- case LC_CHP_REMOVE: ++ case int(LC_CHP_REMOVE): + _action = &ChapterUtility::actionRemove; + break; + +diff -Nrup a/util/mp4file.cpp b/util/mp4file.cpp +--- a/util/mp4file.cpp 2015-04-24 09:37:49.000000000 -0600 ++++ b/util/mp4file.cpp 2019-09-24 12:33:09.735996459 -0600 +@@ -190,15 +190,15 @@ FileUtility::utility_option( int code, b + handled = true; + + switch( code ) { +- case LC_LIST: ++ case int(LC_LIST): + _action = &FileUtility::actionList; + break; + +- case LC_OPTIMIZE: ++ case int(LC_OPTIMIZE): + _action = &FileUtility::actionOptimize; + break; + +- case LC_DUMP: ++ case int(LC_DUMP): + _action = &FileUtility::actionDump; + break; + +diff -Nrup a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp +--- a/util/mp4subtitle.cpp 2015-04-24 09:37:49.000000000 -0600 ++++ b/util/mp4subtitle.cpp 2019-09-24 12:33:53.739773682 -0600 +@@ -165,25 +165,25 @@ SubtitleUtility::utility_option( int cod + handled = true; + + switch( code ) { +- case LC_LIST: ++ case int(LC_LIST): + _action = &SubtitleUtility::actionList; + break; + +- case LC_EXPORT: ++ case int(LC_EXPORT): + _action = &SubtitleUtility::actionExport; + _stTextFile = prog::optarg; + if( _stTextFile.empty() ) + return herrf( "invalid TXT file: empty-string\n" ); + break; + +- case LC_IMPORT: ++ case int(LC_IMPORT): + _action = &SubtitleUtility::actionImport; + _stTextFile = prog::optarg; + if( _stTextFile.empty() ) + return herrf( "invalid TXT file: empty-string\n" ); + break; + +- case LC_REMOVE: ++ case int(LC_REMOVE): + _action = &SubtitleUtility::actionRemove; + break; + +diff -Nrup a/util/mp4track.cpp b/util/mp4track.cpp +--- a/util/mp4track.cpp 2015-04-24 09:37:49.000000000 -0600 ++++ b/util/mp4track.cpp 2019-09-24 12:37:02.934815918 -0600 +@@ -789,11 +789,11 @@ TrackUtility::utility_option( int code, + handled = true; + + switch( code ) { +- case LC_TRACK_WILDCARD: ++ case int(LC_TRACK_WILDCARD): + _trackMode = TM_WILDCARD; + break; + +- case LC_TRACK_INDEX: ++ case int(LC_TRACK_INDEX): + { + _trackMode = TM_INDEX; + istringstream iss( prog::optarg ); +@@ -803,7 +803,7 @@ TrackUtility::utility_option( int code, + break; + } + +- case LC_TRACK_ID: ++ case int(LC_TRACK_ID): + { + _trackMode = TM_ID; + istringstream iss( prog::optarg ); +@@ -813,142 +813,142 @@ TrackUtility::utility_option( int code, + break; + } + +- case LC_LIST: ++ case int(LC_LIST): + _action = &TrackUtility::actionList; + break; + +- case LC_COLR_PARMS: ++ case int(LC_COLR_PARMS): + _colorParameterItem.convertFromCSV( prog::optarg ); + break; + +- case LC_COLR_PARM_HD: ++ case int(LC_COLR_PARM_HD): + _colorParameterItem.primariesIndex = 1; + _colorParameterItem.transferFunctionIndex = 1; + _colorParameterItem.matrixIndex = 1; + break; + +- case LC_COLR_PARM_SD: ++ case int(LC_COLR_PARM_SD): + _colorParameterItem.primariesIndex = 6; + _colorParameterItem.transferFunctionIndex = 1; + _colorParameterItem.matrixIndex = 6; + break; + +- case LC_COLR_LIST: ++ case int(LC_COLR_LIST): + _action = &TrackUtility::actionColorParameterList; + break; + +- case LC_ENABLED: ++ case int(LC_ENABLED): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setEnabled; + _actionTrackModifierSet_name = "enabled"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_INMOVIE: ++ case int(LC_INMOVIE): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setInMovie; + _actionTrackModifierSet_name = "inMovie"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_INPREVIEW: ++ case int(LC_INPREVIEW): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setInPreview; + _actionTrackModifierSet_name = "inPreview"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_LAYER: ++ case int(LC_LAYER): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setLayer; + _actionTrackModifierSet_name = "layer"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_ALTGROUP: ++ case int(LC_ALTGROUP): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setAlternateGroup; + _actionTrackModifierSet_name = "alternateGroup"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_VOLUME: ++ case int(LC_VOLUME): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setVolume; + _actionTrackModifierSet_name = "volume"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_WIDTH: ++ case int(LC_WIDTH): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setWidth; + _actionTrackModifierSet_name = "width"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_HEIGHT: ++ case int(LC_HEIGHT): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setHeight; + _actionTrackModifierSet_name = "height"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_LANGUAGE: ++ case int(LC_LANGUAGE): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setLanguage; + _actionTrackModifierSet_name = "language"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_HDLRNAME: ++ case int(LC_HDLRNAME): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setHandlerName; + _actionTrackModifierSet_name = "handlerName"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_UDTANAME: ++ case int(LC_UDTANAME): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setUserDataName; + _actionTrackModifierSet_name = "userDataName"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_UDTANAME_R: ++ case int(LC_UDTANAME_R): + _action = &TrackUtility::actionTrackModifierRemove; + _actionTrackModifierRemove_function = &TrackModifier::removeUserDataName; + _actionTrackModifierRemove_name = "userDataName"; + break; + +- case LC_COLR_ADD: ++ case int(LC_COLR_ADD): + _action = &TrackUtility::actionColorParameterAdd; + break; + +- case LC_COLR_SET: ++ case int(LC_COLR_SET): + _action = &TrackUtility::actionColorParameterSet; + break; + +- case LC_COLR_REMOVE: ++ case int(LC_COLR_REMOVE): + _action = &TrackUtility::actionColorParameterRemove; + break; + +- case LC_PASP_PARMS: ++ case int(LC_PASP_PARMS): + _pictureAspectRatioItem.convertFromCSV( prog::optarg ); + break; + +- case LC_PASP_LIST: ++ case int(LC_PASP_LIST): + _action = &TrackUtility::actionPictureAspectRatioList; + break; + +- case LC_PASP_ADD: ++ case int(LC_PASP_ADD): + _action = &TrackUtility::actionPictureAspectRatioAdd; + break; + +- case LC_PASP_SET: ++ case int(LC_PASP_SET): + _action = &TrackUtility::actionPictureAspectRatioSet; + break; + +- case LC_PASP_REMOVE: ++ case int(LC_PASP_REMOVE): + _action = &TrackUtility::actionPictureAspectRatioRemove; + break; + diff --git a/libmp4v2.spec b/libmp4v2.spec index 32c66f3..4974c36 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.19%{gver}%{?dist} +Release: 0.20%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -21,6 +21,7 @@ Patch7: 0007-Fix-Out-of-bounds-memory-access-in-MP4v2-2.0.0.patch Patch8: 0008-Fix-v2-Type-confusion-in-MP4v2-2.0.0.patch Patch9: 0009-Null-out-pointer-after-free-to-prevent-double-free.patch Patch10: 0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch +Patch50: gcc10.patch BuildRequires: gcc-c++ BuildRequires: autoconf automake gettext-devel libtool texinfo svn @@ -82,6 +83,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Sat Dec 14 2019 Jeff Law - 2.1.0-0.20.trunkREV507 +- Fix narrowing conversion issue caught by gcc-10 + * Fri Nov 08 2019 Sérgio Basto - 2.1.0-0.19.trunkREV507 - Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0 From 33958b4f7d77fede7bcfc620a2571806486d7ed8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 09:46:08 +0000 Subject: [PATCH 03/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index 4974c36..1561882 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.20%{gver}%{?dist} +Release: 0.21%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -83,6 +83,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.1.0-0.21.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Dec 14 2019 Jeff Law - 2.1.0-0.20.trunkREV507 - Fix narrowing conversion issue caught by gcc-10 From ef4a048fdc8d2b88be96a022ca3abbc86c74ddde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 2 Nov 2019 06:31:08 +0000 Subject: [PATCH 04/24] Fix https://nvd.nist.gov/vuln/detail/CVE-2018-14446 https://nvd.nist.gov/vuln/detail/CVE-2018-14403 https://nvd.nist.gov/vuln/detail/CVE-2018-14379 https://nvd.nist.gov/vuln/detail/CVE-2018-14326 https://nvd.nist.gov/vuln/detail/CVE-2018-14325 https://nvd.nist.gov/vuln/detail/CVE-2018-14054 based on https://github.com/TechSmith/mp4v2/pull/27 and https://github.com/sergiomb2/libmp4v2/ Update spec --- 0001-Fix-make-dist.patch | 4 +- ...an-man3-BTW-like-in-libmp4v2-1.5.0.1.patch | 6 +- 0003-Fix-out-of-tree-builds-182.patch | 6 +- 0004-Fix-GCC7-build.patch | 4 +- 0005-Fix-clang-compilation.patch | 39 ++++++++++++ ...-bounds-memory-access-in-MP4v2-2.0.0.patch | 28 +++++++++ ...Fix-v2-Type-confusion-in-MP4v2-2.0.0.patch | 33 +++++++++++ ...er-after-free-to-prevent-double-free.patch | 35 +++++++++++ ...er-underflow-overflow-in-MP4v2-2.0.0.patch | 59 +++++++++++++++++++ libmp4v2.spec | 28 ++++++--- 10 files changed, 224 insertions(+), 18 deletions(-) create mode 100644 0005-Fix-clang-compilation.patch create mode 100644 0007-Fix-Out-of-bounds-memory-access-in-MP4v2-2.0.0.patch create mode 100644 0008-Fix-v2-Type-confusion-in-MP4v2-2.0.0.patch create mode 100644 0009-Null-out-pointer-after-free-to-prevent-double-free.patch create mode 100644 0010-Fix-v2-Integer-underflow-overflow-in-MP4v2-2.0.0.patch diff --git a/0001-Fix-make-dist.patch b/0001-Fix-make-dist.patch index 1558313..2929dda 100644 --- a/0001-Fix-make-dist.patch +++ b/0001-Fix-make-dist.patch @@ -1,7 +1,7 @@ From 60e346211e53257d2fd0b39d4b89ce60c9053409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 7 Oct 2015 03:59:59 +0100 -Subject: [PATCH 1/4] Fix make dist. +Subject: [PATCH 01/10] Fix make dist. Makes fail because make doc fails . for more information please see : @@ -276,5 +276,5 @@ index 9087853..e3b27dd 100644 +@COMMANDinstall{} @end example -- -2.7.4 +2.21.0 diff --git a/0002-Install-man-man3-BTW-like-in-libmp4v2-1.5.0.1.patch b/0002-Install-man-man3-BTW-like-in-libmp4v2-1.5.0.1.patch index 1d43b5b..4a72ad7 100644 --- a/0002-Install-man-man3-BTW-like-in-libmp4v2-1.5.0.1.patch +++ b/0002-Install-man-man3-BTW-like-in-libmp4v2-1.5.0.1.patch @@ -1,12 +1,12 @@ From fc65e21b1fe12cb3d51a8bc8152efbebedabbd6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 7 Oct 2015 04:25:20 +0100 -Subject: [PATCH 2/4] Install man/man3/, BTW like in libmp4v2-1.5.0.1 +Subject: [PATCH 02/10] Install man/man3/, BTW like in libmp4v2-1.5.0.1 And fix 30 annoying warnings "target x given more than once in the same rule" --- - GNUmakefile.am | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + GNUmakefile.am | 73 ++++++++++++++++++++++++++++++++++++++++++++++ doc/GNUmakefile.mk | 2 +- 2 files changed, 74 insertions(+), 1 deletion(-) @@ -108,5 +108,5 @@ index dadb234..1e6188e 100644 DOC.texi.includes = \ doc/texi/base/project.texi \ -- -2.7.4 +2.21.0 diff --git a/0003-Fix-out-of-tree-builds-182.patch b/0003-Fix-out-of-tree-builds-182.patch index a78b373..e666b93 100644 --- a/0003-Fix-out-of-tree-builds-182.patch +++ b/0003-Fix-out-of-tree-builds-182.patch @@ -1,12 +1,12 @@ From d7de4350e9fb40c296798f2d0b5197aa760dd417 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 6 Feb 2017 06:23:19 +0100 -Subject: [PATCH 3/4] Fix out-of-tree builds (#182) +Subject: [PATCH 03/10] Fix out-of-tree builds (#182) Building with srcdir!=builddir was failing with a "no rule to create doc/MP4.3" error. --- - GNUmakefile.am | 144 ++++++++++++++++++++++++++++----------------------------- + GNUmakefile.am | 144 ++++++++++++++++++++++++------------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/GNUmakefile.am b/GNUmakefile.am @@ -165,5 +165,5 @@ index ea45d75..4b30ee6 100644 endif -- -2.7.4 +2.21.0 diff --git a/0004-Fix-GCC7-build.patch b/0004-Fix-GCC7-build.patch index dec02f9..9057243 100644 --- a/0004-Fix-GCC7-build.patch +++ b/0004-Fix-GCC7-build.patch @@ -1,7 +1,7 @@ From 855e9674232808ff3be7191b697dfb56917db21f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 8 Feb 2017 00:56:32 +0000 -Subject: [PATCH 4/4] Fix GCC7 build +Subject: [PATCH 04/10] Fix GCC7 build if (*pSlash != '\0') { @@ -26,5 +26,5 @@ index e07309d..1eb01f5 100644 *ppEncodingParams = (char *)MP4Calloc(length + 1); strncpy(*ppEncodingParams, pSlash, length); -- -2.7.4 +2.21.0 diff --git a/0005-Fix-clang-compilation.patch b/0005-Fix-clang-compilation.patch new file mode 100644 index 0000000..588c298 --- /dev/null +++ b/0005-Fix-clang-compilation.patch @@ -0,0 +1,39 @@ +From edc4f0ad8f37bb8aeae4e3ea34766dc6cdbb2f15 Mon Sep 17 00:00:00 2001 +From: David Carlos Manuelda +Date: Tue, 7 Aug 2018 05:42:28 +0200 +Subject: [PATCH 05/10] Fix clang compilation + +--- + src/mp4.cpp | 2 +- + src/mp4util.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mp4.cpp b/src/mp4.cpp +index 1016f79..d576103 100644 +--- a/src/mp4.cpp ++++ b/src/mp4.cpp +@@ -896,7 +896,7 @@ MP4FileHandle MP4ReadProvider( const char* fileName, const MP4FileProvider* file + } + + catch (...) { +- return MP4_INVALID_TRACK_ID; ++ return (mp4v2_ismacrypParams *)MP4_INVALID_TRACK_ID; + } + } + +diff --git a/src/mp4util.h b/src/mp4util.h +index 1fbbd81..b33bb44 100644 +--- a/src/mp4util.h ++++ b/src/mp4util.h +@@ -33,7 +33,7 @@ namespace mp4v2 { namespace impl { + #ifndef ASSERT + # define ASSERT(expr) \ + if (!(expr)) { \ +- throw new Exception("assert failure: "LIBMPV42_STRINGIFY((expr)), __FILE__, __LINE__, __FUNCTION__ ); \ ++ throw new Exception("assert failure: " LIBMPV42_STRINGIFY((expr)), __FILE__, __LINE__, __FUNCTION__ ); \ + } + #endif + +-- +2.21.0 + diff --git a/0007-Fix-Out-of-bounds-memory-access-in-MP4v2-2.0.0.patch b/0007-Fix-Out-of-bounds-memory-access-in-MP4v2-2.0.0.patch new file mode 100644 index 0000000..d1fd1fd --- /dev/null +++ b/0007-Fix-Out-of-bounds-memory-access-in-MP4v2-2.0.0.patch @@ -0,0 +1,28 @@ +From a94a3372c6ef66a2276cc6cd92f7ec07a9c8bb6b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= +Date: Wed, 17 Oct 2018 16:13:06 +0100 +Subject: [PATCH 07/10] Fix Out-of-bounds memory access in MP4v2 2.0.0 + +The bug can be fixed by more checks when doing type comparison. +Reference: https://www.openwall.com/lists/oss-security/2018/07/18/3 + +Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14403 +--- + src/mp4util.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/mp4util.cpp b/src/mp4util.cpp +index 47bd74e..696dab4 100644 +--- a/src/mp4util.cpp ++++ b/src/mp4util.cpp +@@ -46,6 +46,7 @@ bool MP4NameFirstMatches(const char* s1, const char* s2) + s1++; + s2++; + } ++ if(*s2 != '[' && *s2 != '.' && *s2 != '\0') return false; + return true; + } + +-- +2.21.0 + diff --git a/0008-Fix-v2-Type-confusion-in-MP4v2-2.0.0.patch b/0008-Fix-v2-Type-confusion-in-MP4v2-2.0.0.patch new file mode 100644 index 0000000..a521552 --- /dev/null +++ b/0008-Fix-v2-Type-confusion-in-MP4v2-2.0.0.patch @@ -0,0 +1,33 @@ +From bb920de948c85e3db4a52292ac7250a50e3bfc86 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= +Date: Sat, 2 Nov 2019 04:19:27 +0000 +Subject: [PATCH 08/10] Fix v2 Type confusion in MP4v2 2.0.0 + +The bug is caused by the wrong assumption that the child of an `ilst` +can never be an `ilst`. So we could fix it by simply adding an ASSERT. + +Reference: https://www.openwall.com/lists/oss-security/2018/07/17/1 +Addresses: https://nvd.nist.gov/vuln/detail/CVE-2018-14379 +--- + src/mp4atom.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/mp4atom.cpp b/src/mp4atom.cpp +index 520cbc8..7a0a53f 100644 +--- a/src/mp4atom.cpp ++++ b/src/mp4atom.cpp +@@ -778,8 +778,10 @@ MP4Atom::factory( MP4File &file, MP4Atom* parent, const char* type ) + const char* const ptype = parent->GetType(); + + if( descendsFrom( parent, "ilst" )) { +- if( ATOMID( ptype ) == ATOMID( "ilst" )) ++ if( ATOMID( ptype ) == ATOMID( "ilst" )) { ++ ASSERT(ATOMID( type ) != ATOMID( "ilst" )); + return new MP4ItemAtom( file, type ); ++ } + + if( ATOMID( type ) == ATOMID( "data" )) + return new MP4DataAtom(file); +-- +2.21.0 + diff --git a/0009-Null-out-pointer-after-free-to-prevent-double-free.patch b/0009-Null-out-pointer-after-free-to-prevent-double-free.patch new file mode 100644 index 0000000..6309b5d --- /dev/null +++ b/0009-Null-out-pointer-after-free-to-prevent-double-free.patch @@ -0,0 +1,35 @@ +From 3410bc66fb91f46325ab1d008b6a421dd8240949 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= +Date: Sat, 2 Nov 2019 04:21:17 +0000 +Subject: [PATCH 09/10] Null out pointer after free to prevent double free + +If an exception occurs (because of a crafted MP4) before the value is reassigned, then a double free can occur. By setting the pointer to NULL after the first free, we prevent the double free in this case. +Addresses: https://nvd.nist.gov/vuln/detail/CVE-2018-14054 + +copied form https://github.com/TechSmith/mp4v2/commit/f09cceeee5bd7f783fd31f10e8b3c440ccf4c743 +From: Dave O'Rourke +Date: Wed, 20 Mar 2019 08:57:29 -0400 +--- + src/mp4property.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/mp4property.cpp b/src/mp4property.cpp +index 9a5b1e3..1b8e1d2 100644 +--- a/src/mp4property.cpp ++++ b/src/mp4property.cpp +@@ -391,8 +391,10 @@ void MP4StringProperty::Read( MP4File& file, uint32_t index ) + char*& value = m_values[i]; + + // Generally a default atom setting, e.g. see atom_avc1.cpp, "JVT/AVC Coding"; we'll leak this string if +- // we don't free. Note that MP4Free checks for null. +- MP4Free(value); ++ // we don't free. Note that this code checks for null before calling free and sets the pointer to null ++ // after freeing it, to prevent a double free in case an exception occurs before the value is reassigned. ++ MP4Free( value ); ++ value = NULL; + + if( m_useCountedFormat ) { + value = file.ReadCountedString( (m_useUnicode ? 2 : 1), m_useExpandedCount, m_fixedLength ); +-- +2.21.0 + diff --git a/0010-Fix-v2-Integer-underflow-overflow-in-MP4v2-2.0.0.patch b/0010-Fix-v2-Integer-underflow-overflow-in-MP4v2-2.0.0.patch new file mode 100644 index 0000000..3c9a769 --- /dev/null +++ b/0010-Fix-v2-Integer-underflow-overflow-in-MP4v2-2.0.0.patch @@ -0,0 +1,59 @@ +From f5f814801ecd312a1418e2226dadfea72badec49 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= +Date: Sat, 2 Nov 2019 04:37:15 +0000 +Subject: [PATCH 10/10] Fix v2 Integer underflow/overflow in MP4v2 2.0.0 + +Reference: https://www.openwall.com/lists/oss-security/2018/07/16/1 + +For the overflow, we could check the result of the integer multiplication: + +Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14326 and https://nvd.nist.gov/vuln/detail/CVE-2018-14446 + +For the underflow, we could check if `dataSize >= hdrSize` satisfies: +Throw exception when invalid atom size would cause integer underflow +The calculation `hdrSize - dataSize` can underflow the 64-bit unsigned int dataSize type, which can lead to incorrect results. We throw an exception to stop the code from going any further. + +Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14325 +Based on https://github.com/TechSmith/mp4v2/commit/e475013c6ef78093055a02b0d035eda0f9f01451 +--- + src/mp4array.h | 5 ++++- + src/mp4atom.cpp | 6 ++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/mp4array.h b/src/mp4array.h +index c49d59b..340d74d 100644 +--- a/src/mp4array.h ++++ b/src/mp4array.h +@@ -102,8 +102,11 @@ protected: + void Resize(MP4ArrayIndex newSize) { \ + m_numElements = newSize; \ + m_maxNumElements = newSize; \ ++ uint32_t mul = newSize * sizeof(type); \ ++ if(mul / newSize != sizeof(type)) \ ++ throw new Exception("multiplication overflow", __FILE__, __LINE__, __FUNCTION__);\ + m_elements = (type*)MP4Realloc(m_elements, \ +- m_maxNumElements * sizeof(type)); \ ++ mul); \ + } \ + \ + type& operator[](MP4ArrayIndex index) { \ +diff --git a/src/mp4atom.cpp b/src/mp4atom.cpp +index 7a0a53f..f5d5dc0 100644 +--- a/src/mp4atom.cpp ++++ b/src/mp4atom.cpp +@@ -143,6 +143,12 @@ MP4Atom* MP4Atom::ReadAtom(MP4File& file, MP4Atom* pParentAtom) + dataSize = file.GetSize() - pos; + } + ++ if(dataSize < hdrSize) { ++ ostringstream oss; ++ oss << "Invalid atom size in '" << type << "' atom, dataSize = " << dataSize << " cannot be less than hdrSize = " << static_cast( hdrSize ); ++ log.errorf( "%s: \"%s\": %s", __FUNCTION__, file.GetFilename().c_str(), oss.str().c_str() ); ++ throw new Exception( oss.str().c_str(), __FILE__, __LINE__, __FUNCTION__ ); ++ } + dataSize -= hdrSize; + + log.verbose1f("\"%s\": type = \"%s\" data-size = %" PRIu64 " (0x%" PRIx64 ") hdr %u", +-- +2.21.0 + diff --git a/libmp4v2.spec b/libmp4v2.spec index ba86644..e645291 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.17%{gver}%{?dist} +Release: 0.18%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -16,6 +16,11 @@ Patch1: 0001-Fix-make-dist.patch Patch2: 0002-Install-man-man3-BTW-like-in-libmp4v2-1.5.0.1.patch Patch3: 0003-Fix-out-of-tree-builds-182.patch Patch4: 0004-Fix-GCC7-build.patch +Patch5: 0005-Fix-clang-compilation.patch +Patch7: 0007-Fix-Out-of-bounds-memory-access-in-MP4v2-2.0.0.patch +Patch8: 0008-Fix-v2-Type-confusion-in-MP4v2-2.0.0.patch +Patch9: 0009-Null-out-pointer-after-free-to-prevent-double-free.patch +Patch10:0010-Fix-v2-Integer-underflow-overflow-in-MP4v2-2.0.0.patch BuildRequires: gcc-c++ BuildRequires: autoconf automake gettext-devel libtool texinfo svn @@ -38,23 +43,19 @@ using the libmp4v2 library. %prep -%setup -q -n mp4v2-trunk -%patch1 -p1 -b .doc -%patch2 -p1 -b .doc2 -%patch3 -p1 -b .doc3 -%patch4 -p1 -b .gcc7 +%autosetup -p1 -n mp4v2-trunk %build autoreconf --force --install --verbose %configure --disable-static -%{__make} %{?_smp_mflags} +%make_build %{__make} txt export LANG=en_US.utf8 %{__make} api %install -%{__make} install DESTDIR=%{buildroot} +%make_install find %{buildroot} -name '*.la' -delete %ldconfig_scriptlets @@ -75,6 +76,17 @@ find %{buildroot} -name '*.la' -delete %changelog +* Sat Nov 02 2019 Sérgio Basto - 2.1.0-0.18.trunkREV507 +- Fix https://nvd.nist.gov/vuln/detail/CVE-2018-14446 + https://nvd.nist.gov/vuln/detail/CVE-2018-14403 + https://nvd.nist.gov/vuln/detail/CVE-2018-14379 + https://nvd.nist.gov/vuln/detail/CVE-2018-14326 + https://nvd.nist.gov/vuln/detail/CVE-2018-14325 + https://nvd.nist.gov/vuln/detail/CVE-2018-14054 + based on https://github.com/TechSmith/mp4v2/pull/27 + and https://github.com/sergiomb2/libmp4v2/ +- Update spec + * Thu Jul 25 2019 Fedora Release Engineering - 2.1.0-0.17.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 091b2dfa976c4f6e463299950b654c4274ac8fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 2 Nov 2019 07:51:53 +0000 Subject: [PATCH 05/24] Fix build on epel7 --- libmp4v2.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libmp4v2.spec b/libmp4v2.spec index e645291..1a33870 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -25,7 +25,9 @@ Patch10:0010-Fix-v2-Integer-underflow-overflow-in-MP4v2-2.0.0.patch BuildRequires: gcc-c++ BuildRequires: autoconf automake gettext-devel libtool texinfo svn BuildRequires: python%{python3_pkgversion} doxygen help2man +%if 0%{?fedora} > 29 || 0%{?rhel} > 7 BuildRequires: glibc-langpack-en +%endif %description The libmp4v2 library provides an abstraction layer for working with files @@ -49,7 +51,9 @@ using the libmp4v2 library. autoreconf --force --install --verbose %configure --disable-static %make_build +%if 0%{?fedora} > 29 || 0%{?rhel} > 7 %{__make} txt +%endif export LANG=en_US.utf8 %{__make} api @@ -62,7 +66,9 @@ find %{buildroot} -name '*.la' -delete %files +%if 0%{?fedora} > 29 || 0%{?rhel} > 7 %doc doc/articles/txt/*txt +%endif %license COPYING %{_bindir}/* %{_libdir}/libmp4v2.so.2* @@ -86,6 +92,7 @@ find %{buildroot} -name '*.la' -delete based on https://github.com/TechSmith/mp4v2/pull/27 and https://github.com/sergiomb2/libmp4v2/ - Update spec +- Fix build on epel7 * Thu Jul 25 2019 Fedora Release Engineering - 2.1.0-0.17.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 3187b4d348b02e79cef433fb15896440101f5e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 8 Nov 2019 01:27:12 +0000 Subject: [PATCH 06/24] Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0 --- ...er-underflow-overflow-in-MP4v2-2.0.0.patch | 28 ++++++++++--------- libmp4v2.spec | 7 +++-- 2 files changed, 20 insertions(+), 15 deletions(-) rename 0010-Fix-v2-Integer-underflow-overflow-in-MP4v2-2.0.0.patch => 0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch (69%) diff --git a/0010-Fix-v2-Integer-underflow-overflow-in-MP4v2-2.0.0.patch b/0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch similarity index 69% rename from 0010-Fix-v2-Integer-underflow-overflow-in-MP4v2-2.0.0.patch rename to 0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch index 3c9a769..e70fe93 100644 --- a/0010-Fix-v2-Integer-underflow-overflow-in-MP4v2-2.0.0.patch +++ b/0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch @@ -1,12 +1,16 @@ -From f5f814801ecd312a1418e2226dadfea72badec49 Mon Sep 17 00:00:00 2001 +From def286d811716ad55cb39b8d935bb7b2d656fa30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 2 Nov 2019 04:37:15 +0000 -Subject: [PATCH 10/10] Fix v2 Integer underflow/overflow in MP4v2 2.0.0 +Subject: [PATCH 10/10] Fix v3 Integer underflow/overflow in MP4v2 2.0.0 Reference: https://www.openwall.com/lists/oss-security/2018/07/16/1 For the overflow, we could check the result of the integer multiplication: +fix vulnerability where an atom list size is enormous +and calculating the number of bytes needed to hold the list overflows +https://github.com/TechSmith/mp4v2/pull/27/commits/70d823ccd8e2d7d0ed9e62fb7e8983d21e6acbeb + Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14326 and https://nvd.nist.gov/vuln/detail/CVE-2018-14446 For the underflow, we could check if `dataSize >= hdrSize` satisfies: @@ -15,28 +19,26 @@ The calculation `hdrSize - dataSize` can underflow the 64-bit unsigned int dataS Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14325 Based on https://github.com/TechSmith/mp4v2/commit/e475013c6ef78093055a02b0d035eda0f9f01451 + +Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14326 and https://nvd.nist.gov/vuln/detail/CVE-2018-14446 --- - src/mp4array.h | 5 ++++- + src/mp4array.h | 2 ++ src/mp4atom.cpp | 6 ++++++ - 2 files changed, 10 insertions(+), 1 deletion(-) + 2 files changed, 8 insertions(+) diff --git a/src/mp4array.h b/src/mp4array.h -index c49d59b..340d74d 100644 +index c49d59b..69d470a 100644 --- a/src/mp4array.h +++ b/src/mp4array.h -@@ -102,8 +102,11 @@ protected: +@@ -102,6 +102,8 @@ protected: void Resize(MP4ArrayIndex newSize) { \ m_numElements = newSize; \ m_maxNumElements = newSize; \ -+ uint32_t mul = newSize * sizeof(type); \ -+ if(mul / newSize != sizeof(type)) \ -+ throw new Exception("multiplication overflow", __FILE__, __LINE__, __FUNCTION__);\ ++ if ( (uint64_t) m_maxNumElements * sizeof(type) > 0xFFFFFFFF ) \ ++ throw new PlatformException("requested array size exceeds 4GB", ERANGE, __FILE__, __LINE__, __FUNCTION__); /* prevent overflow */ \ m_elements = (type*)MP4Realloc(m_elements, \ -- m_maxNumElements * sizeof(type)); \ -+ mul); \ + m_maxNumElements * sizeof(type)); \ } \ - \ - type& operator[](MP4ArrayIndex index) { \ diff --git a/src/mp4atom.cpp b/src/mp4atom.cpp index 7a0a53f..f5d5dc0 100644 --- a/src/mp4atom.cpp diff --git a/libmp4v2.spec b/libmp4v2.spec index 1a33870..32c66f3 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.18%{gver}%{?dist} +Release: 0.19%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -20,7 +20,7 @@ Patch5: 0005-Fix-clang-compilation.patch Patch7: 0007-Fix-Out-of-bounds-memory-access-in-MP4v2-2.0.0.patch Patch8: 0008-Fix-v2-Type-confusion-in-MP4v2-2.0.0.patch Patch9: 0009-Null-out-pointer-after-free-to-prevent-double-free.patch -Patch10:0010-Fix-v2-Integer-underflow-overflow-in-MP4v2-2.0.0.patch +Patch10: 0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch BuildRequires: gcc-c++ BuildRequires: autoconf automake gettext-devel libtool texinfo svn @@ -82,6 +82,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Fri Nov 08 2019 Sérgio Basto - 2.1.0-0.19.trunkREV507 +- Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0 + * Sat Nov 02 2019 Sérgio Basto - 2.1.0-0.18.trunkREV507 - Fix https://nvd.nist.gov/vuln/detail/CVE-2018-14446 https://nvd.nist.gov/vuln/detail/CVE-2018-14403 From e331fdfa1f24c414d94249c6e8b05f3389019797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 8 Nov 2019 02:05:56 +0000 Subject: [PATCH 07/24] Update 0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch --- 0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch b/0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch index e70fe93..a7a850f 100644 --- a/0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch +++ b/0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch @@ -1,6 +1,6 @@ -From def286d811716ad55cb39b8d935bb7b2d656fa30 Mon Sep 17 00:00:00 2001 +From 9084868fd9f86bee118001c23171e832f15009f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= -Date: Sat, 2 Nov 2019 04:37:15 +0000 +Date: Fri, 8 Nov 2019 02:01:32 +0000 Subject: [PATCH 10/10] Fix v3 Integer underflow/overflow in MP4v2 2.0.0 Reference: https://www.openwall.com/lists/oss-security/2018/07/16/1 @@ -19,8 +19,6 @@ The calculation `hdrSize - dataSize` can underflow the 64-bit unsigned int dataS Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14325 Based on https://github.com/TechSmith/mp4v2/commit/e475013c6ef78093055a02b0d035eda0f9f01451 - -Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14326 and https://nvd.nist.gov/vuln/detail/CVE-2018-14446 --- src/mp4array.h | 2 ++ src/mp4atom.cpp | 6 ++++++ From b456f253474538b1dd8c244da0eeea8b726043ae Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 14 Dec 2019 15:44:07 -0700 Subject: [PATCH 08/24] Fix narrowing convesion problem caught by gcc-10 --- gcc10.patch | 411 ++++++++++++++++++++++++++++++++++++++++++++++++++ libmp4v2.spec | 6 +- 2 files changed, 416 insertions(+), 1 deletion(-) create mode 100644 gcc10.patch diff --git a/gcc10.patch b/gcc10.patch new file mode 100644 index 0000000..bd18636 --- /dev/null +++ b/gcc10.patch @@ -0,0 +1,411 @@ +diff -Nrup a/libutil/Utility.cpp b/libutil/Utility.cpp +--- a/libutil/Utility.cpp 2015-04-24 09:37:49.000000000 -0600 ++++ b/libutil/Utility.cpp 2019-09-24 12:39:23.669103515 -0600 +@@ -531,26 +531,26 @@ Utility::process_impl() + printHelp( false, false ); + return SUCCESS; + +- case LC_DEBUG: ++ case int(LC_DEBUG): + debugUpdate( std::strtoul( prog::optarg, NULL, 0 ) ); + break; + +- case LC_VERBOSE: ++ case int(LC_VERBOSE): + { + const uint32_t level = std::strtoul( prog::optarg, NULL, 0 ); + _verbosity = ( level < 4 ) ? level : 3; + break; + } + +- case LC_HELP: ++ case int(LC_HELP): + printHelp( true, false ); + return SUCCESS; + +- case LC_VERSION: ++ case int(LC_VERSION): + printVersion( false ); + return SUCCESS; + +- case LC_VERSIONX: ++ case int(LC_VERSIONX): + printVersion( true ); + return SUCCESS; + +diff -Nrup a/util/mp4art.cpp b/util/mp4art.cpp +--- a/util/mp4art.cpp 2015-04-24 09:37:49.000000000 -0600 ++++ b/util/mp4art.cpp 2019-09-24 12:32:35.078171912 -0600 +@@ -377,11 +377,11 @@ ArtUtility::utility_option( int code, bo + handled = true; + + switch( code ) { +- case LC_ART_ANY: ++ case int(LC_ART_ANY): + _artFilter = numeric_limits::max(); + break; + +- case LC_ART_INDEX: ++ case int(LC_ART_INDEX): + { + istringstream iss( prog::optarg ); + iss >> _artFilter; +@@ -390,29 +390,29 @@ ArtUtility::utility_option( int code, bo + break; + } + +- case LC_LIST: ++ case int(LC_LIST): + _action = &ArtUtility::actionList; + break; + +- case LC_ADD: ++ case int(LC_ADD): + _action = &ArtUtility::actionAdd; + _artImageFile = prog::optarg; + if( _artImageFile.empty() ) + return herrf( "invalid image file: empty-string\n" ); + break; + +- case LC_REMOVE: ++ case int(LC_REMOVE): + _action = &ArtUtility::actionRemove; + break; + +- case LC_REPLACE: ++ case int(LC_REPLACE): + _action = &ArtUtility::actionReplace; + _artImageFile = prog::optarg; + if( _artImageFile.empty() ) + return herrf( "invalid image file: empty-string\n" ); + break; + +- case LC_EXTRACT: ++ case int(LC_EXTRACT): + _action = &ArtUtility::actionExtract; + break; + +diff -Nrup a/util/mp4chaps.cpp b/util/mp4chaps.cpp +--- a/util/mp4chaps.cpp 2015-04-24 09:37:49.000000000 -0600 ++++ b/util/mp4chaps.cpp 2019-09-24 12:35:24.121316167 -0600 +@@ -634,32 +634,32 @@ ChapterUtility::utility_option( int code + + switch( code ) { + case 'A': +- case LC_CHPT_ANY: ++ case int(LC_CHPT_ANY): + _ChapterType = MP4ChapterTypeAny; + break; + + case 'Q': +- case LC_CHPT_QT: ++ case int(LC_CHPT_QT): + _ChapterType = MP4ChapterTypeQt; + break; + + case 'N': +- case LC_CHPT_NERO: ++ case int(LC_CHPT_NERO): + _ChapterType = MP4ChapterTypeNero; + break; + + case 'C': +- case LC_CHPT_COMMON: ++ case int(LC_CHPT_COMMON): + _ChapterFormat = CHPT_FMT_COMMON; + break; + + case 'l': +- case LC_CHP_LIST: ++ case int(LC_CHP_LIST): + _action = &ChapterUtility::actionList; + break; + + case 'e': +- case LC_CHP_EVERY: ++ case int(LC_CHP_EVERY): + { + istringstream iss( prog::optarg ); + iss >> _ChaptersEvery; +@@ -675,7 +675,7 @@ ChapterUtility::utility_option( int code + _action = &ChapterUtility::actionExport; + break; + +- case LC_CHP_EXPORT: ++ case int(LC_CHP_EXPORT): + _action = &ChapterUtility::actionExport; + /* currently not supported since the chapters of n input files would be written to one chapter file + _ChapterFile = prog::optarg; +@@ -690,7 +690,7 @@ ChapterUtility::utility_option( int code + _action = &ChapterUtility::actionImport; + break; + +- case LC_CHP_IMPORT: ++ case int(LC_CHP_IMPORT): + _action = &ChapterUtility::actionImport; + /* currently not supported since the chapters of n input files would be read from one chapter file + _ChapterFile = prog::optarg; +@@ -702,12 +702,12 @@ ChapterUtility::utility_option( int code + break; + + case 'c': +- case LC_CHP_CONVERT: ++ case int(LC_CHP_CONVERT): + _action = &ChapterUtility::actionConvert; + break; + + case 'r': +- case LC_CHP_REMOVE: ++ case int(LC_CHP_REMOVE): + _action = &ChapterUtility::actionRemove; + break; + +diff -Nrup a/util/mp4file.cpp b/util/mp4file.cpp +--- a/util/mp4file.cpp 2015-04-24 09:37:49.000000000 -0600 ++++ b/util/mp4file.cpp 2019-09-24 12:33:09.735996459 -0600 +@@ -190,15 +190,15 @@ FileUtility::utility_option( int code, b + handled = true; + + switch( code ) { +- case LC_LIST: ++ case int(LC_LIST): + _action = &FileUtility::actionList; + break; + +- case LC_OPTIMIZE: ++ case int(LC_OPTIMIZE): + _action = &FileUtility::actionOptimize; + break; + +- case LC_DUMP: ++ case int(LC_DUMP): + _action = &FileUtility::actionDump; + break; + +diff -Nrup a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp +--- a/util/mp4subtitle.cpp 2015-04-24 09:37:49.000000000 -0600 ++++ b/util/mp4subtitle.cpp 2019-09-24 12:33:53.739773682 -0600 +@@ -165,25 +165,25 @@ SubtitleUtility::utility_option( int cod + handled = true; + + switch( code ) { +- case LC_LIST: ++ case int(LC_LIST): + _action = &SubtitleUtility::actionList; + break; + +- case LC_EXPORT: ++ case int(LC_EXPORT): + _action = &SubtitleUtility::actionExport; + _stTextFile = prog::optarg; + if( _stTextFile.empty() ) + return herrf( "invalid TXT file: empty-string\n" ); + break; + +- case LC_IMPORT: ++ case int(LC_IMPORT): + _action = &SubtitleUtility::actionImport; + _stTextFile = prog::optarg; + if( _stTextFile.empty() ) + return herrf( "invalid TXT file: empty-string\n" ); + break; + +- case LC_REMOVE: ++ case int(LC_REMOVE): + _action = &SubtitleUtility::actionRemove; + break; + +diff -Nrup a/util/mp4track.cpp b/util/mp4track.cpp +--- a/util/mp4track.cpp 2015-04-24 09:37:49.000000000 -0600 ++++ b/util/mp4track.cpp 2019-09-24 12:37:02.934815918 -0600 +@@ -789,11 +789,11 @@ TrackUtility::utility_option( int code, + handled = true; + + switch( code ) { +- case LC_TRACK_WILDCARD: ++ case int(LC_TRACK_WILDCARD): + _trackMode = TM_WILDCARD; + break; + +- case LC_TRACK_INDEX: ++ case int(LC_TRACK_INDEX): + { + _trackMode = TM_INDEX; + istringstream iss( prog::optarg ); +@@ -803,7 +803,7 @@ TrackUtility::utility_option( int code, + break; + } + +- case LC_TRACK_ID: ++ case int(LC_TRACK_ID): + { + _trackMode = TM_ID; + istringstream iss( prog::optarg ); +@@ -813,142 +813,142 @@ TrackUtility::utility_option( int code, + break; + } + +- case LC_LIST: ++ case int(LC_LIST): + _action = &TrackUtility::actionList; + break; + +- case LC_COLR_PARMS: ++ case int(LC_COLR_PARMS): + _colorParameterItem.convertFromCSV( prog::optarg ); + break; + +- case LC_COLR_PARM_HD: ++ case int(LC_COLR_PARM_HD): + _colorParameterItem.primariesIndex = 1; + _colorParameterItem.transferFunctionIndex = 1; + _colorParameterItem.matrixIndex = 1; + break; + +- case LC_COLR_PARM_SD: ++ case int(LC_COLR_PARM_SD): + _colorParameterItem.primariesIndex = 6; + _colorParameterItem.transferFunctionIndex = 1; + _colorParameterItem.matrixIndex = 6; + break; + +- case LC_COLR_LIST: ++ case int(LC_COLR_LIST): + _action = &TrackUtility::actionColorParameterList; + break; + +- case LC_ENABLED: ++ case int(LC_ENABLED): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setEnabled; + _actionTrackModifierSet_name = "enabled"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_INMOVIE: ++ case int(LC_INMOVIE): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setInMovie; + _actionTrackModifierSet_name = "inMovie"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_INPREVIEW: ++ case int(LC_INPREVIEW): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setInPreview; + _actionTrackModifierSet_name = "inPreview"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_LAYER: ++ case int(LC_LAYER): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setLayer; + _actionTrackModifierSet_name = "layer"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_ALTGROUP: ++ case int(LC_ALTGROUP): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setAlternateGroup; + _actionTrackModifierSet_name = "alternateGroup"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_VOLUME: ++ case int(LC_VOLUME): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setVolume; + _actionTrackModifierSet_name = "volume"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_WIDTH: ++ case int(LC_WIDTH): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setWidth; + _actionTrackModifierSet_name = "width"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_HEIGHT: ++ case int(LC_HEIGHT): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setHeight; + _actionTrackModifierSet_name = "height"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_LANGUAGE: ++ case int(LC_LANGUAGE): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setLanguage; + _actionTrackModifierSet_name = "language"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_HDLRNAME: ++ case int(LC_HDLRNAME): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setHandlerName; + _actionTrackModifierSet_name = "handlerName"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_UDTANAME: ++ case int(LC_UDTANAME): + _action = &TrackUtility::actionTrackModifierSet; + _actionTrackModifierSet_function = &TrackModifier::setUserDataName; + _actionTrackModifierSet_name = "userDataName"; + _actionTrackModifierSet_value = prog::optarg; + break; + +- case LC_UDTANAME_R: ++ case int(LC_UDTANAME_R): + _action = &TrackUtility::actionTrackModifierRemove; + _actionTrackModifierRemove_function = &TrackModifier::removeUserDataName; + _actionTrackModifierRemove_name = "userDataName"; + break; + +- case LC_COLR_ADD: ++ case int(LC_COLR_ADD): + _action = &TrackUtility::actionColorParameterAdd; + break; + +- case LC_COLR_SET: ++ case int(LC_COLR_SET): + _action = &TrackUtility::actionColorParameterSet; + break; + +- case LC_COLR_REMOVE: ++ case int(LC_COLR_REMOVE): + _action = &TrackUtility::actionColorParameterRemove; + break; + +- case LC_PASP_PARMS: ++ case int(LC_PASP_PARMS): + _pictureAspectRatioItem.convertFromCSV( prog::optarg ); + break; + +- case LC_PASP_LIST: ++ case int(LC_PASP_LIST): + _action = &TrackUtility::actionPictureAspectRatioList; + break; + +- case LC_PASP_ADD: ++ case int(LC_PASP_ADD): + _action = &TrackUtility::actionPictureAspectRatioAdd; + break; + +- case LC_PASP_SET: ++ case int(LC_PASP_SET): + _action = &TrackUtility::actionPictureAspectRatioSet; + break; + +- case LC_PASP_REMOVE: ++ case int(LC_PASP_REMOVE): + _action = &TrackUtility::actionPictureAspectRatioRemove; + break; + diff --git a/libmp4v2.spec b/libmp4v2.spec index 32c66f3..4974c36 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.19%{gver}%{?dist} +Release: 0.20%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -21,6 +21,7 @@ Patch7: 0007-Fix-Out-of-bounds-memory-access-in-MP4v2-2.0.0.patch Patch8: 0008-Fix-v2-Type-confusion-in-MP4v2-2.0.0.patch Patch9: 0009-Null-out-pointer-after-free-to-prevent-double-free.patch Patch10: 0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch +Patch50: gcc10.patch BuildRequires: gcc-c++ BuildRequires: autoconf automake gettext-devel libtool texinfo svn @@ -82,6 +83,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Sat Dec 14 2019 Jeff Law - 2.1.0-0.20.trunkREV507 +- Fix narrowing conversion issue caught by gcc-10 + * Fri Nov 08 2019 Sérgio Basto - 2.1.0-0.19.trunkREV507 - Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0 From 5933a17481cdff3b1aff349abc1b6877d5d099d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 09:46:08 +0000 Subject: [PATCH 09/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index 4974c36..1561882 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.20%{gver}%{?dist} +Release: 0.21%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -83,6 +83,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.1.0-0.21.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Dec 14 2019 Jeff Law - 2.1.0-0.20.trunkREV507 - Fix narrowing conversion issue caught by gcc-10 From 6a501abadcff730034efaa4264bea3a6959e5f99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 05:07:36 +0000 Subject: [PATCH 10/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index 1561882..dea87ee 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.21%{gver}%{?dist} +Release: 0.22%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -83,6 +83,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.1.0-0.22.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 2.1.0-0.21.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From fc94490818ac94666d6646e88528e36d256fe9df Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 18:55:31 +0000 Subject: [PATCH 11/24] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 18c9722ffa8003547e8f20382bac614c6b3fa1be Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 6 Jan 2021 01:15:22 +0000 Subject: [PATCH 12/24] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libmp4v2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libmp4v2.spec b/libmp4v2.spec index dea87ee..45f7c0b 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -23,6 +23,7 @@ Patch9: 0009-Null-out-pointer-after-free-to-prevent-double-free.patch Patch10: 0010-Fix-v3-Integer-underflow-overflow-in-MP4v2-2.0.0.patch Patch50: gcc10.patch +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: autoconf automake gettext-devel libtool texinfo svn BuildRequires: python%{python3_pkgversion} doxygen help2man From 63b256f2c7c018a69d0261c7db5fee651c699a07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:32:31 +0000 Subject: [PATCH 13/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index 45f7c0b..d6601ef 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.22%{gver}%{?dist} +Release: 0.23%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -84,6 +84,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.1.0-0.23.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 2.1.0-0.22.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3688e45913ab8b65306f880da2c359232f47ec60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:52:30 +0000 Subject: [PATCH 14/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index d6601ef..4b7fa8d 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.23%{gver}%{?dist} +Release: 0.24%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -84,6 +84,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.1.0-0.24.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.1.0-0.23.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 6e2ed9a5afe8f8b861d411e283fde1306e2e0419 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:43:51 +0000 Subject: [PATCH 15/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index 4b7fa8d..33012a3 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.24%{gver}%{?dist} +Release: 0.25%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -84,6 +84,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.1.0-0.25.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 2.1.0-0.24.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From afd486851639cbf39eaefc1a9ac04534ca6284ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 18:24:38 +0000 Subject: [PATCH 16/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index 33012a3..65278c0 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.25%{gver}%{?dist} +Release: 0.26%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -84,6 +84,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.1.0-0.26.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 2.1.0-0.25.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 4ebe9904e3a1cc0459d54dd082fd270268a5326b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 16:54:26 +0000 Subject: [PATCH 17/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index 65278c0..642044d 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.26%{gver}%{?dist} +Release: 0.27%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -84,6 +84,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.1.0-0.27.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 2.1.0-0.26.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c43a2cb3e794ad21b7d263fcc9e1efcc673ac45e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 11:29:29 +0000 Subject: [PATCH 18/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index 642044d..94bbe41 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.27%{gver}%{?dist} +Release: 0.28%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -84,6 +84,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2.1.0-0.28.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 2.1.0-0.27.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d86e78df27b2f7dfc12e904958be0b45d774d65b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 04:42:58 +0000 Subject: [PATCH 19/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index 94bbe41..606e857 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.28%{gver}%{?dist} +Release: 0.29%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -84,6 +84,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2.1.0-0.29.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 2.1.0-0.28.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4de1efad61016e136fc5e1ebcd20fcc77c1a0093 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 02:55:21 +0000 Subject: [PATCH 20/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index 606e857..ad8750c 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.29%{gver}%{?dist} +Release: 0.30%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -84,6 +84,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 2.1.0-0.30.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 2.1.0-0.29.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 075bc035a164b5203173520865e0b08de5a28e39 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 14:29:25 +0000 Subject: [PATCH 21/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index ad8750c..86755a7 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.30%{gver}%{?dist} +Release: 0.31%{gver}%{?dist} License: MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh @@ -84,6 +84,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.1.0-0.31.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 2.1.0-0.30.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From faaf79e71ea9c87d74ea019063c26380baf3fc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 10:06:26 +0200 Subject: [PATCH 22/24] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- libmp4v2.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index 86755a7..fa234f7 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,8 +4,9 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.31%{gver}%{?dist} -License: MPLv1.1 +Release: 0.32%{gver}%{?dist} +# Automatically converted from old format: MPLv1.1 - review is highly recommended. +License: LicenseRef-Callaway-MPLv1.1 URL: http://code.google.com/p/mp4v2 # mp4v2-trunk-r507.tar.bz2 made with ./make-svn-snapshot.sh Source0: http://mp4v2.googlecode.com/files/mp4v2-trunk-r%{svnversion}.tar.bz2 @@ -84,6 +85,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Mon Sep 02 2024 Miroslav Suchý - 2.1.0-0.32.trunkREV507 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 2.1.0-0.31.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c883aaf3f78d35afc16ab5c07916d0f066bd5069 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 12:07:40 +0000 Subject: [PATCH 23/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index fa234f7..3ae4819 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.32%{gver}%{?dist} +Release: 0.33%{gver}%{?dist} # Automatically converted from old format: MPLv1.1 - review is highly recommended. License: LicenseRef-Callaway-MPLv1.1 URL: http://code.google.com/p/mp4v2 @@ -85,6 +85,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.1.0-0.33.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 02 2024 Miroslav Suchý - 2.1.0-0.32.trunkREV507 - convert license to SPDX From 5402fddbc50348cc93833a1a08d8cf00c4db27e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:00:57 +0000 Subject: [PATCH 24/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libmp4v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmp4v2.spec b/libmp4v2.spec index 3ae4819..275a829 100644 --- a/libmp4v2.spec +++ b/libmp4v2.spec @@ -4,7 +4,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 2.1.0 -Release: 0.33%{gver}%{?dist} +Release: 0.34%{gver}%{?dist} # Automatically converted from old format: MPLv1.1 - review is highly recommended. License: LicenseRef-Callaway-MPLv1.1 URL: http://code.google.com/p/mp4v2 @@ -85,6 +85,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.1.0-0.34.trunkREV507 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 2.1.0-0.33.trunkREV507 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild