Commit graph

88 commits

Author SHA1 Message Date
abs
ceb456a94a Update wwwoffle to wwwoffle-2.8enb1
- Use gzip rather than gtar to extract in PLIST (should really be
	  an INSTALL script)
	- Fix some lines in MESSAGE to for pkglint
2005-11-01 12:22:24 +00:00
wiz
5e5f5cc285 Use ${RMDIR} instead of rmdir. 2005-10-23 16:51:00 +00:00
jlam
585534220c Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:
USE_GNU_TOOLS	-> USE_TOOLS
	awk		-> gawk
	m4		-> gm4
	make		-> gmake
	sed		-> gsed
	yacc		-> bison
2005-05-22 20:07:36 +00:00
jlam
7425b543e8 Note that gtar is required by the package. 2005-05-16 01:15:30 +00:00
abs
af7a0ecf13 Update wwwoffle to 2.8e, and take over maintainership
Changes since 2.8c:
* src/version.h, doc/NEWS: Update to version 2.8e.
* src/wwwoffle-tools.c:
Fix previous wwwoffle-mv change and preserve timestamps.
* src/configdata.c:
Make the default value for reply-chunked-data match the documentation.
* src/info.c: Indicate on the info page if the URL has been requested.
* src/wwwoffles.c: Handle HEAD requests more intelligently.
When online send HEAD don't cache them, when offline convert to GET if not cached.
* doc/README: Updated description of wwwoffle-mv program.
* src/configdata.c, src/wwwoffles.c, conf/upgrade-config.pl,
conf/wwwoffle.conf.template, doc/CHANGES.CONF, doc/README.CONF,
src/config.h:
Added a new option cache-control-max-age-0 to OnlineOptions and OfflineOptions.
* doc/FAQ: Another solution to the infamous libc resolver problem.
* src/wwwoffles.c: No functional changes.
Added more comments relating to Fetch mode, and on mode for else statements.
Rearranged code so that mode==Fetch is evaluated with others in else branch.
* src/wwwoffles.c:
Fix two places where being in Fetch mode would go wrong
(aliased URL and unauthenticated proxy request).
* doc/README, doc/README.CONF: Some text changes.
* src/wwwoffle-tools.c: Allow moving files and changing the path.
* src/control.c: Fix spurious error message.
* doc/wwwoffle.conf.man.template:
Updated the dates in the footer/header.
* src/spool.c:
Only print an error for a missing monitor time file if the URL is monitored.
Version 2.8d of WWWOFFLE released.
* doc/NEWS, src/version.h: Update to version 2.8d.
* doc/README:
Update acknowledgements section (removal of old GIF code).
* src/gifmodify.c:
All new GIF modification code (handles GIF87a and GIF89a).
* doc/README.CONF:
Make sure that all lines are less than 78 characters long.
* src/htmlmodify.l, conf/upgrade-config.pl,
conf/wwwoffle.conf.template, doc/CHANGES.CONF, doc/README.CONF,
src/config.h, src/configdata.c:
Add a new option to remove HTML "marquee" effect (scrolling text).
* src/Makefile.in, src/configedit.c, src/control.c, src/index.c,
src/monitor.c, src/refresh.c:
Give warnings if processing URL arguments and an unexpected one is seen.
* conf/wwwoffle.conf.template, doc/CHANGES.CONF, doc/README,
doc/README.CONF, src/config.h, src/configdata.c, src/htmlmodify.l,
conf/upgrade-config.pl:
Add an HTMLModify option to fix bad cyrillic coding.
* src/wwwoffle-tools.c: Return an error status in case of a failure.
* src/wwwoffles.c:
Make sure that there is a message from 'wwwoffle -fetch' for all URLs.
* src/miscurl.c: Fix hostname character checking.
* src/document.c: Parse xhtml pages for links and images.
* src/info.c: Display source of xhtml and xml pages.
* src/wwwoffles.c: Add cache information to xhtml pages.
* doc/README.CONF: Clarify the try-without-password option wording.
* src/miscurl.c:
When splitting a URL disallow invalid characters in hostnames.
* src/wwwoffled.c: Change log file ownership before changing uid/gid.
Close stdin/stdout/stderr after detaching from terminal not before.
Don't open log file again after detaching from terminal.
Don't force usage of stderr when re-initialising error handler.
* doc/README.CONF, src/configmisc.c:
A URL-SPEC path like '/*/foo*' matches '/foo*' and '/*/foo*' as a special case.
* src/cgi.c, src/search.c:
Fix bug with setting up stdout for CGI program.
* src/errors.c: Fix bug that left file descriptor open on log file.
* src/document.h, src/htmlmodify.l, src/wwwoffles.c:
Disable the demoronise-ms-html option if the HTML is UTF-8 or other multibyte charset.
2005-05-07 11:02:47 +00:00
reed
ee8be9d0c1 RCD_SCRIPTS_EXAMPLEDIR is no longer customizable.
And always is defined as share/examples/rc.d
which was the default before.

