cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.3.1; with and ok pea@

Browse Source
This commit is contained in:
naddy 2010-06-03 15:48:36 +00:00
parent cc9aabeb34
commit 5c730ef576
14 changed files with 54 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
audio/libvorbis/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.29 2009/11/24 21:43:14 naddy Exp $
# $OpenBSD: Makefile,v 1.30 2010/06/03 15:48:36 naddy Exp $
COMMENT= audio compression codec library
DISTNAME= libvorbis-1.2.3
PKGNAME= ${DISTNAME}p0
DISTNAME= libvorbis-1.3.1
CATEGORIES= audio
HOMEPAGE= http://www.xiph.org/vorbis/
SHARED_LIBS += vorbis 7.0 # .4.3
SHARED_LIBS += vorbis 8.0 # .4.4
SHARED_LIBS += vorbisfile 6.0 # .6.2
SHARED_LIBS += vorbisenc 3.0 # .2.6
SHARED_LIBS += vorbisenc 3.1 # .2.7
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>

10
audio/libvorbis/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libvorbis-1.2.3.tar.gz) = Wqd/VcDgqrjrjtmCM12qyA==
RMD160 (libvorbis-1.2.3.tar.gz) = 6ArX3jwlmeDYiZSHZAesj+PJoOc=
SHA1 (libvorbis-1.2.3.tar.gz) = qTJRql5PFC20+mQz3oB5f4CWD6w=
SHA256 (libvorbis-1.2.3.tar.gz) = xnnR5eRaPsis615x3o43EmMLem3saVKIbBdDWmWVWUc=
SIZE (libvorbis-1.2.3.tar.gz) = 1474492
MD5 (libvorbis-1.3.1.tar.gz) = AW5SP6xwvdeGJYqdFf026Q==
RMD160 (libvorbis-1.3.1.tar.gz) = DtEi1ijDwBUv8tJFqvXnrCZn8Mw=
SHA1 (libvorbis-1.3.1.tar.gz) = CHTdCGmSQLhosil52kyVrmMlAGs=
SHA256 (libvorbis-1.3.1.tar.gz) = lR9GK6cyp29RACWQ1WQ37kU2L0NT2L2+sBIxpUotoPE=
SIZE (libvorbis-1.3.1.tar.gz) = 1467164

14
audio/libvorbis/patches/patch-Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.9 2009/07/13 15:48:55 naddy Exp $
--- Makefile.in.orig Mon Jul 6 17:52:04 2009
+++ Makefile.in Mon Jul 6 17:52:31 2009
@@ -227,7 +227,7 @@ target_vendor = @target_vendor@
$OpenBSD: patch-Makefile_in,v 1.10 2010/06/03 15:48:36 naddy Exp $
--- Makefile.in.orig Fri May 21 22:24:18 2010
+++ Makefile.in Fri May 21 22:24:31 2010
@@ -231,7 +231,7 @@ target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
-SUBDIRS = m4 include vq lib examples test doc
+SUBDIRS = m4 include lib test doc
AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2
-SUBDIRS = m4 include vq lib test doc $(am__append_1)
+SUBDIRS = m4 include lib test doc $(am__append_1)
m4datadir = $(datadir)/aclocal
m4data_DATA = vorbis.m4
pkgconfigdir = $(libdir)/pkgconfig

10
audio/libvorbis/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.12 2009/07/13 15:48:55 naddy Exp $
--- configure.orig Fri Jul 10 00:42:23 2009
+++ configure Fri Jul 10 19:52:53 2009
@@ -20492,7 +20492,7 @@ if test -z "$GCC"; then
$OpenBSD: patch-configure,v 1.13 2010/06/03 15:48:36 naddy Exp $
--- configure.orig Fri Mar 26 08:00:09 2010
+++ configure Fri May 21 22:33:39 2010
@@ -11778,7 +11778,7 @@ if test -z "$GCC"; then
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
*)
DEBUG="-g"
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.12 2009/07/13 15:48:55 naddy Exp $
PROFILE="-g -p" ;;
esac
else
@@ -20666,9 +20666,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
@@ -11956,9 +11956,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
*)

