Update wwwoffle to 2.9j, PR pkg/51340.

Version 2.9j of WWWOFFLE released : Sat 23 Mar 2016
---------------------------------------------------

Bug Fixes
 Fix to remove compilation warnings for [gs]etres[ug]id() functions.
 Don't delete newlines from within quoted strings when modifying HTML.
 Accept 'Transfer-Encoding: Chunked' instead of '... chunked'.
 Increase the socket backlog to queue requests better.
 Documentation changes for mailing lists, web-page and e-mail addresses.
 Accept data from servers that use gzip encoding but don't send the tail.
 Improve the error messages for gnutls problems. [*]
 Some gnutls fixes and improvements. [*]
 Fix an error with chunked encoding and compression from slow servers.
 Fix HTML (and CSS) parsing problems related to media types.

Improvements:
 Increase the root certificate and fake certificates to 2048 bits. [*]
 Change the certificate hash function to SHA256 (SHA1 is deprecated). [*]
 Use the SNI TLS extension for incoming and outgoing https connections. [*]

*NOTE* *These only apply if WWWOFFLE is compiled with SSL/https support*


Version 2.9i of WWWOFFLE released : Mon 15 Oct 2012
---------------------------------------------------

Bug Fixes
 Check the flex and lex programs are found by configure.
 Allow https requests in outgoing to be requested when next online as https.
 Don't detect webbugs for images with width and height set to auto.
 Fix problem with infinite loop when root certificate expires.


Version 2.9h of WWWOFFLE released : Mon Oct 3 13:00:00 2011
-----------------------------------------------------------

Bug Fixes:
  Remove some gcc warnings.
  Delete keys & certs differently (fix crash with some gnutls versions). [*]
  Try decompressing buffered compressed data before asking for more.
  Handle buffered https data better. [*]

Improvements:
  Improve the SSL/https error messages (gnutls error conditions). [*]
  Use version 3 SSL certificates. [*]

*NOTE* *These only apply if WWWOFFLE is compiled with SSL/https support*


Version 2.9g of WWWOFFLE released : Sun Mar 27 11:00:00 2011
------------------------------------------------------------

Bug Fixes:
  Fix 2038 UNIX time_t problem with SSL certificates.
  Allow a margin on current time when warning about future timestamps.
  Check for libgnutls and libgcrypt separately at configure time.
  Better handling of the command line recursive options.

New Features:
 A new option allows passing URLs from browser to server unmodified.


Version 2.9f of WWWOFFLE released : Sun Jan 31 19:00:00 2010
------------------------------------------------------------

Bug Fixes:
 Some compilation warnings caused by flex have been removed.
 When making a HEAD request use the cached version if possible.
 Don't use the libgnutls-config program in the configure script.
 Only remove "authorization" header if it is "basic" authentication.
 Send a 304 header when online if cached page won't be refreshed.
 Clarify SSL/HTTPS error messages and documentation.
 Clarify last online/offline messages from 'wwwoffle -status'.
 Perform MIME type tests case insensitively.

New Features:
 A new option to the wwwoffle program closes and re-opens the server log file.

Documentation:
 Several small fixes to documentation.

New SSL Features [*]:
 A faster but less cryptographically secure key generation option is provided.
 The expiration time of the SSL certificates can be increased from one year.

*NOTE* *These only apply if WWWOFFLE is compiled with SSL/https support*


Version 2.9e of WWWOFFLE released : Sun Jan 25 16:00:00 2009
------------------------------------------------------------

Bug Fixes:
 Handle deflate compression errors.  Don't allow wwwoffle program to make
 requests that won't be got.  Handle various encodings of URLs in HTML documents
 better.  Display a note on the monitor form if the page is already monitored.
 Stopped an error message when refreshing while online.

Documentation:
 Several small fixes to documentation.


Version 2.9d of WWWOFFLE released : Wed Jan 23 19:00:00 2008
------------------------------------------------------------

Bug Fixes:
 Don't output extra space before XHTML closing tag when modifying HTML.  Don't
 error in case of race condition creating directory.  Remove the generation and
 display of the XML format certificate.  Fix bug with decompressing zlib data.
 Ensure that creating files supplies a permission option.  Fetch image URLs
 stored in style attributes.

Documentation:
 Improve documentation of http-port and https-port configuration file options.

New Features:
 Add a new option to the CensorHeader section called referer-from.
 Add a new option to the FetchOptions section called iframes (default=no).