This rc.d scripts are not automatically added to PLISTs now also.
So add to each corresponding PLIST as required.

This was discussed on tech-pkg in late January and late April.

Todo: remove the RCD_SCRIPTS_EXAMPLEDIR uses in MESSAGES and elsewhere
and remove the RCD_SCRIPTS_EXAMPLEDIR itself.
2005-05-02 20:33:57 +00:00
wiz
809ad6f2f7 Add RMD160 checksums. 2005-02-24 14:08:26 +00:00
minskim
5e28b53ad3 Use VARBASE. 2004-12-29 15:42:37 +00:00
reed
32d8f290c2 The default location of the pkgsrc-installed rc.d scripts is now
under share/examples/rc.d. The variable name already was named
RCD_SCRIPTS_EXAMPLEDIR.

This is from ideas from Greg Woods and others.

Also bumped PKGREVISION for all packages using RCD_SCRIPTS mechanism
(as requested by wiz).
2004-12-28 02:47:40 +00:00
reed
62071c8b2f RCD_SCRIPTS_EXAMPLEDIR was just changed to be a relative directory
under ${PREFIX} instead of being an absolute path.

So fix the references using RCD_SCRIPTS_EXAMPLEDIR to be
${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}.

This should have no changes to use before.

Please note that the MESSAGE files in most cases are wrong in the
first place. We have automated mechanisms and could have an automated
message for explaining rc.d script usage. (This is something to do!)
2004-10-11 22:14:51 +00:00
recht
45c41f793e update to wwwoffle-2.8c
patch provided by Ove Soerensen in PR 26792

changes compared to 2.7f:
wwwoffle 2.8c contains various fixes and new features. For example the
removal of some memory-leaks, fixes for race-conditions and it's noew
CSS aware and has support for chunked encoding.
2004-08-29 15:03:46 +00:00
salo
31f9f99abe Replace test -e with -f.
Addresses part of PR pkg/26235 by Georg Schwarz.
2004-07-10 23:23:45 +00:00
cjep
f6887a97b1 Add USE_INET6 to BUILD_DEFS as these packages use it. Part of PR#25743 from
Georg Schwarz.
2004-06-08 12:23:59 +00:00
reed
2d4122dd45 Fix references to rc.d scripts. This package uses RCD_SCRIPTS
which installs to ${RCD_SCRIPTS_EXAMPLEDIR}. But the MESSAGE
referred to wrong hard-coded location if the RCD_SCRIPTS_EXAMPLEDIR
was not the default. So use RCD_SCRIPTS_EXAMPLEDIR instead.

PKGREVISION not bumped because if someone had changed
RCD_SCRIPTS_EXAMPLEDIR before recent change of autoregistration
of rc.d script in PLIST, then it could not have been packaged
in first place.

Note that this commit does not imply that the MESSAGE is correct.
In some cases, the MESSAGE is clearly wrong such as suggesting
running the rc.d script from the example directory (which will work
although).
2004-04-23 22:43:20 +00:00
reed
9c790735db mk/bsd.pkg.install.mk now automatically registers
the RCD_SCRIPTS rc.d script(s) to the PLIST.

This GENERATE_PLIST idea is part of Greg A. Woods'
PR #22954.

This helps when the RC_SCRIPTS are installed to
a different ${RCD_SCRIPTS_EXAMPLEDIR}. (Later,
the default RCD_SCRIPTS_EXAMPLEDIR will be changed
to be more clear that they are the examples.)

These patches also remove the etc/rc.d/ scripts from PLISTs
(of packages that use RCD_SCRIPTS). (This also removes
now unused references from openssh* makefiles. Note that
qmail package has not been changed yet.)

I have been doing automatic PLIST registration for RC_SCRIPTS
for over a year. Not all of these packages have been tested,
but many have been tested and used.

Somethings maybe to do:
- a few packages still manually install the rc.d scripts to
  hard-coded etc/rc.d. These need to be fixed.
