Source: microdc2
Version: 0.15.6-4.1
The debdiff for the just uploaded NMU is attached.
diff -Nru microdc2-0.15.6/debian/changelog microdc2-0.15.6/debian/changelog
--- microdc2-0.15.6/debian/changelog 2016-07-08 00:31:05.000000000 +0200
+++ microdc2-0.15.6/debian/changelog 2022-04-22 14:29:15.000000000 +0200
@@ -1,3 +1,14 @@
+microdc2 (0.15.6-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control: Build-Depend on pkg-config.
+ * debian/patches:
+ - Drop "disable-libxml2-version-check" in favour of pkg-config.
+ - Refresh some patches due to removal of "disable-libxml2-version-check".
+ - Use pkg-config to find libxml2 (Closes: #949413).
+
+ -- Hugh McMaster <hugh.mcmas...@outlook.com> Fri, 22 Apr 2022 22:29:15 +1000
+
microdc2 (0.15.6-4) unstable; urgency=medium
* Hardening insecure fprintf() logging in screen.c -- repeat
diff -Nru microdc2-0.15.6/debian/control microdc2-0.15.6/debian/control
--- microdc2-0.15.6/debian/control 2016-07-08 00:17:31.000000000 +0200
+++ microdc2-0.15.6/debian/control 2022-04-22 13:51:03.000000000 +0200
@@ -2,7 +2,13 @@
Section: net
Priority: extra
Maintainer: Al Nikolov <cl...@debian.org>
-Build-Depends: debhelper (>= 9), dh-autoreconf, libreadline-dev, libxml2-dev
(>= 2.6.16), libbz2-dev
+Build-Depends:
+ debhelper (>= 9),
+ dh-autoreconf,
+ libreadline-dev,
+ libxml2-dev (>= 2.6.16),
+ libbz2-dev,
+ pkg-config
Standards-Version: 3.9.8
Homepage: http://corsair626.no-ip.org/microdc/
diff -Nru microdc2-0.15.6/debian/patches/debian-link-system-bz2
microdc2-0.15.6/debian/patches/debian-link-system-bz2
--- microdc2-0.15.6/debian/patches/debian-link-system-bz2 2010-01-21
00:57:38.000000000 +0100
+++ microdc2-0.15.6/debian/patches/debian-link-system-bz2 2022-04-22
13:56:16.000000000 +0200
@@ -2,14 +2,12 @@
Author: Al Nikolov <cl...@debian.org>
Forwarded: non-needed
Last-Update: 2010-01-21
-Index: microdc2-0.15.6/configure.ac
-===================================================================
---- microdc2-0.15.6.orig/configure.ac 2010-01-20 23:55:08.000000000 +0000
-+++ microdc2-0.15.6/configure.ac 2010-01-20 23:57:34.000000000 +0000
+--- a/configure.ac
++++ b/configure.ac
@@ -64,6 +64,7 @@
- # AC_MSG_WARN([XML libxml2 library version 2.6.16 or later is required to
support XML filelists])
- # fi
- #fi
+ AC_MSG_WARN([XML libxml2 library version 2.6.16 or later is required to
support XML filelists])
+ fi
+ fi
+AC_CHECK_LIB(bz2, BZ2_bzRead,, AC_MSG_ERROR([Missing bz2 library]))
# Checks for header files
@@ -22,10 +20,8 @@
src/tth/Makefile
rpm/microdc.spec])
AC_CONFIG_FILES([slackware/microdc.SlackBuild],
-Index: microdc2-0.15.6/src/Makefile.am
-===================================================================
---- microdc2-0.15.6.orig/src/Makefile.am 2010-01-20 23:55:08.000000000
+0000
-+++ microdc2-0.15.6/src/Makefile.am 2010-01-20 23:57:20.000000000 +0000
+--- a/src/Makefile.am
++++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = common bzip2 tth
+SUBDIRS = common tth
diff -Nru microdc2-0.15.6/debian/patches/disable-libxml2-version-check
microdc2-0.15.6/debian/patches/disable-libxml2-version-check
--- microdc2-0.15.6/debian/patches/disable-libxml2-version-check
2010-01-17 22:46:14.000000000 +0100
+++ microdc2-0.15.6/debian/patches/disable-libxml2-version-check
1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-Description: Disable the libxml2 version check
- The check is broken (dotted version to integer conversion is wrong).
- .
- Since the Debian package has versionned dependency on a fresh version
- of libxml2-dev, the version check isn't needed. And probably libxml2
- older than version 2.6.16 aren't in the wild anymore.
-Author: Al Nikolov <cl...@debian.org>
-Last-Update: 2010-01-17
-Index: microdc2-0.15.6/configure.ac
-===================================================================
---- microdc2-0.15.6.orig/configure.ac 2010-01-17 04:45:33.000000000 +0000
-+++ microdc2-0.15.6/configure.ac 2010-01-17 04:44:54.000000000 +0000
-@@ -47,12 +47,12 @@
- #AH_TEMPLATE([XML_SAVE_FORMAT], [1], [Define if libxml2 has no such option
for xmlSave- functions])
- AC_PATH_PROG(XML_CONFIG, xml2-config)
- AC_PATH_PROG(TR, tr)
--if test -n "$XML_CONFIG" && test -n "$TR"; then
-- LIBXML2_VERSION=`$XML_CONFIG --version | $TR -d "."`
-- if test $LIBXML2_VERSION -eq 2616; then
-- AC_DEFINE([XML_SAVE_FORMAT], [1], [The libxml2 version 2.6.16 has no such
option defined in the library headers])
-- fi
-- if test $LIBXML2_VERSION -ge 2616; then
-+#if test -n "$XML_CONFIG" && test -n "$TR"; then
-+# LIBXML2_VERSION=`$XML_CONFIG --version | $TR -d "."`
-+# if test $LIBXML2_VERSION -eq 2616; then
-+# AC_DEFINE([XML_SAVE_FORMAT], [1], [The libxml2 version 2.6.16 has no
such option defined in the library headers])
-+# fi
-+# if test $LIBXML2_VERSION -ge 2616; then
- AC_DEFINE([HAVE_LIBXML2])
- LIBXML2_LIBS="`$XML_CONFIG --libs`"
- LIBXML2_CFLAGS="`$XML_CONFIG --cflags`"
-@@ -60,10 +60,10 @@
- AC_SUBST(LIBXML2_CFLAGS)
- # LIBS="$LIBS $LIBXML2_LIBS"
- # CFLAGS="$CFLAGS $LIBXML2_CFLAGS"
-- else
-- AC_MSG_WARN([XML libxml2 library version 2.6.16 or later is required to
support XML filelists])
-- fi
--fi
-+# else
-+# AC_MSG_WARN([XML libxml2 library version 2.6.16 or later is required to
support XML filelists])
-+# fi
-+#fi
-
- # Checks for header files
-
diff -Nru microdc2-0.15.6/debian/patches/libxml2.patch
microdc2-0.15.6/debian/patches/libxml2.patch
--- microdc2-0.15.6/debian/patches/libxml2.patch 1970-01-01
01:00:00.000000000 +0100
+++ microdc2-0.15.6/debian/patches/libxml2.patch 2022-04-22
14:28:24.000000000 +0200
@@ -0,0 +1,48 @@
+Description: Use pkg-config to find libxml2
+Author: Hugh McMaster <hugh.mcmas...@outlook.com>
+Forwarded: no, upstream dead
+Bug-Debian: https://bugs.debian.org/949413
+Last-Update: 2022-04-22
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,6 +33,8 @@
+ AC_PROG_CC
+ AC_PROG_RANLIB
+
++PKG_PROG_PKG_CONFIG
++
+ # Checks for libraries
+ #ACX_PTHREAD
+ #ACX_PTHREAD([], [AC_MSG_ERROR([POSIX Threads is required to build and run
this project.])])
+@@ -43,27 +45,9 @@
+ LIBS="$LIBS $READLINE_LIBS"
+ AC_CHECK_FUNC(_rl_mark_modified_lines,
[AC_DEFINE([HAVE__RL_MARK_MODIFIED_LINES])])
+ LIBS="$OLD_LIBS"
+-AH_TEMPLATE([HAVE_LIBXML2], [Define if libxml2 is installed])
+-#AH_TEMPLATE([XML_SAVE_FORMAT], [1], [Define if libxml2 has no such option
for xmlSave- functions])
+-AC_PATH_PROG(XML_CONFIG, xml2-config)
+-AC_PATH_PROG(TR, tr)
+-if test -n "$XML_CONFIG" && test -n "$TR"; then
+- LIBXML2_VERSION=`$XML_CONFIG --version | $TR -d "."`
+- if test $LIBXML2_VERSION -eq 2616; then
+- AC_DEFINE([XML_SAVE_FORMAT], [1], [The libxml2 version 2.6.16 has no such
option defined in the library headers])
+- fi
+- if test $LIBXML2_VERSION -ge 2616; then
+- AC_DEFINE([HAVE_LIBXML2])
+- LIBXML2_LIBS="`$XML_CONFIG --libs`"
+- LIBXML2_CFLAGS="`$XML_CONFIG --cflags`"
+- AC_SUBST(LIBXML2_LIBS)
+- AC_SUBST(LIBXML2_CFLAGS)
+-# LIBS="$LIBS $LIBXML2_LIBS"
+-# CFLAGS="$CFLAGS $LIBXML2_CFLAGS"
+- else
+- AC_MSG_WARN([XML libxml2 library version 2.6.16 or later is required to
support XML filelists])
+- fi
+-fi
++
++PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], [AC_DEFINE([HAVE_LIBXML2], [1],
[Define to 1 if we have LibXML2])])
++
+ AC_CHECK_LIB(bz2, BZ2_bzRead,, AC_MSG_ERROR([Missing bz2 library]))
+
+ # Checks for header files
diff -Nru microdc2-0.15.6/debian/patches/minus-in-manpage-fix
microdc2-0.15.6/debian/patches/minus-in-manpage-fix
--- microdc2-0.15.6/debian/patches/minus-in-manpage-fix 2011-08-26
23:50:47.000000000 +0200
+++ microdc2-0.15.6/debian/patches/minus-in-manpage-fix 2022-04-22
13:56:42.000000000 +0200
@@ -1,11 +1,9 @@
Description: fix minus signs in options.
Author: Al Nikolov <cl...@debian.org>
Last-Updated: 2011-08-27
-Index: microdc2-0.15.6/src/microdc2.1
-===================================================================
---- microdc2-0.15.6.orig/src/microdc2.1 2011-08-27 00:41:15.000000000
+0300
-+++ microdc2-0.15.6/src/microdc2.1 2011-08-27 00:41:32.000000000 +0300
-@@ -48,7 +48,7 @@
+--- a/src/microdc2.1
++++ b/src/microdc2.1
+@@ -54,7 +54,7 @@
.TP
\fB~/.microdc/config\fR
This file is loaded on startup. It contains commands, one per line, that will
be executed
diff -Nru microdc2-0.15.6/debian/patches/series
microdc2-0.15.6/debian/patches/series
--- microdc2-0.15.6/debian/patches/series 2016-07-08 00:22:17.000000000
+0200
+++ microdc2-0.15.6/debian/patches/series 2022-04-22 14:15:47.000000000
+0200
@@ -1,5 +1,4 @@
disable-touching-debian
-disable-libxml2-version-check
rename-manpage
disable-make-tthsum
debian-link-system-bz2
@@ -10,3 +9,4 @@
minus-in-manpage-fix
spelling
hardening
+libxml2.patch
