pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/libwww libwww: updated to 5.4.2



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f2604d1fc8f
branches:  trunk
changeset: 382259:9f2604d1fc8f
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun Jun 24 16:54:59 2018 +0000

description:
libwww: updated to 5.4.2

5.4.2:
Unknown changes.

Changes with libwww 5.4.1
* Removed the expat source code in favor of linking against
the global system expat library to avoid having to track
security advisories in that library
* Updated expat to 2.2.0
* Updated autotools to the current versions
* Library/src/HTSQL.c: add missing mysql_init to HTSQL_connect reported by Xavier Torne
* configure.ac, Library/src/Makefile.am, Library/cvs2sql/Makefile.am,
  Robot/src/Makefile.am:
  modify configure scripts for mysql_config based autoconf processing
* Library/src/HTSQL.c, Library/src/HTSQL.html, Library/src/HTSQLLog.c: remove
  mysql directory from include directiv
* Robot/src/RobotMain.c: added flag MR_KEEP_META for -lm last modified option
  detected by Jan Huta?
* Robot/src/RobotMain.c: added flag MR_KEEP_META for -title option
  detected by Jan Huta?
* close leak in HTBound process_boundary() detected by Sam Varshavchik
  using valgrind; excised old #if 0 snippets from HTMIME.c
* Library/src/HTCookie.c: add private function HTCookie_splitPair to
  split a KEY=VALUE pair, from Jesse Morgan
* configure.ac: remove unecessary check for appkit.h as
  suggested by Roger Persson
* Library/src/wwwsys.html: change genuine angle bracket characters
  into the angle bracket entities, thanks to Bobby Jack
* Library/src/HT*.html, Library/src/SSL/HT*.html: wrap
  all header files with extern "C"
* Library/src/HTFile, configure.ac: add a basis for
  addressing Ben's security concerns
* Library/src/HTBound.c: libwww security advisory fix from
  Sam Varshavchik, fix double-counting of processed bytes,
  rewrote HTBoundary_put_block, to fix problematic HTTP 1.1
  byte range requests
* Library/src/: HTAlert.c, HTHeader.c, HTInit.c, HTNet.c,
  HTProfil.c, HTProt.c, HTTrans.c: Patch to greatly speed up
  repeated requests, from Arthur Smith
* Library/src/HTSQL.c: modifications to compile without using
  deprecated mysql functions
* config/: config.sub, ltmain.sh: updates for recent version of
  libtool
* INSTALL.html, Library/src/HTEvtLst.c: cleaning
* libwww-config.in: include -lwwwssl, thanks to mgoddard at
  itgs-presearch.com
* Library/src/SSL/HTSSLWriter.c: avoids an eternal loop in libwww
* Library/src/SSL/HTSSL.html, Robot/src/RobotMain.c: fix for webbot
  -v option check and documentation addition
* configure.ac, Library/src/SSL/HTSSL.c,
  Library/src/SSL/windows/wwwssl.def, Robot/src/HTRobMan.html,
  Robot/src/Makefile.am, Robot/src/RobotMain.c: basic support for
  client side certificates using PEM format
* Library/src/SSL/: HTSSL.c, HTSSLReader.c, HTSSLWriter.c: add
  openssl to include for ssl.h and rand.h
* config/: config.guess, config.sub, ltmain.sh: update after
  running libtoolize
* Robot/src/Makefile.am: use SSL directory for libwwwssl.la
* Robot/src/RobotMain.c: include HTSSL.h
* configure.ac: fix aclocal underquoting warnings
* Robot/src/: RobotMain.c, Makefile.am: update to enable https
  protocol
* Library/src/HTTPReq.c: fixed , to _ in HTTRACE call
* Library/src/HTTPReq.c: removed LIBWWW_USEIDN, because unnecessary
* modules/idn/unicode_template.c: forgot one file
* Library/src/HTDNS.html: moved IDN to main branch
* Library/src/HTDNS.c: moved IDN to main branch
* Library/src/HTTPReq.c: added "LIBWWW_USEIDN" conditional
* Library/src/HTTPReq.c: moved IDN to main branch
* Library/Overview.html: JK: Added the libwww survey results

