Commit 2fcd016f authored by mirabilos's avatar mirabilos Committed by Axel Beckert

Imported Debian patch 1.3.1-4.1

parent ede6c277
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
DIST_SUBDIRS = intl pcre lib src po doc modules tests
......
......@@ -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],
......
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_DEFINE_UNQUOTED([MP4HLIBDIR], ["$MP4HLIBDIR/$PACKAGE_VERSION:$MP4HDATADIR"],
AC_PROG_CC
AC_PROG_CPP
AC_PROG_RANLIB
AC_PROG_MAKE_SET
AC_PROG_INSTALL
......@@ -105,13 +105,8 @@ test ".$with_modules" = .yes && with_modules=`echo $module_list | sed -e 's/ */
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 @@ fi
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])
......
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 <tg@mirbsd.de> Thu, 04 Mar 2010 19:30:06 +0000
mp4h (1.3.1-4) unstable; urgency=low
* Remove me from Maintainers.
......
......@@ -3,11 +3,14 @@ Section: web
Priority: optional
Maintainer: Felipe Augusto van de Wiel (faw) <faw@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
......
......@@ -4,7 +4,7 @@ on Mon, 28 Feb 2000 21:46:36 +0100.
Currently maintained by Luk Claes <luk@debian.org> and
Felipe Augusto van de Wiel <felipe@cathedrallabs.org>
Author: (C) 2000-2003, Denis Barbier <barbier@linuxfr.org>
Author: Copyright (C) 2000-2003, Denis Barbier <barbier@linuxfr.org>
It was downloaded from
http://mp4h.tuxfamily.org/distrib/
......
......@@ -18,23 +18,34 @@ CFLAGS += -g
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
......
......@@ -40,6 +40,9 @@ $(PROGRAM):
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 \
......
......@@ -39,8 +39,7 @@ subdir = intl
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@
......
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
......
......@@ -13,7 +13,7 @@ TESTFILES = gettext.mp4h
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
......
......@@ -5,7 +5,7 @@ thisdir = javascript
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
......
......@@ -13,7 +13,7 @@ TESTFILES = sh.mp4h
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
......
......@@ -28,8 +28,7 @@ gettextsrcdir = $(datadir)/gettext/po
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@
......
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_mp4h_SOURCES = module.c
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 @@ mp4h_SOURCES = builtin.c debug.c devel.c freeze.c input.c \
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
--- ltdl.c Tue Jun 11 18:23:20 2002
+++ ltdl.c Sun Jun 30 23:23:36 2002
@@ -2039,7 +2039,7 @@
}
/* try to open the not-installed module */
- if (!installed)
+ if (!installed && objdir)
{
if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0)
return 0;
@@ -2047,7 +2047,7 @@
/* maybe it was moved to another directory */
{
- if (tryall_dlopen_module (handle,
+ if (dir && tryall_dlopen_module (handle,
(const char *) 0, dir, dlname) == 0)
return 0;
}
@@ -2691,10 +2691,6 @@
}
#endif
}
- if (!file)
- {
- file = fopen (filename, LT_READTEXT_MODE);
- }
/* If we didn't find the file by now, it really isn't there. Set
the status flag, and bail out. */
@@ -2990,7 +2986,7 @@
failed, it is better to return an error message here than to
report FILE_NOT_FOUND when the alternatives (foo.so etc) are not
in the module search path. */
- if (handle || ((errors > 0) && file_not_found ()))
+ if (handle || ((errors > 0) && !file_not_found ()))
{
LT_DLFREE (tmp);
return handle;
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