> > Patched package available at: > > http://mentors.debian.net/cgi-bin/sponsor-pkglist?action=details;package=tla
The fixed version is up.
$ interdiff tla1.diff tla2.diff | diffstat
patches/06-disable_builtin_expat.dpatch | 50 +++++++++++++++++++-------------
rules | 5 +--
2 files changed, 34 insertions(+), 21 deletions(-)
diff -u tla-1.3.5+dfsg/debian/rules tla-1.3.5+dfsg/debian/rules
--- tla-1.3.5+dfsg/debian/rules
+++ tla-1.3.5+dfsg/debian/rules
@@ -56,8 +56,9 @@
# Disable builtin expat
# See also patches/06-disable_builtin_expat.dpatch
- rm -f src/expat/PLUGIN/AUTOCONF
- rm -f src/expat/PLUGIN/REQ
+ #rm -f src/expat/PLUGIN/AUTOCONF
+ #rm -f src/expat/PLUGIN/REQ
+ rm -rf src/expat/ # Let's play safe
rm -f src/libneon/PLUGIN/REQ
# Cleaning package
diff -u tla-1.3.5+dfsg/debian/patches/06-disable_builtin_expat.dpatch
tla-1.3.5+dfsg/debian/patches/06-disable_builtin_expat.dpatch
--- tla-1.3.5+dfsg/debian/patches/06-disable_builtin_expat.dpatch
+++ tla-1.3.5+dfsg/debian/patches/06-disable_builtin_expat.dpatch
@@ -2,22 +2,12 @@
## 06-disable_builtin_expat.dpatch by Sylvain Beucler <b...@beuc.net>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: use system expat to address CVE-2009-3560 and CVE-2009-3720 DoS
-## DP: see also debian/rules, target 'clean'
+## DP: No description.
---- tla-1.3.5+dfsg.orig/src/tla/tla/Makefile.in
-+++ tla-1.3.5+dfsg/src/tla/tla/Makefile.in
-@@ -21,7 +21,7 @@
- endif
-
- $(programs):%$(cfg__exec_suffix):%.o $(thelib) $(filter-out -L%, $(filter-out
-l%, $(libs)))
-- $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS)
-L../../expat -o $@ $< $(thelib) $(libs)
-+ $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS) -o $@
$< $(thelib) $(libs)
-
- clean: clean-prog
-
---- tla-1.3.5+dfsg.orig/src/libneon/Makefile.in
-+++ tla-1.3.5+dfsg/src/libneon/Makefile.in
+...@dpatch@
+diff -urNad tla-1.3.5+dfsg~/src/libneon/Makefile.in
tla-1.3.5+dfsg/src/libneon/Makefile.in
+--- tla-1.3.5+dfsg~/src/libneon/Makefile.in 2009-12-24 12:30:27.000000000
+0100
++++ tla-1.3.5+dfsg/src/libneon/Makefile.in 2009-12-24 12:30:41.000000000
+0100
@@ -33,7 +33,7 @@
@SET_MAKE@
@@ -30,11 +20,33 @@
---- tla-1.3.5+dfsg.orig/src/libneon/src/Makefile.in
-+++ tla-1.3.5+dfsg/src/libneon/src/Makefile.in
-@@ -26,7 +26,7 @@
+diff -urNad tla-1.3.5+dfsg~/src/libneon/src/Makefile.in
tla-1.3.5+dfsg/src/libneon/src/Makefile.in
+--- tla-1.3.5+dfsg~/src/libneon/src/Makefile.in 2009-12-24
12:30:27.000000000 +0100
++++ tla-1.3.5+dfsg/src/libneon/src/Makefile.in 2009-12-24 12:31:28.000000000
+0100
+@@ -25,14 +25,14 @@
+
# Flags
CPPFLAGS = @DEFS@ @CPPFLAGS@
- CFLAGS = @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)/../expat/lib
@NEON_CFLAGS@
+-CFLAGS = @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)/../expat/lib
@NEON_CFLAGS@
-LDFLAGS = -L$(top_builddir)/../expat @LDFLAGS@
++CFLAGS = @CFLAGS@ -I$(top_builddir) @NEON_CFLAGS@
+LDFLAGS = @LDFLAGS@
NEON_LINK_FLAGS = @NEON_LINK_FLAGS@
# Note: don't substitute @LIBS@ in here; during a bundled
# build of this directory, @LIBS@ may include -lneon.
+ LIBS = @NEON_LIBS@ @NEON_LTLIBS@
+
+-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -I$(top_builddir)
-I$(top_srcdir)/../expat/lib @NEON_CFLAGS@
++COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -I$(top_builddir) @NEON_CFLAGS@
+ LINK = $(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS)
+
+ NEON_BASEOBJS = ne_reque...@neon_objext@ ne_sessi...@neon_objext@ \
+diff -urNad tla-1.3.5+dfsg~/src/tla/tla/Makefile.in
tla-1.3.5+dfsg/src/tla/tla/Makefile.in
+--- tla-1.3.5+dfsg~/src/tla/tla/Makefile.in 2009-12-24 12:30:27.000000000
+0100
++++ tla-1.3.5+dfsg/src/tla/tla/Makefile.in 2009-12-24 12:30:41.000000000
+0100
+@@ -21,7 +21,7 @@
+ endif
+
+ $(programs):%$(cfg__exec_suffix):%.o $(thelib) $(filter-out -L%, $(filter-out
-l%, $(libs)))
+- $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS)
-L../../expat -o $@ $< $(thelib) $(libs)
++ $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS) -o $@
$< $(thelib) $(libs)
+
+ clean: clean-prog
+
signature.asc
Description: Digital signature