17
audio/libvorbis/patches/patch-doc_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.9 2009/07/13 15:48:55 naddy Exp $
--- doc/Makefile.in.orig Mon Jul 6 17:39:18 2009
+++ doc/Makefile.in Mon Jul 6 17:40:28 2009
@@ -168,7 +168,7 @@ build_vendor = @build_vendor@
$OpenBSD: patch-doc_Makefile_in,v 1.10 2010/06/03 15:48:36 naddy Exp $
--- doc/Makefile.in.orig Fri Mar 26 08:00:08 2010
+++ doc/Makefile.in Fri May 21 22:56:58 2010
@@ -171,7 +171,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
@ -10,3 +10,12 @@ $OpenBSD: patch-doc_Makefile_in,v 1.9 2009/07/13 15:48:55 naddy Exp $
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
@@ -275,7 +275,7 @@ SPEC_TEX = \
footer.tex
built_docs = Vorbis_I_spec.pdf Vorbis_I_spec.html Vorbis_I_spec.css
-@BUILD_DOCS_FALSE@doc_DATA = $(static_docs) doxygen-build.stamp
+@BUILD_DOCS_FALSE@doc_DATA = $(static_docs)
# conditionally make the generated documentation
@BUILD_DOCS_TRUE@doc_DATA = $(static_docs) $(SPEC_PNG) $(built_docs) doxygen-build.stamp

8
audio/libvorbis/patches/patch-doc_vorbisenc_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_vorbisenc_Makefile_in,v 1.8 2009/07/13 15:48:55 naddy Exp $
--- doc/vorbisenc/Makefile.in.orig Mon Jul 6 17:39:34 2009
+++ doc/vorbisenc/Makefile.in Mon Jul 6 17:41:29 2009
@@ -156,7 +156,7 @@ build_vendor = @build_vendor@
$OpenBSD: patch-doc_vorbisenc_Makefile_in,v 1.9 2010/06/03 15:48:36 naddy Exp $
--- doc/vorbisenc/Makefile.in.orig Fri Mar 26 08:00:08 2010
+++ doc/vorbisenc/Makefile.in Fri May 21 22:33:39 2010
@@ -158,7 +158,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@

8
audio/libvorbis/patches/patch-doc_vorbisfile_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_vorbisfile_Makefile_in,v 1.8 2009/07/13 15:48:55 naddy Exp $
--- doc/vorbisfile/Makefile.in.orig Mon Jul 6 17:39:26 2009
+++ doc/vorbisfile/Makefile.in Mon Jul 6 17:40:54 2009
@@ -156,7 +156,7 @@ build_vendor = @build_vendor@
$OpenBSD: patch-doc_vorbisfile_Makefile_in,v 1.9 2010/06/03 15:48:36 naddy Exp $
--- doc/vorbisfile/Makefile.in.orig Fri Mar 26 08:00:08 2010
+++ doc/vorbisfile/Makefile.in Fri May 21 22:33:39 2010
@@ -158,7 +158,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@

