Changeset 5383:d4a903e7077b

Timestamp:

2008-05-17 17:36:05 (7 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Build local md5 tool for hcachever.sh. Closes #3025.

Files:

• .hgignore (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• hcachever.sh.in (modified) (2 diffs)
• md5.c (modified) (1 diff)

.hgignore

@@ -2 +2 @@
 ^aclocal\.m4$
 ^autom4te\.cache
+^compile$
 ^(contrib/|doc/|imap/|m4/|po/)?Makefile\.in$
 ^config\.h(\.in~?)?$
@@ -25 +26 @@
 ^mutt$
 ^mutt_dotlock(\.c)?$
+^mutt_md5$
 ^patchlist\.c$
 ^pgpewrap|pgpring$

ChangeLog

@@ -1 @@
-2008-05-17 12:31 -0700  Brendan Cully  <brendan@kublai.com>  (fa4990c5b5c6)
+2008-05-17 12:39 -0700  Brendan Cully  <brendan@kublai.com>  (692b7c063bf1)
+
+        * .hgsigs: mutt-1.5.18 signed
+
+        * .hgtags: Added tag mutt-1-5-18-rel for changeset ff9e4d0464b1
+
+        * ChangeLog, VERSION, po/bg.po, po/ca.po, po/cs.po, po/da.po,
+        po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/eu.po,
+        po/fr.po, po/ga.po, po/gl.po, po/hu.po, po/id.po, po/it.po,
+        po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po,
+        po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po,
+        po/zh_TW.po: automatic post-release commit for mutt-1.5.18
 
         * UPDATING: Update UPDATING.

Makefile.am

@@ -3 +3 @@
 
 AUTOMAKE_OPTIONS = 1.6 foreign
-EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap
+EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap mutt_md5
 
 if BUILD_IMAP
@@ -81 +81 @@
 pgpring_LDADD = @LIBOBJS@ $(INTLLIBS) 
 pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
+
+mutt_md5_SOURCES = md5.c
+mutt_md5_CFLAGS = -DMD5UTIL
+
+noinst_PROGRAMS = $(MUTT_MD5)
 
 mutt_dotlock.c: dotlock.c

configure.ac

@@ -825 +825 @@
 
     need_md5="yes"
-
-    dnl hcachever.sh tool for calculating struct digest
-    AC_CHECK_PROGS([MD5], [md5 md5sum openssl], [none])
 
     dnl -- QDBM --
@@ -953 +950 @@
 then
   MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5.o"
-fi
+  MUTT_MD5="mutt_md5"
+fi
+AC_SUBST(MUTT_MD5)
 
 AC_SUBST(MUTTLIBS)

hcachever.sh.in

@@ -2 +2 @@
 
 BASEVERSION=2
-
-MD5=@MD5@
-if test "$MD5" = "openssl"
-then
-  MD5="openssl md5 -hex"
-elif test "$MD5" = "none"
-then
-  echo "ERROR: no MD5 tool found"
-  exit 1
-fi
 
 cleanstruct () {
@@ -92 +82 @@
 echo " */" >> $TMPD
 
-MD5TEXT=`echo "$TEXT" | $MD5`
+MD5TEXT=`echo "$TEXT" | ./mutt_md5`
 echo "#define HCACHEVER 0x"`echo $MD5TEXT | cut -c-8` >> $TMPD
 

md5.c

@@ -451 +451 @@
   ctx->D = D;
 }
+
+#ifdef MD5UTIL
+/* local md5 equivalent for header cache versioning */
+int main(int argc, char** argv)
+{
+  unsigned char r[16];
+  int rc;
+
+  if ((rc = md5_stream(stdin, r)))
+    return rc;
+
+  printf("%02x%02x%02x%02x%02x%02x%02x%02x"
+         "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+         r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7],
+         r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15]);
+
+  return 0;
+}
+#endif