- maybe  remove from mk/${OPSYS}.pkg.dist mtree specifications too.
2004-04-23 22:07:52 +00:00
grant
e3d128293a replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. 2004-01-24 15:18:32 +00:00
fredb
2138bc2c1d Set "rcvar" in the rc.d script, so that wwwoffled=NO is effective, and
bump PKGREVISION. Problem noted by Benjamin Walkenhorst on netbsd-users.
2003-12-23 16:43:56 +00:00
jmmv
22a7d6e637 Use bsd.pkg.install.mk to handle generation and installation of the rc.d
script.  Bump PKGREVISION to 1.
2003-08-29 09:25:40 +00:00
jmmv
bfe5412698 Add missing file to PLIST. 2003-08-29 09:23:25 +00:00
grant
ca3be631f2 s/netbsd.org/NetBSD.org/ 2003-07-17 22:50:55 +00:00
tron
39a943ad92 Replace "true" by "${TRUE}". 2002-12-09 16:01:10 +00:00
fredb
e9183d3edd Update to version 2.7f. The following is condensed in format only from
the "ChangeLog" file:

    * src/configrdwr.c:
    When allowing '=' signs in URL-SPECIFICATIONS ignore trailing spaces.

    * doc/FAQ: Added a question about startup error/warning messages.

    * src/wwwoffles.c:
    Don't attempt to modify HTML if the page is compressed.

    * src/headbody.c: Fix the Set-Cookie problem again.

    * doc/scripts/FAQ-html.pl: New file.

    * doc/scripts/README.CONF-html.pl, doc/scripts/README.CONF-msg.pl:
    Convert characters with umlauts into proper HTML entities.

    * src/headbody.c: A fix for the stupid bug in the previous version.

    * src/io.c:
    Fix for partial pages when server uses compression (suggested by
    Paul Rombouts).

    * src/wwwoffled.c: Close the client socket if SocketRemoteName() fails.
2002-11-08 15:39:55 +00:00
fredb
ae54016cd8 Do as intended all along with the old config handling, and choose the
newest of the possible candidates.

Update comment -- there are now multiple wwwoffle.pac files.
2002-11-08 15:34:21 +00:00
wiz
e8817c9088 Complete standardization of messages according to latest pkglint. 2002-09-24 12:29:55 +00:00
fredb
6832a16900 Update wwwoffle to Version 2.7e. From the NEWS file:
Bug Fixes:
 Correct some invalid HTML in the message files.  Fix some memory leaks, free
 some unfreed memory, check some pointers, close some files.  Don't send the
 extra arguments to POST requests that WWWOFFLE uses internally.  Removed
 segmentation fault potential when password not used in config file.  Another
 fix for the cookie problem.  Warn if running as root.  Try both IPv6 and IPv4
 socket binding (IPv6 may not accept IPv4).  Potential bug fix for page
 corruption.  Potential fix for IPv6 configuration on Solaris.

New Features:
 Add an option to have case-insensitive matching for URL-SPEC path and args.
 Added the option to only fetch images on the same host (automatic fetching).
 Allow URL-SPECs to contain an '=' sign embedded in them (long time bug fix).
 The monitor options page now accepts ranges of hours or days (e.g. '1-5n').

[Note: The change to IPv6 binding to not require IPv4-mapped addresses was
already present in the package as "patch-ac".]

[Note: TODO: Have the package create a user, and let the "rc.d" script run
wwwoffle as that user.]

Also, reorder ${MASTER_SITES} to comply with the request on the download
page, and work around an install target corner case for the benefit of bulk
build machines (only applies for hosts on which wwwoffle has never run).
2002-09-05 16:56:54 +00:00
fredb
f54df28f73 Clarify comment. 2002-09-05 15:34:19 +00:00
grant
618961e568 check that USE_INET6 is defined.
remove extraneous parenthesis around .if (${FOO} ..) conditions.
2002-08-21 02:43:44 +00:00
fredb
b03b625e7a Update to version 2.7d. From the NEWS file:
Bug Fixes:
 Discard POST/PUT requests that have negative content-lengths.  Make the
 CanonicaliseHost() function robust to bad IP addresses.  Fix some memory leaks,
 free some unfreed memory.  Don't give socket error using '-f' option.  Fix
 compilation on Cygwin.  Fix IPv6 compilation on Solaris 9.  Bug fix for v2.7c
 Cookie change.  Don't replace '//' in a URL path with '/'.
2002-08-19 22:03:04 +00:00
fredb
9ccd29a8f3 Really respect ${PKG_SYSCONFDIR}, and account for the fact that it may
have moved since the last installation.

