Commit graph

87 commits

Author SHA1 Message Date
jlam
fe0e35dbfe Fix installation so that existing config files are preserved when building
from source instead of installing from a binary package (problem noted in
private email by George Coulouris <george@coulouris.org>.  Also move the
ownership of SSL-related config directories to the www/ap-ssl package.
2002-01-01 06:12:05 +00:00
jlam
da525c873f (1) Create new variable "APACHE_SUEXEC_CONFIGURE_ARGS" that may contain
--suexec-* configure options that are passed directly to the Apache
    configure script.  This may be used to tune the suEXEC configuration
    in more restrictive ways, e.g. --suexec-uidmin=1000.  This solution
    is more open-ended than the fix proposed in pkg/14973.  Also, we
    don't duplicate all of the options from the Apache configure script
    in pkgsrc bsd.pkg.defaults.mk.  This closes pkg/14973 by Eric
    Schnoebelen <eric@cirr.com>

(2) For namespace consistency, deprecate APACHE_USER in favor of
    APACHE_SUEXEC_USER.  Move APACHE_USER into bsd.pkg.obsolete.mk.

(3) Create the suEXEC user when the functionality is enabled in the server
    so that CGI scripts will work properly.  This closes pkg/14903 by
    Wojciech Puchar <wojtek@3miasto.net>
2001-12-26 21:20:26 +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
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
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
jlam
8b5f62044c Don't do the dance with ROOT_GROUP. Apache extension modules installed by
apxs are now installed with "${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP}",
which should do the right thing regardless of the platform.  ${INSTALL} is
replaced with the full path to the install program used by pkgsrc, which
should be /usr/bin/install on NetBSD, and /usr/ucb/install on Solaris.

This should fix pkg/14232 by Pierre Bourgin.
2001-10-22 18:02:51 +00:00
jlam
c99b206439 Only link -lgcc whole-archive on NetBSD ELF platforms, to allow a.out
platforms to correctly links this package.
2001-10-20 17:46:50 +00:00
veego
205345c4b8 Define a ROOT_GROUP, which defaults to root on SunOS, otherwise to wheel.
Using -o 0 and -g 0 doesn't work with the ucb install on Solaris.
2001-10-19 09:52:22 +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
b8d0b8d85a Update apache{,6} to 1.3.20nb1. Changes from version 1.3.20 are:
On NetBSD, we need to link libgcc.a whole-archive so that certain symbols
from the C++ implementation (__get_eh_context, etc.) referenced by DSOs
written in C++ will resolve correctly.  This makes php4-sablot work with
mod_php4.so (from ap-php4) on ELF platforms when loaded by Apache's httpd.
2001-10-16 04:11:06 +00:00
jlam
f79573370a Mechanical changes to 375 files to change dependency patterns of the form
foo-* to foo-[0-9]*.  This is to cause the dependencies to match only the
packages whose base package name is "foo", and not those named "foo-bar".
A concrete example is p5-Net-* matching p5-Net-DNS as well as p5-Net.  Also
change dependency examples in Packages.txt to reflect this.
2001-09-27 23:17:41 +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
hubertf
1f91c92c05 Solaris doesn't know about xargs -0 2001-07-09 02:45:09 +00:00
jlam
99d44cc895 Update apache to 1.3.20. Relevant changes from version 1.3.19 include:
NetBSD Packages Collection (pkgsrc) changes:
     * Modify French page in same way as the English page.  Translation
       provided by Remi Zara <remi_zara@mac.com> in private e-mail.
     * Use EAPI patches from mod_ssl-2.8.4-1.3.20.
     * Unify repeated SED replacement info for config.layout, apache.sh,
       DEINSTALL, and INSTALL into one location, FILES_SUBST.
     * Modify patch to apxs to use 0:0 instead of root:wheel, as some
       non-NetBSD systems don't have a wheel group.

   The general bug fixes:
     * Eliminate a potential segfault if an invalid floating point value
       is passed to the ap_snprintf() function, on platforms supporting
       isnan() and isinf().
     * Fix a possible segfault at startup in the detection of a default
       ServerName or IP string when no ServerName was specified.
     * Fixed mod_proxy to retain empty headers, as allowed by RFC2068.
     * Properly resolve the location of ndbm on Linux and some glibc2
       builds, where ndbm.h is in the nonstandard db1/ subdir.

   The main new features include:
     * Enhanced rotatelogs to allow a UTC offset to be specified, and
       the format logfile names with human-readable date/time stamps.
     * Added the NOESCAPE (NS) flag to RewriteRule, to disable *all*
       normal URI escaping.  Note incautious use can give unexpected
       results or introduce security risks.
     * Added the '\' character to RewriteRule to allow escaping of
       special characters.  Allows embedding of both the '$' and '%'
       characters in the results, so 'foo\$1' translates to 'foo$1'
       rather than 'foo\<value of $1>'.
     * Added the -V flag to suexec, to display the compile-time settings
       with which it was built.  (Only valid for root or the HTTPD_USER
       username.)
     * Introduced EBCDIC conversion configuration options, controlling the
       conversion based on MIME type or file suffix.
2001-06-09 06:36:42 +00:00
jlam
5f0d65a65d Introduce a new make variable APACHE_CUSTOM_CFLAGS that can be set in
/etc/mk.conf to any string of legal compiler flags to tune different aspects
of the built httpd.
2001-05-18 06:01:35 +00:00
jlam
763c66cabe Revert last change...MAKE is now added CONFIGURE_ENV in bsd.pkg.mk. 2001-05-18 02:19:07 +00:00
abs
c332bc2929 Add MAKE="${MAKE}" to CONFIGURE_ENV, otherwise on Linux apache configures to
use gmake when when it is being compiled with bmake, and much pain ensues
2001-05-17 16:32:26 +00:00
jlam
3d570b5894 Update apache to 1.3.19nb2. The only change from version 1.3.19nb1 is using
the updated EAPI patches from mod_ssl-2.8.3-1.3.19 which includes the
following fix:

   *) Fixed EAPI context usage in http_request.c: a context pointer
      potentially can be NULL requests and can cause a segfault if
      dereferenced.
