Commit graph

57 commits

Author SHA1 Message Date
cube
4dd45c8301 Do the DIST_SUBDIR dance because of already-downloaded files. *Sigh*
Pointed out by Thomas Klausner and Jeremy C. Reed.
2005-08-19 13:38:58 +00:00
cube
a3a9013fb7 The thttpd tarball has changed (the e-mail address of the author was
changed all through it).  While there, make the package correctly fetch the
NetBSD logo.

Bump PKGREVISION, and after that I'll delete the copy ftp.netbsd.org
currently has.  The tarball change doesn't happen often enough for this
package to justify the use of DIST_SUBDIR (and that avoids the hairy
problem of sharing the sitedrivenby.gif file).

PR#30641 by Jared Momose.
2005-08-19 07:30:50 +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
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
wiz
809ad6f2f7 Add RMD160 checksums. 2005-02-24 14:08:26 +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
wiz
9d15e05be5 Add patch from PR 25487 to disable mmap on old (1.5ish) NetBSD systems.
Apply patch from PR 25488 to enable choosing the log facility for thttpd.
Both based on patches from Michael Santos.
Bump PKGREVISION to 1.
2004-09-14 08:32:16 +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
jlam
dda8edf053 bl3ify and general touch-up 2004-02-22 18:34:54 +00:00
xtraeme
f6594a15dd Update to 2.25b, provided by Michael Santos in PR pkg/24128.
Changes:

New in version 2.25b:

    * Move fdwatch initialization before the chroot, so that
      /dev/poll can work.
    * Multiple fdwatch cleanups and fixes (Adam Zell).

New in version 2.25:

    * Prohibit "Host: ." and "Host: .." (David Leadbeater).
    * Don't free memory prematurely on SIGUSR1 (A.D.F.).
    * Use the specified charset in directory listings and errors
      (Jonas Ohlsson).
    * Lowered THROTTLE_TIME from 60 seconds to 2 seconds, plus more
      aggressive computation of sending rate, to improve throttle
      reaction time (E Frank Ball).
    * Added code to redistribute the throttled bandwidth fairly among
      the currently sending connections.
    * Some more throttling changes that smooth things out a lot.
    * Added an experimental limitation on the number of simultaneous CGIs.
    * Chown the log file when starting as root, so that it can later be
      re-opened when running as nobody (or whatever user you configure).
      Also tweak the logfile pathname so that it still works inside a
      chroot tree.
    * Make sure URL paths begin with a slash.
    * Generate multiple MIME encodings in the correct order, and with the
      correct separator.
    * Ignore EINTR on read() and write().
    * Fix error in httpd_read_fully() and httpd_write_fully() that could
      cause incorrect data to be read or written (Daniel Jensen).
    * Don't attempt to double-free a file descriptor if a connection times
      out while it is paused for throttling.
    * Save and restore errno in signal handlers.
    * The non-local referer check is no longer fooled by URLs with query
      strings.
    * Simplified handling of HAVE_INT64T (Trisk). If this causes problems,
      e.g. if there are still systems which don't have "long long", we can
      back out the change.
    * Keep a list of free connection structs, instead of doing linear search
      to find a free one (Adam Zell).
    * Added config.h option FLUSH_LOG_EVERY_TIME - if it's turned off, the
      log does not get fflushed after each request (Adam Zell).
    * Multiple robustness improvements to the fdwatch module (Adam Zell).
    * Added /dev/poll support to fdwatch (Adam Zell).
    * Automatically add no-cache control header on error responses.
2004-01-17 12:55:05 +00:00
cube
8701eeeb9d Update to 2.24. Closes PR pkg/22198 (fix was integratedin that version).
New in version 2.24:

    * Added a bunch of MIME types.
    * Fix minor problem with returning unknown protocol on some errors.
    * Changed the config-file option for diabling symlink checking from "nosymlink" to "nosymlinkcheck" to make its function clearer.
    * Allow blank lines in the config file.
    * Handle more than one SIGHUP and SIGUSR2 (Cameron Gregory).
    * Slight change to handle_newconnect() to better deal with unexpected errors from accept(), such as running out of file descriptors (Alex Keahan).
    * Added optional minimum rate to throttles.
    * Stats syslog messages downgraded from LOG_NOTICE to LOG_INFO.
    * Use unsigned short consistently for port number.
    * Prohibit slashes in the Host: header (Marcus Breiing).
    * Added a -dd data_dir flag and corresponding config-file option.
    * Got rid of the old timer-based zombie process reaper, replacing it with a SIGCHLD handler.
    * Changed the idle connection checking from using a separate timer for each connection to using a single timer that checks all active connections.
    * Correction to missing-slash directory redirect with query string.
    * Added a watchdog alarm handler that forces a core dump if thttpd stops running its timers for too long.
    * Don't send Content-Length header on 304 Not Modified responses.
    * Allow user-agent log entries to be up to 200 characters long, instead only of 80.
    * Fixed buffer overflow bug in defang().
    * Re-arranged the order of calling de_dotdot() so that it doesn't get applied to query strings.
    * Some fixes for the syslogtocern script (paul fox).
    * Changed configure script to use "gcc -dumpversion" instead of "gcc --version" (Ed Goforth).
    * Changed most uses of \r and \n to \015 and \012 (Jens Bauer).
    * In ssi.c, lack of PATH_INFO is now non-fatal (David Phillips).
    * Some improvements to fdwatch (David Burgess).
