head 1.4; access; symbols pkgsrc-2018Q1:1.3.0.120 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.118 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.116 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.112 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.110 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.108 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.106 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.104 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.102 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.100 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.98 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.96 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.94 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.92 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.90 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.88 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.86 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.84 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.82 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.80 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.78 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.76 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.74 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.72 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.70 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.68 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.66 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.64 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.62 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.60 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.58 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.56 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.54 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.52 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.50 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.48 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.46 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.36 pkgsrc-2008Q1:1.3.0.34 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.32 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.30 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.28 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.26 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.24 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.22 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.20 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.18 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.16 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.14 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.12 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.10 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.8 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.6 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.4 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.1.0.4 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.2 netbsd-1-6-1-base:1.1; locks; strict; comment @# @; 1.4 date 2018.06.24.16.54.59; author adam; state dead; branches; next 1.3; commitid gko1QjdfYW8xtyHA; 1.3 date 2004.02.29.11.49.55; author markd; state Exp; branches; next 1.2; 1.2 date 2004.02.12.20.31.35; author minskim; state Exp; branches; next 1.1; 1.1 date 2002.11.19.20.54.12; author reinoud; state Exp; branches; next ; desc @@ 1.4 log @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 @ text @$NetBSD: patch-am,v 1.3 2004/02/29 11:49:55 markd Exp $ --- configure.in.orig 2002-06-12 04:26:46.000000000 -0500 +++ configure.in @@@@ -237,6 +237,8 @@@@ AC_CHECK_FUNC(unlink) fi fi +dnl AC_CHECK_FUNC(unlink, , AC_CHECK_FUNC(remove, AC_DEFINE(unlink, remove))) + dnl Checks for configuration arguments AC_MSG_CHECKING(whether to support direct WAIS access.) AC_ARG_WITH(wais, @@@@ -330,6 +332,11 @@@@ AC_ARG_WITH(regex, AC_DEFINE(HT_POSIX_REGEX) if test "x$withval" = "xyes"; then AC_CHECK_LIB(rx, regexec, [ LIBS="-lrx $LIBS" ] ) + AC_TRY_LINK([], + [ regexec(); ], + [], + [ AC_CHECK_LIB(rx, regexec, [ LIBS="-lrx $LIBS" ] ) ] ) + else AC_ADDLIB($withval) AC_TRY_LINK([], @@@@ -532,27 +539,39 @@@@ AC_ARG_WITH(md5, [ case "$withval" in no) AC_MSG_RESULT(no) + MD5DIR="" WWWMD5="" LWWWMD5="" LIBWWWMD5="" + LIBMD5DEP="" + LIBMD5INC="" + AC_CHECK_LIB(c, MD5Init, [:], + [ AC_CHECK_LIB(md5, MD5Init, [ LWWWMD5="-lmd5"; LIBWWWMD5="-lmd5"], [ AC_MSG_ERROR(Could not find md5 functions. You need to compile in the md5 library.) ] ) ] ) ;; *) AC_MSG_RESULT(yes) AC_DEFINE(HT_MD5) + MD5DIR="md5" WWWMD5="libmd5.la" LWWWMD5="-lmd5" LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la' + LIBMD5INC='-I${top_srcdir}/modules/md5' + LIBMD5DEP="../../modules/md5/libmd5.la" ;; esac ], AC_MSG_RESULT(yes) AC_DEFINE(HT_MD5) + MD5DIR="md5" WWWMD5="libmd5.la" LWWWMD5="-lmd5" LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la' ) +AC_SUBST(MD5DIR) AC_SUBST(WWWMD5) AC_SUBST(LWWWMD5) AC_SUBST(LIBWWWMD5) +AC_SUBST(LIBMD5INC) +AC_SUBST(LIBMD5DEP) AC_MSG_CHECKING(whether we include WebDAV support.) AC_ARG_WITH(dav, @@@@ -609,31 +628,9 @@@@ AC_SUBST(MYEXT) -dnl Checks for libwww and OpenSSL: -AC_MSG_CHECKING(whether we can find OpenSSL) -dnl find the ssl library dir (empirical) -if test -d '/usr/local/ssl/lib'; then - ssllib="-L/usr/local/ssl/lib -lssl -lcrypto" -else - ssllib="-L/usr/lib -lssl -lcrypto" -fi -dnl find the ssl include dir (empirical) -if test -d '/usr/local/ssl/include'; then - sslinc="-I/usr/local/ssl/include" -elif test -d '/usr/local/openssl/include'; then - sslinc="-I/usr/local/openssl/include" -elif test -d '/usr/local/include/openssl'; then - sslinc="-I/usr/local/include/openssl" -elif test -d '/usr/include/ssl'; then - sslinc="-I/usr/include/ssl" -elif test -d '/usr/include/openssl'; then - sslinc="-I/usr/include/openssl" -else - sslinc="" -fi +dnl Checks for OpenSSL: +AC_MSG_CHECKING(whether to support OpenSSL.) WWWSSL="" -SSLINC="" -LIBSSL="" LWWWSSL="" LIBWWWSSL="" WWWSSLEX="" @@@@ -645,10 +642,35 @@@@ AC_ARG_WITH(ssl, ;; *) if test "x$withval" = "xyes"; then - withval=$ssllib - SSLINC=$sslinc + dnl find the ssl library dir (empirical) + if test -d '/usr/local/ssl/lib'; then + ssllib="-L/usr/local/ssl/lib -lssl -lcrypto" + else + ssllib="-L/usr/lib -lssl -lcrypto" + fi + dnl find the ssl include dir (empirical) + if test -d '/usr/local/ssl/include'; then + sslinc="-I/usr/local/ssl/include" + elif test -d '/usr/local/openssl/include'; then + sslinc="-I/usr/local/openssl/include" + elif test -d '/usr/local/include/openssl'; then + sslinc="-I/usr/local/include/openssl" + elif test -d '/usr/include/ssl'; then + sslinc="-I/usr/include/ssl" + elif test -d '/usr/include/openssl'; then + sslinc="-I/usr/include/openssl" + else + sslinc="" + fi + SSLINC="$sslinc" + SSLLIBS="$ssllib" + else + SSLINC="-I${withval}/include/openssl -I${withval}/include" + SSLLIBS="-L${withval}/lib -lssl -lcrypto -Wl,-R${withval}/lib" + fi - LIBS="$LIBS $withval" + SAVED_LIBS="${LIBS}" + LIBS="${LIBS} ${SSLLIBS}" AC_TRY_LINK([], [ SSL_library_init(); ], [], @@@@ -663,6 +685,7 @@@@ AC_ARG_WITH(ssl, [ AC_MSG_RESULT(no) ]) AC_SUBST(WWWSSL) AC_SUBST(SSLINC) +AC_SUBST(SSLLIBS) AC_SUBST(LWWWSSL) AC_SUBST(LIBWWWSSL) AC_SUBST(WWWSSLEX) @ 1.3 log @Some shells don't like: if test -x /bin/true; then else so replace with: if test -x /bin/true; then : else From Roland Illig in a posting to "tech-pkg" Also add missing openssl/buildlink2.mk to buildlink2.mk. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.2 2004/02/12 20:31:35 minskim Exp $ @ 1.2 log @Replace configure with the one generated by newer autoconf, and adjust Makefile accordingly. This makes libwww build again with libtool-1.5.2. The problem was reported by reed@@ in PR pkg/24391. @ text @d1 1 a1 1 $NetBSD$ d36 1 a36 1 + AC_CHECK_LIB(c, MD5Init, [ ], @ 1.1 log @Update of the libwww package to the w3c-libwww-5.4.0 distro as found on w3c.org. It features some bug fixes and new function calls that are used in the new Amaya f.e. Tested on Alpha @ text @d3 1 a3 1 --- configure.in.orig Wed Jun 12 11:26:46 2002 d100 1 a100 1 @@@@ -645,14 +642,40 @@@@ AC_ARG_WITH(ssl, d135 1 a135 1 + LIBS="${SSLLIBS}" d139 1 a139 6 [ AC_MSG_ERROR(Could not find the $withval libraries. You must first install openSSL.) ]) + LIBS="${SAVED_LIBS}" AC_MSG_RESULT(yes) WWWSSL="libwwwssl.la" LWWWSSL="-lwwwssl" @@@@ -663,6 +686,7 @@@@ AC_ARG_WITH(ssl, @