Commit graph

33 commits

Author SHA1 Message Date
jlam
76bdc72fc4 As per discussion in pkg/18854, remove support for apache_start.conf as
the precedence of the contents of this file changes depending on whether
it's started at boot time or started manually, and it's not really
necessary to add the extra complexity since it's valid (and easier) to just
set apache_start in /etc/rc.conf.
2002-11-19 23:08:47 +00:00
lukem
df661f69e5 Only set apache_start to "start" if it's not already set.
Previously, if apache_start was set in /etc/rc.conf and /etc/rc.d/apache was
loaded as part of the /etc/rc start sequence, apache_start's value would
be overridden by "apache_start=start" in this script, because /etc/rc.conf
would have already been loaded and load_rc_config() would not reload it again.

This problem would not have been seen if /etc/rc.d/apache was started
manually, or /etc/rc.conf.d/apache or @PKG_SYSCONFDIR@/apache_start.conf
was used to set apache_start.

(I am using /etc/rc.conf, and was wondering why apache wasn't starting
with ssl support at boot, but worked after a manual restart...)
2002-10-14 00:29:50 +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
a020ed9056 Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
2002-08-25 21:50:52 +00:00
wiz
fb88b63b73 Update apache packages with some common changes:
Give Apache a user and group by default, not only with suexec.
The variables for this have changed from APACHE_SUEXEC_USER and
APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP.
Mention 'Apache' in COMMENT.
Use variables for the version number instead of copying it around.
Bump PKGREVISION.

For apache{,6}:
Change paths to /var/httpd instead of /var/spool/httpd.
Honour STRIPFLAG.
Add --without-confadjust as configure argument.
Enable the 'define' module.

For apache:
Enable proxy module on NOPIC platforms.

Some of these changes are based on pkg/17469 by Greg A. Woods, some on
comments by Johnny Lam.

Reviewed by Johnny Lam.
2002-07-30 18:40:14 +00:00
tv
d84b6cc3f9 Provide the common rc.d directive "reload" as an alias for "apachectl graceful",
which reloads the server without killing transfers in progress.
2002-07-07 00:45:18 +00:00
jlam
cd8056aeb4 Add back ability to change the value of "apache_start" from /etc/rc.conf
that was lost in the previous commit.

"${apache_start}" is the subcommand sent to apachectl to control how
httpd is started.  It's value may be overridden in:

	@PKG_SYSCONFDIR@/apache_start.conf
	/etc/rc.conf
	/etc/rc.conf.d/apache,

in order of increasing precedence.  Its possible values are "start"
and "startssl", and defaults to "start".
2002-02-26 20:28:41 +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
049ae3fcc4 Vastly simplify this script by using /etc/rc.subr. Provide minimal start
functionality on pre-1.5 platforms, as apachectl may always be used instead
for the full control interface.
2001-12-26 22:03:38 +00:00
jlam
6e896e42e0 Forgot a CONFDIR -> PKG_SYSCONFDIR replacement. 2001-11-26 07:30:44 +00:00
martti
b8b916983c - Updated to Apache 1.3.22
- Updated the IPv6 patch

