From: Jeongmo Yang <jm80.yang@samsung.com>
Date: Fri, 30 Oct 2020 02:51:59 +0000 (+0900)
Subject: Merge tag 'v1.3.7' into tizen
X-Git-Tag: accepted/tizen/6.5/base/20211028.060335^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_6.5_base;p=platform%2Fupstream%2Flibvorbis.git

Merge tag 'v1.3.7' into tizen

libvorbis 1.3.7 (2020-07-04) -- "Xiph.Org libVorbis I 20200704 (Reducing Environment)"

* Fix CVE-2018-10393 - out-of-bounds read encoding very low sample rates.
* Fix CVE-2017-14160 - out-of-bounds read encoding very low sample rates.
* Fix handling invalid bytes per sample arguments.
* Fix handling invalid channel count arguments.
* Fix invalid free on seek failure.
* Fix negative shift reading blocksize.
* Fix accepting unreasonable float32 values.
* Fix tag comparison depending on locale.
* Fix unnecessarily linking libm.
* Fix memory leak in test_sharedbook.
* Update Visual Studio projects for ogg library filename change.
* Distribute CMake build files with the source package.
* Remove unnecessary configure --target switch.
* Add gitlab CI support.
* Add OSS-Fuzz support.
* Build system and integration updates.

Change-Id: Id3fe58a29509679f5b2ae2dfaa9da5dee8e7ff17
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
---

05379d312abfc81a5b7ca8452ddf3e26c95008d4
diff --cc .gbs.conf
index 0000000,0000000..4e09195
new file mode 100644
--- /dev/null
+++ b/.gbs.conf
@@@ -1,0 -1,0 +1,3 @@@
++[general]
++upstream_branch = upstream/master
++upstream_tag = v1.3.7
diff --cc libvorbis.manifest
index 0000000,0000000..97e8c31
new file mode 100644
--- /dev/null
+++ b/libvorbis.manifest
@@@ -1,0 -1,0 +1,5 @@@
++<manifest>
++	<request>
++		<domain name="_"/>
++	</request>
++</manifest>
diff --cc packaging/libvorbis.spec
index b345c72,0000000..c79b124
mode 100644,000000..100644
--- a/packaging/libvorbis.spec
+++ b/packaging/libvorbis.spec
@@@ -1,123 -1,0 +1,120 @@@
 +Name:           libvorbis
- Version:        1.3.4
++Version:        1.3.7
 +Release:        0
 +License:        BSD-2.0
 +Summary:        The Vorbis General Audio Compression Codec
 +Url:            http://www.vorbis.com/
 +Group:          Multimedia/Audio
 +Source:         %{name}-%{version}.tar.xz
- Source2:        baselibs.conf
- Source1001:     libvorbis.manifest
 +BuildRequires:  fdupes
 +BuildRequires:  libogg-devel
 +BuildRequires:  libtool
 +BuildRequires:  pkgconfig
 +
 +%description
 +Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and
 +general-purpose compressed audio format for audio and music at fixed
 +and variable bit rates from 16 to 128 kbps/channel.
 +
 +The native bitstream format of Vorbis is libogg (Ogg). Alternatively,
 +libmatroska (matroska) can also be used.
 +
 +
 +%package -n libvorbisenc
 +
 +Summary:        The Vorbis General Audio Compression Codec
 +Group:          Multimedia/Audio
 +
 +%description -n libvorbisenc
 +Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and
 +general-purpose compressed audio format for audio and music at fixed
 +and variable bit rates from 16 to 128 kbps/channel.
 +
 +The native bitstream format of Vorbis is libogg (Ogg). Alternatively,
 +libmatroska (matroska) can also be used.
 +
 +%package -n libvorbisfile
 +
 +Summary:        The Vorbis General Audio Compression Codec
 +Group:          Multimedia/Audio
 +
 +%description -n libvorbisfile
 +Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and
 +general-purpose compressed audio format for audio and music at fixed
 +and variable bit rates from 16 to 128 kbps/channel.
 +
 +The native bitstream format of Vorbis is libogg (Ogg). Alternatively,
 +libmatroska (matroska) can also be used.
 +
 +%package devel
 +Summary:        Include Files and Libraries mandatory for Ogg Vorbis Development
 +Group:          Development/Libraries
 +Requires:       glibc-devel
 +Requires:       libogg-devel
 +Requires:       libvorbis = %{version}-%{release}
 +Requires:       libvorbisenc = %{version}-%{release}
 +Requires:       libvorbisfile = %{version}-%{release}
 +
 +%description devel
 +This package contains all necessary include files and libraries needed
 +to compile and develop applications that use libvorbis.
 +
 +%prep
 +%setup -q
- cp %{SOURCE1001} .
 +
 +%build
 +# Fix optimization level
 +sed -i s,-O20,-O3,g configure.ac
 +
 +%autogen --disable-examples --disable-static
 +%__make %{?_smp_mflags}
 +
 +%check
 +%__make check
 +
 +%install
 +%make_install
 +mkdir -p %{buildroot}%{_docdir}/%{name}
 +mv %{buildroot}%{_datadir}/doc/libvorbis-* %{buildroot}%{_docdir}/%{name}
 +install -c -m 0644 doc/Vorbis_I_spec.* %{buildroot}%{_docdir}/%{name}
 +
 +%remove_docs
 +
 +%post  -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%post -n libvorbisenc -p /sbin/ldconfig
 +
 +%postun -n libvorbisenc -p /sbin/ldconfig
 +
 +%post -n libvorbisfile -p /sbin/ldconfig
 +
 +%postun -n libvorbisfile -p /sbin/ldconfig
 +
 +%files 
 +%manifest %{name}.manifest
 +%defattr(0644,root,root,0755)
 +%license COPYING 
 +%{_libdir}/libvorbis.so.0*
 +
 +%files -n libvorbisenc
 +%manifest %{name}.manifest
 +%defattr(0644,root,root,0755)
 +%license COPYING 
 +%{_libdir}/libvorbisenc.so.2*
 +
 +%files -n libvorbisfile
 +%manifest %{name}.manifest
 +%defattr(0644,root,root,0755)
 +%license COPYING 
 +%{_libdir}/libvorbisfile.so.3*
 +
 +%files devel
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%license COPYING 
 +%{_datadir}/aclocal/*.m4
 +%{_includedir}/vorbis
 +%{_libdir}/lib*.so
 +%{_libdir}/pkgconfig/*.pc