Commit graph

165 commits

Author SHA1 Message Date
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
428690a394 Fix typo, from pkg/18336 by Joachim Koenig-Baltes. 2002-09-20 01:53:14 +00:00
jlam
5c053dd06a Take advantage of the auto-generation and installation of rc.d scripts. 2002-09-19 09:04:02 +00:00
jlam
82497c7f64 Use USE_PERL5=build instead of directly depending on perl. 2002-09-13 23:42:27 +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
mycroft
d18238a32d Crank libmm dependency versions and dependent pkg revisions. 2002-08-01 00:58:31 +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
taca
7acdf43499 Update to mod_ssl to 2.8.10. Since apache package contains it,
bump PKGREVISION.


  Changes with mod_ssl 2.8.10 (19-Jun-2002 to 24-Jun-2002)

   *) Fixed off-by-one buffer overflow bug in the compatibility
      functionality (mapping of old directives to new ones).

   *) Fixed memory leak in processing of CA certificates.

   *) In case there is actually a certificate chain in the session cache,
      we now use the value of SSL_get_peer_certificate(ssl) to verify as
      it will have been removed from the chain before it was put in the
      cache.

   *) Seed the PRNG with a maximum of 1K from the internal scoreboard.
2002-06-24 16:26:18 +00:00
taca
f03e21d4df - Add share/httpd/htdocs/index.html.lb.utf8 to PLIST.
- Prevent chown whole files under ${PREFIX}/share/httpd.
2002-06-20 17:12:36 +00:00
tron
f7e64164e2 Add missing "source/" to master site entries for "ftp.funet.fi". 2002-06-19 15:22:36 +00:00
fredb
a1000c817a Define ${EXTRACT_SUFX} before referring to it on the left hand side
(indirectly, through ``SITES_${MODSSL_DIST}=''), and add a comment
regarding same, to help spare maintainers from brain-damage.
2002-06-19 15:14:16 +00:00
tron
9f0a6127ea Use the same master sites of the "mod_ssl" as in the "ap-ssl" package. 2002-06-19 14:07:51 +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
306739b5f5 g/c patch-an, this is fixed by Apache 1.3.26 different way 2002-06-19 10:31:01 +00:00
jdolecek
c46cbb86cf g/c, Apache folks fixed this differently 2002-06-19 10:28:31 +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
itojun
871627fca7 crank PKGREVISION 2002-06-18 02:06:01 +00:00
itojun
86a26c2594 http chunk transfer vulnerability
http://httpd.apache.org/info/security_bulletin_20020617.txt
2002-06-18 01:45:36 +00:00
kleink
a763c90bcc G/c references to ftp.uni-trier.de. 2002-05-08 11:44:50 +00:00
jlam
fbb10cccfb Update www/apache to 1.3.24 with EAPI patch from mod_ssl-2.8.8-1.3.24.
Relevant changes from version 1.3.23 include:

     * Prevent invalid client hostnames from appearing in the log file.
     * Various mod_proxy improvements, such as the new ProxyIOBufferSize
       directive.
     * The new ''IgnoreCase' keyword to the IndexOptions directive.
     * mod_rewrite's 'rnd' was broken and has been fixed.
     * The '-S' option of 'apxs' was not able to handle quotes; also 'apxs'
       is now rebuilt when options are changed.
     * proxy now correctly handles Cookies and X-Cache headers.
     * Fixed a problem in TPF when we were using the wrong subpool when
       opening the error log.
     * pthread accept() mutexes on Solaris were broken (since we were
       not linking against pthread)
2002-04-02 14:13:01 +00:00
thorpej
041dfc640c Fix build on arm-elf. 2002-03-28 17:17:08 +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
b94c4a6b29 Update www/apache to 1.3.23nb1. Changes from version 1.3.23 include using
the EAPI patches from modssl-2.8.7-1.3.23.  Also, link against the MM
Shared Memory library (devel/libmm) to provide shared memory support in
Apache/EAPI.  For example, this allows mod_ssl to use a high-performance
RAM-based session cache instead of a disk-based one.
2002-02-28 05:45:33 +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
jmc
bee110162f Remove the perl buildlink. I disagree that installing a perl script shouldn't
commit the package to depending on perl as well but that seems to be the
current way it's done for apache.
2002-02-05 05:35:11 +00:00
jmc
f1e82d76c3 Apache installs apxs which is a perl script so the package needs to depend on
perl as well.
2002-02-05 04:45:29 +00:00
jlam
7cb3b9a80b Update apache to 1.3.23 with the EAPI patch from mod_ssl-2.8.6-1.3.23.
The main new features in 1.3.23 (compared to 1.3.22) are:

     * HTTP/1.1 support for mod_proxy.
     * Other mod_proxy improvements.
     * The new 'FileETag' directive to allow one to build the
       format of the ETag via runtime directives.
     * Addition of a 'filter callback' function to enable modules to
       intercept the output byte stream for dynamic page caching.

   The following bugs were found in Apache 1.3.22 and have been fixed in
   Apache 1.3.23:

     * Fix incorrect "Content-Length" header in the 416 response.
     * Revert mod_negotation's handling of path_info and query_args
       to the 1.3.20 behavior (PRs: 8628, 8582, 8538).
     * Prevent an Apache module from being loaded or added twice due
       to duplicate LoadModule or AddModule directives.
2002-02-01 16:04:39 +00:00
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
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
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
2c718cd982 Fix typo. 2001-12-02 19:41:04 +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
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
40c036b324 Fix installation when an old config file exists. 2001-11-15 05:32:56 +00:00
zuntum
431e7a7dda Move pkg/ files into package's toplevel directory 2001-11-01 02:15:23 +00:00
jmc
3f4dcce89e Fix depends lines to point to correct paths 2001-10-29 05:43:47 +00:00
jlam
6d4acd5e38 There are some .c files in the header directory. 2001-10-23 15:50:55 +00:00
jlam
ce061a4a99 Add a buildlink.mk file for use primarily by packages that use apxs to
compile Apache extension modules.  This is usable by packages that depend
on either apache or apache6.
2001-10-23 15:42:05 +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