tags 559822 + patch
thanks
Dear Felipe,
I've prepared an NMU for mp4h (versioned as 1.3.1-4.1) and will
upload it to DELAYED/2, according to devref ยง5.11.1, now.
This one's similar to my hercules fix, using autoreconf to tear
out the old GNU autotools/libtool infrastructure and replace it
with a new one (for that, relatively simple though).
bye,
//mirabilos
--
FWIW, I'm quite impressed with mksh interactively. I thought it was much
*much* more bare bones. But it turns out it beats the living hell out of
ksh93 in that respect. I'd even consider it for my daily use if I hadn't
wasted half my life on my zsh setup. :-) -- Frank Terbeck in #!/bin/mksh
reverted: mp4h-1.3.1/src/ltdl.c.patch
diff -u mp4h-1.3.1/debian/changelog mp4h-1.3.1/debian/changelog
--- mp4h-1.3.1/debian/changelog
+++ mp4h-1.3.1/debian/changelog
@@ -1,3 +1,13 @@
+mp4h (1.3.1-4.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Update the autotools/libtool subsystem, use libltdl from
+ the system instead of our own. (CVE-2009-3736) (Closes: #559822)
+ * Fix lintian copyright-without-copyright-notice (possible REJECT cause)
+ * Add missing ${misc:Depends} for debhelper to get them right
+
+ -- Thorsten Glaser <t...@mirbsd.de> Thu, 04 Mar 2010 19:30:06 +0000
+
mp4h (1.3.1-4) unstable; urgency=low
* Remove me from Maintainers.
diff -u mp4h-1.3.1/debian/copyright mp4h-1.3.1/debian/copyright
--- mp4h-1.3.1/debian/copyright
+++ mp4h-1.3.1/debian/copyright
@@ -4,7 +4,7 @@
Currently maintained by Luk Claes <l...@debian.org> and
Felipe Augusto van de Wiel <fel...@cathedrallabs.org>
-Author: (C) 2000-2003, Denis Barbier <barb...@linuxfr.org>
+Author: Copyright (C) 2000-2003, Denis Barbier <barb...@linuxfr.org>
It was downloaded from
http://mp4h.tuxfamily.org/distrib/
diff -u mp4h-1.3.1/debian/rules mp4h-1.3.1/debian/rules
--- mp4h-1.3.1/debian/rules
+++ mp4h-1.3.1/debian/rules
@@ -18,23 +18,34 @@
endif
build: build-stamp
-build-stamp: config.status
+build-stamp: configure-stamp
dh_testdir
$(MAKE)
touch build-stamp
-config.status: configure
+configure-stamp:
+ test -d m4 || mkdir m4
+ ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 \
+ autoreconf -fvi -Im4
+
CFLAGS="$(CFLAGS)" ./configure $(confflags) \
+ --without-included-ltdl \
--prefix=/usr \
--mandir='$${prefix}/share/man' \
--with-modules='intl:gettext' \
--with-tidy=/usr/bin/tidy
+ @:>$@
clean:
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
- dh_clean build-stamp
+ rm -rf autom4te.cache m4
+ rm -f src/ltdl.* \
+ aclocal.m4 config.guess config.h.in config.sub configure depcomp \
+ install-sh ltmain.sh missing mkinstalldirs
+ find . -name Makefile.in | fgrep -v ./intl/Makefile.in | xargs -r rm
+ dh_clean build-stamp configure-stamp
install: build-stamp
dh_testdir
diff -u mp4h-1.3.1/debian/control mp4h-1.3.1/debian/control
--- mp4h-1.3.1/debian/control
+++ mp4h-1.3.1/debian/control
@@ -3,11 +3,14 @@
Priority: optional
Maintainer: Felipe Augusto van de Wiel (faw) <f...@debian.org>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4), tidy
+Build-Depends: debhelper (>= 4), tidy,
+ autoconf (>= 2.57~), automake1.9, autotools-dev, gettext,
+ libtool, libltdl-dev
+Build-Conflicts: autoconf2.13, automake1.4
Package: mp4h
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Macro processor for HTML documents
Mp4h is a macro processor specifically designed for HTML documents,
with powerful programming features. It allows definition and expansion
only in patch2:
unchanged:
--- mp4h-1.3.1.orig/Makefile.am
+++ mp4h-1.3.1/Makefile.am
@@ -1,5 +1,6 @@
AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
DIST_SUBDIRS = intl pcre lib src po doc modules tests
only in patch2:
unchanged:
--- mp4h-1.3.1.orig/acinclude.m4
+++ mp4h-1.3.1/acinclude.m4
@@ -8,7 +8,7 @@
# serial 1
-AC_DEFUN(MP4H_LOADABLE_MODULES,
+AC_DEFUN([MP4H_LOADABLE_MODULES],
[AC_MSG_CHECKING(if support for loadable modules is requested)
AC_ARG_WITH(modules,
[ --with-modules=x,y,z select loadable modules to compile],
only in patch2:
unchanged:
--- mp4h-1.3.1.orig/configure.ac
+++ mp4h-1.3.1/configure.ac
@@ -1,5 +1,6 @@
dnl As this file is called configure.ac, Autoconf 2.50 is required
AC_PREREQ([2.50])
+AC_CONFIG_MACRO_DIR([m4])
AC_INIT([mp4h], [1.3.1])
PACKAGE_DATE="11-Jan-2003"
@@ -40,7 +41,6 @@
AC_PROG_CC
AC_PROG_CPP
-AC_PROG_RANLIB
AC_PROG_MAKE_SET
AC_PROG_INSTALL
@@ -105,13 +105,8 @@
if test ".$with_modules" != .no; then
echo ''
$shtool echo -e "Checking for %Bloadable modules%b support"
- AC_LIBTOOL_WIN32_DLL
- AC_LIBLTDL_CONVENIENCE
- AC_ENABLE_SHARED
- AC_DISABLE_STATIC
- AC_LIBTOOL_DLOPEN
- AC_LIBTOOL_SETUP
- AC_PROG_LIBTOOL
+ LT_INIT([dlopen win32-dll shared disable-static])
+ LTDL_INIT([])
case ,$with_modules, in
*,intl:gettext,* )
@@ -157,10 +152,6 @@
test ".$with_modules" = . && with_modules=none
-AC_LIB_LTDL
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-
AC_MSG_CHECKING([which modules to compile])
AC_MSG_RESULT([$with_modules])
only in patch2:
unchanged:
--- mp4h-1.3.1.orig/intl/Makefile.in
+++ mp4h-1.3.1/intl/Makefile.in
@@ -39,8 +39,7 @@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo
"$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(install_sh) -d
l = @INTL_LIBTOOL_SUFFIX_PREFIX@
only in patch2:
unchanged:
--- mp4h-1.3.1.orig/po/Makefile.in.in
+++ mp4h-1.3.1/po/Makefile.in.in
@@ -28,8 +28,7 @@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo
"$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(install_sh) -d
CC = @CC@
GMSGFMT = @GMSGFMT@
only in patch2:
unchanged:
--- mp4h-1.3.1.orig/src/Makefile.am
+++ mp4h-1.3.1/src/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/pcre -I$(top_srcdir)/lib @INTLINCL@
+INCLUDES = -I$(top_srcdir)/pcre -I$(top_srcdir)/lib @INTLINCL@ $(LTDLINCL)
bin_PROGRAMS = mp4h
@@ -8,7 +8,8 @@
EXTRA_DIST = readme.tmpl
if LOADABLE_MODULES
-MODULE_C = module.c ltdl.c
+MODULE_C = module.c
+MODULE_LDADD = $(LIBLTDL)
endif
mp4h_SOURCES = builtin.c debug.c devel.c freeze.c input.c \
@@ -16,8 +17,8 @@
if LOADABLE_MODULES
mp4h_LDFLAGS = -export-dynamic
endif
-mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a
$(top_builddir)/pcre/libpcre.a @INTLLIBS@
+mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a
$(top_builddir)/pcre/libpcre.a @INTLLIBS@ $(MODULE_LDADD)
include_HEADERS = mp4h.h
-noinst_HEADERS = builtin.h ltdl.h
+noinst_HEADERS = builtin.h
only in patch2:
unchanged:
--- mp4h-1.3.1.orig/doc/Makefile.am
+++ mp4h-1.3.1/doc/Makefile.am
@@ -40,6 +40,9 @@
EXTRA_DIST = mp4h.mp4h list-tags html.out pod.out texinfo.out
+html.out pod.out texinfo.out:
+ : # defeat GNU make's implicit rules
+
CLEANFILES = \
mp4h.pod mp4h.1 \
mp4h.html \
only in patch2:
unchanged:
--- mp4h-1.3.1.orig/modules/example/Makefile.am
+++ mp4h-1.3.1/modules/example/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/src @INTLINCL@
-LDFLAGS = -no-undefined -module -avoid-version -rpath $(pkglibdir) @DLLDFLAGS@
+AM_LDFLAGS = -no-undefined -module -avoid-version -rpath $(pkglibdir)
@DLLDFLAGS@
if DO_MODULE_TEST
noinst_LTLIBRARIES = test.la
only in patch2:
unchanged:
--- mp4h-1.3.1.orig/modules/system/Makefile.am
+++ mp4h-1.3.1/modules/system/Makefile.am
@@ -13,7 +13,7 @@
man3ext = 3
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/src @INTLINCL@
-LDFLAGS = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
+AM_LDFLAGS = -no-undefined -module -avoid-version -rpath $(mp4mdir)
@DLLDFLAGS@
if DO_MODULE_SYSTEM
mp4m_LTLIBRARIES = sh.la exec.la
only in patch2:
unchanged:
--- mp4h-1.3.1.orig/modules/intl/Makefile.am
+++ mp4h-1.3.1/modules/intl/Makefile.am
@@ -13,7 +13,7 @@
man3ext = 3
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/src @INTLINCL@
-LDFLAGS = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
+AM_LDFLAGS = -no-undefined -module -avoid-version -rpath $(mp4mdir)
@DLLDFLAGS@
if DO_MODULE_INTL_GETTEXT
mp4m_LTLIBRARIES = gettext.la
only in patch2:
unchanged:
--- mp4h-1.3.1.orig/modules/javascript/Makefile.am
+++ mp4h-1.3.1/modules/javascript/Makefile.am
@@ -5,7 +5,7 @@
mp4mdir = $(pkglibdir)/@VERSION@/$(thisdir)
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/src @INTLINCL@
-LDFLAGS = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
+AM_LDFLAGS = -no-undefined -module -avoid-version -rpath $(mp4mdir)
@DLLDFLAGS@
if DO_MODULE_JAVASCRIPT_MOZJS
MODULE_JAVASCRIPT_MOZJS = mozjs.la