diffstat:

 www/libwww/Makefile                              |   51 +-
 www/libwww/PLIST                                 |    5 +-
 www/libwww/distinfo                              |   38 +-
 www/libwww/options.mk                            |    4 +-
 www/libwww/patches/patch-Library_Makefile.in     |   15 +
 www/libwww/patches/patch-Library_src_HTMIMImp.c  |   15 +
 www/libwww/patches/patch-Library_src_HTStyle.c   |   15 +
 www/libwww/patches/patch-Library_src_SSL_HTSSL.c |   56 ++
 www/libwww/patches/patch-Library_src_wwwsys.h    |   72 +++
 www/libwww/patches/patch-aa                      |   11 -
 www/libwww/patches/patch-ab                      |   13 -
 www/libwww/patches/patch-ac                      |   13 -
 www/libwww/patches/patch-ad                      |   58 --
 www/libwww/patches/patch-ae                      |   19 -
 www/libwww/patches/patch-af                      |   70 ---
 www/libwww/patches/patch-ai                      |   13 -
 www/libwww/patches/patch-aj                      |   47 --
 www/libwww/patches/patch-ak                      |   10 -
 www/libwww/patches/patch-al                      |   33 -
 www/libwww/patches/patch-am                      |  146 ------
 www/libwww/patches/patch-an                      |   12 -
 www/libwww/patches/patch-ao                      |   21 -
 www/libwww/patches/patch-ap                      |  524 -----------------------
 www/libwww/patches/patch-aq                      |   13 -
 www/libwww/patches/patch-ar                      |   15 -
 www/libwww/patches/patch-as                      |   16 -
 www/libwww/patches/patch-configure               |   24 +
 www/libwww/patches/patch-libwww-config.in        |   15 +
 28 files changed, 246 insertions(+), 1098 deletions(-)

diffs (truncated from 1492 to 300 lines):

diff -r 14af610a9faa -r 9f2604d1fc8f www/libwww/Makefile
--- a/www/libwww/Makefile       Sun Jun 24 16:04:53 2018 +0000
+++ b/www/libwww/Makefile       Sun Jun 24 16:54:59 2018 +0000
@@ -1,38 +1,23 @@
-# $NetBSD: Makefile,v 1.91 2016/07/09 06:39:13 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2018/06/24 16:54:59 adam Exp $
 
