Hi, Apparently on RHEL, md5.h requires the inclusion of md5global.h. That means that mtree doesn't currently build, b/c it finds md5.h on the system (and thus doesn't use libnbcompat's md5.h), and barfs. I haven't kept track of the pkgtools for a long time, so I'd like for somebody to review the attached patch and let me know if it's ok to commit or if nowadays mtree has some other magic that needs attention. :-) Thanks, -Jan
Index: files/config.h.in
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/mtree/files/config.h.in,v
retrieving revision 1.8
diff -b -u -r1.8 config.h.in
--- files/config.h.in 21 Aug 2004 04:17:31 -0000 1.8
+++ files/config.h.in 5 Nov 2008 18:52:52 -0000
@@ -81,6 +81,9 @@
/* Define to 1 if <wchar.h> declares mbstate_t. */
#undef HAVE_MBSTATE_T
+/* Define to 1 if you have the <md5global.h> header file. */
+#undef HAVE_MD5GLOBAL_H
+
/* Define to 1 if you have the <md5.h> header file. */
#undef HAVE_MD5_H
Index: files/configure
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/mtree/files/configure,v
retrieving revision 1.8
diff -b -u -r1.8 configure
--- files/configure 21 Aug 2004 06:33:39 -0000 1.8
+++ files/configure 5 Nov 2008 18:52:56 -0000
@@ -2929,7 +2929,7 @@
for ac_header in ctype.h dirent.h err.h errno.h fcntl.h fnmatch.h fts.h \
- grp.h limits.h md5.h netdb.h pwd.h rmd160.h sha1.h \
+ grp.h limits.h md5.h md5global.h netdb.h pwd.h rmd160.h sha1.h \
stdarg.h stddef.h stdio.h stdlib.h string.h time.h unistd.h \
util.h vis.h
do
Index: files/create.c
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/mtree/files/create.c,v
retrieving revision 1.5
diff -b -u -r1.5 create.c
--- files/create.c 19 Nov 2007 08:41:25 -0000 1.5
+++ files/create.c 5 Nov 2008 18:52:56 -0000
@@ -95,6 +95,9 @@
#endif
#ifndef NO_MD5
+#if HAVE_MD5GLOBAL_H
+#include <md5global.h>
+#endif
#if HAVE_MD5_H
#include <md5.h>
#endif
Attachment:
pgpVfXpjNkS8j.pgp
Description: PGP signature