2003-10-27 20:29:52 +00:00
wiz
13512b40ca Fix a buffer overflow reported in PR 22863 by Ross Patterson.
Bump PKGREVISION.
2003-09-19 17:54:16 +00:00
martti
33e2a02324 COMMENT should start with a capital letter. 2003-07-22 04:14:17 +00:00
jmmv
f1446ddf2b Drop trailing whitespace. Ok'ed by wiz. 2003-05-06 17:40:18 +00:00
jlam
d7f69e47ce Instead of including bsd.pkg.install.mk directly in a package Makefile,
have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set
to "YES".  This enforces the requirement that bsd.pkg.install.mk be
included at the end of a package Makefile.  Idea suggested by Julio M.
Merino Vidal <jmmv at menta.net>.
2003-01-28 22:03:00 +00:00
grant
0c5bb6abcc Make these scripts more portable by taking advantage of automatic rc.d
script handling and using @RCD_SCRIPTS_SHELL@.

as discussed with jlam.
2002-09-20 02:01:54 +00:00
jlam
5c053dd06a Take advantage of the auto-generation and installation of rc.d scripts. 2002-09-19 09:04:02 +00:00
wiz
b25a418960 pkglint silencing. 2002-06-16 19:12:13 +00:00
wiz
bc89da4037 Update to 2.23beta1, as requested in pkg/17251 by Oliver Tonnhofer.
Changes since 2.21b:
* Added some Microsoft MIME types (Kevin Day).
* Switch htpasswd from using tmpnam to mkstemp.
* Rewrote figure_mime() to do binary search.
* Removed the x- from gzip and compress in mime_encodings.txt.
* Added rudimentary option to set cache-control headers.
* Simplified the IPv6 ifdefs.
* Allow filenames with ? in them (Cameron Gregory).
* Some improvements to the mmap cache - added a "panic mode" if you run out
  of address space, added DESIRED_MAX_MAPPED_BYTES config.h option.
* Lowered OCCASIONAL_TIME from five minutes to two minutes.
* Fix CGI variable AUTH_TYPE (Alexandre CHERIF).
* Split clear_connection() into two routines, one which sends a possible
  buffered response and the other which ignores such (David Burgess).
* Remove /./ in de_dotdot() (Dana Dahlstrom).
* Shortened LINGER_TIME from two seconds to half a second.
* Changed some write() calls to httpd_write_fully(), as suggested by
  Neale Pickett.
* Changed the non-mmap() read() call in mmc.c to httpd_read_fully(), as
  suggested by Cameron Gregory.
* Added an madvise(MADV_SEQUENTIAL) call in mmc.c.
* Added .xhtml and .xht to mime_types.txt (suggested by Dave Hodder).
* Added index.xhtml and index.xht to INDEX_NAMES (suggested by Dave Hodder).
* Got rid of the custom-jiggered syslog.c, now we just use the standard
  system version. Also added a paragraph in the man page about the syslogd
  flags needed to make syslogging work from inside a chroot tree.
* Added some OpenOffice MIME types (Dave Hodder).
* Lowered the default DESIRED_MAX_MAPPED_FILES from 2000 to 1000.
* Set up accept filters after listen() (Kris Spinka).
* Preserve query string when doing a missing-slash directory redirect.
* Special-case logging to '-' as stdout (Matt Armstrong).
* Added -s to usage line (Pavel Janík).
* Fix for security hole that exposed contents of .htpasswd in some cases
  (noticed by zeno@cgisecurity.com).
