projects / packages / tla.git / blame
| Commit | Line | Data |
|---|---|---|
| c296792b MK |
1 | From: Sylvain Beucler <beuc@beuc.net> |
| 2 | Date: Mon, 14 Dec 2009 17:27:55 +0100 | |
| 3 | Subject: disable builtin expat | |
| 4 | ||
| 5 | Fixes CVE-2009-3560 and CVE-2009-3720 denial-of-services | |
| 6 | ||
| 7 | Bug-Debian: http://bugs.debian.org/560940 | |
| 8 | --- | |
| 9 | src/libneon/Makefile.in | 2 +- | |
| 10 | src/libneon/src/Makefile.in | 6 +++--- | |
| 11 | src/tla/tla/Makefile.in | 2 +- | |
| 12 | 3 files changed, 5 insertions(+), 5 deletions(-) | |
| 13 | ||
| 14 | diff --git a/src/libneon/Makefile.in b/src/libneon/Makefile.in | |
| 15 | index f05110d..da89ddb 100644 | |
| 16 | --- a/src/libneon/Makefile.in | |
| 17 | +++ b/src/libneon/Makefile.in | |
| 18 | @@ -33,7 +33,7 @@ VPATH = @srcdir@ | |
| 19 | ||
| 20 | @SET_MAKE@ | |
| 21 | ||
| 22 | -LDFLAGS = -L. -L$(top_builddir)/../expat @LDFLAGS@ | |
| 23 | +LDFLAGS = -L. @LDFLAGS@ | |
| 24 | LIBS = @LIBS@ | |
| 25 | CC = @CC@ | |
| 26 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
| 27 | diff --git a/src/libneon/src/Makefile.in b/src/libneon/src/Makefile.in | |
| 28 | index e3c61e5..aff1fca 100644 | |
| 29 | --- a/src/libneon/src/Makefile.in | |
| 30 | +++ b/src/libneon/src/Makefile.in | |
| 31 | @@ -25,14 +25,14 @@ LIBTOOL = @LIBTOOL@ | |
| 32 | ||
| 33 | # Flags | |
| 34 | CPPFLAGS = @DEFS@ @CPPFLAGS@ | |
| 35 | -CFLAGS = @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)/../expat/lib @NEON_CFLAGS@ | |
| 36 | -LDFLAGS = -L$(top_builddir)/../expat @LDFLAGS@ | |
| 37 | +CFLAGS = @CFLAGS@ -I$(top_builddir) @NEON_CFLAGS@ | |
| 38 | +LDFLAGS = @LDFLAGS@ | |
| 39 | NEON_LINK_FLAGS = @NEON_LINK_FLAGS@ | |
| 40 | # Note: don't substitute @LIBS@ in here; during a bundled | |
| 41 | # build of this directory, @LIBS@ may include -lneon. | |
| 42 | LIBS = @NEON_LIBS@ @NEON_LTLIBS@ | |
| 43 | ||
| 44 | -COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -I$(top_builddir) -I$(top_srcdir)/../expat/lib @NEON_CFLAGS@ | |
| 45 | +COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -I$(top_builddir) @NEON_CFLAGS@ | |
| 46 | LINK = $(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) | |
| 47 | ||
| 48 | NEON_BASEOBJS = ne_request.@NEON_OBJEXT@ ne_session.@NEON_OBJEXT@ \ | |
| 49 | diff --git a/src/tla/tla/Makefile.in b/src/tla/tla/Makefile.in | |
| 50 | index 13a761a..8c66e2e 100644 | |
| 51 | --- a/src/tla/tla/Makefile.in | |
| 52 | +++ b/src/tla/tla/Makefile.in | |
| 53 | @@ -21,7 +21,7 @@ Programs: $(programs) | |
| 54 | endif | |
| 55 | ||
| 56 | $(programs):%$(cfg__exec_suffix):%.o $(thelib) $(filter-out -L%, $(filter-out -l%, $(libs))) | |
| 57 | - $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS) -L../../expat -o $@ $< $(thelib) $(libs) | |
| 58 | + $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS) -o $@ $< $(thelib) $(libs) | |
| 59 | ||
| 60 | clean: clean-prog | |
| 61 |