libcompat: Take over md5 module from libdpkg

The md5 code is imported from the BSDs, and should not generally be
touched, only updated from there. Also on several platforms the code
should use the system available interfaces instead.

5 files changed, 4 insertions, 2 deletions

diff --git a/lib/compat/Makefile.am b/lib/compat/Makefile.am
index 33da1bd19..4aa4754b0 100644
--- a/lib/compat/Makefile.am
+++ b/lib/compat/Makefile.am
@@ -12,6 +12,9 @@ libcompat_a_SOURCES = \
 	compat.h \
 	gettext.h
 
+# FIXME: unconditionally include these for now.
+libcompat_a_SOURCES += md5.c md5.h
+
 if !HAVE_GETOPT
 libcompat_a_SOURCES += getopt.c getopt.h
 endif
diff --git a/lib/dpkg/md5.c b/lib/compat/md5.c
index 3da18c98e..3da18c98e 100644
--- a/lib/dpkg/md5.c
+++ b/lib/compat/md5.c
diff --git a/lib/dpkg/md5.h b/lib/compat/md5.h
index f6243603d..f6243603d 100644
--- a/lib/dpkg/md5.h
+++ b/lib/compat/md5.h
diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am
index e53ddbdb9..15bd57590 100644
--- a/lib/dpkg/Makefile.am
+++ b/lib/dpkg/Makefile.am
@@ -46,7 +46,6 @@ libdpkg_a_SOURCES = \
 	glob.c \
 	i18n.h \
 	log.c \
-	md5.c md5.h \
 	mlib.c \
 	namevalue.c \
 	nfmalloc.c \
diff --git a/lib/dpkg/buffer.c b/lib/dpkg/buffer.c
index ec818f402..bf365dcb5 100644
--- a/lib/dpkg/buffer.c
+++ b/lib/dpkg/buffer.c
@@ -26,6 +26,7 @@
 #include <sys/types.h>
 
 #include <errno.h>
+#include <md5.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -33,7 +34,6 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/varbuf.h>
-#include <dpkg/md5.h>
 #include <dpkg/fdio.h>
 #include <dpkg/buffer.h>