INSTALL/DEINSTALL script creation within pkgsrc.
If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts. If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:
INSTALL_SRC= ${PKGDIR}/INSTALL
DEINSTALL_SRC= # emtpy
As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts. By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).
In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework. The only public variables relating to the templates are:
INSTALL_SRC INSTALL_TEMPLATE
DEINSTALL_SRC DEINSTALL_TEMPLATE
HEADER_TEMPLATE
The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.
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.
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.
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).
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!)
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.
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).
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.
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.
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).
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 '/'.
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.
