]>
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 | ||
58 | --- w3c-libwww-5.4.0/Library/src/Makefile.am.orig 2008-09-17 13:29:33.000000000 +0200 | |
59 | +++ w3c-libwww-5.4.0/Library/src/Makefile.am 2008-09-17 14:08:06.000000000 +0200 | |
60 | @@ -269,10 +269,10 @@ | |
61 | HTPEP.c | |
62 | ||
63 | libwwwhttp_la_DEPENDENCIES = \ | |
64 | - ../../modules/md5/libmd5.la libwwwmime.la libwwwutils.la libwwwcore.la | |
3fda81ad | 65 | + libwwwmime.la libwwwutils.la libwwwcore.la |
57a7d4ad PS |
66 | |
67 | libwwwhttp_la_LIBADD = \ | |
68 | - ../../modules/md5/libmd5.la libwwwmime.la libwwwutils.la libwwwcore.la | |
69 | + @LIBWWWMD5@ libwwwmime.la libwwwutils.la libwwwcore.la | |
70 | ||
71 | libwwwnews_la_SOURCES = \ | |
72 | WWWNews.h \ | |
73 | @@ -425,10 +425,6 @@ | |
74 | ||
75 | libwwwsql_la_LDFLAGS = -rpath $(libdir) | |
76 | ||
77 | -INCLUDES = \ | |
78 | - -I/usr/local/include \ | |
79 | - -I${top_srcdir}/modules/md5 | |
80 | - | |
81 | BUILT_SOURCES = \ | |
82 | wwwsys.h \ | |
83 | HTAABrow.h \ | |
84 | --- w3c-libwww-5.4.0/Library/src/HTDigest.h.orig 2002-06-12 11:31:20.000000000 +0200 | |
85 | +++ w3c-libwww-5.4.0/Library/src/HTDigest.h 2008-09-17 13:42:22.000000000 +0200 | |
86 | @@ -60,7 +60,7 @@ | |
87 | typedef struct _HTDigestContext { | |
88 | int algorithm; | |
89 | union { | |
90 | - MD5_CTX md5; | |
91 | + md5_state_t md5; | |
92 | } context; | |
93 | } HTDigestContext; | |
94 | ||
95 | --- w3c-libwww-5.4.0/Library/src/HTDigest.c.orig 1999-02-05 18:31:45.000000000 +0100 | |
96 | +++ w3c-libwww-5.4.0/Library/src/HTDigest.c 2008-09-17 13:44:19.000000000 +0200 | |
97 | @@ -29,7 +29,7 @@ | |
98 | ||
99 | switch (digesttype) { | |
100 | case HTDaMD5: | |
101 | - MD5Init (&context->context.md5); | |
102 | + md5_init (&context->context.md5); | |
103 | break; | |
104 | default: | |
105 | return NO; | |
106 | @@ -43,7 +43,7 @@ | |
107 | if (context) { | |
108 | switch (context->algorithm) { | |
109 | case HTDaMD5: | |
110 | - MD5Update (&context->context.md5, (unsigned char *) input, | |
111 | + md5_append (&context->context.md5, (unsigned char *) input, | |
112 | inputLen); | |
113 | break; | |
114 | default: | |
115 | @@ -60,7 +60,7 @@ | |
116 | if (context) { | |
117 | switch (context->algorithm) { | |
118 | case HTDaMD5: | |
119 | - MD5Final (digest, &context->context.md5); | |
120 | + md5_finish (&context->context.md5, digest); | |
121 | break; | |
122 | default: | |
123 | return NO; | |
124 | --- w3c-libwww-5.4.0/modules/Makefile.am.orig 2008-09-17 14:10:11.000000000 +0200 | |
125 | +++ w3c-libwww-5.4.0/modules/Makefile.am 2008-09-17 14:27:10.000000000 +0200 | |
126 | @@ -5,5 +5,4 @@ | |
127 | EXTRA_DIST = \ | |
128 | $(DOCS) | |
129 | ||
130 | -SUBDIRS = md5 | |
131 |