Commit graph

60 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
e2afa97f51 Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
2002-08-25 18:38:05 +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
wiz
6718d8cd70 Test some more files before using 1.5 rc.subr features.
Closes pkg/17378 by Greg A. Woods.
2002-07-02 11:57:19 +00:00
jdolecek
d94ae5e191 update for now-available mod_ssl-2.8.9-1.3.26 2002-06-19 11:03:58 +00:00
jdolecek
564cc4aca9 Update apache to 1.3.26.
Custom mod_ssl eapi patch used for now, since update of mod_ssl for 1.3.26
isn't available yet.

This fixes the CAN-2002-0392 (mitre.org) [CERT VU#944335] security
issue. For full list of changes, see
	http://www.apache.org/dist/httpd/CHANGES_1.3
2002-06-19 10:17:58 +00:00
abs
ae2edbe9ce If we do not have /etc/rc.subr then call apache_doit "$1" not eval ${start_cmd} - "/etc/rc.d/apache restart" and friends work again on Linux 2002-03-18 12:15:37 +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
jlam
1008fafead Update apache to 1.3.22. Relevant changes from version 1.3.20 include
using the pkgsrc expat library instead of the builtin one (this is to
avoid conflicts between expat libraries when an expat XML parser is loaded
by either mod_perl or mod_php), and:

  Security vulnerabilities

     * 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.
     * 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.

  General bug fixes and improvements

     * Bug fixes
     * The supplied icons are now also distributed in PNG format
     * New directives have been added to the mod_usertrack module, The
       first, CookieDomain, can be used to customise the Domain
       attribute.
     * A new directive, AcceptMutex, allows run-time configuration of the
       mutex type used for accept serialization.
     * mod_auth has been enhanced to allow access to a document to be
       controlled based on the owner of the file being served.
     * A new directive, AcceptFilter, has been added to control BSD
       accept filters at run-time. 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
2001-10-17 19:17:00 +00:00
jlam
7ba343dd3c Make this look more like databases/postgresql-server/files/pgsql.sh:
Respect /etc/rc.conf.
	Handle "force" commands.
	Allow overriding of ${name}_flags with ${flags} from environment.
2001-05-14 21:27:25 +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
6a44f59798 Update apache to 1.3.19nb1. Changes from 1.3.19 include using mod_ssl
2.8.2 patches and more thorough use of APACHE_SYSCONFDIR setting.
2001-04-29 20:42:28 +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
kim
e6e2609df2 Use APACHE_SYSCONFDIR to set sysconfdir (the location of config files). 2001-04-14 19:42:53 +00:00
jlam
cf3f21d472 Update apache to 1.3.19. The pkgsrc-related changes include adding a
config.layout file instead of specifying every directory as on option to
the Apache configure script.  This layout file might be useful later when
we package Apache 2.x.  I also reordered a few lines so that it's easier
to diff apache/Makefile and apache6/Makefile (hi itojun!).  Also build
the mod_define shared module from the mod_ssl sources.

Relevant changes from version 1.3.17.1 include:

  *) Rewrite ap_unparse_uri_components() to make it safer and more readable
  *) Under certain circumstances, Apache did not supply the
     right response headers when requiring authentication.
  *) Clean up some end-of-loop not reached warnings
  *) Add the correct language tag for interoperation with the Taiwanese
     versions of MSIE and Netscape.
  *) Workaround enabled for a core dump which appeared in broken
     NameVirtualHost configurations.
  *) Sporadic core dump in ap_default_port_for_scheme() with
     internal requests
  *) SECURITY: The default installation could lead to mod_negotiation
     and mod_dir/mod_autoindex displaying a directory listing instead of
     the index.html.* files, if a very long path was created artificially
     by using many slashes. Now a 403 FORBIDDEN is returned.
  *) Trailing slashes (if they exist) are now removed from ServerRoot,
     because there were known problems with them.
  *) TPF startup/shutdown fixes.
  *) Correct a typo in httpd.conf.
  *) Get the correct IP address if ServerName isn't set and we can't
     find a fully-qualified domain name at startup.
  *) Fix pointer arithmetic in mod_rewrite map expansion.
  *) Fixed a problem with file extensions being truncated during
     the call to ap_os_canonical_filename().
