]>
Commit | Line | Data |
---|---|---|
57a7d4ad PS |
1 | --- w3c-libwww-5.4.0/configure.in.orig 2008-09-17 13:29:33.000000000 +0200 |
2 | +++ w3c-libwww-5.4.0/configure.in 2008-09-17 13:47:03.000000000 +0200 | |
3 | @@ -541,14 +541,14 @@ | |
4 | AC_DEFINE(HT_MD5) | |
5 | WWWMD5="libmd5.la" | |
6 | LWWWMD5="-lmd5" | |
7 | - LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la' | |
3fda81ad | 8 | + LIBWWWMD5='-lmd5' |
57a7d4ad PS |
9 | ;; |
10 | esac ], | |
11 | AC_MSG_RESULT(yes) | |
12 | AC_DEFINE(HT_MD5) | |
13 | WWWMD5="libmd5.la" | |
14 | LWWWMD5="-lmd5" | |
15 | - LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la' | |
3fda81ad | 16 | + LIBWWWMD5='-lmd5' |
57a7d4ad PS |
17 | ) |
18 | AC_SUBST(WWWMD5) | |
19 | AC_SUBST(LWWWMD5) | |
20 | --- w3c-libwww-5.4.0/Robot/src/Makefile.am.orig 2008-09-17 13:29:33.000000000 +0200 | |
21 | +++ w3c-libwww-5.4.0/Robot/src/Makefile.am 2008-09-17 14:05:35.000000000 +0200 | |
22 | @@ -20,7 +20,7 @@ | |
23 | $(top_builddir)/Library/src/libwwwtrans.la \ | |
24 | $(top_builddir)/Library/src/libwwwcore.la \ | |
25 | $(top_builddir)/Library/src/libwwwutils.la \ | |
26 | - -lm @LIBWWWXML@ @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@ @LIBWWWMD5@ | |
27 | + -lm @LIBWWWXML@ @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@ | |
28 | ||
29 | SUBDIRS = windows | |
30 | ||
31 | @@ -66,7 +66,6 @@ | |
32 | $(CC) $(LDFLAGS) -o purify $(webbot_OBJECTS) \ | |
33 | -lm -lexpat \ | |
34 | ../../Library/src/.libs/libwww.a \ | |
35 | - ../../modules/md5/.libs/libmd5.a \ | |
36 | $(LIBS) | |
37 | ||
38 | ||
39 | --- w3c-libwww-5.4.0/Library/Examples/Makefile.am.orig 2008-09-17 13:29:33.000000000 +0200 | |
40 | +++ w3c-libwww-5.4.0/Library/Examples/Makefile.am 2008-09-17 14:06:04.000000000 +0200 | |
41 | @@ -28,7 +28,7 @@ | |
42 | ../src/libwwwutils.la \ | |
43 | @LIBWWWDAV@ \ | |
44 | @LIBWWWSSL@ \ | |
45 | - -lm @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@ @LIBWWWMD5@ | |
46 | + -lm @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@ | |
47 | ||
48 | INCLUDES = \ | |
49 | -I$(srcdir)/../src \ | |
50 | @@ -66,7 +66,6 @@ | |
51 | ../src/.libs/libwwwutils.a \ | |
52 | ../src/.libs/libwwwdav.a \ | |
53 | ../src/.libs/libwwwzip.a \ | |
54 | - ../../modules/md5/.libs/libmd5.a \ | |
55 | $(LIBS) | |
56 | ||
57 | ||
57a7d4ad PS |
58 | --- w3c-libwww-5.4.0/Library/src/HTDigest.h.orig 2002-06-12 11:31:20.000000000 +0200 |
59 | +++ w3c-libwww-5.4.0/Library/src/HTDigest.h 2008-09-17 13:42:22.000000000 +0200 | |
60 | @@ -60,7 +60,7 @@ | |
61 | typedef struct _HTDigestContext { | |
62 | int algorithm; | |
63 | union { | |
64 | - MD5_CTX md5; | |
65 | + md5_state_t md5; | |
66 | } context; | |
67 | } HTDigestContext; | |
68 | ||
69 | --- w3c-libwww-5.4.0/Library/src/HTDigest.c.orig 1999-02-05 18:31:45.000000000 +0100 | |
70 | +++ w3c-libwww-5.4.0/Library/src/HTDigest.c 2008-09-17 13:44:19.000000000 +0200 | |
71 | @@ -29,7 +29,7 @@ | |
72 | ||
73 | switch (digesttype) { | |
74 | case HTDaMD5: | |
75 | - MD5Init (&context->context.md5); | |
76 | + md5_init (&context->context.md5); | |
77 | break; | |
78 | default: | |
79 | return NO; | |
80 | @@ -43,7 +43,7 @@ | |
81 | if (context) { | |
82 | switch (context->algorithm) { | |
83 | case HTDaMD5: | |
84 | - MD5Update (&context->context.md5, (unsigned char *) input, | |
85 | + md5_append (&context->context.md5, (unsigned char *) input, | |
86 | inputLen); | |
87 | break; | |
88 | default: | |
89 | @@ -60,7 +60,7 @@ | |
90 | if (context) { | |
91 | switch (context->algorithm) { | |
92 | case HTDaMD5: | |
93 | - MD5Final (digest, &context->context.md5); | |
94 | + md5_finish (&context->context.md5, digest); | |
95 | break; | |
96 | default: | |
97 | return NO; | |
98 | --- w3c-libwww-5.4.0/modules/Makefile.am.orig 2008-09-17 14:10:11.000000000 +0200 | |
99 | +++ w3c-libwww-5.4.0/modules/Makefile.am 2008-09-17 14:27:10.000000000 +0200 | |
100 | @@ -5,5 +5,4 @@ | |
101 | EXTRA_DIST = \ | |
102 | $(DOCS) | |
103 | ||
104 | -SUBDIRS = md5 | |
105 | ||
23b91159 | 106 | --- w3c-libwww-5.4.0/Library/src/Makefile.am.orig 2010-11-09 17:07:12.876029313 +0100 |
107 | +++ w3c-libwww-5.4.0/Library/src/Makefile.am 2010-11-09 17:09:21.308695152 +0100 | |
108 | @@ -269,8 +269,11 @@ | |
109 | HTPEP.c | |
110 | ||
111 | libwwwhttp_la_DEPENDENCIES = \ | |
112 | - ../../modules/md5/libmd5.la | |
113 | + libwwwmime.la libwwwutils.la libwwwcore.la | |
114 | ||
115 | +libwwwhttp_la_LIBADD = \ | |
116 | + @LIBWWWMD5@ libwwwmime.la libwwwutils.la libwwwcore.la | |
117 | + | |
118 | libwwwnews_la_SOURCES = \ | |
119 | WWWNews.h \ | |
120 | HTNDir.h \ | |
121 | @@ -422,10 +425,6 @@ | |
122 | ||
123 | libwwwsql_la_LDFLAGS = -rpath $(libdir) | |
124 | ||
125 | -INCLUDES = \ | |
126 | - -I/usr/local/include \ | |
127 | - -I${top_srcdir}/modules/md5 | |
128 | - | |
129 | BUILT_SOURCES = \ | |
130 | wwwsys.h \ | |
131 | HTAABrow.h \ |