diff --git a/libvorbis-1.3.2.tar.bz2 b/libvorbis-1.3.2.tar.bz2 deleted file mode 100644 index cb59c3d..0000000 --- a/libvorbis-1.3.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f04b60ba89edbe860dc0a5902171e4ac35cff8ba19252aa23ed029994823395 -size 1230364 diff --git a/libvorbis-1.3.3.tar.bz2 b/libvorbis-1.3.3.tar.bz2 new file mode 100644 index 0000000..47a5d35 --- /dev/null +++ b/libvorbis-1.3.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e41fcc78b48755985751a09746a68b6b80125a6755b753c516fac7bfb9a8139 +size 1329917 diff --git a/libvorbis-CVE-2012-0444.diff b/libvorbis-CVE-2012-0444.diff deleted file mode 100644 index 4cbaf9e..0000000 --- a/libvorbis-CVE-2012-0444.diff +++ /dev/null @@ -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;jpartitions;j++){ - count+=info->class_dim[info->partitionclass[j]]; -+ if(count>VIF_POSIT) goto err_out; - for(;kpostlist[k+2]=oggpack_read(opb,rangebits); - if(t<0 || t>=(1< 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 diff --git a/vorbis-fix-linking.patch b/vorbis-fix-linking.patch index ed6d641..79c0e8d 100644 --- a/vorbis-fix-linking.patch +++ b/vorbis-fix-linking.patch @@ -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