commit 28a514501c0597b5157db5b3af7c4d2bd2e17f62
Author: Jan Rękorajski <[email protected]>
Date: Wed Sep 29 22:25:09 2021 +0200
- rediff patches, rebuild with openssl 3.0.0, rel 6
w3c-libwww-link.patch | 52 ++++++-------
w3c-libwww-system-libmd5.patch | 164 ++++++++++++++++++++---------------------
w3c-libwww.spec | 2 +-
3 files changed, 109 insertions(+), 109 deletions(-)
---
diff --git a/w3c-libwww.spec b/w3c-libwww.spec
index 597e7f1..e19b606 100644
--- a/w3c-libwww.spec
+++ b/w3c-libwww.spec
@@ -9,7 +9,7 @@ Summary(ru.UTF-8): HTTP-библиотека общеупотребительн
Summary(uk.UTF-8): HTTP-бібліотека загальновживаного коду
Name: w3c-libwww
Version: 5.4.2
-Release: 5
+Release: 6
License: W3C (see:
http://www.w3.org/Consortium/Legal/copyright-software.html)
Group: Libraries
Source0: http://www.w3.org/Library/Distribution/%{name}-%{version}.tgz
diff --git a/w3c-libwww-link.patch b/w3c-libwww-link.patch
index 5eda14c..3978de0 100644
--- a/w3c-libwww-link.patch
+++ b/w3c-libwww-link.patch
@@ -1,9 +1,10 @@
Add inter-library linking.
HTBind.* moved from libwwwfile to libwwwdir in order to break circular
dependencies.
---- w3c-libwww-5.4.2/Library/src/Makefile.am.orig 2018-02-17
23:07:29.681038241 +0100
-+++ w3c-libwww-5.4.2/Library/src/Makefile.am 2018-02-17 23:08:36.487704147
+0100
-@@ -6,23 +6,23 @@
+diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/src/Makefile.am
w3c-libwww-5.4.2/Library/src/Makefile.am
+--- w3c-libwww-5.4.2.org/Library/src/Makefile.am 2021-09-29
22:22:47.424976516 +0200
++++ w3c-libwww-5.4.2/Library/src/Makefile.am 2021-09-29 22:22:47.498309658
+0200
+@@ -6,23 +6,23 @@ lib_LTLIBRARIES = \
libwwwutils.la \
libwwwcore.la \
libwwwtrans.la \
@@ -32,7 +33,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to break
circular dependenc
@WWWWAIS@ \
@WWWSQL@
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,7 @@ EXTRA_LTLIBRARIES = \
libwwwdav.la \
libwwwsql.la
@@ -41,7 +42,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to break
circular dependenc
# .h files are distributed but originally are made from the
# self-documenting hypertext files.
-@@ -144,6 +144,8 @@
+@@ -144,6 +144,8 @@ libwwwcore_la_SOURCES = \
HTWWWStr.h \
HTWWWStr.c
@@ -50,7 +51,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to break
circular dependenc
libwwwtrans_la_SOURCES = \
WWWTrans.h \
HTANSI.h \
-@@ -159,6 +161,8 @@
+@@ -159,6 +161,8 @@ libwwwtrans_la_SOURCES = \
HTWriter.h \
HTWriter.c
@@ -59,7 +60,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to break
circular dependenc
libwwwstream_la_SOURCES = \
WWWStream.h \
HTConLen.h \
-@@ -182,22 +186,26 @@
+@@ -182,22 +186,26 @@ libwwwstream_la_SOURCES = \
HTXParse.h \
HTXParse.c
@@ -88,7 +89,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to break
circular dependenc
libwwwftp_la_SOURCES = \
WWWFTP.h \
HTFTP.h \
-@@ -205,11 +213,15 @@
+@@ -205,11 +213,15 @@ libwwwftp_la_SOURCES = \
HTFTPDir.h \
HTFTPDir.c
@@ -104,7 +105,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to
break circular dependenc
libwwwmime_la_SOURCES = \
WWWMIME.h \
HTBound.h \
-@@ -226,6 +238,8 @@
+@@ -226,6 +238,8 @@ libwwwmime_la_SOURCES = \
HTMIMImp.c \
HTMulpar.h
@@ -113,7 +114,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to
break circular dependenc
libwwwhttp_la_SOURCES = \
WWWHTTP.h \
HTTPUtil.h \
-@@ -252,7 +266,7 @@
+@@ -252,7 +266,7 @@ libwwwhttp_la_SOURCES = \
HTPEP.h \
HTPEP.c
@@ -122,7 +123,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to
break circular dependenc
../../modules/md5/libmd5.la
libwwwhttp_la_CPPFLAGS = \
-@@ -270,11 +284,15 @@
+@@ -270,11 +284,15 @@ libwwwnews_la_SOURCES = \
HTNewsRq.h \
HTNewsRq.c
@@ -138,7 +139,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to
break circular dependenc
libwwwwais_la_SOURCES = \
WWWWAIS.h \
HTWAIS.h \
-@@ -283,6 +301,7 @@
+@@ -283,6 +301,7 @@ libwwwwais_la_SOURCES = \
HTWSRC.c
libwwwwais_la_LDFLAGS = -rpath $(libdir)
@@ -146,7 +147,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to
break circular dependenc
libwwwhtml_la_SOURCES = \
WWWHTML.h \
-@@ -306,15 +325,21 @@
+@@ -306,15 +325,21 @@ libwwwhtml_la_SOURCES = \
HTStyle.h \
HTStyle.c
@@ -168,7 +169,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to
break circular dependenc
libwwwapp_la_SOURCES = \
WWWApp.h \
HTAccess.h \
-@@ -338,11 +363,20 @@
+@@ -338,11 +363,20 @@ libwwwapp_la_SOURCES = \
HTRules.h \
HTRules.c
@@ -189,7 +190,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to
break circular dependenc
libwwwmux_la_SOURCES = \
WWWMux.h \
HTDemux.h \
-@@ -353,11 +387,14 @@
+@@ -353,11 +387,14 @@ libwwwmux_la_SOURCES = \
HTMuxTx.h \
HTMuxTx.c
@@ -204,7 +205,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to
break circular dependenc
libwwwxml_la_SOURCES = \
WWWXML.h \
-@@ -366,9 +403,8 @@
+@@ -366,9 +403,8 @@ libwwwxml_la_SOURCES = \
HTXML.h \
HTXML.c
@@ -215,7 +216,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to
break circular dependenc
libwwwzip_la_SOURCES = \
WWWZip.h \
-@@ -377,6 +413,7 @@
+@@ -377,6 +413,7 @@ libwwwzip_la_SOURCES = \
HTZip.c
libwwwzip_la_LDFLAGS = -rpath $(libdir)
@@ -223,7 +224,7 @@ HTBind.* moved from libwwwfile to libwwwdir in order to
break circular dependenc
libwwwsql_la_SOURCES = \
WWWSQL.h \
-@@ -386,7 +423,8 @@
+@@ -386,7 +423,8 @@ libwwwsql_la_SOURCES = \
HTSQLLog.h \
HTSQLLog.c
@@ -233,10 +234,10 @@ HTBind.* moved from libwwwfile to libwwwdir in order to
break circular dependenc
libwwwsql_la_CPPFLAGS = \
-I/usr/local/include \
---- w3c-libwww-5.4.2/Library/src/SSL/Makefile.am.orig 2017-06-24
07:51:38.000000000 +0200
-+++ w3c-libwww-5.4.2/Library/src/SSL/Makefile.am 2018-02-18
11:29:09.440530134 +0100
-@@ -39,7 +39,10 @@
- HTSSLhttps.h \
+diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/src/SSL/Makefile.am
w3c-libwww-5.4.2/Library/src/SSL/Makefile.am
+--- w3c-libwww-5.4.2.org/Library/src/SSL/Makefile.am 2017-06-24
07:51:38.000000000 +0200
++++ w3c-libwww-5.4.2/Library/src/SSL/Makefile.am 2021-09-29
22:22:47.498309658 +0200
+@@ -40,6 +40,9 @@ libwwwssl_la_SOURCES = \
HTSSLhttps.c
libwwwssl_la_LDFLAGS = -rpath $(libdir)
@@ -246,9 +247,10 @@ HTBind.* moved from libwwwfile to libwwwdir in order to
break circular dependenc
LDADD = \
libwwwssl.la
---- w3c-libwww-5.4.2/PICS-client/src/Makefile.am.orig 2017-06-24
07:51:38.000000000 +0200
-+++ w3c-libwww-5.4.2/PICS-client/src/Makefile.am 2018-02-18
11:32:54.180527570 +0100
-@@ -30,6 +30,10 @@
+diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/PICS-client/src/Makefile.am
w3c-libwww-5.4.2/PICS-client/src/Makefile.am
+--- w3c-libwww-5.4.2.org/PICS-client/src/Makefile.am 2017-06-24
07:51:38.000000000 +0200
++++ w3c-libwww-5.4.2/PICS-client/src/Makefile.am 2021-09-29
22:22:47.498309658 +0200
+@@ -30,6 +30,10 @@ libpics_la_SOURCES = \
CSMacRed.c CSMem.c CSApp.c \
CSParse.c CSUsrLst.c CSUser.c
diff --git a/w3c-libwww-system-libmd5.patch b/w3c-libwww-system-libmd5.patch
index c80f2dc..48581ff 100644
--- a/w3c-libwww-system-libmd5.patch
+++ b/w3c-libwww-system-libmd5.patch
@@ -1,48 +1,7 @@
---- w3c-libwww-5.4.2/configure.ac.orig 2008-09-17 13:29:33.000000000 +0200
-+++ w3c-libwww-5.4.2/configure.ac 2008-09-17 13:47:03.000000000 +0200
-@@ -541,15 +541,15 @@
- AC_MSG_RESULT(yes)
- AC_DEFINE(HT_MD5, 1, [Define to enable MD5 for HTTP access
authentication.])
- WWWMD5="libmd5.la"
-- LWWWMD5="-lmd5"
-- LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
-+ LWWWMD5="-lcrypto"
-+ LIBWWWMD5='-lcrypto'
- ;;
- esac ],
- AC_MSG_RESULT(yes)
- AC_DEFINE(HT_MD5)
- WWWMD5="libmd5.la"
-- LWWWMD5="-lmd5"
-- LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
-+ LWWWMD5="-lcrypto"
-+ LIBWWWMD5='-lcrypto'
- )
- AC_SUBST(WWWMD5)
- AC_SUBST(LWWWMD5)
---- w3c-libwww-5.4.2/Robot/src/Makefile.am.orig 2018-02-16
22:55:46.492032806 +0100
-+++ w3c-libwww-5.4.2/Robot/src/Makefile.am 2018-02-17 09:24:56.628268433
+0100
-@@ -21,7 +21,7 @@
- $(top_builddir)/Library/src/libwwwcore.la \
- $(top_builddir)/Library/src/libwwwutils.la \
- -lm @LIBWWWXML@ @LIBWWWZIP@ @LIBWWWWAIS@ \
-- @LIBWWWSQL@ @LIBWWWMD5@ @LIBWWWSSL@ \
-+ @LIBWWWSQL@ @LIBWWWSSL@ \
- $(MYSQL_LIBS)
-
- SUBDIRS = windows
-@@ -71,8 +71,6 @@
- $(CC) $(LDFLAGS) -o purify $(webbot_OBJECTS) \
- -lm \
- ../../Library/src/.libs/libwww.a \
-- ../../modules/md5/.libs/libmd5.a \
-- ../../modules/expat/.libs/libexpat.a
- $(LIBS)
-
-
---- w3c-libwww-5.4.2/Library/Examples/Makefile.am.orig 2017-06-24
07:51:37.000000000 +0200
-+++ w3c-libwww-5.4.2/Library/Examples/Makefile.am 2018-02-17
09:25:25.091601441 +0100
-@@ -28,7 +28,7 @@
+diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/Examples/Makefile.am
w3c-libwww-5.4.2/Library/Examples/Makefile.am
+--- w3c-libwww-5.4.2.org/Library/Examples/Makefile.am 2017-06-24
07:51:37.000000000 +0200
++++ w3c-libwww-5.4.2/Library/Examples/Makefile.am 2021-09-29
22:22:47.701642460 +0200
+@@ -28,7 +28,7 @@ LDADD = \
../src/libwwwutils.la \
@LIBWWWDAV@ \
@LIBWWWSSL@ \
@@ -51,7 +10,7 @@
AM_CPPFLAGS = \
-I$(srcdir)/../src \
-@@ -67,8 +67,6 @@
+@@ -67,8 +67,6 @@ purify: $(mget_OBJECTS) $(mget_DEPENDENC
../src/.libs/libwwwutils.a \
../src/.libs/libwwwdav.a \
../src/.libs/libwwwzip.a \
@@ -60,29 +19,10 @@
$(LIBS)
---- w3c-libwww-5.4.0/Library/src/HTDigest.h.orig 2002-06-12
11:31:20.000000000 +0200
-+++ w3c-libwww-5.4.0/Library/src/HTDigest.h 2008-09-17 13:42:22.000000000
+0200
-@@ -39,7 +39,7 @@
- /* Library include files */
- #include "WWWLib.h"
- /* add the MD algorithm header files here below */
--#include "md5.h"
-+#include <openssl/md5.h>
-
- #ifdef __cplusplus
- extern "C" {
-@@ -60,7 +60,7 @@
- typedef struct _HTDigestContext {
- int algorithm;
- union {
-- MD5_CTX md5;
-+ MD5_CTX md5;
- } context;
- } HTDigestContext;
-
---- w3c-libwww-5.4.0/Library/src/HTDigest.c.orig 1999-02-05
18:31:45.000000000 +0100
-+++ w3c-libwww-5.4.0/Library/src/HTDigest.c 2008-09-17 13:44:19.000000000
+0200
-@@ -29,7 +29,7 @@
+diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/src/HTDigest.c
w3c-libwww-5.4.2/Library/src/HTDigest.c
+--- w3c-libwww-5.4.2.org/Library/src/HTDigest.c 2017-06-24
07:51:38.000000000 +0200
++++ w3c-libwww-5.4.2/Library/src/HTDigest.c 2021-09-29 22:22:47.701642460
+0200
+@@ -29,7 +29,7 @@ PUBLIC BOOL HTDigest_init (HTDigestConte
switch (digesttype) {
case HTDaMD5:
@@ -91,7 +31,7 @@
break;
default:
return NO;
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ PUBLIC BOOL HTDigest_update (HTDigestCon
if (context) {
switch (context->algorithm) {
case HTDaMD5:
@@ -100,7 +40,7 @@
inputLen);
break;
default:
-@@ -60,7 +60,7 @@
+@@ -60,7 +60,7 @@ PUBLIC BOOL HTDigest_final (unsigned cha
if (context) {
switch (context->algorithm) {
case HTDaMD5:
@@ -109,17 +49,22 @@
break;
default:
return NO;
---- w3c-libwww-5.4.0/modules/Makefile.am.orig 2008-09-17 14:10:11.000000000
+0200
-+++ w3c-libwww-5.4.0/modules/Makefile.am 2008-09-17 14:27:10.000000000
+0200
-@@ -5,5 +5,4 @@
- EXTRA_DIST = \
- $(DOCS)
-
--SUBDIRS = md5
+diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/src/HTDigest.h
w3c-libwww-5.4.2/Library/src/HTDigest.h
+--- w3c-libwww-5.4.2.org/Library/src/HTDigest.h 2017-06-24
07:52:15.000000000 +0200
++++ w3c-libwww-5.4.2/Library/src/HTDigest.h 2021-09-29 22:22:47.701642460
+0200
+@@ -39,7 +39,7 @@ Library.
+ /* Library include files */
+ #include "WWWLib.h"
+ /* add the MD algorithm header files here below */
+-#include "md5.h"
++#include <openssl/md5.h>
---- w3c-libwww-5.4.2/Library/src/Makefile.am.orig 2018-02-17
22:22:57.834402083 +0100
-+++ w3c-libwww-5.4.2/Library/src/Makefile.am 2018-02-17 22:24:20.137734478
+0100
-@@ -267,11 +267,7 @@
+ #ifdef __cplusplus
+ extern "C" {
+diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Library/src/Makefile.am
w3c-libwww-5.4.2/Library/src/Makefile.am
+--- w3c-libwww-5.4.2.org/Library/src/Makefile.am 2021-09-29
22:22:47.624975995 +0200
++++ w3c-libwww-5.4.2/Library/src/Makefile.am 2021-09-29 22:22:47.701642460
+0200
+@@ -267,11 +267,7 @@ libwwwhttp_la_SOURCES = \
HTPEP.c
libwwwhttp_la_LIBADD = libwwwmime.la libwwwstream.la libwwwcore.la
libwwwutils.la \
@@ -132,8 +77,8 @@
libwwwnews_la_SOURCES = \
WWWNews.h \
-@@ -422,8 +418,6 @@
- libwwwsql_la_LIBADD = $(MYSQL_LIBS)
+@@ -427,8 +423,6 @@ libwwwsql_la_LDFLAGS = -rpath $(libdir)
+ libwwwsql_la_LIBADD = libwwwcore.la libwwwutils.la $(MYSQL_LIBS)
libwwwsql_la_CPPFLAGS = \
- -I/usr/local/include \
@@ -141,3 +86,56 @@
$(MYSQL_CFLAGS)
BUILT_SOURCES = \
+diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/Robot/src/Makefile.am
w3c-libwww-5.4.2/Robot/src/Makefile.am
+--- w3c-libwww-5.4.2.org/Robot/src/Makefile.am 2017-06-24 07:51:38.000000000
+0200
++++ w3c-libwww-5.4.2/Robot/src/Makefile.am 2021-09-29 22:22:47.701642460
+0200
+@@ -21,7 +21,7 @@ webbot_LDADD = \
+ $(top_builddir)/Library/src/libwwwcore.la \
+ $(top_builddir)/Library/src/libwwwutils.la \
+ -lm @LIBWWWXML@ @LIBWWWZIP@ @LIBWWWWAIS@ \
+- @LIBWWWSQL@ @LIBWWWMD5@ @LIBWWWSSL@ \
++ @LIBWWWSQL@ @LIBWWWSSL@ \
+ $(MYSQL_LIBS)
+
+ SUBDIRS = windows
+@@ -71,8 +71,6 @@ purify: $(webbot_OBJECTS) $(webbot_DEPEN
+ $(CC) $(LDFLAGS) -o purify $(webbot_OBJECTS) \
+ -lm \
+ ../../Library/src/.libs/libwww.a \
+- ../../modules/md5/.libs/libmd5.a \
+- ../../modules/expat/.libs/libexpat.a
+ $(LIBS)
+
+
+diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/configure.ac
w3c-libwww-5.4.2/configure.ac
+--- w3c-libwww-5.4.2.org/configure.ac 2017-06-24 08:11:09.000000000 +0200
++++ w3c-libwww-5.4.2/configure.ac 2021-09-29 22:22:47.701642460 +0200
+@@ -643,15 +643,15 @@ AC_ARG_WITH(md5,
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HT_MD5, 1, [Define to enable MD5 for HTTP access
authentication.])
+ WWWMD5="libmd5.la"
+- LWWWMD5="-lmd5"
+- LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
++ LWWWMD5="-lcrypto"
++ LIBWWWMD5='-lcrypto'
+ ;;
+ esac ],
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HT_MD5)
+ WWWMD5="libmd5.la"
+- LWWWMD5="-lmd5"
+- LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
++ LWWWMD5="-lcrypto"
++ LIBWWWMD5='-lcrypto'
+ )
+ AC_SUBST(WWWMD5)
+ AC_SUBST(LWWWMD5)
+diff -urNp -x '*.orig' w3c-libwww-5.4.2.org/modules/Makefile.am
w3c-libwww-5.4.2/modules/Makefile.am
+--- w3c-libwww-5.4.2.org/modules/Makefile.am 2017-06-24 07:51:38.000000000
+0200
++++ w3c-libwww-5.4.2/modules/Makefile.am 2021-09-29 22:22:47.701642460
+0200
+@@ -5,5 +5,4 @@ DOCS := $(wildcard *.html *.gif)
+ EXTRA_DIST = \
+ $(DOCS)
+
+-SUBDIRS = md5
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/w3c-libwww.git/commitdiff/28a514501c0597b5157db5b3af7c4d2bd2e17f62
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