* Allow (and ignore) extra fields in .htpasswd files.
* Added some calls to shutdown() in strategic places.
* Added a timer-kill of the CGI interpose input and output process.
  These processes also now close the listen fd(s).
* Fixed rare file descriptor leak, when we get an unknown sockaddr family
  (George Schlossnagle).
* Put virtual hostname in non-local referer syslog (Craig Leres).
* Added a P3P server privacy header setting (Henrik Schack Jensen).
And lots of other bug fixes.
2002-06-16 19:10:25 +00:00
joda
603dd5fd63 don't change .htpasswd into .thtpasswd 2002-05-12 14:47:28 +00:00
jlam
e0d358778b Solaris' test binary (test/[) doesn't grok "-e". Replace with "-f".
Noted by Stoned Elipot <seb@netbsd.org> in private email.
2002-02-05 06:04:36 +00:00
jlam
55ffb37406 bsd.pkg.install.mk calls the INSTALL script at the right times
automatically, so no need to do it ourselves.
2001-12-02 06:56:38 +00:00
jlam
6e896e42e0 Forgot a CONFDIR -> PKG_SYSCONFDIR replacement. 2001-11-26 07:30:44 +00:00
jlam
ffceca11a9 PKG_SYSCONFDIR is where the configuration files for a package may be found.
This value may be customized in various ways:

PKG_SYSCONFBASE is the main config directory under which all package
	configuration files are to be found.

PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the
	configuration files for a particular package may be found.

PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a
	particular package.

Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the
default location of ${PREFIX}/etc.

This obsoletes the use of CONFDIR, which was active for only 6 days, so no
need to have a workaround to still accept old CONFDIR settings.
2001-11-25 18:59:45 +00:00
jlam
892b322f45 These rc.d scripts are copied to ${RCD_SCRIPTS_DIR} == /etc/rc.d, so change
the test for pre-rc.d systems to just whether /etc/rc.subr is present.
2001-11-21 21:38:50 +00:00
jlam
cdec44e8b4 RCD_SCRIPTS now just lists the filenames (see bsd.pkg.install.mk). 2001-11-21 15:44:22 +00:00
jlam
b23d2e8626 Adapt to use shared INSTALL/DEINSTALL scripts by using the logic in
bsd.pkg.install.mk:

	* Remove old DEINSTALL/INSTALL scripts.
	* Move some text printed at POST-INSTALL time into the MESSAGE file.
	* Adjust rc.d scripts to respect rc.conf settings, so that the
	  script may be directly copied into /etc/rc.d.
2001-11-19 16:23:08 +00:00
zuntum
431e7a7dda Move pkg/ files into package's toplevel directory 2001-11-01 02:15:23 +00:00
jlam
9820a22a90 In package Makefiles, create FILES_SUBST instead of duplicating sed
expression for substituting in DEINSTALL/INSTALL scripts.  Use "${CMP} -s"
instead of "diff -q" since the former is more portable across OSes.
2001-07-13 07:09:17 +00:00
wiz
2a1bff66d3 Update to 2.21b, as requested in pkg/13144 by Wolfgang Rupprecht.
Changes: Lots of bugfixes (lingering-close problem, USR1 handling,
off-by-1 in base64 decoding and others), throttling syslog, tuned
throttling, improvements on mmap cache, etc.  See
http://www.acme.com/software/thttpd/#releasenotes
2001-06-09 11:26:33 +00:00
jlam
71e78c7453 Add libexec/cgi-bin directory to standard /usr/pkg hierarchy. Remove all
the per-package code that attempt to remove this directory if it's empty.
2001-05-02 22:22:42 +00:00
skrll
aa3c03b75a Move to sha1 digests, and add distfile sizes. 2001-04-20 12:02:30 +00:00
agc
8f972b049a + move the distfile digest/checksum value from files/md5 to distinfo
+ move the patch digest/checksum values from files/patch-sum to distinfo
2001-04-17 12:12:16 +00:00
wiz
a0745845b3 Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT. 2001-02-17 17:21:28 +00:00
wiz
d4fce8d4e7 Unify format of MESSAGEs, and include RCS Ids. 2001-02-06 14:24:03 +00:00
jlam
dea113dec7 Install cgi-bin programs with executable bit set, and modify thttpd rc.d
script to check for the pid instead of requiring a pidfile that may not
exist.
2001-01-14 06:14:13 +00:00
jlam
714d2c98a1 Make this default file more useful with regard to accepting URIs to
CGI programs.  Also add a comment about syntax of this file.
2000-12-18 00:16:26 +00:00
jlam
2241a81cb3 Honor CFLAGS passed in from environment during build. Improve the INSTALL
script and add a DEINSTALL script in handling the config file.
2000-12-17 22:21:44 +00:00
itojun
da6833051b upgrade to 2.20b. main purpose for this upgrade is security fix.
---
New in version 2.20b:

  * Corrected version of Marcel Telka's ssi fix. My bad.

