- Fix patch fuzz build failure

This commit is contained in:
Hans de Goede 2008-09-07 14:55:05 +00:00
parent ea84b837e5
commit a80e4ff7f1
2 changed files with 31 additions and 26 deletions

View File

@ -1,26 +1,7 @@
--- libvorbis-1.0/vorbis.m4.m4-patch 2002-07-09 09:08:57.000000000 -0400
+++ libvorbis-1.0/vorbis.m4 2003-02-21 09:46:34.000000000 -0500
@@ -20,7 +20,7 @@
elif test "x$vorbis_prefix" != "x" ; then
VORBIS_LIBS="-L$vorbis_prefix/lib"
elif test "x$prefix" != "xNONE"; then
- VORBIS_LIBS="-L$prefix/lib"
+ VORBIS_LIBS="-L$libdir"
fi
VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
@@ -32,7 +32,7 @@
elif test "x$vorbis_prefix" != "x" ; then
VORBIS_CFLAGS="-I$vorbis_prefix/include"
elif test "x$prefix" != "xNONE"; then
- VORBIS_CFLAGS="-I$prefix/include"
+ VORBIS_CFLAGS=""
fi
--- libvorbis-1.0/configure.m4-patch 2002-07-19 08:26:08.000000000 -0400
+++ libvorbis-1.0/configure 2003-02-21 09:46:22.000000000 -0500
@@ -5704,7 +5704,7 @@
diff -up libvorbis-1.2.0/configure.foo libvorbis-1.2.0/configure
--- libvorbis-1.2.0/configure.foo 2008-09-07 16:51:15.000000000 +0200
+++ libvorbis-1.2.0/configure 2008-09-07 16:51:24.000000000 +0200
@@ -19936,7 +19936,7 @@ fi
elif test "x$ogg_prefix" != "x" ; then
OGG_LIBS="-L$ogg_prefix/lib"
elif test "x$prefix" != "xNONE" ; then
@ -29,7 +10,7 @@
fi
OGG_LIBS="$OGG_LIBS -logg"
@@ -5714,7 +5714,7 @@
@@ -19946,7 +19946,7 @@ fi
elif test "x$ogg_prefix" != "x" ; then
OGG_CFLAGS="-I$ogg_prefix/include"
elif test "x$prefix" != "xNONE"; then
@ -37,4 +18,25 @@
+ OGG_CFLAGS=""
fi
echo $ac_n "checking for Ogg""... $ac_c" 1>&6
{ echo "$as_me:$LINENO: checking for Ogg" >&5
diff -up libvorbis-1.2.0/vorbis.m4.foo libvorbis-1.2.0/vorbis.m4
--- libvorbis-1.2.0/vorbis.m4.foo 2008-09-07 16:51:15.000000000 +0200
+++ libvorbis-1.2.0/vorbis.m4 2008-09-07 16:51:24.000000000 +0200
@@ -20,7 +20,7 @@ AC_ARG_ENABLE(vorbistest, [ --disable-v
elif test "x$vorbis_prefix" != "x" ; then
VORBIS_LIBS="-L$vorbis_prefix/lib"
elif test "x$prefix" != "xNONE"; then
- VORBIS_LIBS="-L$prefix/lib"
+ VORBIS_LIBS="-L$libdir"
fi
VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
@@ -32,7 +32,7 @@ AC_ARG_ENABLE(vorbistest, [ --disable-v
elif test "x$vorbis_prefix" != "x" ; then
VORBIS_CFLAGS="-I$vorbis_prefix/include"
elif test "x$prefix" != "xNONE"; then
- VORBIS_CFLAGS="-I$prefix/include"
+ VORBIS_CFLAGS=""
fi

View File

@ -1,7 +1,7 @@
Summary: The Vorbis General Audio Compression Codec.
Name: libvorbis
Version: 1.2.0
Release: 4%{?dist}
Release: 5%{?dist}
Epoch: 1
Group: System Environment/Libraries
License: BSD
@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig
%changelog
* Sun Sep 7 2008 Hans de Goede <hdegoede@redhat.com> -1:1.2.0-5
- Fix patch fuzz build failure
* Wed May 14 2008 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-4
- fix CVE-2008-1420, CVE-2008-1419, CVE-2008-1423 (#446344)