16
audio/libvorbis/patches/patch-lib_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_Makefile_in,v 1.7 2009/07/13 15:48:55 naddy Exp $
--- lib/Makefile.in.orig Mon Jul 6 17:48:03 2009
+++ lib/Makefile.in Mon Jul 6 17:50:16 2009
@@ -64,13 +64,13 @@ libvorbis_la_OBJECTS = $(am_libvorbis_la_OBJECTS)
$OpenBSD: patch-lib_Makefile_in,v 1.8 2010/06/03 15:48:36 naddy Exp $
--- lib/Makefile.in.orig Fri Mar 26 08:00:08 2010
+++ lib/Makefile.in Fri May 21 22:33:39 2010
@@ -65,13 +65,13 @@ libvorbis_la_OBJECTS = $(am_libvorbis_la_OBJECTS)
libvorbis_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libvorbis_la_LDFLAGS) $(LDFLAGS) -o $@
@ -17,16 +17,16 @@ $OpenBSD: patch-lib_Makefile_in,v 1.7 2009/07/13 15:48:55 naddy Exp $
am_libvorbisfile_la_OBJECTS = vorbisfile.lo
libvorbisfile_la_OBJECTS = $(am_libvorbisfile_la_OBJECTS)
libvorbisfile_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -169,7 +169,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -167,7 +167,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS =
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
@@ -276,14 +276,14 @@ libvorbis_la_SOURCES = mdct.c smallft.c block.c envelo
LIPO = @LIPO@
@@ -279,14 +279,14 @@ libvorbis_la_SOURCES = mdct.c smallft.c block.c envelo
registry.h scales.h window.h lookup.h lookup_data.h\
codec_internal.h backends.h bitrate.h