New in version 2.20:

  * Performance improvements to the timer package via hashing, and
    double-linking / sorting the lists. Partially based on a suggestion by
    Michal Ostrowski.
  * Performance improvement to the mmap cache package, from Evan Jones.
  * Minor Linux fix for open files limit, from Jordan Ritter.
  * Fix for null ClientData, which picky compilers didn't like.
  * Unknown sockaddr type becomes a non-fatal error, preventing a DOS attack.
  * Close extraneous file descriptors on CGI calls - from Russell Dill.
  * Security fixes for the external ssi program, from ghandi@dopesquad.net and
    Wolfgang Rupprecht.
  * Fix to make the ssi program elide the HTML comment sequence, from Marcel
    Telka.
  * Red Hat packaging updates from Bennett Todd.
  * Throttling fix from Tom Pavel.
2000-10-28 02:35:52 +00:00
jlam
9ab26c50e7 Install rc.d control script as "foo" instead of "foo.sh" to comply with
how NetBSD's rc.d system interprets script names.  Also add appropriate
REQUIRE and PROVIDE sections to allow direct use in NetBSD's rc.d system.
2000-09-20 05:14:10 +00:00
jlam
9d09a539fc Make sure that thttpd uses a pidfile when running. Also some minor
nits to make startup script nicer.
2000-08-06 02:51:59 +00:00
jlam
63a7e2f8c4 Remove empty line 2000-08-06 02:48:35 +00:00
tron
1b67217a5f Because "thttpd" is not the only HTTP daemon in the package collection
use "@unexec rmdir" on "libexec/cgi-bin".
2000-08-01 18:47:50 +00:00
jlam
bcaaeb83c4 Missing a " in the installed index.html. Now the little NetBSD logo
actually appears, which is good for advertising :)
2000-08-01 12:38:45 +00:00
jlam
2de66ffdb2 Remove trailing whitespace. 2000-07-27 12:54:15 +00:00
jlam
099a8cda10 Find default document root in ${PREFIX}/share/thttpd, not
${PREFIX}/share/www.
2000-07-27 12:49:22 +00:00
jlam
3a4e0c9434 Put files in ${PREFIX}/share/thttpd, not ${PREFIX}/share/www. 2000-07-27 12:47:33 +00:00
jlam
0cc03ae1d8 Update thttpd to 2.19. Changes from 2.16:
New in version 2.19:
     * Added hack to prevent MSIE 5 from censoring error messages.
     * Minor fix to handling of shouldn't-happen error in ls().
     * IPv6/Linux fix from Tero Pelander.
     * Documented the -D flag.
   New in version 2.18:
     * Fixed URL-encoding of high-bit characters - used in directory
       listings.
     * Made a few more characters come through verbatim instead of %-encoded.
     * Couple of minor code cleanups.
     * Added some MIME types to support WAP/WML.
     * IPv6 fix.
     * Made MIME text character-set an option, with iso-8859-1 the default.
   New in version 2.17:
     * A change in the way wildcard matching works - now a single * only
       matches strings that don't include a slash. To match entire pathnames
       including slashes you have to use **.
     * On systems with IPv6, automatically bind to both v4 and v6 sockets.
     * Slight change to non-local referer checking to handle older browsers.
     * Tweaks to some of the error-403 syslog messages.
     * Portability tweak for OSF/1.
     * Portability tweak for IPv6 systems.
     * Fix for ssi.c from Marcel Telka.
     * Added charset=iso-8859-1 to text MIME types.
     * Added wildcards to redirect.
     * Changed symlinks/nosymlinks config options to symlink/nosymlink, to
       conform to the man page (old style still accepted).
2000-07-27 12:42:08 +00:00
itojun
5ce609ddb2 fix IPv6 build.
upgrade 2.15 -> 2.16.  changes from webpage:
- More explicit error pages for 403 Forbidden.
- New section in the manual page explaining how thttpd is picky about
  file permissions.
- Couple of CGI tweaks from David Chaiken.
2000-04-07 10:11:54 +00:00
hubertf
d131fd6fb8 no need to specify %D for @dirrm - remove it 2000-03-01 16:12:13 +00:00