Commit b7269a58 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contrib constistency

parent 995bc2e5
......@@ -960,14 +960,8 @@ DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz
libebml-$(LIBEBML_VERSION).tar.bz2:
$(WGET) $(LIBEBML_URL)
## No reasons to use SVN anymore
#ifdef SVN
#libebml:
# $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml
#else
libebml: libebml-$(LIBEBML_VERSION).tar.bz2
$(EXTRACT_BZ2)
#endif
ifdef HAVE_WIN32
(cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch)
endif
......@@ -983,12 +977,6 @@ else
$(RANLIB) $(PREFIX)/lib/libebml.a
endif
touch $@
## No reasons to use SVN anymore
#ifdef SVN
#libebml-source: libebml
# tar cfvz libebml-$(DATE).tar.gz libebml
#SOURCE += libebml-source
#endif
CLEAN_FILE += .ebml
CLEAN_PKG += libebml
......@@ -1001,14 +989,8 @@ DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2
libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
$(WGET) $(LIBMATROSKA_URL)
## No reasons to use SVN anymore
#if SVN
#libmatroska:
# $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
#else
libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
$(EXTRACT_BZ2)
#endif
patch -p0 < ./Patches/libmatroska-kaxblock.patch
ifdef HAVE_WIN32
(cd $@; patch -p0 < ../Patches/libmatroska-win32.patch)
......@@ -1023,13 +1005,6 @@ else
endif
touch $@
## No reasons to use SVN anymore
#ifdef SVN
#libmatroska-source: libmatroska
# tar cfvz libmatroska-$(DATE).tar.gz libmatroska
#
#SOURCE += libmatroska-source
#endif
CLEAN_FILE += .matroska
CLEAN_PKG += libmatroska
......@@ -1359,8 +1334,8 @@ libcaca: libcaca-$(LIBCACA_VERSION).tar.gz
$(EXTRACT_GZ)
ifdef HAVE_DARWIN_OS
#remove me at next libcaca upgrade
patch -p0 < Patches/caca_driver_cocoa.diff
patch -p0 < Patches/caca_macosx.diff
patch -p0 < Patches/libcaca_driver_cocoa.diff
patch -p0 < Patches/libcaca_macosx.diff
patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
(cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig configure)
endif
......@@ -2159,7 +2134,6 @@ SDL_image-$(SDL_IMAGE_VERSION).tar.gz:
SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz
$(EXTRACT_GZ)
patch -p0 < Patches/SDL_image.patch
patch -p0 < Patches/SDL_image-CVE-2006-4484.patch
.SDL_image: SDL_image .SDL .png .jpeg .tiff
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --enable-tif --disable-sdltest && make && make install)
......
--- SDL_image/IMG_gif.orig.c 2008-02-01 11:58:19.000000000 +0100
+++ SDL_image/IMG_gif.c 2008-02-01 11:58:28.000000000 +0100
@@ -415,6 +415,10 @@
static int table[2][(1 << MAX_LWZ_BITS)];
static int stack[(1 << (MAX_LWZ_BITS)) * 2], *sp;
register int i;
+
+ /* Fixed buffer overflow found by Michael Skladnikiewicz */
+ if( input_code_size > MAX_LWZ_BITS )
+ return -1;
if (flag) {
set_code_size = input_code_size;
diff -ur asa.orig/lib/Makefile.am asa/lib/Makefile.am
--- asa.orig/lib/Makefile.am 2007-08-31 17:26:54.000000000 +0200
+++ asa/lib/Makefile.am 2008-03-08 23:17:27.000000000 +0100
@@ -25,7 +25,9 @@
echo obj $(objname) pic $(picname)
$(NASM) -f elf $(ASMOPT) -o ${picname} $^
$(NASM) -f elf $(ASMOPT) -DNO_PIC -o ${objname} $^
- echo -e "# Generated by libtool\npic_object='../${picname}'\nnon_pic_object='../${objname}'" > $@
+ echo "# Generated by libtool" > $@
+ echo "pic_object='../${picname}'" >> $@
+ echo "non_pic_object='../${objname}'" >> $@
noinst_HEADERS = blitter_internal.h
lib_LTLIBRARIES = libasa.la
@@ -51,11 +53,12 @@
../csri/subhelp/libsubhelp_la-openfile.lo \
../csri/subhelp/libsubhelp_la-logging.lo \
import/libimport.la \
+ $(PCRE_LIBS) \
$(ASM)
libasa_la_LDFLAGS = -version-info 0:0:0 -no-undefined
install-exec-hook:
- test -z "$(csrilibdir)" || $(MKDIR_P) "$(DESTDIR)$(csrilibdir)"
+ test -z "$(csrilibdir)" || $(mkdir_p) "$(DESTDIR)$(csrilibdir)"
$(LN_S) $(libdir)/libasa.so.0 \
$(DESTDIR)$(csrilibdir)/asa_csri.so
diff -ur asa.orig/lib/import/Makefile.am asa/lib/import/Makefile.am
--- asa.orig/lib/import/Makefile.am 2007-08-31 17:26:54.000000000 +0200
+++ asa/lib/import/Makefile.am 2008-03-08 23:01:50.000000000 +0100
@@ -1,6 +1,6 @@
if IMPORTS_PREP
noinst_PROGRAMS = preparse
-preparse_LDFLAGS = -limportparser
+preparse_LDFLAGS = -limportparser $(PCRE_LIBS)
BUILT_SOURCES = imports_prep.h
imports_prep.h: $(srcdir)/imports libimportparser.la preparse
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment