Accepting request 125562 from multimedia:libs

upstream update (forwarded request 125550 from ftake)

OBS-URL: https://build.opensuse.org/request/show/125562
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvorbis?expand=0&rev=38
This commit is contained in:
Stephan Kulow 2012-06-25 12:18:19 +00:00 committed by Git OBS Bridge
commit faa27ee7d3
6 changed files with 33 additions and 62 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9f04b60ba89edbe860dc0a5902171e4ac35cff8ba19252aa23ed029994823395
size 1230364

3
libvorbis-1.3.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e41fcc78b48755985751a09746a68b6b80125a6755b753c516fac7bfb9a8139
size 1329917

View File

@ -1,14 +0,0 @@
---
lib/floor1.c | 1 +
1 file changed, 1 insertion(+)
--- a/lib/floor1.c
+++ b/lib/floor1.c
@@ -167,6 +167,7 @@ static vorbis_info_floor *floor1_unpack
for(j=0,k=0;j<info->partitions;j++){
count+=info->class_dim[info->partitionclass[j]];
+ if(count>VIF_POSIT) goto err_out;
for(;k<count;k++){
int t=info->postlist[k+2]=oggpack_read(opb,rangebits);
if(t<0 || t>=(1<<rangebits))

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Jun 20 15:42:24 UTC 2012 - ftake@geeko.jp
- updated to 1.3.3
* vorbis: additional proofing against invalid/malicious
streams in decode (see SVN for details).
* vorbis: fix a memory leak in vorbis_commentheader_out().
* updates, corrections and clarifications in the Vorbis I
specification document
* build warning fixes
-------------------------------------------------------------------
Tue Feb 21 14:32:38 CET 2012 - tiwai@suse.de

View File

@ -17,7 +17,7 @@
Name: libvorbis
Version: 1.3.2
Version: 1.3.3
Release: 0
#to_be_filled_by_service
Summary: The Vorbis General Audio Compression Codec
@ -39,7 +39,6 @@ Patch2: libvorbis-m4.dif
Patch10: libvorbis-pkgconfig.patch
Patch11: vorbis-fix-linking.patch
Patch12: vorbis-ocloexec.patch
Patch20: libvorbis-CVE-2012-0444.diff
BuildRequires: fdupes
BuildRequires: libogg-devel
BuildRequires: libtool
@ -104,11 +103,11 @@ libmatroska (matroska) can also be used.
%package devel
Summary: Include Files and Libraries mandatory for Ogg Vorbis Development
Group: Development/Libraries/C and C++
Requires: libvorbis0 = %{version}
Requires: libvorbisfile3 = %{version}
Requires: libvorbisenc2 = %{version}
Requires: glibc-devel
Requires: libogg-devel
Requires: libvorbis0 = %{version}
Requires: libvorbisenc2 = %{version}
Requires: libvorbisfile3 = %{version}
# bug437293 (SLES10 -> SLES11 upgrade path)
%ifarch ppc64
Obsoletes: libvorbis-devel-64bit
@ -140,7 +139,6 @@ if [ "%{_lib}" == "lib64" ]; then
fi
%patch11
%patch12
%patch20 -p1
%build
# Fix optimization level

View File

@ -1,18 +1,20 @@
--- test/Makefile.am.orig
+++ test/Makefile.am
@@ -10,7 +10,7 @@ check: $(check_PROGRAMS)
./test$(EXEEXT)
--- Makefile.am 2010-12-21 17:46:03.000000000 +0900
+++ Makefile.am 2012-06-16 15:43:41.143756104 +0900
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
test_SOURCES = util.c util.h write_read.c write_read.h test.c
-test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@
+test_LDADD = -lm ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@
#AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2
-AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
-
+AUTOMAKE_OPTIONS = foreign 1.10 dist-zip
+ACLOCAL_AMFLAGS = -I m4
SUBDIRS = m4 include vq lib test doc
debug:
$(MAKE) all CFLAGS="@DEBUG@"
--- configure.ac.orig
+++ configure.ac
@@ -8,13 +8,12 @@ dnl ------------------------------------
AC_INIT([libvorbis],[1.3.2],[vorbis-dev@xiph.org])
if BUILD_EXAMPLES
--- configure.ac 2012-02-04 07:00:34.000000000 +0900
+++ configure.ac 2012-06-16 15:43:05.647225479 +0900
@@ -8,7 +8,7 @@
AC_INIT([libvorbis],[1.3.3],[vorbis-dev@xiph.org])
AC_CONFIG_SRCDIR([lib/mdct.c])
-
@ -20,29 +22,3 @@
AC_CANONICAL_TARGET([])
AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
AM_MAINTAINER_MODE
AM_CONFIG_HEADER([config.h])
-
dnl Add parameters for aclocal
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
@@ -53,7 +52,9 @@ dnl ------------------------------------
dnl save $CFLAGS since AC_PROG_CC likes to insert "-g -O2"
dnl if $CFLAGS is blank
cflags_save="$CFLAGS"
-AC_PROG_CC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
AC_PROG_CPP
CFLAGS="$cflags_save"
--- Makefile.am.orig
+++ Makefile.am
@@ -1,5 +1,6 @@
## Process this file with automake to produce Makefile.in
+ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2
SUBDIRS = m4 include vq lib test doc