Version 2.9c of WWWOFFLE released : Sun Jul 15 14:30:00 2007
------------------------------------------------------------

Bug Fixes:
 Don't truncate the log file when opening it.  Fix some memory leaks and other
 lint problems.  Fix problem with info page for compressed cached files.  More
 fixes for 64-bit compilation.  Fix potential crash with case-insensitive
 wildcard matching.  Try to only get IPv4 socket info if no IPv6 addresses on
 system.  Better handling of https error if connection fails.  Add more
 information to fatal errors related to SSL certificates.


Version 2.9b of WWWOFFLE released : Fri Feb 16 09:30:00 2007
------------------------------------------------------------

Bug Fixes:
 Fix some string allocations.  Don't delete the lasttime cached spool file if
 page was fetched in this session.  Fix HTML parsing of '\' inside or outside
 quoted strings.  Make sure that files are truncated when opened.  Display
 non-empty value in monitor page hour-of-day setting for default value.  Some
 documentation updates.

New Features:
 Expired SSL certificates are deleted and replaced.


*NOTE* *This only applies if WWWOFFLE is compiled with SSL/https support*
       WWWOFFLE creates SSL certificates with a 1 year expiry period.  When they
       expire web browsers will start to give errors.  If the WWWOFFLE root
       Certificate Authority certificate expires then all sites will give SSL
       errors.  Deleting the existing WWWOFFLE CA certificate from the browser
       and installing the new one will fix this problem (the WWWOFFLE CA
       certificate can be loaded from https://localhost:8443/certificates/root).

9 files changed, 59 insertions, 33 deletions

diff --git a/www/wwwoffle/DESCR b/www/wwwoffle/DESCR
index a326b04350d..b6fbc76d62e 100644
--- a/www/wwwoffle/DESCR
+++ b/www/wwwoffle/DESCR
@@ -3,4 +3,4 @@ with dial-up internet links.  This means that it is possible to browse web
 pages and read them without having to remain connected.
 
 The cache created by wwwoffled is searchable with the addition of the
-ht://Dig program.  Consider using www/htdig package.
+ht://Dig program.  Consider using the www/htdig package.
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 994e42fd22f..28097443fd1 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.81 2016/07/09 06:39:15 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2016/08/21 09:53:55 bsiegert Exp $
 
-DISTNAME=	wwwoffle-2.9a
-PKGREVISION=	7
+DISTNAME=	wwwoffle-2.9j
 CATEGORIES=	www
-MASTER_SITES=	http://www.gedanken.demon.co.uk/download-wwwoffle/
+MASTER_SITES=   http://www.gedanken.org.uk/software/wwwoffle/download/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gedanken.demon.co.uk/wwwoffle/
+MAINTAINER=     ginger@email.su
+HOMEPAGE=	http://www.gedanken.org.uk/software/wwwoffle
+LICENSE=	gnu-gpl-v2
 COMMENT=	WWW proxy with support for offline browsing
 
 USE_TOOLS+=	gmake gzip perl tar lex
 GNU_CONFIGURE=	yes
+BUILD_DEFS+=	VARBASE
 
 CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/wwwoffle
diff --git a/www/wwwoffle/PLIST b/www/wwwoffle/PLIST
index 71ddb0bc16a..1b4629b9c76 100644
--- a/www/wwwoffle/PLIST
+++ b/www/wwwoffle/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2014/03/11 14:05:18 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.17 2016/08/21 09:53:55 bsiegert Exp $
 bin/wwwoffle
 bin/wwwoffle-fsck
 bin/wwwoffle-gunzip
@@ -37,14 +37,12 @@ share/doc/wwwoffle/README.namazu
 share/doc/wwwoffle/README.win32
 share/doc/wwwoffle/de/CHANGES.CONF
 share/doc/wwwoffle/de/INSTALL
-share/doc/wwwoffle/de/LSM
 share/doc/wwwoffle/de/NEWS
 share/doc/wwwoffle/de/README.1st
 share/doc/wwwoffle/de/README.CONF
 share/doc/wwwoffle/de/README.CONF.html
 share/doc/wwwoffle/de/README.html
 share/doc/wwwoffle/es/INSTALL
-share/doc/wwwoffle/es/LSM
 share/doc/wwwoffle/es/README
 share/doc/wwwoffle/es/README.1st
 share/doc/wwwoffle/es/README.CONF
@@ -57,7 +55,6 @@ share/doc/wwwoffle/es/wwwoffle.conf
 share/doc/wwwoffle/fr/README.CONF
 share/doc/wwwoffle/fr/wwwoffle.conf.man
 share/doc/wwwoffle/pl/INSTALL
-share/doc/wwwoffle/pl/LSM
 share/doc/wwwoffle/pl/README.1st
 share/doc/wwwoffle/pl/README.lang
 share/examples/wwwoffle/wwwoffle.conf
diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo
index 7e9da81ef96..af2c791e0a9 100644
--- a/www/wwwoffle/distinfo
+++ b/www/wwwoffle/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.25 2015/11/04 02:47:42 agc Exp $
+$NetBSD: distinfo,v 1.26 2016/08/21 09:53:55 bsiegert Exp $
 
-SHA1 (wwwoffle-2.9a.tgz) = 9070d944c609979b9f8d14e38d31536214e2caf4
-RMD160 (wwwoffle-2.9a.tgz) = b183fe881f9824a0dbf11480fc8d98f57cd5a7f8
-SHA512 (wwwoffle-2.9a.tgz) = f62f6ff5b7801fca7ce0f9d8db4cc0f5ea7de88b463f48bdb6b8157bd4daea577cd86443bb647edc16528b4b1ee3eb8c7a42cdd196e08be403e559ff420228b4
-Size (wwwoffle-2.9a.tgz) = 1071362 bytes
-SHA1 (patch-aa) = 897de385a47826e16a8a09b1bc1c207a2d350f94
+SHA1 (wwwoffle-2.9j.tgz) = ca74e440b7dfbba700e01106f1afd113d5e5dbd4
+RMD160 (wwwoffle-2.9j.tgz) = 638cdc1e5a252440b414f69d302f88cb221836b7
+SHA512 (wwwoffle-2.9j.tgz) = 03f3177fac563ecab33288d1c193d3e193ff1c07413151fc5db1b85e0111b10815d572bcc59d188145b2851e57be0327f7c9e7538361a36e1a9457aa0d028818
+Size (wwwoffle-2.9j.tgz) = 1110599 bytes
+SHA1 (patch-aa) = 223fc32a68fa6d3a3015b4637c7188797678ff56
 SHA1 (patch-ab) = 8a76c65991ac7aeab65d0e3027c9423901e68759
 SHA1 (patch-ac) = d63ea67a612d61f0eff83cbfbbc86b99db24f3e4
 SHA1 (patch-ad) = cb2d858b89b498f99adf82dd6e9395908f5ed993
-SHA1 (patch-ae) = c6ba677d6a5dd8b43572e9cf021c8f2aefcf3e74
-SHA1 (patch-af) = 5899e59a22b1d51ca48b0a8ad6a6fd203f513512
+SHA1 (patch-ae) = 75a48afcd14d7bb8db2b114c6823a9170302d3d4
+SHA1 (patch-af) = d4b60bc31cf6dae4ea31f5d05d1e919bc3cd5f79
+SHA1 (patch-configure) = 60f5265d4aae93fb78e699a37b44f62d62a5c033
diff --git a/www/wwwoffle/options.mk b/www/wwwoffle/options.mk
index fef653658f1..ad1d891b9ef 100644
--- a/www/wwwoffle/options.mk
+++ b/www/wwwoffle/options.mk
@@ -1,11 +1,23 @@
-# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:04 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2016/08/21 09:53:55 bsiegert Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wwwoffle
-PKG_SUPPORTED_OPTIONS=	inet6
-PKG_SUGGESTED_OPTIONS=	inet6
-
+PKG_SUPPORTED_OPTIONS=	inet6 gnutls libgcrypt
+PKG_SUGGESTED_OPTIONS=	inet6 gnutls libgcrypt
+# Note: gcrypt is needed for some SSL/HTTPS Features!
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+= --with-ipv6
 .endif
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+CONFIGURE_ARGS+= --with-gnutls=${BUILDLINK_DIR}
+BUILDLINK_ABI_DEPENDS.gnutls+= gnutls>=3.0
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/gnutls/libgnutls-config.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mlibgcrypt)
+BUILDLINK_API_DEPENDS.libgcrypt+= libgcrypt>=1.2.0
+.include "../../security/libgcrypt/buildlink3.mk"
+.endif
diff --git a/www/wwwoffle/patches/patch-aa b/www/wwwoffle/patches/patch-aa
index 865abbfa561..89d4cfee96b 100644
--- a/www/wwwoffle/patches/patch-aa
+++ b/www/wwwoffle/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.17 2002/04/25 10:43:26 fredb Exp $
+$NetBSD: patch-aa,v 1.18 2016/08/21 09:53:55 bsiegert Exp $
 