Apache 1.3.20 - 1.3.22 Major changes

  Security vulnerabilities

     * A vulnerability was found in the Win32 port of Apache 1.3.20.  A
       client submitting a very long URI could cause a directory listing
       to be returned rather than the default index page. A 403 Forbidden
       will now be returned.  CAN-2001-0729
     * A vulnerability was found in the split-logfile support program. A
       request with a specially crafted Host: header could allow any file
       with a .log extension on the system to be written to. PR#7848
       CAN-2001-0730
     * A vulnerability was found when Multiviews are used to negotiate
       the directory index. In some configurations, requesting a URI with
       a QUERY_STRING of M=D could return a directory listing rather than
       the expected index page.  CAN-2001-0731

     The security issues above have been assigned standardized names, CAN-
     by the Common Vulnerabilities and Exposures project (cve.mitre.org)

  New features

   The main new features in 1.3.22 (compared to 1.3.20) are:
     * The user manual has been updated. As well as a number of small
       fixes these updates include new translations into French and
       Japanese, a guide to using Apache httpd on Cygwin, a lexicon of
       Apache error messages, updated TPF documentation, and a
       comprehensive guide to using log files
     * The user manual can now be moved out of the htdocs DocumentRoot
       during installation by invoking configure with the --manualdir=
       switch, to allow separation of on-line docs from regular contents.
     * The supplied icons are now also distributed in PNG format
     * A significant overhaul to the Apache Bench program, ab has taken
       place, as first reported in April. The new Apache Bench includes
       fixes, additional statistics, csv and gnuplot output, and some
       SSL support
     * New directives have been added to the mod_usertrack module, The
       first, CookieDomain, can be used to customise the Domain
       attribute.  The patch to add the CookieDomain directive was first
       submitted over two years ago. Historically mod_usertrack has used
       the obsolete Netscape cookie syntax. The new CookieStyle directive
       allows use of the RFC2109 or RFC2965 syntax instead. PR#5023,
       PR#5920, PR#6140.
     * The server will now display a warning if line-end comments (#) are
       found in the configuration file. Not all directives are able to
       handle comments on the same line
     * A new directive, AcceptMutex, allows run-time configuration of the
       mutex type used for accept serialization, currently a compile-time
       only setting in 1.3. Since different types of mutex have different
       performance characteristics on different platforms, this directive
       will allow administrators to tune their Apache server more easily.
       The current list of possible methods is: uslock, pthread, sysvsem,
       fcntl, flock, os2sem, tpfcore, none. Not all platforms support all
       methods
     * mod_auth has been enhanced to allow access to a document to be
       controlled based on the owner of the file being served. Require
       file-owner will only allow files to be served where the
       authenticated username matches the user that owns the document.
       Require file-group works in a similar way checking that the group
       matches

   New features that relate to specific platforms:
     * A new directive, AcceptFilter, has been added to control BSD
       accept filters at run-time.  This should make it easier to move
       server binaries across different BSD machines without requiring
       recompilation.  Support for accept filters was first added to
       version 1.3.14, the functionality can postpone the requirement for
       a child process to handle a new connection until an HTTP request
       has arrived, therefore increasing the number of connections that a
       given number of child processes can handle
     * On Win32 mod_unique_id, mod_mime_magic, and the mod_vhost_alias
       modules are now enabled
     * The Cygwin port includes a number of fixes and updates.  Cygwin
       support was first introduced in version 1.3.20
     * On Windows 2000, the service display names can now be modified
       by the user (use the service control panel applet)
     * On Win32 a new option -W can be used to set up a dependency on
       another service, see win_service.html
     * The server will now take advantage of recent improvements to the
       TPF operating system which include an enhanced system fork and
       exec, updates to allow non-blocking file descriptors, and an
       update to shutdown processing

  Bugs fixed

   The following bugs were found in Apache 1.3.20 and have been fixed in
   Apache 1.3.22:
     * Under certain circumstances a child may crash due to a bug in
       mod_include.  If a server uses an ErrorDocument for 404 (request
       not found) errors which points to a server-parsed HTML file which
       uses a <!--#include  virtual="file" --> section, then a request
       containing %2f will result in a segfault. The segfault is harmless
       and does not cause a security problem, but is being triggered by
       the recent IIS worm
     * The Multiviews functionality has been fixed to prevent
       mod_negotiation from serving any multiview variant that contains
       unknown filename extensions. PR#8130
     * Apache will prefer installed version of the Expat library over the
       bundled version. This fixes conflicts when multiple copies of the
       Expat library get loaded (notably when using mod_perl and
       XML::Parsers::Expat)
     * UnsetEnv now works from the main body of a configuration file.
       PR#8254
     * When used as a reverse proxy any headers set by other modules
       (such as mod_usertrack or mod_securid) now get passed on to the
       back-end server. PR#6055
     * Server response headers can now be logged via the proxy. PR#7461
     * mod_proxy will now pay attention to HTTP headers that specify the
       request is not to be cached. PR#5668
     * When a client making a request via mod_proxy died unexpectedly,
       mod_proxy did not close its connection. PR#8090
     * The CacheForceCompletion directive has been fixed PR#7383,
       PR#8067, PR#6585
     * A memory leak has been fixed in the mod_mime_magic module
     * A Satisfy All option has been added to the default container
       designed to stop access to .htaccess files.  Without this
       directive, these files could still be fetched if they were within
       the scope of a Satisfy Any directive.

   The following bugs relate to specific platforms:
     * A number of fixes for NetWare have been added. These include:
       enabling long file names in htpasswd and htdigest, protection
       against ill behaved modules, better handling of abnormal
       shutdowns, dealing with the limited stack space during server side
       includes, and recognising special filenames such as proxy:http://
       correctly
     * A shutdown hang could occur on Solaris when using lots of piped
       TransferLogs and at least one piped ErrorLog
     * On EBCDIC platforms a bug in the proxy module stopped SSL proxying
       working
     * On Win32, mod_unique_id did not guarantee a unique ID due to
       threading
     * The Win32 Makefiles are now 100% compatible with the Microsoft
       Visual C++ compiler versions 5,6,7
2001-10-17 07:47:52 +00:00
jlam
4f3f95f3d7 Mirror changes in www/apache/files/apache.sh. 2001-05-14 21:28:33 +00:00
jlam
5f9dd5a24f Improve rc.d-style startup script. It now respects settings in
/etc/rc.conf (apache=YES/NO and apache_start=startssl) if it exists.
2001-05-08 18:13:51 +00:00
jlam
f765238971 Make apache and apache6 package skeletons look more similar. Change
maintainer of apache6 package back to itojun@netbsd.org.
2001-04-29 21:21:13 +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
itojun
802996410d update to 1.3.19 with IPv6 patch.
--- from apache/Announcements
                         Apache 1.3.19  Major changes

   The primary security fix is:
     * The default installation could lead mod_negotiation and mod_dir or
       mod_autoindex to display a directory listing instead of the
       multiview'ed index.html.* files, if a very long path was created
       artificially by using many slashes.  Now 403 FORBIDDEN is returned.

   The bug fixes are:
     * The ServerRoot directive now removes trailing slashes.
     * Restore functionality broken by the mod_rewrite security fix:
       The mod_rewrite string arithmetic is corrected for rewrite map.
     * Some possible segfault conditions have been fixed.
     * Under certain circumstances, Apache did not supply the
       right response headers when requiring authentication.

   The main new features include:
     * New configuration error reporting if the UserDir argument is set
       to a relative path on Win32 or Netware [which do not support home
       directories], or a relative path on any platform if that path
       includes the '*' username substitution.

   Selected new features that relate to Windows platforms:
     * Apache on Win9x now ensures the service is stopped before removal.
     * Test httpd.conf (-t) now holds the console open on "SYNTAX OK".
     * Apache/Win32 no longer holds open the console on error unless
       it was invoked from a shortcut with the -w option.
     * mod_user was significantly refactored to assure that the UserDir
       directive is parsed effectively the same across platforms, fixing
       a UserDir bug introduced in 1.3.17 on the Win32 platform.

   Selected new features relating to other platforms:
     * Netware problems with file extension truncatation are resolved.
     * Netware recognizes the SERVER/VOLUME:/PATH/FILE filename pattern.
     * Netware mod_tls properly disables nagle for SSL connections,
       and properly negotiates SSL based on the port.
     * Startup and Shutdown issues were addressed on TPF.
2001-03-01 04:03:08 +00:00
tron
a12bae94e6 Fix typo. 2001-02-07 15:08:30 +00:00
itojun
5530243cc0 pull official patch from apache.org. make it 1.3.17.1 2001-02-06 12:50:19 +00:00
itojun
5ed60a1dcb upgrade to 1.3.17 + IPv6 patch. pkgsrc directory is much more similar to
pksrc/www/apache.  see pkgsrc/www/apache changelog for full changelog.
2001-02-06 10:58:18 +00:00
itojun
adfb4742a9 use latest IPv6 patch. this fixes problem with virtual host directives
when incoming IPv4 connections are captured by AF_INET6 socket (IPv4 mapped
address).  not really matter for normal NetBSD installation.

I beileve IPv4 mapped address is very bad from security/access control POV.
really.
2001-01-15 11:43:59 +00:00
itojun
6e87833b2c upgrade to 1.3.14 + IPv6 patch. apache side fixed security hole between
1.3.12 -> 1.3.14.
2000-11-14 19:58:05 +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
itojun
859420d97a use 9/8 apache IPv6 patch. this fixes some problem in http proxying code
(URL parser makes mistake on certain pattern)
2000-09-08 11:42:43 +00:00
jlam
749b27c581 Don't specify version numbers of the libraries to load for SSL support --
version numbers change, and it doesn't work correctly on a.out anyway.

Closes pkg/10309.
2000-09-06 05:52:48 +00:00
itojun
6afe74926b upgrade to 1.3.12 + latest IPv6 patch.
solves cross site scripting problem in 1.3.11 (www.apache.org)
2000-08-15 10:31:24 +00:00
hubertf
dab9a8dec8 Make the rc.d script(s) react to something else then 'start', i.e.
one can now stop the daemon.
2000-07-10 12:22:27 +00:00
hubertf
0988c681f9 defuzz 2000-04-26 03:30:26 +00:00
itojun
df5bd1c792 correct patch-sum. 2000-03-26 13:36:42 +00:00
itojun
3e799d0d3d use apache 1.3.11 + IPv6 patch as base version.
for changes between 1.3.9 to 1.3.11, please see commit logs for
pkgsrc/www/apache, or apache changelogs.
2000-02-21 07:14:44 +00:00
itojun
580978d17c reven patchsum.
PR: 8307
1999-09-03 04:06:33 +00:00
itojun
49b6bd679d upgrade apache original version to 1.3.9.
use latest IPv6 patch from ftp://ftp.kame.net/pub/kame/misc/.

fixes PR: 8307
1999-09-01 07:41:01 +00:00
itojun
dffe436c17 provide and enable IPv6-ready apache.
This is provided as separate package because:
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6 enable patch.
# IPv6 enable patch conflicts with third-party modules anyway, due to
# sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
1999-07-23 18:19:29 +00:00
itojun
5e218c5552 import pkgsrc/www/apache into pkgsrc/www/apache6,
to make a IPv6-ready version of apache package.
1999-07-23 17:53:29 +00:00