From e98bff05dee523457442c14f2e10a3c66b9e0868 Mon Sep 17 00:00:00 2001 From: BruceGW Date: Sat, 11 Jan 2020 15:49:59 +0800 Subject: [PATCH] remove useless patch --- libvorbis.spec | 9 ++++---- libvorbis_CVE-2017-14160.patch | 40 ---------------------------------- 2 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 libvorbis_CVE-2017-14160.patch diff --git a/libvorbis.spec b/libvorbis.spec index 7e9b0ea..188eb3a 100644 --- a/libvorbis.spec +++ b/libvorbis.spec @@ -2,7 +2,7 @@ Name: libvorbis Version: 1.3.6 -Release: 4 +Release: 5 Summary: The Vorbis General Audio Compression Codec Epoch: 1 License: BSD @@ -13,8 +13,6 @@ BuildRequires: gcc, pkgconfig(ogg) >= 1.0 # patch from Fedora, fix compile error on arm64 and CVE-2018-10392/10393 CVE-2017-14160 Patch0: libvorbis-1.3.6-git.patch -Patch6000: libvorbis_CVE-2017-14160.patch - %description Ogg Vorbis is a fully open, non-proprietary, patent- and royalty-free, general-purpose compressed audio format for audio and music at fixed @@ -74,5 +72,8 @@ make check %ldconfig_scriptlets %changelog -* Wed Sep 4 2019 openEuler Buildteam -1.3.6-4 +* Sat Jan 11 2020 BruceGW - 1.3.6-5 +- Remove useless patch + +* Wed Sep 4 2019 openEuler Buildteam - 1.3.6-4 - Package init diff --git a/libvorbis_CVE-2017-14160.patch b/libvorbis_CVE-2017-14160.patch deleted file mode 100644 index bb6aaba..0000000 --- a/libvorbis_CVE-2017-14160.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/lib/psy.c b/lib/psy.c -index 1310123..98f9bd2 100644 ---- a/lib/psy.c -+++ b/lib/psy.c -@@ -599,7 +599,7 @@ static void bark_noise_hybridmp(int n,const long *b, - XY[i] = tXY; - } - -- for (i = 0, x = 0.f;; i++, x += 1.f) { -+ for (i = 0, x = 0.f; i < n; i++, x += 1.f) { - - lo = b[i] >> 16; - hi = b[i] & 0xffff; -@@ -622,7 +622,7 @@ static void bark_noise_hybridmp(int n,const long *b, - noise[i] = R - offset; - } - -- for ( ;; i++, x += 1.f) { -+ for ( ; i < n; i++, x += 1.f) { - - lo = b[i] >> 16; - hi = b[i] & 0xffff; -@@ -652,7 +652,7 @@ static void bark_noise_hybridmp(int n,const long *b, - - if (fixed <= 0) return; - -- for (i = 0, x = 0.f;; i++, x += 1.f) { -+ for (i = 0, x = 0.f; i < n; i++, x += 1.f) { - hi = i + fixed / 2; - lo = hi - fixed; - if(lo>=0)break; -@@ -671,7 +671,7 @@ static void bark_noise_hybridmp(int n,const long *b, - - if (R - offset < noise[i]) noise[i] = R - offset; - } -- for ( ;; i++, x += 1.f) { -+ for ( ; i < n; i++, x += 1.f) { - - hi = i + fixed / 2; - lo = hi - fixed;