checked in

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libvorbis?expand=0&rev=7

libvorbis-1.2.0-warning-fixes.diff

@@ -0,0 +1,100 @@
+--- lib/floor1.c
++++ lib/floor1.c
+@@ -417,7 +417,7 @@
+ 			  int x0, int x1,lsfit_acc *a,
+ 			  int n,vorbis_info_floor1 *info){
+   long i;
+-  int quantized=vorbis_dBquant(flr+x0);
++  /*int quantized=vorbis_dBquant(flr+x0);*/
+ 
+   long xa=0,ya=0,x2a=0,y2a=0,xya=0,na=0, xb=0,yb=0,x2b=0,y2b=0,xyb=0,nb=0;
+ 
+@@ -595,7 +595,7 @@
+   return (A[pos]+B[pos])>>1;
+ }
+ 
+-static int seq=0;
++/*static int seq=0;*/
+ 
+ int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look,
+ 			  const float *logmdct,   /* in */
+@@ -767,7 +767,7 @@
+ 
+   long i,j;
+   vorbis_info_floor1 *info=look->vi;
+-  long n=look->n;
++  /*long n=look->n;*/
+   long posts=look->posts;
+   codec_setup_info *ci=vb->vd->vi->codec_setup;
+   int out[VIF_POSIT+2];
+--- lib/mapping0.c
++++ lib/mapping0.c
+@@ -623,8 +623,8 @@
+     float **couple_bundle=alloca(sizeof(*couple_bundle)*vi->channels);
+     int *zerobundle=alloca(sizeof(*zerobundle)*vi->channels);
+     int **sortindex=alloca(sizeof(*sortindex)*vi->channels);
+-    float **mag_memo;
+-    int **mag_sort;
++    float **mag_memo = NULL;
++    int **mag_sort = NULL;
+ 
+     if(info->coupling_steps){
+       mag_memo=_vp_quantize_couple_memo(vb,
+@@ -783,7 +783,7 @@
+   codec_setup_info     *ci=vi->codec_setup;
+   private_state        *b=vd->backend_state;
+   vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)l;
+-  int hs=ci->halfrate_flag; 
++  /*int hs=ci->halfrate_flag; */
+ 
+   int                   i,j;
+   long                  n=vb->pcmend=ci->blocksizes[vb->W];
+--- lib/res0.c
++++ lib/res0.c
+@@ -372,7 +372,7 @@
+   vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
+   vorbis_info_residue0 *info=look->info;
+   vorbis_info           *vi=vb->vd->vi;
+-  codec_setup_info      *ci=vi->codec_setup;
++  /*codec_setup_info      *ci=vi->codec_setup;*/
+ 
+   /* move all this setup out later */
+   int samples_per_partition=info->grouping;
+@@ -500,7 +500,7 @@
+   vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
+   vorbis_info_residue0 *info=look->info;
+ 
+-  vorbis_dsp_state      *vd=vb->vd;
++  /*vorbis_dsp_state      *vd=vb->vd;*/
+ 
+   /* move all this setup out later */
+   int samples_per_partition=info->grouping;
+--- lib/scales.h
++++ lib/scales.h
+@@ -25,7 +25,7 @@
+ #define VORBIS_IEEE_FLOAT32 1
+ #ifdef VORBIS_IEEE_FLOAT32
+ 
+-static float unitnorm(float x){
++static inline float unitnorm(float x){
+   union {
+     ogg_uint32_t i;
+     float f;
+@@ -36,7 +36,7 @@
+ }
+ 
+ /* Segher was off (too high) by ~ .3 decibel.  Center the conversion correctly. */
+-static float todB(const float *x){
++static inline float todB(const float *x){
+   union {
+     ogg_uint32_t i;
+     float f;
+@@ -50,7 +50,7 @@
+ 
+ #else
+ 
+-static float unitnorm(float x){
++static inline float unitnorm(float x){
+   if(x<0)return(-1.f);
+   return(1.f);
+ }

libvorbis-1.2.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:184494c0281f651f21ad3afc1b66bdc784ffe79b839ed46aa33c8cd27d4cbb79
+size 1214375

libvorbis-1.2.3.tar.bz2

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

libvorbis-am111.diff

@@ -0,0 +1,12 @@
+Index: libvorbis-1.2.0/doc/Makefile.am
+===================================================================
+--- libvorbis-1.2.0.orig/doc/Makefile.am
++++ libvorbis-1.2.0/doc/Makefile.am
+@@ -44,7 +44,6 @@ SPEC_PNG = \
+ 	hufftree-under.png \
+ 	residue-pack.png \
+ 	residue2.png \
+-	white-xifish.png \
+ 	window1.png \
+ 	window2.png
+ SPEC_PDF = xifish.pdf

libvorbis-automake-fix.diff

@@ -1,26 +0,0 @@
----
- Makefile.am     |    2 ++
- doc/Makefile.am |    1 -
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
---- Makefile.am.orig
-+++ Makefile.am
-@@ -2,6 +2,8 @@
- 
- AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
- 
-+ACLOCAL_AMFLAGS = -I m4
-+
- SUBDIRS = m4 include vq lib examples test doc
- 
- m4datadir = $(datadir)/aclocal
---- doc/Makefile.am.orig
-+++ doc/Makefile.am
-@@ -44,7 +44,6 @@
- 	hufftree-under.png \
- 	residue-pack.png \
- 	residue2.png \
--	white-xifish.png \
- 	window1.png \
- 	window2.png
- SPEC_PDF = xifish.pdf

libvorbis-cflags.diff

@@ -0,0 +1,30 @@
+--- configure.in
++++ configure.in
+@@ -103,10 +103,10 @@
+ 	AC_MSG_RESULT([$GCC_VERSION])
+ 	case $host in 
+ 	*86-*-linux*)
+-		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+-		CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
+-#              	PROFILE="-Wall -W -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
+-		PROFILE="-Wall -W -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
++		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES"
++		CFLAGS="-ffast-math -mno-ieee-fp -D_REENTRANT"
++#              	PROFILE="-Wall -W -pg -g -ffast-math -D_REENTRANT -fno-inline -static"
++		PROFILE="-Wall -W -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fno-inline"
+ 
+ 		# glibc < 2.1.3 has a serious FP bug in the math inline header
+ 		# that will cripple Vorbis.  Look to see if the magic FP stack
+@@ -152,9 +152,9 @@
+ 		CFLAGS="-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
+ 		PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";;
+ 	*-*-linux*)
+-		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+-		CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
+-		PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
++		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES"
++		CFLAGS="-ffast-math -D_REENTRANT"
++		PROFILE="-pg -g -ffast-math -D_REENTRANT";;
+ 	sparc-sun-*)
+ 		DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char -mv8"
+ 		CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"

libvorbis-doc-fixes.diff

@@ -1,8 +1,4 @@
----
- doc/vorbisenc/index.html |    2 ++
- 1 file changed, 2 insertions(+)
-
---- doc/vorbisenc/index.html.orig
+--- doc/vorbisenc/index.html
 +++ doc/vorbisenc/index.html
 @@ -20,8 +20,10 @@
  <p>

libvorbis-lib64.dif

@@ -1,12 +1,8 @@
----
- vorbis.m4 |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- vorbis.m4.orig
+--- vorbis.m4
 +++ vorbis.m4
-@@ -20,9 +20,9 @@
-   elif test "x$vorbis_prefix" = "xno" || test "x$vorbis_prefix" = "xyes" ; then
-     VORBIS_LIBS=""
+@@ -18,9 +18,9 @@
+   if test "x$vorbis_libraries" != "x" ; then
+     VORBIS_LIBS="-L$vorbis_libraries"
    elif test "x$vorbis_prefix" != "x" ; then
 -    VORBIS_LIBS="-L$vorbis_prefix/lib"
 +    VORBIS_LIBS="-L$vorbis_prefix/lib64"
@@ -15,4 +11,4 @@
 +    VORBIS_LIBS="-L$prefix/lib64"
    fi
  
-   if test "x$vorbis_prefix" != "xno" ; then
+   VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"

libvorbis-m4.dif

@@ -1,11 +1,7 @@
----
- vorbis.m4 |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- vorbis.m4.orig
+--- vorbis.m4
 +++ vorbis.m4
-@@ -21,7 +21,7 @@
-     VORBIS_LIBS=""
+@@ -19,7 +19,7 @@
+     VORBIS_LIBS="-L$vorbis_libraries"
    elif test "x$vorbis_prefix" != "x" ; then
      VORBIS_LIBS="-L$vorbis_prefix/lib"
 -  elif test "x$prefix" != "xNONE"; then
@@ -13,8 +9,8 @@
      VORBIS_LIBS="-L$prefix/lib"
    fi
  
-@@ -37,7 +37,7 @@
-     VORBIS_CFLAGS=""
+@@ -31,7 +31,7 @@
+     VORBIS_CFLAGS="-I$vorbis_includes"
    elif test "x$vorbis_prefix" != "x" ; then
      VORBIS_CFLAGS="-I$vorbis_prefix/include"
 -  elif test "x$prefix" != "xNONE"; then

libvorbis-r14598-r14600-CVE-2008-1420.diff

@@ -0,0 +1,34 @@
+Index: /trunk/vorbis/lib/res0.c
+================================================================================
+--- libvorbis/BUILD/libvorbis-1.2.0/lib/res0.c
++++ libvorbis/BUILD/libvorbis-1.2.0/lib/res0.c
+@@ -223,6 +223,20 @@
+   for(j=0;j<acc;j++)
+     if(info->booklist[j]>=ci->books)goto errout;
+ 
++  /* verify the phrasebook is not specifying an impossible or
++     inconsistent partitioning scheme. */
++  {
++    int entries = ci->book_param[info->groupbook]->entries;
++    int dim = ci->book_param[info->groupbook]->dim;
++    int partvals = 1;
++    while(dim>0){
++      partvals *= info->partitions;
++      if(partvals > entries) goto errout;
++      dim--;
++    }
++    if(partvals != entries) goto errout;
++  }
++
+   return(info);
+  errout:
+   res0_free_info(info);
+@@ -263,7 +277,7 @@
+     }
+   }
+ 
+-  look->partvals=rint(pow((float)look->parts,(float)dim));
++  look->partvals=look->phrasebook->entries;
+   look->stages=maxstage;
+   look->decodemap=_ogg_malloc(look->partvals*sizeof(*look->decodemap));
+   for(j=0;j<look->partvals;j++){

libvorbis-r14602-CVE-2008-1419.diff

@@ -0,0 +1,13 @@
+Index: /trunk/vorbis/lib/codebook.c
+================================================================================
+--- libvorbis/BUILD/libvorbis-1.2.0/lib/codebook.c
++++ libvorbis/BUILD/libvorbis-1.2.0/lib/codebook.c
+@@ -225,7 +225,7 @@
+       int quantvals=0;
+       switch(s->maptype){
+       case 1:
+-	quantvals=_book_maptype1_quantvals(s);
++	quantvals=(s->dim==0?0:_book_maptype1_quantvals(s));
+ 	break;
+       case 2:
+ 	quantvals=s->entries*s->dim;

libvorbis-r14604-CVE-2008-1423.diff

@@ -0,0 +1,13 @@
+Index: /trunk/vorbis/lib/codebook.c
+================================================================================
+--- libvorbis/BUILD/libvorbis-1.2.0/lib/codebook.c
++++ libvorbis/BUILD/libvorbis-1.2.0/lib/codebook.c
+@@ -159,6 +159,8 @@
+   s->entries=oggpack_read(opb,24);
+   if(s->entries==-1)goto _eofout;
+ 
++  if(_ilog(s->dim)+_ilog(s->entries)>24)goto _eofout;
++
+   /* codeword ordering.... length ordered or unordered? */
+   switch((int)oggpack_read(opb,1)){
+   case 0:

libvorbis.changes

@@ -1,28 +1,3 @@
--------------------------------------------------------------------
-Wed Nov 11 10:56:23 CET 2009 - tiwai@suse.de
-
-- updated to version 1.2.3:
- * correct a vorbisfile bug that prevented proper playback of
-   Vorbis files where all audio in a logical stream is in a
-   single page
- * Additional decode setup hardening against malicious streams
- * Add 'OV_EXCLUDE_STATIC_CALLBACKS' define for developers who 
-   wish to avoid avoid unused symbol warnings from the static
-   callbacks defined in vorbisfile.h
-
-- updated to version 1.2.2:
- * define VENDOR and ENCODER strings
- * seek correctly in files bigger than 2 GB (Windows)
- * fix regression from CVE-2008-1420; 1.0b1 files work again
- * mark all tables as constant to reduce memory occupation
- * additional decoder hardening against malicious streams
- * substantially reduce amount of seeking performed by Vorbisfile
- * Multichannel decode bugfix 
- * build system updates
- * minor specification clarifications/fixes
-
-- dropped aotuv patch temporarily
-
 -------------------------------------------------------------------
 Thu Jul 23 15:28:13 CEST 2009 - tiwai@suse.de
 

libvorbis.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package libvorbis (Version 1.2.3)
+# spec file for package libvorbis (Version 1.2.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,8 +21,8 @@
 Name:           libvorbis
 BuildRequires:  libogg-devel pkgconfig
 Summary:        The Vorbis General Audio Compression Codec
-Version:        1.2.3
-Release:        1
+Version:        1.2.0
+Release:        82
 Group:          System/Libraries
 License:        BSD 3-clause (or similar)
 Url:            http://www.vorbis.com/
@@ -34,11 +34,18 @@ Obsoletes:      libvorbis-64bit
 Source:         %{name}-%{version}.tar.bz2
 Patch1:         libvorbis-lib64.dif
 Patch2:         libvorbis-m4.dif
-Patch3:         libvorbis-automake-fix.diff
 # URL http://www.geocities.jp/aoyoume/aotuv/
-# Patch5:         libvorbis-%{version}-aotuv-b5.7.diff
+Patch5:         libvorbis-%{version}-aotuv-b5.7.diff
+# included in aotuv-b5.7.diff
+# Patch6:         libvorbis-%{version}-warning-fixes.diff
+Patch7:         libvorbis-cflags.diff
 Patch9:         libvorbis-doc-fixes.diff
 Patch10:        libvorbis-pkgconfig.patch
+# These security fixes are already included aotuv-b5.7 patch
+# Patch11:        libvorbis-r14598-r14600-CVE-2008-1420.diff
+# Patch12:        libvorbis-r14602-CVE-2008-1419.diff
+# Patch13:        libvorbis-r14604-CVE-2008-1423.diff
+Patch14:        libvorbis-am111.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -98,10 +105,15 @@ Authors:
 %prep
 %setup -q
 %patch2
-%patch3
-# %patch5 -p1
+%patch5 -p1
+# %patch6
+%patch7
 %patch9
 %patch10
+# %patch11 -p3
+# %patch12 -p3
+# %patch13 -p3
+%patch14 -p1
 if [ "%_lib" == "lib64" ]; then
 %patch1
 fi
@@ -118,6 +130,7 @@ make
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
 mv $RPM_BUILD_ROOT%{_datadir}/doc/libvorbis-* $RPM_BUILD_ROOT%{_docdir}/%{name}/html
 install -c -m 0644 doc/Vorbis_I_spec.* $RPM_BUILD_ROOT%{_docdir}/%{name}/html
+ln -s white-xifish.png $RPM_BUILD_ROOT%{_docdir}/%{name}/html/fish_xiph_org.png
 cp COPYING AUTHORS README $RPM_BUILD_ROOT%{_docdir}/%{name}
 cp *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}
 # remove unneeded files