2001-03-13 20:52:26 +00:00
wiz
ee04ec3a02 regen 2001-03-01 13:40:01 +00:00
jdolecek
96606f662b Put back the patch to avoid dlclose(). Without the patch, it's not
possible to use LoadModule at all (httpd crashes soon after it forks).
This is most probably an Apache problem. Until the real problem
is tracked down, put this in as workaround.

This addresses lib/12164 and bin/12283.
2001-02-27 20:04:23 +00:00
tron
a12bae94e6 Fix typo. 2001-02-07 15:08:30 +00:00
itojun
57d899e609 pull in official fix from apache. make the version number 1.3.17.1
(hope it is the right way).

>There's another bug in RewriteMap handling in Apache 1.3.17, which
>causes ${} expansions to be completely ignored. This patch fixes it.
2001-02-06 12:38:59 +00:00
jlam
9669e40488 Correct HTML syntax. 2001-02-03 20:53:10 +00:00
jlam
ec0d4b522c Update apache to 1.3.17. Important changes from version 1.3.14 include:
-) Remove patch to avoid dlclose()ing on NetBSD.  The mod_perl vs. perl CGI
   mis-interaction seems to be gone and I wasn't able to reproduce it on my
   system.

*) Fix the declaration of the module structure in mod_example.
*) Fix the handling of variable expansion look-ahead in mod_rewrite,
   i.e. syntax like %{LA-U:REMOTE_USER}, and also fix the parsing of
   more complicated nested RewriteMap lookups.
*) mod_status now respects ?refresh=n of 1 or greater.  If the given
   refresh value is not a number, ?refresh is set to 1 second.
*) Accomodate an out-of-space condition in the piped logs and the
   rotatelogs.c code, and no longer churn log processes for this condition.
*) Make cgi-bin work as a regular directory when using mod_vhost_alias
   with no VirtualScriptAlias directives.
*) Move the check of the Expect request header field after the hook
   for ap_post_read_request, since that is the only opportunity for
   modules to handle Expect extensions.
*) Eliminate caching problems of mod_autoindex results, so the last
   modified date of the directory is returned as the Last-Modified
   and ETag HTTP header tags are sent if IndexOptions TrackModified
   directive/option is used.
*) Correct an issue with Alias and ScriptAlias directives that
   file path arguments were not normalized in canonical form.
   This correction makes no attempt to normalize regular expression
   forms of Alias or ScriptAlias.
*) Add a new LogFormat directive, %c, that will log connection
   status at the end of the response.
*) Update the mime.types file to the registered media types as of 2000-10-19.
*) Restore functionality broken by the mod_rewrite security fix:
   rewrite map lookup keys and default values are now expanded
   so that the lookup can depend on the requested URI etc.
2001-02-02 16:39:56 +00:00
jlam
f7c81d455f Install cgi-bin scripts with executable bit set. 2001-01-14 05:58:01 +00:00
jlam
fed7aee3f4 Update ap-ssl to 2.7.1 using mod_ssl-2.7.1-1.3.14. Also update apache to
1.3.14.1, adding a superminor version number to indicate possible EAPI
update.

   *) Fixed the parsing of SSLSessionCache directives. The prefixes were
      incorrectly skipped and leaded to "unable to open semaphore file"
      errors.