---- doc/Makefile.in.orig	Sun Apr 21 11:53:25 2002
+--- doc/Makefile.in.orig	2010-12-28 10:04:45.000000000 +0000
 +++ doc/Makefile.in
-@@ -22,7 +22,7 @@
- 
+@@ -23,7 +23,7 @@
  prefix=@prefix@
+ datarootdir = @datarootdir@
  mandir=$(DESTDIR)@mandir@
 -docdir=$(DESTDIR)${prefix}/doc/wwwoffle
 +docdir=$(DESTDIR)${prefix}/share/doc/wwwoffle
diff --git a/www/wwwoffle/patches/patch-ae b/www/wwwoffle/patches/patch-ae
index 36662a4a367..703e7286d7e 100644
--- a/www/wwwoffle/patches/patch-ae
+++ b/www/wwwoffle/patches/patch-ae
@@ -1,14 +1,14 @@
-$NetBSD: patch-ae,v 1.1 2006/09/26 13:48:56 abs Exp $
+$NetBSD: patch-ae,v 1.2 2016/08/21 09:53:55 bsiegert Exp $
 
---- cache/search/hyperestraier/conf/estseek.conf.orig	2005-09-05 03:34:30.000000000 +1200
+--- cache/search/hyperestraier/conf/estseek.conf.orig	2011-03-27 11:10:23.000000000 +0000
 +++ cache/search/hyperestraier/conf/estseek.conf
 @@ -1,4 +1,4 @@
 -indexname: ../db
 +indexname: ../db/index
  tmplfile: estseek.tmpl
  topfile: estseek.top
