mutt stable branch with some hacks
Build local md5 tool for hcachever.sh. Closes #3025.
+42
-16
+2
.hgignore
+2
.hgignore
···
1
1
# autoconf products
2
2
^aclocal\.m4$
3
3
^autom4te\.cache
4
+
^compile$
4
5
^(contrib/|doc/|imap/|m4/|po/)?Makefile\.in$
5
6
^config\.h(\.in~?)?$
6
7
^config\.(log|status)$
···
24
25
^doc/makedoc$
25
26
^mutt$
26
27
^mutt_dotlock(\.c)?$
28
+
^mutt_md5$
27
29
^patchlist\.c$
28
30
^pgpewrap|pgpring$
29
31
^reldate\.h$
+12
-1
ChangeLog
+12
-1
ChangeLog
···
1
-
2008-05-17 12:31 -0700 Brendan Cully <brendan@kublai.com> (fa4990c5b5c6)
1
+
2008-05-17 12:39 -0700 Brendan Cully <brendan@kublai.com> (692b7c063bf1)
2
+
3
+
* .hgsigs: mutt-1.5.18 signed
4
+
5
+
* .hgtags: Added tag mutt-1-5-18-rel for changeset ff9e4d0464b1
6
+
7
+
* ChangeLog, VERSION, po/bg.po, po/ca.po, po/cs.po, po/da.po,
8
+
po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/eu.po,
9
+
po/fr.po, po/ga.po, po/gl.po, po/hu.po, po/id.po, po/it.po,
10
+
po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po,
11
+
po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po,
12
+
po/zh_TW.po: automatic post-release commit for mutt-1.5.18
2
13
3
14
* UPDATING: Update UPDATING.
4
15
+6
-1
Makefile.am
+6
-1
Makefile.am
···
2
2
## Use aclocal -I m4; automake --foreign
3
3
4
4
AUTOMAKE_OPTIONS = 1.6 foreign
5
-
EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap
5
+
EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap mutt_md5
6
6
7
7
if BUILD_IMAP
8
8
IMAP_SUBDIR = imap
···
80
80
pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c pgppacket.c ascii.c
81
81
pgpring_LDADD = @LIBOBJS@ $(INTLLIBS)
82
82
pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
83
+
84
+
mutt_md5_SOURCES = md5.c
85
+
mutt_md5_CFLAGS = -DMD5UTIL
86
+
87
+
noinst_PROGRAMS = $(MUTT_MD5)
83
88
84
89
mutt_dotlock.c: dotlock.c
85
90
cp $(srcdir)/dotlock.c mutt_dotlock.c
+2
-3
configure.ac
+2
-3
configure.ac
···
825
825
826
826
need_md5="yes"
827
827
828
-
dnl hcachever.sh tool for calculating struct digest
829
-
AC_CHECK_PROGS([MD5], [md5 md5sum openssl], [none])
830
-
831
828
dnl -- QDBM --
832
829
if test "$with_qdbm" != "no"
833
830
then
···
952
949
if test "$need_md5" = "yes"
953
950
then
954
951
MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5.o"
952
+
MUTT_MD5="mutt_md5"
955
953
fi
954
+
AC_SUBST(MUTT_MD5)
956
955
957
956
AC_SUBST(MUTTLIBS)
958
957
AC_SUBST(MUTT_LIB_OBJECTS)
+1
-11
hcachever.sh.in
+1
-11
hcachever.sh.in
···
2
2
3
3
BASEVERSION=2
4
4
5
-
MD5=@MD5@
6
-
if test "$MD5" = "openssl"
7
-
then
8
-
MD5="openssl md5 -hex"
9
-
elif test "$MD5" = "none"
10
-
then
11
-
echo "ERROR: no MD5 tool found"
12
-
exit 1
13
-
fi
14
-
15
5
cleanstruct () {
16
6
echo "$1" | sed -e 's/} *//' -e 's/;$//'
17
7
}
···
91
81
done
92
82
echo " */" >> $TMPD
93
83
94
-
MD5TEXT=`echo "$TEXT" | $MD5`
84
+
MD5TEXT=`echo "$TEXT" | ./mutt_md5`
95
85
echo "#define HCACHEVER 0x"`echo $MD5TEXT | cut -c-8` >> $TMPD
96
86
97
87
# TODO: validate we have all structs
+19
md5.c
+19
md5.c
···
450
450
ctx->C = C;
451
451
ctx->D = D;
452
452
}
453
+
454
+
#ifdef MD5UTIL
455
+
/* local md5 equivalent for header cache versioning */
456
+
int main(int argc, char** argv)
457
+
{
458
+
unsigned char r[16];
459
+
int rc;
460
+
461
+
if ((rc = md5_stream(stdin, r)))
462
+
return rc;
463
+
464
+
printf("%02x%02x%02x%02x%02x%02x%02x%02x"
465
+
"%02x%02x%02x%02x%02x%02x%02x%02x\n",
466
+
r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7],
467
+
r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15]);
468
+
469
+
return 0;
470
+
}
471
+
#endif