Make myself the maintainer of this package.
2002-08-10 17:03:26 +00:00
fredb
1c7477d085 Fix PR pkg/17672 a little more portably, with patch suggested by Andrew
M. Bishop (wwwoffle's author/maintainer). With this, if IPv6-mapped IPv6
addresses are enabled, attempting to bind the wildcard address for both
protocols is not a fatal error.
2002-08-10 13:43:09 +00:00
jlam
e3a7832109 Merge wwwoffle.sh and wwwoffled into one rc.d script that follows pkgsrc
conventions for rc.d scripts.
2002-08-07 09:15:43 +00:00
itojun
865a511d81 one more instance of :: and 0.0.0.0 issue. by fredb 2002-08-06 01:58:34 +00:00
itojun
a5a3ead2a0 simply obey config file, don't do trick against :: and 0.0.0.0.
(patch sent to the author).  bump PKGREVISION
2002-08-06 01:20:20 +00:00
fredb
c7f528a950 In FTP_Request(), don't free "path" until we're really done with it, as
"file" is in "path"'s allocation. This fixes a bug where the server task
would randomly try to acces a file as a directory, and fail. Bump
PKGREVISION, as this was a fairly serious bug.
2002-07-25 15:56:19 +00:00
fredb
c75fe1231c Update to 2.7c. Straight from the NEWS file:
Bug Fixes:
 Install two DLLs for the Win32 version.  Don't crash for HTTP servers that send
 headers prefixed with whitespace.  Make the "edit selected entry" option work.
 Don't write uncompressed data to the cache with a header saying it is
 compressed.  Be more lenient in detecting spiders that cannot make requests.
 The wwwoffle-tools programs now handle dir names as if they had http:// in
 front.  Disallow wwwoffle requests for protocols that WWWOFFLE does not
 handle.  Use the command line config filename in error messages.  Fix to allow
 compilation on SGI IRIX.  Handle XHTML style tags when modifying HTML.  Updated
 setuid/setgid code.  Some memory leaks removed and potential crashes removed
 due to using lint).

New Features:
 Split up Set-Cookie headers since browsers can't handle them.
 Don't request deflated data since WWWOFFLE and servers don't agree on format.
 Added a form on the monitor options page to stop monitoring a URL.
 The confirm-requests option now asks for confirmation for page reloads.

Documentation:
 Update FAQ to reference privoxy as well as JunkBuster.
 Describe how to modify htdig templates to work with WWWOFFLE.
2002-07-16 14:28:07 +00:00
fredb
96c602805c Don't core just because a silly server, like my 3com [TM] Lan Modem,
puts leading white space at the beginning of the very first header
line. (Leading blanks are supposed to signify a continuation of the
previous header line, but for the "server:" line, there aren't any
previous lines, so who knows why they do that.) This patch was
suggested by Andrew M. Bishop, "wwwoffle"'s author and maintainer.
Don't know if it's going to be in the next release, or not.
2002-05-14 15:37:19 +00:00
fredb
e0e9ec9355 Update wwwoffle to 2.7b (from NEWS):
Bug Fixes:
 Ensure that only one argument is given to wwwoffle -o or -O.  Some more version
 2.7 documentation updates.  Fix crash using 'wwwoffle -O|-o|-put|-post <URL>'.
 Put refresh URLs in the outgoing directory with correct URL.  Delete
 auto-generated files in Makefile before re-generating.  Choosing 'edit selected
 item' in configuration pages shows current values.  Fix potential crash with
 wwwoffle-hash.  Put a DESTDIR variable in Makefile for easier installation.
 Fix parsing IPv6 addresses in audit-usage.pl script.  Makefile change for
 FreeBSD make.  Bug fix for the Alias section of the config file.  Fix Makefile
 for Win32.

New Features:
  Allow CGI scripts to be used with the built-in web server.