2000-10-17 18:14:15 +00:00
jlam
d0abc415ac Update apache to 1.3.14. Changes from version 1.3.12 are listed below.
The security fixes are:
     * A problem with the Rewrite module, mod_rewrite, allowed access to
       any file on the web server under certain circumstances
     * The handling of Host: headers in mass virtual hosting
       configurations, mod_vhost_alias, could allow access to any file on
       the server
     * If a cgi-bin directory is under the document root, the source to
       the scripts inside it could be sent if using mass virtual hosting

   The main new features include:
     * Support for a directory-based configuration system. If any of the
       configuration directives point to directories instead of files,
       all files in that directory (and in subdirectories) will be also
       parsed as configuration files
     * Support name-based virtual hosting without needing to specify an
       IP address in the Apache configuration file. This enables sites
       that use dynamic IP addresses to support name-based virtual
       hosting as well as allowing identical machines to share a
       configuration file, say in a load-balanced cluster
     * The SetEnvIf and BrowserMatch range of directives are now able to
       be used in .htaccess files.
     * Administrators who are nervous about their full server version
       details being public can use the new keyword 'ProductOnly' in the
       ServerTokens directive. This keyword forces the server to only
       return the string "Apache" as the server version.
     * The new digest authentication module, mod_auth_digest has had a
       number of fixes and upgrades applied
2000-10-13 21:46:45 +00:00
jlam
b2dc1746ad When restarting, increase the delay slightly to give servers a chance to
stop completely.
2000-10-13 21:46:32 +00:00
jlam
329b962c7e Make the rc.d control script less verbose/redundant in its messages. 2000-09-20 06:08:42 +00:00
jlam
2bb5b87d82 When calling "apache.sh restart", instead of calling "apachectl restart",
we call stop, then start.  This correctly restarts httpd with SSL support
if it was initially started with SSL support.
2000-09-14 02:31:04 +00:00
jlam
141783533c Check for @PREFIX@/etc/httpd/mod_ssl.conf, not @PREFIX@/etc/mod_ssl.conf,
if we're sourcing the former.
2000-09-13 20:06:24 +00:00
jlam
ddf7651497 Provide mechanism to allow ap-ssl to force start of apache with "startssl". 2000-09-12 14:50:51 +00:00
jlam
a29e7d6317 Update build to work with mod_ssl-2.6.6-1.3.12 to keep in sync with ap-ssl.
EAPI didn't change so no need to change Apache's version number.

Also standardize package builds to have Apache listen on ports 80/443
regardless of UID of user that builds the package, and make MAINTAINER
point to me.
2000-09-12 14:17:31 +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
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
explorer
19916bed0a upgrade to 1.3.12, which will handle openssl-0.9.5a 2000-04-21 02:16:23 +00:00
hubertf
6539d1231e defuzz 2000-02-09 00:54:01 +00:00
christos
f1ab0ac29a regen 2000-01-31 16:35:52 +00:00
christos
b2ee1a6e4c update for 1.3.11 2000-01-31 16:35:36 +00:00
rh
5ad7f2cded defuzz 1999-11-27 21:57:11 +00:00
tron
a18ca017b2 Update Apache package to version 1.3.9 (SSL Module 2.4.8) using patches
suppled by SUNAGAWA Keiki in PR pkg/8819. This version mostly fixes
bugs discovered since version 1.3.6.
1999-11-21 22:09:26 +00:00
agc
00a16e3008 Add package patch checksum files. 1999-07-09 14:22:59 +00:00
tron
fbd3923a66 Redirect output of "apachectl" to "/dev/null". 1999-05-11 18:38:31 +00:00
tron
40c91b2f8d Add a standard start script for Apache. 1999-05-11 18:32:23 +00:00
tv
930832d85c Update Apache to 1.3.6, mod_ssl to 2.2.8, and mod_perl to 1.19. mod_ssl
now makes use of OpenSSL.
1999-04-30 17:05:19 +00:00
tv
d9888daccd - Update mod_ssl's distname to 2.1.3 (does not require an apache version
bump; EAPI is unchanged)
- Remove restriction of mod_include to disallow "../" or "/" prefixed
  file names in <!--#include file=""--> if Includes (but not
  IncludesNOEXEC) is set; proposed in Apache PR mod_include/3500
- Add signature for hook function used to do mod_include callbacks
  (perl-embedded SSI was not working with new 4 argument call)
1998-12-07 16:20:39 +00:00
tv
ccf67c359f Bump version to 1.3.3.2' - add timefmt' argument to
ap_include_extern_func's (needed for a couple upcoming XSSI-extending
modules).  Also fix apxs to use `install' and fix the cgi-bin
`preservation' while we're here.
1998-12-04 17:23:19 +00:00