-DISTNAME=              w3c-libwww-5.4.0
-PKGNAME=               libwww-5.4.0
-PKGREVISION=           17
-CATEGORIES=            www devel
-MASTER_SITES=          http://www.w3.org/Library/Distribution/
-EXTRACT_SUFX=          .tgz
-DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} libwww-configure-5.4.0nb2.gz
+DISTNAME=      w3c-libwww-5.4.2
+PKGNAME=       ${DISTNAME:S/^w3c-//}
+CATEGORIES=    www devel
+MASTER_SITES=  http://www.w3.org/Library/Distribution/
+EXTRACT_SUFX=  .tgz
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.w3.org/Library/
-COMMENT=               The W3C Reference Library
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.w3.org/Library/
+COMMENT=       The W3C Reference Library
+LICENSE=       w3c
 
-EXTRACT_ONLY=          ${DISTNAME}${EXTRACT_SUFX}
-SITES.libwww-configure-5.4.0nb2.gz=    ${MASTER_SITE_LOCAL}
-
+USE_LIBTOOL=           yes
 USE_TOOLS+=            automake14 gmake gzcat perl
-USE_LIBTOOL=           YES
-
-GNU_CONFIGURE=         YES
-CONFIGURE_ARGS+=       --with-zlib --without-x
-CONFIGURE_ARGS+=       --with-ssl=${SSLBASE:Q}
-
-.include "options.mk"
-
-post-extract:
-       gzcat ${DISTDIR}/libwww-configure-5.4.0nb2.gz > ${WRKSRC}/configure
-
-pre-configure:
-       chmod a+x ${WRKSRC}/configure
-.for f in aclocal.m4 configure stamp-h.in
-       touch ${WRKSRC}/${f}
-.endfor
-       cd ${WRKSRC} && automake
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-expat=${BUILDLINK_PREFIX.expat}
+CONFIGURE_ARGS+=       --with-ssl #=${SSLBASE:Q}
+CONFIGURE_ARGS+=       --with-zlib
+CONFIGURE_ARGS+=       --without-x
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -53,7 +38,9 @@
 .  endif
 .endif
 
+.include "options.mk"
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 14af610a9faa -r 9f2604d1fc8f www/libwww/PLIST
--- a/www/libwww/PLIST  Sun Jun 24 16:04:53 2018 +0000
+++ b/www/libwww/PLIST  Sun Jun 24 16:54:59 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 22:00:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/06/24 16:54:59 adam Exp $
 bin/libwww-config
 bin/w3c
 bin/webbot
@@ -161,7 +161,6 @@
 include/w3c-libwww/WWWXML.h
 include/w3c-libwww/WWWZip.h
 include/w3c-libwww/wwwsys.h
-include/w3c-libwww/xmlparse.h
 include/wwwconf.h
 ${PLIST.md5}lib/libmd5.la
 lib/libpics.la
@@ -185,8 +184,6 @@
 lib/libwwwutils.la
 lib/libwwwxml.la
 lib/libwwwzip.la
-lib/libxmlparse.la
-lib/libxmltok.la
 share/w3c-libwww/back.xbm
 share/w3c-libwww/binary.xbm
 share/w3c-libwww/binhex.xbm
diff -r 14af610a9faa -r 9f2604d1fc8f www/libwww/distinfo
--- a/www/libwww/distinfo       Sun Jun 24 16:04:53 2018 +0000
+++ b/www/libwww/distinfo       Sun Jun 24 16:54:59 2018 +0000
@@ -1,27 +1,13 @@
-$NetBSD: distinfo,v 1.27 2015/11/04 02:46:57 agc Exp $
+$NetBSD: distinfo,v 1.28 2018/06/24 16:54:59 adam Exp $
 
-SHA1 (libwww-configure-5.4.0nb2.gz) = de3292e2ec4034485b300845e7a0c0ef4ceb0199
-RMD160 (libwww-configure-5.4.0nb2.gz) = bead5840a43b85e7de79e1bf5e26fa997cf827e3
-SHA512 (libwww-configure-5.4.0nb2.gz) = 37609c70925c99cde5ab1b6a6d5051b701cb21cc813d7c05de3d10480492cd56963700b4c92f30789a143a4b906e72005c0f9c2e9463b913cc6d0afa6dcb671e
-Size (libwww-configure-5.4.0nb2.gz) = 155806 bytes
-SHA1 (w3c-libwww-5.4.0.tgz) = 2394cb4e0dc4e2313a9a0ddbf508e4b726e9af63
-RMD160 (w3c-libwww-5.4.0.tgz) = 12e55ecb2435f9048d627e56f8ae60d4c246648b
-SHA512 (w3c-libwww-5.4.0.tgz) = edc87430ca3061e7ea0a9d216a29eec8889c36d4dde59262d0751aea842f1682f1ae8a89bbcb0092d7e298643660ed1c7f9bec007fed8b1f84f3e6eb7e97c24b
-Size (w3c-libwww-5.4.0.tgz) = 1129121 bytes
-SHA1 (patch-aa) = fc0124c8995992536782e60ce67332c2dc505b10
-SHA1 (patch-ab) = 24db9ca337bd6768fa5b208186f7b55e555beb8f
-SHA1 (patch-ac) = d3b153c4360d5eb0439a9d328d259896937902df
-SHA1 (patch-ad) = b3c9eaf2e9eabe2ab68b8858f6f9dbe65d650ae4
-SHA1 (patch-ae) = 4130a9a20d806553a79e04c79d652b76ec1dce34
-SHA1 (patch-af) = ce044829940b51037ff37f717dbf92e96504a391
-SHA1 (patch-ai) = 95912fb5b836e4dce01b630f9e6e9c9f41d7bb72
-SHA1 (patch-aj) = 6148ae393aefcce54477b289835038b01a26a0ed
-SHA1 (patch-ak) = fb13a43105ee252a461d20b67d5841db6d247dde
-SHA1 (patch-al) = dae1e731f7a9ff36ef1f60f2a4a6cc97e359ae63
-SHA1 (patch-am) = 8252ce567efc056daa10af39eeca314f9a915f90
-SHA1 (patch-an) = e7195c25ce08e13e0c8b64b05b737e9a5f5157a8
-SHA1 (patch-ao) = b5489ae73d347c9a4e32a66344e12236e2023520
-SHA1 (patch-ap) = 506ee8ddd2e627aa6ba84b933ca39a6934b95689
-SHA1 (patch-aq) = f44086c50dfe3d5af714b6defcb40ac7a1ed36f1
-SHA1 (patch-ar) = ddbe9f7e7add849dcbdf215d0087bb3e314100c3
-SHA1 (patch-as) = cb88580f74998491eb822227af225055b0eeacee
+SHA1 (w3c-libwww-5.4.2.tgz) = 6bc3c0de4cd2e0d51b17789c9a86b5296ce44b2f
+RMD160 (w3c-libwww-5.4.2.tgz) = 7b6ecfbd84ca8b2ce3b19d3b60e9f6a75ea914f5
+SHA512 (w3c-libwww-5.4.2.tgz) = d0dbe2be106c4987a5131c22c300bd3fcb1dce1881d0009269dd4e3c8068da1c07e2b1ca4bfd181640f8b467d4a378a9036f9b385d3a28badbe22b2ed74e0e74
+Size (w3c-libwww-5.4.2.tgz) = 2630357 bytes
+SHA1 (patch-Library_Makefile.in) = f0ea0413c13501cfa7d038ebfe602d6bdbf02de4
+SHA1 (patch-Library_src_HTMIMImp.c) = 2f14df9867758c69f9e6110b16f75d017e032a8e
+SHA1 (patch-Library_src_HTStyle.c) = 2c42a00ce5ed0ff0f34e779582684805e47edce2
+SHA1 (patch-Library_src_SSL_HTSSL.c) = c170125b96ff3fc57e7b193b123b104ab45cb8c8
+SHA1 (patch-Library_src_wwwsys.h) = 25f39cf5afb6e4a2879a0f38129d8a450a863e72
+SHA1 (patch-configure) = 70a7d08b59361bb64069bb27cabfbc6dc2c47ec4
+SHA1 (patch-libwww-config.in) = 438821b7979712cf87781c38c930ab8e24ea1aad
diff -r 14af610a9faa -r 9f2604d1fc8f www/libwww/options.mk
--- a/www/libwww/options.mk     Sun Jun 24 16:04:53 2018 +0000
+++ b/www/libwww/options.mk     Sun Jun 24 16:54:59 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.3 2015/09/30 08:25:37 tnn Exp $
+# $NetBSD: options.mk,v 1.4 2018/06/24 16:54:59 adam Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.libwww
+PKG_OPTIONS_VAR=               PKG_OPTIONS.libwww
 PKG_OPTIONS_OPTIONAL_GROUPS+=  socks
 PKG_OPTIONS_GROUP.socks=       socks4 dante
 
diff -r 14af610a9faa -r 9f2604d1fc8f www/libwww/patches/patch-Library_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/libwww/patches/patch-Library_Makefile.in      Sun Jun 24 16:54:59 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Library_Makefile.in,v 1.1 2018/06/24 16:54:59 adam Exp $
+
+Build only necessary stuff.
+
+--- Library/Makefile.in.orig   2018-06-20 16:07:11.000000000 +0000
++++ Library/Makefile.in
+@@ -352,7 +352,7 @@ DOCS := $(wildcard *.html *.gif)
+ EXTRA_DIST = \
+       $(DOCS)
+ 
+-SUBDIRS = src User Examples External cvs2sql # Test
++SUBDIRS = src User # Examples External cvs2sql # Test
+ all: all-recursive
+ 
+ .SUFFIXES:
diff -r 14af610a9faa -r 9f2604d1fc8f www/libwww/patches/patch-Library_src_HTMIMImp.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/libwww/patches/patch-Library_src_HTMIMImp.c   Sun Jun 24 16:54:59 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Library_src_HTMIMImp.c,v 1.1 2018/06/24 16:54:59 adam Exp $
+
+Fix buidling.
+
+--- Library/src/HTMIMImp.c.orig        Mon Feb 22 16:10:11 1999
++++ Library/src/HTMIMImp.c
+@@ -226,7 +226,7 @@
+     int value = deflt;
+     if (start != NULL) {
+       start += strlen(needle);
+-      while isspace(*start) start++;
++      while (isspace(*start)) start++;
+       if (isdigit(*start)) {
+           char * end = start + 1;
+           char save;
diff -r 14af610a9faa -r 9f2604d1fc8f www/libwww/patches/patch-Library_src_HTStyle.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/libwww/patches/patch-Library_src_HTStyle.c    Sun Jun 24 16:54:59 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Library_src_HTStyle.c,v 1.1 2018/06/24 16:54:59 adam Exp $
+
+Define application-wide style sheet.
+
+--- Library/src/HTStyle.c.orig Mon Feb 22 16:10:12 1999
++++ Library/src/HTStyle.c
+@@ -18,6 +18,8 @@
+ #include "WWWUtil.h"
+ #include "HTStyle.h"
+ 
++PUBLIC HTStyleSheet * styleSheet;
++
+ struct _HTStyle {
+     char *    name;           /* Style name */
+     int               element;        /* Element (if any) that this style applies to */
diff -r 14af610a9faa -r 9f2604d1fc8f www/libwww/patches/patch-Library_src_SSL_HTSSL.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/libwww/patches/patch-Library_src_SSL_HTSSL.c  Sun Jun 24 16:54:59 2018 +0000
@@ -0,0 +1,56 @@
+$NetBSD: patch-Library_src_SSL_HTSSL.c,v 1.1 2018/06/24 16:54:59 adam Exp $
+
+Fix for OpenSSL 1.1.x.
+
+--- Library/src/SSL/HTSSL.c.orig       2018-06-24 13:38:32.023842509 +0000
++++ Library/src/SSL/HTSSL.c
+@@ -98,6 +98,7 @@ PRIVATE void apps_ssl_info_callback (SSL
+ PRIVATE int verify_callback (int ok, X509_STORE_CTX * ctx)
+ {
+     char buf[256];
++    int ctx_error;
+     X509 * err_cert = X509_STORE_CTX_get_current_cert(ctx);
+     int err = X509_STORE_CTX_get_error(ctx);
+     int depth = X509_STORE_CTX_get_error_depth(ctx);
+@@ -115,24 +116,24 @@ PRIVATE int verify_callback (int ok, X50
+           verify_error=X509_V_ERR_CERT_CHAIN_TOO_LONG;
+       }
+     }
+-    switch (ctx->error) {
++    switch (ctx_error = X509_STORE_CTX_get_error(ctx)) {
+ 
+     case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
+-      X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256);
++      X509_NAME_oneline(X509_get_issuer_name(X509_STORE_CTX_get0_cert(ctx)), buf, 256);
+       HTTRACE(PROT_TRACE, "issuer= %s\n" _ buf);
+       break;
+ 
+     case X509_V_ERR_CERT_NOT_YET_VALID:
+     case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
+       HTTRACE(PROT_TRACE, "notBefore=");
+-//    ASN1_TIME_print(bio_err,X509_get_notBefore(ctx->current_cert));
++//    ASN1_TIME_print(bio_err,X509_get_notBefore(X509_STORE_CTX_get0_cert(ctx)));
+       HTTRACE(PROT_TRACE, "\n");
+       break;
+ 
+     case X509_V_ERR_CERT_HAS_EXPIRED:
+     case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
+       HTTRACE(PROT_TRACE, "notAfter=");
+-//    ASN1_TIME_print(bio_err,X509_get_notAfter(ctx->current_cert));
++//    ASN1_TIME_print(bio_err,X509_get_notAfter(X509_STORE_CTX_get0_cert(ctx)));
+       HTTRACE(PROT_TRACE, "\n");
+       break;
+     }
+@@ -214,12 +215,6 @@ PUBLIC BOOL HTSSL_init (void)
+ 
+       /* select the protocol method */
+       switch (ssl_prot_method) {
+-      case HTSSL_V2:
+-        meth = SSLv2_client_method();
+-        break;
+-      case HTSSL_V3:
+-        meth = SSLv3_client_method();
+-        break;
+       case HTSSL_V23:
+         meth = SSLv23_client_method();
+         break;
diff -r 14af610a9faa -r 9f2604d1fc8f www/libwww/patches/patch-Library_src_wwwsys.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/libwww/patches/patch-Library_src_wwwsys.h     Sun Jun 24 16:54:59 2018 +0000
@@ -0,0 +1,72 @@
+$NetBSD: patch-Library_src_wwwsys.h,v 1.1 2018/06/24 16:54:59 adam Exp $
+
+Fix building.
+
+--- Library/src/wwwsys.h.orig  Wed Dec 20 05:00:07 2000
++++ Library/src/wwwsys.h
+@@ -925,6 +925,7 @@ Their existance is discovered by configu
+ #endif
+ 
+ /* appkit.h */
++#ifdef __NeXT__
+ #ifdef HAVE_APPKIT_APPKIT_H
+ #include <appkit/appkit.h>
+ #else
+@@ -932,6 +933,7 @@ Their existance is discovered by configu
+ #include <appkit.h>
+ #endif
+ #endif
++#endif
+ 
+ /* dn.h */
+ #ifdef HAVE_DN_H
+@@ -1225,25 +1227,24 @@ the SOCKS ones. Initial modification of 
+ #ifdef SOCKS4
+ #define connect               Rconnect
+ #define getsockname   Rgetsockname
+-#define getpeername   Rgetpeername
++/* #define getpeername        Rgetpeername */
+ #define bind          Rbind



Home | Main Index | Thread Index | Old Index