w3c-libwww-system-libmd5.patch

   1 diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/Examples/Makefile.am w3c-libwww-5.4.2/Library/Examples/Makefile.am
   2 --- w3c-libwww-5.4.2.org/Library/Examples/Makefile.am   2017-06-24 07:51:37.000000000 +0200
   3 +++ w3c-libwww-5.4.2/Library/Examples/Makefile.am       2021-09-29 22:22:47.701642460 +0200
   4 @@ -28,7 +28,7 @@ LDADD = \
   5         ../src/libwwwutils.la \
   6          @LIBWWWDAV@ \
   7         @LIBWWWSSL@ \
   8 -       -lm @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@ @LIBWWWMD5@
   9 +       -lm @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@
  10
  11  AM_CPPFLAGS = \
  12         -I$(srcdir)/../src \
  13 @@ -67,8 +67,6 @@ purify: $(mget_OBJECTS) $(mget_DEPENDENC
  14         ../src/.libs/libwwwutils.a \
  15          ../src/.libs/libwwwdav.a \
  16         ../src/.libs/libwwwzip.a \
  17 -       ../../modules/md5/.libs/libmd5.a \
  18 -       ../../modules/expat/.libs/libexpat.a
  19         $(LIBS)
  20
  21
  22 diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/src/HTDigest.c w3c-libwww-5.4.2/Library/src/HTDigest.c
  23 --- w3c-libwww-5.4.2.org/Library/src/HTDigest.c 2017-06-24 07:51:38.000000000 +0200
  24 +++ w3c-libwww-5.4.2/Library/src/HTDigest.c     2021-09-29 22:22:47.701642460 +0200
  25 @@ -29,7 +29,7 @@ PUBLIC BOOL HTDigest_init (HTDigestConte
  26
  27      switch (digesttype) {
  28        case HTDaMD5:
  29 -         MD5Init (&context->context.md5);
  30 +         MD5_Init (&context->context.md5);
  31           break;
  32        default:
  33            return NO;
  34 @@ -43,7 +43,7 @@ PUBLIC BOOL HTDigest_update (HTDigestCon
  35      if (context) {
  36         switch (context->algorithm) {
  37         case HTDaMD5:
  38 -           MD5Update (&context->context.md5, (unsigned char *) input,
  39 +           MD5_Update (&context->context.md5, (unsigned char *) input,
  40                        inputLen);
  41             break;
  42         default:
  43 @@ -60,7 +60,7 @@ PUBLIC BOOL HTDigest_final (unsigned cha
  44      if (context) {
  45         switch (context->algorithm) {
  46         case HTDaMD5:
  47 -           MD5Final (digest, &context->context.md5);
  48 +           MD5_Final (&context->context.md5, digest);
  49             break;
  50         default:
  51             return NO;
  52 diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/src/HTDigest.h w3c-libwww-5.4.2/Library/src/HTDigest.h
  53 --- w3c-libwww-5.4.2.org/Library/src/HTDigest.h 2017-06-24 07:52:15.000000000 +0200
  54 +++ w3c-libwww-5.4.2/Library/src/HTDigest.h     2021-09-29 22:22:47.701642460 +0200
  55 @@ -39,7 +39,7 @@ Library.
  56  /* Library include files */
  57  #include "WWWLib.h"
  58  /* add the MD algorithm header files here below */
  59 -#include "md5.h"
  60 +#include <openssl/md5.h>
  61
  62  #ifdef __cplusplus
  63  extern "C" {
  64 diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/src/Makefile.am w3c-libwww-5.4.2/Library/src/Makefile.am
  65 --- w3c-libwww-5.4.2.org/Library/src/Makefile.am        2021-09-29 22:22:47.624975995 +0200
  66 +++ w3c-libwww-5.4.2/Library/src/Makefile.am    2021-09-29 22:22:47.701642460 +0200
  67 @@ -267,11 +267,7 @@ libwwwhttp_la_SOURCES = \
  68         HTPEP.c
  69
  70  libwwwhttp_la_LIBADD = libwwwmime.la libwwwstream.la libwwwcore.la libwwwutils.la \
  71 -       ../../modules/md5/libmd5.la
  72 -
  73 -libwwwhttp_la_CPPFLAGS = \
  74 -       -I/usr/local/include \
  75 -       -I${top_srcdir}/modules/md5
  76 +       @LIBWWWMD5@
  77
  78  libwwwnews_la_SOURCES = \
  79         WWWNews.h \
  80 @@ -427,8 +423,6 @@ libwwwsql_la_LDFLAGS = -rpath $(libdir)
  81  libwwwsql_la_LIBADD = libwwwcore.la libwwwutils.la $(MYSQL_LIBS)
  82
  83  libwwwsql_la_CPPFLAGS = \
  84 -       -I/usr/local/include \
  85 -       -I${top_srcdir}/modules/md5 \
  86         $(MYSQL_CFLAGS)
  87
  88  BUILT_SOURCES = \
  89 diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Robot/src/Makefile.am w3c-libwww-5.4.2/Robot/src/Makefile.am
  90 --- w3c-libwww-5.4.2.org/Robot/src/Makefile.am  2017-06-24 07:51:38.000000000 +0200
  91 +++ w3c-libwww-5.4.2/Robot/src/Makefile.am      2021-09-29 22:22:47.701642460 +0200
  92 @@ -21,7 +21,7 @@ webbot_LDADD = \
  93         $(top_builddir)/Library/src/libwwwcore.la \
  94         $(top_builddir)/Library/src/libwwwutils.la \
  95         -lm @LIBWWWXML@ @LIBWWWZIP@ @LIBWWWWAIS@ \
  96 -       @LIBWWWSQL@ @LIBWWWMD5@ @LIBWWWSSL@ \
  97 +       @LIBWWWSQL@ @LIBWWWSSL@ \
  98         $(MYSQL_LIBS)
  99
 100  SUBDIRS = windows
 101 @@ -71,8 +71,6 @@ purify: $(webbot_OBJECTS) $(webbot_DEPEN
 102         $(CC) $(LDFLAGS) -o purify $(webbot_OBJECTS) \
 103         -lm \
 104         ../../Library/src/.libs/libwww.a \
 105 -       ../../modules/md5/.libs/libmd5.a \
 106 -       ../../modules/expat/.libs/libexpat.a
 107         $(LIBS)
 108
 109
 110 diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/configure.ac w3c-libwww-5.4.2/configure.ac
 111 --- w3c-libwww-5.4.2.org/configure.ac   2017-06-24 08:11:09.000000000 +0200
 112 +++ w3c-libwww-5.4.2/configure.ac       2021-09-29 22:22:47.701642460 +0200
 113 @@ -643,15 +643,15 @@ AC_ARG_WITH(md5,
 114      AC_MSG_RESULT(yes)
 115      AC_DEFINE(HT_MD5, 1, [Define to enable MD5 for HTTP access authentication.])
 116      WWWMD5="libmd5.la"
 117 -    LWWWMD5="-lmd5"
 118 -    LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
 119 +    LWWWMD5="-lcrypto"
 120 +    LIBWWWMD5='-lcrypto'
 121      ;;
 122    esac ],
 123    AC_MSG_RESULT(yes)
 124    AC_DEFINE(HT_MD5)
 125    WWWMD5="libmd5.la"
 126 -  LWWWMD5="-lmd5"
 127 -  LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
 128 +  LWWWMD5="-lcrypto"
 129 +  LIBWWWMD5='-lcrypto'
 130  )
 131  AC_SUBST(WWWMD5)
 132  AC_SUBST(LWWWMD5)
 133 diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/modules/Makefile.am w3c-libwww-5.4.2/modules/Makefile.am
 134 --- w3c-libwww-5.4.2.org/modules/Makefile.am    2017-06-24 07:51:38.000000000 +0200
 135 +++ w3c-libwww-5.4.2/modules/Makefile.am        2021-09-29 22:22:47.701642460 +0200
 136 @@ -5,5 +5,4 @@ DOCS := $(wildcard *.html *.gif)
 137  EXTRA_DIST = \
 138         $(DOCS)
 139
 140 -SUBDIRS = md5
 141