2002-04-25 10:43:26 +00:00
fredb
8a935a1c4c Add a convenience target to run the INSTALL script, and update the
post-install message accordingly. We have to do it manually after
`make package', as explained in the comment.
2002-03-25 09:17:55 +00:00
fredb
ad4d98f3fa Update wwwoffle to 2.7a (2.7.1). From the NEWS file:
Bug Fixes:
 Ensure that the -put or -post options to wwwoffle have one URL.  Fix IPv6
 checking (configure fails if IPv6 not available).  Fix conditional request
 problem (304 reply for non-conditional requests).  Make the socket binding
 errors less confusing.  Fix requesting of compressed data.  Handle NULL strings
 in FTP code and parsing requests.  Speed up wildcard matching of '/*' paths.
 When search script fails give an error not a blank page.  The content-length
 header is not removed unless compression is being used.  Fix core dump with
 configuration page adding first item to DontGet/DontCache section.  Preserve
 cache file timestamps when compressing them.  Handle relative URLs that start
 with '//'.  Fix Solaris compilation problem with statfs/statvfs.  Bug fix for
 failure to censor some headers.  Remove the 'alt' attribute from disabled
 images when modifying HTML.

New Features:
 Re-instate the old configuration editing web pages due to user demand.
 Allow wildcards to have more than two '*' in them.
 The upgrade-config.pl script warns about URL-SPECs with path='/' not '/*'.
2002-03-25 08:49:59 +00:00
fredb
918a9ca4c9 Fix sprintf() overflow for long urls: sprintf() -> snprintf(). 2002-03-23 22:48:09 +00:00
fredb
584da08bcc Update the example "crontab" fragment to the new location for the "htdig"
scripts, and while we're in here, be a little less verbose.
2002-03-11 07:32:33 +00:00
fredb
0a5fe486f5 Update wwwwoffle to 2.7. Very many bug fixes, including fixes for
dealing better with javascript pages, and fixes for old ftp servers.
Lots of new features and configure options, too. Also, new
translations for French, Dutch, Polish, German; docs and notes in
a few other languages; and translations for local pages are now
selected by browser settings!
2002-03-10 22:14:29 +00:00
skrll
08bdd44549 mkdir -> ${MKDIR}
rmdir -> ${RMDIR}
rm -> ${RM} (${RM} added to PLIST_SUBST)
chmod -> ${CHMOD}
chown -> ${CHOWN}
2002-02-15 10:12:28 +00:00
zuntum
431e7a7dda Move pkg/ files into package's toplevel directory 2001-11-01 02:15:23 +00:00
wiz
cf875b62b6 Pass ${command_args} in stop_cmd, as requested in pkg/14349. 2001-10-25 10:20:59 +00:00
fredb
d92999722f Let the default configuration file be installed as "wwwoffle.conf.install",
rather than "wwwoffle.conf.default", so that wwwoffle-upgrade-config*.pl
can use it to populate the new config file with comments (and to minimize
gratuitious changes).
2001-08-18 20:31:13 +00:00
fredb
f989deaade This patch is no longer needed -- the tools now take an absolute path to be
a "localhost" URL. [Per Andrew M. Bishop, wwwoffle's author.]
2001-08-18 20:04:08 +00:00
fredb
0dfbc897e9 Don't call freeaddrinfo() with "0" argument -- it cores. 2001-08-16 04:23:45 +00:00
fredb
af2e50fab0 Update wwwoffle to version 2.6d. From the "NEWS" file...
Bug Fixes:
 Fix pagination problem in wwwoffled manual page.  Fix core dump with missing
 DontCompress section.  Fix error with convert-cache and uncompress-cache
 programs not recognising valid configuration items.  Fix harmless buffer
 overrun.  Improve the URL decoded strings displayed in indexes.  Don't complain
 about empty directory when installing.  Canonicalise the pathname in URLs.
 Compile on __bsdi__ systems.  Convert decimal IP addresses to dotted-quad.
 Add support for compilation on Apple OS X.  Enable HTML modifications on URLs
 with error status.  Use a case-insensitive check when censoring headers.  Fix
 up HTML to that it validates with an SGML checker.

New Features:
 Added IPv6 support.
 Added bind-ipv4 and bind-ipv6 options to specify local IP address to bind to.
 Added 'random' sort order option for indexes.
 Made index sorting use alphabetical as a secondary sort.
 Added HTTP/1.1 'Cache-Control: max-age=..' header handling (same as 'Expires').

Translations:
 Updated the Russian translations of the WWWOFFLE messages.
2001-08-14 04:51:46 +00:00
fredb
e65bc1f071 Upgrade wwwoffle to 2.6c. From the "NEWS" file...
Bug Fixes:
 Changed the HTML message pages to be HTML 4 compliant (use ';' instead of '&'
 for URL arguments).  Fixed meta-refresh-self problem.  Don't get confused by
 scripts when parsing HTML.  Fix crash in convert-cache program.  Made
 compilation work on SGI machines.  Don't truncate partial cached file.  Fix the
 request-changed option.

New Features:
 Add comments where WWWOFFLE modifies the original page's HTML.
 Add the option to remove stylesheets, external links and embedded styles.
 Add the option to remove Java applets.
 Add options to remove links and replace images listed in the DontGet section.
 Add the option to not fetch webbugs (1x1 pixel images) when parsing HTML.
 Add the option to replace webbugs (1x1 pixel images) when modifying HTML.

Translations:
 Added Dutch translations of WWWOFFLE messages.
2001-04-22 06:44:39 +00:00