2001-05-14 14:02:02 +00:00
jlam
a7a1b31121 Allow changing document root for suexec through ${APACHE_SUEXEC_DOCROOT}.
Closes pkg/12852 by Eric Schnoebelen <eric@milo.cirr.com>.
2001-05-08 17:28:08 +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
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
kim
4fba76b074 Fix MASTER_SITES 2001-04-14 19:50:04 +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
a0745845b3 Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT. 2001-02-17 17:21:28 +00:00
kei
da46920fea Workaround for file permission problem of htdocs/index.html.*. Problem report
submitted to the author.
2001-02-13 11:38:23 +00:00
tron
5f4daebc6e Add missing directory name "source" to URL for German "mod_ssl" mirror. 2001-02-07 09:56:45 +00:00
tron
672af70984 Add German mirror sites. 2001-02-07 09:52:45 +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
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
tv
de705a81f0 Use the "nb" convention to distinguish the teeny version bump caused by
pkgsrc (instead of a real version number change in the program).
2001-01-13 15:25:04 +00:00
jlam
cbfbe4c8d8 Make the INSTALL/DEINSTALL scripts handle configuration files like
cups: copy sample config files to default config files, and remove
the config files on deinstall if they're identical to the sample ones.
2000-12-22 19:41:52 +00:00
jlam
b8de91e261 Introduce APACHE_USER: the user allowed to execute the suexec wrapper
if apache was build with APACHE_SUEXEC == YES.
2000-12-11 00:03:07 +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
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
thorpej
467e782954 Don't pass --disable-suexec. The configure script doens't accept
it, and the default is "off" anyhow.
2000-09-12 19:39:02 +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
2013fec161 * This package left cruft after deinstalling. Add DEINSTALL script to remind
package admin where the cruft is that may need to be manually removed.

* Factor out the making of extra directories and the copying of config files
  into a separate INSTALL script.

* Rearrange the Makefile a bit to handle changes in the PLIST.

* Remove erroneous information from pkg/DESCR.
2000-09-06 06:17:55 +00:00
jlam
bb3a955498 Use PERL5 variable for location of perl5 binary. 2000-08-28 09:14:50 +00:00
tron
9fbdbfac5b Finish half done update of "apache" package to 1.3.12. 2000-04-24 13:13:22 +00:00
cjs
3aa4c244b0 I've not maintained this for a long time, but nobody else has taken
over and put his name in. So I'm arbitrarily changeing the maintainer
to the guy with the most commits to the Makefile.
2000-04-05 21:05:30 +00:00
veego
408c764903 Solaris needs a dependence for db-2.7.7 and fix the broken [ -e test on Solaris. 2000-02-22 17:38:16 +00:00
wiz
c2480cce01 replace 'find' by '${FIND}' where appropriate 2000-02-20 22:05:37 +00:00
wiz
d2d328304e replaced tail by ${TAIL} 2000-02-05 14:01:11 +00:00
christos
b2ee1a6e4c update for 1.3.11 2000-01-31 16:35:36 +00:00
bad
a775e3c339 Adjust offset into ssldoc.patch for mod_ssl-2.4.8. 1999-12-01 00:41:34 +00:00
tron
f7dc26c56a Don't try to disable obsolete configuration rule "STATUS" if
"${APACHE_PERF_TUNING}" is set to "YES". Fixes PR pkg/8915 by
Damon Brodie.
1999-11-30 20:33:33 +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