- logfile:
-@@ -23,4 +23,8 @@ dotfidf: true
+ helpfile: estseek.help
+@@ -24,7 +24,11 @@
  smplphrase: true
  candetail: true
  smlrvnum: 0
@@ -17,3 +17,6 @@ $NetBSD: patch-ae,v 1.1 2006/09/26 13:48:56 abs Exp $
 +wildmax: 256
 +qxpndcmd: 
 +
+ deftitle: Hyper Estraier search for WWWOFFLE
+ attrwidth: 80
+ scancheck: 3
diff --git a/www/wwwoffle/patches/patch-af b/www/wwwoffle/patches/patch-af
index 911d5b33c78..b99e1d99cfe 100644
--- a/www/wwwoffle/patches/patch-af
+++ b/www/wwwoffle/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2006/09/26 13:48:56 abs Exp $
+$NetBSD: patch-af,v 1.2 2016/08/21 09:53:55 bsiegert Exp $
 
 --- cache/search/hyperestraier/scripts/wwwoffle-estcmd-full.orig	2005-09-06 05:45:59.000000000 +1200
 +++ cache/search/hyperestraier/scripts/wwwoffle-estcmd-full
@@ -9,4 +9,3 @@ $NetBSD: patch-af,v 1.1 2006/09/26 13:48:56 abs Exp $
 -estwolefind . | estcmd gather -cl -fm -px @uri -sd -cm search/hyperestraier/db - \
 +estwolefind . | estcmd gather -cl -fm -px @uri -sd -cm search/hyperestraier/db/index - \
      >> search/hyperestraier/wwwoffle-estcmd.log 2>&1
-
diff --git a/www/wwwoffle/patches/patch-configure b/www/wwwoffle/patches/patch-configure
new file mode 100644
index 00000000000..2e7a3ebbd06
--- /dev/null
+++ b/www/wwwoffle/patches/patch-configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-configure,v 1.1 2016/08/21 09:53:55 bsiegert Exp $
+
+--- configure.orig	2016-04-23 12:25:12.000000000 +0000
++++ configure
+@@ -3206,7 +3206,7 @@ fi
+ rm -f conftest.l $LEX_OUTPUT_ROOT.c
+ 
+ fi
+-if test "x$LEX" == "x:"; then
++if test "x$LEX" = "x:"; then
+     as_fn_error $? "No lex/flex program could be found" "$LINENO" 5
+ fi
+