11
audio/libvorbis/patches/patch-lib_backends_h
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-lib_backends_h,v 1.1 2009/11/24 21:43:14 naddy Exp $
--- lib/backends.h.orig Tue Nov 24 22:00:01 2009
+++ lib/backends.h Tue Nov 24 22:00:01 2009
@@ -109,6 +109,7 @@ typedef struct vorbis_info_residue0{
/* first stage (lossless partitioning) */
int grouping; /* group n vectors per partition */
int partitions; /* possible codebooks for a partition */
+ int partvals; /* partitions ^ groupbook dim */
int groupbook; /* huffbook for partitioning */
int secondstages[64]; /* expanded out to pointers in lookup */
int booklist[512]; /* list of second stage books */

11
audio/libvorbis/patches/patch-lib_codebook_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-lib_codebook_c,v 1.3 2009/11/24 21:43:14 naddy Exp $
--- lib/codebook.c.orig Thu Jul 9 11:12:08 2009
+++ lib/codebook.c Tue Nov 24 22:00:01 2009
@@ -198,6 +198,7 @@ int vorbis_staticbook_unpack(oggpack_buffer *opb,stati
for(i=0;i<s->entries;){
long num=oggpack_read(opb,_ilog(s->entries-i));
if(num==-1)goto _eofout;
+ if(length>32)goto _errout;
for(j=0;j<num && i<s->entries;j++,i++)
s->lengthlist[i]=length;
length++;

30
audio/libvorbis/patches/patch-lib_modes_residue_44_h
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-lib_modes_residue_44_h,v 1.1 2009/11/24 21:43:14 naddy Exp $
--- lib/modes/residue_44.h.orig Thu Jul 9 11:12:08 2009
+++ lib/modes/residue_44.h Tue Nov 24 22:00:01 2009
@@ -22,7 +22,7 @@
/***** residue backends *********************************************/
static const vorbis_info_residue0 _residue_44_low={
- 0,-1, -1, 9,-1,
+ 0,-1, -1, 9,-1,-1,
/* 0 1 2 3 4 5 6 7 */
{0},
{-1},
@@ -31,7 +31,7 @@ static const vorbis_info_residue0 _residue_44_low={
};
static const vorbis_info_residue0 _residue_44_mid={
- 0,-1, -1, 10,-1,
+ 0,-1, -1, 10,-1,-1,
/* 0 1 2 3 4 5 6 7 8 */
{0},
{-1},
@@ -40,7 +40,7 @@ static const vorbis_info_residue0 _residue_44_mid={
};
static const vorbis_info_residue0 _residue_44_high={
- 0,-1, -1, 10,-1,
+ 0,-1, -1, 10,-1,-1,
/* 0 1 2 3 4 5 6 7 8 */
{0},
{-1},

30
audio/libvorbis/patches/patch-lib_modes_residue_44u_h
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-lib_modes_residue_44u_h,v 1.1 2009/11/24 21:43:14 naddy Exp $
--- lib/modes/residue_44u.h.orig Wed Jul 8 07:40:12 2009
+++ lib/modes/residue_44u.h Tue Nov 24 22:00:01 2009
@@ -23,7 +23,7 @@
static const vorbis_info_residue0 _residue_44_low_un={
- 0,-1, -1, 8,-1,
+ 0,-1, -1, 8,-1,-1,
{0},
{-1},
{ .5, 1.5, 1.5, 2.5, 2.5, 4.5, 28.5},
@@ -31,7 +31,7 @@ static const vorbis_info_residue0 _residue_44_low_un={
};
static const vorbis_info_residue0 _residue_44_mid_un={
- 0,-1, -1, 10,-1,
+ 0,-1, -1, 10,-1,-1,
/* 0 1 2 3 4 5 6 7 8 9 */
{0},
{-1},
@@ -40,7 +40,7 @@ static const vorbis_info_residue0 _residue_44_mid_un={
};
static const vorbis_info_residue0 _residue_44_hi_un={
- 0,-1, -1, 10,-1,
+ 0,-1, -1, 10,-1,-1,
/* 0 1 2 3 4 5 6 7 8 9 */
{0},
{-1},

40
audio/libvorbis/patches/patch-lib_res0_c
View File

@ -1,40 +0,0 @@
$OpenBSD: patch-lib_res0_c,v 1.4 2009/11/24 21:43:14 naddy Exp $
--- lib/res0.c.orig Tue Nov 24 21:59:48 2009
+++ lib/res0.c Tue Nov 24 22:00:01 2009
@@ -238,6 +238,10 @@ vorbis_info_residue *res0_unpack(vorbis_info *vi,oggpa
/* verify the phrasebook is not specifying an impossible or
inconsistent partitioning scheme. */
+ /* modify the phrasebook ranging check from r16327; an early beta
+ encoder had a bug where it used an oversized phrasebook by
+ accident. These files should continue to be playable, but don't
+ allow an exploit */
{
int entries = ci->book_param[info->groupbook]->entries;
int dim = ci->book_param[info->groupbook]->dim;
@@ -247,6 +251,7 @@ vorbis_info_residue *res0_unpack(vorbis_info *vi,oggpa
if(partvals > entries) goto errout;
dim--;
}
+ info->partvals = partvals;
}
return(info);
@@ -667,7 +672,7 @@ static int _01inverse(vorbis_block *vb,vorbis_look_res
for(j=0;j<ch;j++){
int temp=vorbis_book_decode(look->phrasebook,&vb->opb);
- if(temp==-1)goto eopbreak;
+ if(temp==-1 || temp>=info->partvals)goto eopbreak;
partword[j][l]=look->decodemap[temp];
if(partword[j][l]==NULL)goto errout;
}
@@ -883,7 +888,7 @@ int res2_inverse(vorbis_block *vb,vorbis_look_residue
if(s==0){
/* fetch the partition word */
int temp=vorbis_book_decode(look->phrasebook,&vb->opb);
- if(temp==-1)goto eopbreak;
+ if(temp==-1 || temp>info->partvals)goto eopbreak;
partword[l]=look->decodemap[temp];
if(partword[l]==NULL)goto errout;
}

8
audio/libvorbis/patches/patch-test_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-test_Makefile_in,v 1.1 2009/07/13 15:48:55 naddy Exp $
--- test/Makefile.in.orig Mon Jul 6 17:54:48 2009
+++ test/Makefile.in Mon Jul 6 17:55:08 2009
@@ -204,7 +204,7 @@ top_srcdir = @top_srcdir@
$OpenBSD: patch-test_Makefile_in,v 1.2 2010/06/03 15:48:36 naddy Exp $
--- test/Makefile.in.orig Fri Mar 26 08:00:09 2010
+++ test/Makefile.in Fri May 21 22:33:39 2010
@@ -205,7 +205,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
test_SOURCES = util.c util.h write_read.c write_read.h test.c