Commit graph

202 commits

Author SHA1 Message Date
tron
f75453b3d1 Update "apache" package to version 1.3.28. Changes since version 1.3.27:
- SECURITY: CAN-2003-0460 (cve.mitre.org)
  Fix the rotatelogs support program on Win32 and OS/2 to ignore
  special control characters received over the pipe.  Previously
  such characters could cause it to quit logging and exit.
  [André Malo]
- Prevent the server from crashing when entering infinite loops. The
  new LimitInternalRecursion directive configures limits of subsequent
  internal redirects and nested subrequests, after which the request
  will be aborted.  PR 19753 (and probably others).
  [William Rowe, Jeff Trawick, Jim Jagielski, André Malo]
- Fix NULL-pointer issue in ab when parsing an incomplete or non-HTTP
  response. PR 21085. [Glenn Nielsen <glenn@apache.org>, André Malo]
- Removed BIND_NOSTART from HP/UX shl_load() logic for loadable
  Apache modules, so that statics are initialized when the module
  is loaded (especially critical for c++ modules on HPUX.)
  [William Rowe, Noah Arliss <narliss@netegrity.com>]
- Win32 build system changes; always recompile buildmark.c (used for
  Apache -v 'server built' messages) even when Apache is built from
  within the IDE; build test_char.h and uri_delims.h from within the
  ApacheCore.dsp project.  PR 12706.  [William Rowe]
- Introduce Win32 .pdb diagnostic symbols into the Apache 1.3 build
  (as created in Apache 2.0.45 and later.)  Makes debugging and
  analysis of crash dumps and Dr. Watson logs trivial.  Requires the
  Win32 binary builder to set aside the exact .pdb files that match
  the released binaries (.exe/.so files) for reference by users and
  developers.  [William Rowe]
- Make sure the accept mutex is released before calling child exit
  hooks and cleanups.  Otherwise, modules can segfault in such code
  and, with pthread mutexes, leave the server deadlocked.  Even if
  the module doesn't segfault, if it performs extensive processing
  it can temporarily prevent the server from accepting new
  connections.  [Jeff Trawick]
- Fix mod_rewrite's handling of absolute URIs. The escaping routines
  now work scheme dependent and the query string will only be
  appended if supported by the particular scheme.  [André Malo]
- Use appropriate language codes for Czech (cs) and Traditional Chinese
  (zh-tw) in default config files. PR 9427.  [André Malo]
- Don't block synchronous signals (e.g., SIGSEGV) while waiting for
  and holding a pthread accept mutex.  [Jeff Trawick]
- AIX: Change the default accept mechanism from pthread back to
  fcntl.  Idle child cleanup doesn't work when the child selected
  for termination by the parent is waiting on a pthread mutex, and
  because the AIX kernel's notion of hot process is apparently the
  same as Apache's, it is common for the Apache parent to continually
  select a child for termination that the kernel will leave waiting
  on the mutex for extended periods of time.  There are other
  concerns with pthread mutexes as well, such as the ability to
  deadlock the server if a child process segfaults while holding the
  mutex.  [Jeff Trawick]
- Fix a pair of potential buffer overflows in htdigest
  [Martin Schulze <joey@infodrom.org>, Thom May]
- A newly created child now has a start_time of 0, to prevent
  mod_status from displaying a bogus value for the "time to
  process most recent request" column for freshly-started children
  in a previously-used scoreboard slot. [Martin Kraemer]
- When using Redirect in directory context, append requested query
  string if there's no one supplied by configuration. PR 10961.
  [André Malo]
- Fix path handling of mod_rewrite, especially on non-unix systems.
  There was some confusion between local paths and URL paths.
  PR 12902.  [André Malo]
- backport from 2.x series: Prevent endless loops of internal redirects
  in mod_rewrite by aborting after exceeding a limit of internal redirects.
  The limit defaults to 10 and can be changed using the RewriteOptions
  directive. PR 17462.  [André Malo]
- Use the correct locations of srm.conf and access.conf when tailoring
  the httpd.conf during the install process. PR 9446.
  [Stanislav Brabec <utx@penguin.cz>]
- suexec: Be more pedantic when cleaning environment. Clean it
  immediately after startup. PR 2790, 10449.
  [Jeff Stewart <jws@purdue.edu>, André Malo]
- Fix apxs to insert LoadModule/AddModule directives only outside of
  sections. PR 8712, 9012.  [André Malo]
- Fix suexec compile error under SUNOS4, where strerror() doesn't
  exist. PR 5913, 9977.
  [Jonathan W Miner <Jonathan.W.Miner@lmco.com>]
- Unix build: Add support for environment variable
  EXTRA_LDFLAGS_SHLIB, which allows the user to add to the hard-coded
  ld flags specified for DSOs.  Compare with the existing LDFLAGS_SHLIB
  environment variable, which allows the user to completely replace the
  hard-coded ld flags specified for DSOs.  [Jeff Trawick]
- mod_auth_digest no longer tries to guess AuthDigestDomain, if it's
  not specified. Now it assumes "/" as already documented. PR 16937.
  [André Malo]
- In configure always assume suexec-umask to be an octal value by
  prepending a "0". PR 16984.  [André Malo]
- Fix typo in suexec -V output. PR 9034.
  [Youichirou Koga <y-koga@apache.or.jp>]
- Fix bug where 'Satisfy Any' without an AuthType resulted in an
  "Internal Server Error" response. PR 9076.  [André Malo]
- mod_rewrite: Allow "RewriteEngine Off" even if no
  "Options FollowSymlinks" (or SymlinksIfOwnermatch) is set.
  PR 12395.  [André Malo]
- Change the log messages for setsockopt(TCP_NODELAY) and
  getsockname() failures to log the client IP address and to
  change the log level to debug.  [Jeff Trawick]
- Correction to mod_negotation for Win32, OS2, Netware etc, where
  case insensitive requests such as the HEADER or README search
  from autoindex would fail to match HEADER.html (because the
  system internally looked for the case-sensitive header.* pattern.)
  PR 7300 [William Rowe]
- Correction to mod_autoindex so that only text/* files (prefering
  /html, then /plain, then some other flavor) can be recovered
  from a multiview-based HEADER or README subrequest.
  [William Rowe]
- Improvements to mod_usertrack that allows for a regular (verbose)
  as well as "compact" version of the tracking cookie (the new
  'CookieFormat' directive), and the ability to prepend a string
  to the cookie via the 'CookiePrefix' directive.
  [Pål Løberg <pallo@initio.no>, with cleanup by Jim Jagielski]
- Certain 3rd party modules would bypass the Apache API and not
  invoke ap_cleanup_for_exec() before creating sub-processes.
  To such a child process, Apache's file descriptors (lock
  fd's, log files, sockets) were accessible, allowing them
  direct access to Apache log file etc.  Where the OS allows,
  we now add proactive close functions to prevent these file
  descriptors from leaking to the child processes.
  [Jim Jagielski, Martin Kraemer]
- Prevent obscenely large values of precision in ap_vformatter
  from clobbering a buffer. [Sander Striker, Jim Jagielski]
- NetWare: implemented ap_os_default_port() to resolve the
  correct default port based on the request method. This fixes
  a URL reconstruction problem on a redirect.
  [Pavel Novy (novy@feld.cvut.cz)]
- Added new ap_register_cleanup_ex() API function which allows
  for a "magic" cleanup function to be run at register time
  rather than at cleanup time. Also added the
  ap_note_cleanups_for_(socket|fd|file)_ex() API functions
  which allows for control over whether that magic cleanup
  should be called or not. This does not change the default
  behavior of the non-"ex" function (eg: ap_register_cleanup).
  [Jim Jagielski, concept by Ben Laurie]
- PORT: Take advantage of OpenBSD's arc4random() function for the
  initial secret [Henning Brauer <hb-apache-dev at bsws.de>]
- If Listen directive is not a port, but just an IP, emit an
  error condition as this case is ambiguous.
  [Rich Bowen, Justin Erenkrantz, Cliff Woolley]
- Update timeout algorithm in free_proc_chain. If a subprocess
  did not exit immediately, the thread would sleep for 3 seconds
  before checking the subprocess exit status again. In a very
  common case when the subprocess was an HTTP server CGI script,
  the CGI script actually exited a fraction of a second into the 3
  second sleep, which effectively limited the server to serving one
  CGI request every 3 seconds across a persistent connection.
  PRs 6961, 8664 [Bill Stoddard]
- mod_setenvif: Add SERVER_ADDR special keyword to allow
  envariable setting according to the server IP address
  which received the request.  [Ken Coar]
- PORT: Enable SINGLE_LISTEN_UNSERIALIZED_ACCEPT for AIX 4.3.2
  and above.  Update AIX configure logic to allow higher AIX
  release numbers without having to change Apache.
  [Jeff Trawick]
2003-07-19 12:31:05 +00:00
grant
ab4338ef1a gcc.buildlink2.mk is now handled automatically. 2003-07-18 10:57:15 +00:00
grant
ca3be631f2 s/netbsd.org/NetBSD.org/ 2003-07-17 22:50:55 +00:00
drochner
860d5efe06 replace ${WHOLE_ARCHIVE_FLAG} -lgcc ${NO_WHOLE_ARCHIVE_FLAG} by just
${LINK_ALL_LIBGCC_HACK}
2003-06-06 19:33:12 +00:00
grant
d84b75c064 tidy up logic for adding libgcc and libgcc_s. no functional change. 2003-05-31 15:03:17 +00:00
grant
47115b7c1a make sure modules are built with the correct version of gcc. 2003-05-31 14:31:14 +00:00
grant
cd251c52ef for consistency, use WHOLE_ARCHIVE_FLAG instead of
-Wl,--whole-archive.
2003-05-31 13:32:49 +00:00
grant
e3d3090ec8 drop some unnecessary parens 2003-05-31 13:30:30 +00:00
grant
853782d996 link against shared libgcc_s when built with gcc3 so Apache modules
can resolve the required symbols.
2003-05-31 13:29:20 +00:00
grant
48e85c9b62 be quiet in all targets except post-install. 2003-04-15 01:39:15 +00:00
wiz
e4b22ed387 Fix fetch stage. Noted broken by grant. 2003-04-10 19:31:52 +00:00
wiz
79dd59d61e Update to 1.3.27nb4: compile with mod-ssl-2.8.14.
Remove quite some lint while here.
2003-04-10 08:25:21 +00:00
jlam
3ef633718c (1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;
Makefiles simply need to use this value often, for better or for
    worse.

(2) Create a new variable FIX_RPATH that lists variables that should
    be cleansed of -R or -rpath values if ${_USE_RPATH} is "no".  By
    default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and
    additional variables may be appended from package Makefiles.
2003-03-14 19:37:30 +00:00
jmmv
a754f1c0c3 Use MASTER_SITE_APACHE. 2003-02-23 15:55:57 +00:00
grant
e8bd0cf988 also pass CPPFLAGS to apxs. 2003-02-17 22:33:55 +00:00
grant
c0120deb5c pass LDFLAGS to apxs. 2003-02-17 21:31:09 +00:00
grant
a25ed7d30d set the default source files to *.c, as this is common in our apache
modules.
2003-02-17 20:58:19 +00:00
grant
69a1c6fa6e USE_PERL5 is already defined in apache/buildlink2.mk. 2003-02-17 17:47:52 +00:00
grant
710d00a6a3 add makefile fragment for Apache modules.
This provides a build and install target to simplify the writing of
Apache module Makefiles.

ok'd by wiz.
2003-02-17 17:32:08 +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
abs
8b28d00afd Use XARGS="${XARGS}" rather than XARGS=${XARGS} when adding to MAKE_ENV.
Avoids breakage on Linux which has XARGS as "usr/bin/xargs -r"
2003-01-27 11:10:27 +00:00
jschauma
167d43fea7 Make this use ${CHOWN}, ${CHMOD}, ${XARGS} and ${FIND}, rather than the
hard-coded commands, which may not be in the PATH depending on the operating
system.  This partly addresses PR pkg/19804.
2003-01-20 22:58:26 +00:00
grant
276042c696 Revert to previous behavior and use db1 functions in libc if they are
present, rather than installing databases/db (affects NetBSD, Linux,
Darwin and possibly others).

As suggested by Kimmo Suominen.
2002-12-22 13:04:39 +00:00
grant
78e8431b23 Tidy up conditional use of databases/db/buildlink2.mk.
Fixes build problem on Solaris.
2002-12-19 14:08:34 +00:00
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
tron
68ab4a719e Fix glitch in last commit. 2002-11-18 10:40:12 +00:00
tron
faef62d0af Use "${NONBINMODE}" instead of mode "0" so that "pkg_admin check" still
works for a normal user. Also invoke "chmod" only once because fork()
and exec() is expensive on certain platforms.
2002-11-18 10:36:35 +00:00
martti
c80138e37a Fix chmod (PR#19093 by Adrian Portelli). Bump PKGREVISION. 2002-11-18 08:19:37 +00:00
martti
ba0bc59f54 Updated apache to 1.3.27nb2
chmod 0 libexec/cgi-bin/{printenv,test-cgi} (to make nessus happy).
2002-11-15 10:40:26 +00:00
martti
06229b5bbf chmod 0 libexec/cgi-bin/{printenv,test-cgi} (to make nessus happy). 2002-11-15 09:08:06 +00:00
wiz
38ed98e5fc Unused. 2002-10-25 12:59:48 +00:00
tron
2abca9a311 Update "apache" package to version 1.3.27nb1 which is now based version
2.8.12-1.3.27 of "mod_ssl" module so that one doesn't need two version
of the "mod_ssl" sources to build "apache".
2002-10-25 09:00:29 +00:00
jlam
f8d269d8c5 Use newer way to convert a build dependency to a full dependency. 2002-10-18 21:46:02 +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
jlam
1626476cb5 Fully convert to buildlink2, even on Solaris. 2002-10-10 00:52:43 +00:00
tron
02318624eb Update "apache" package to version 1.3.27. This version fixes many bugs
discovered in version 1.3.26 including these security fixes:
- SECURITY: CAN-2002-0840 (cve.mitre.org)
  Prevent a cross-site scripting vulnerability in the default
  error page.  The issue could only be exploited if the directive
  UseCanonicalName is set to Off and a server is being run at
  a domain that allows wildcard DNS.  [Matthew Murphy]
- SECURITY CAN-2002-0843 (cve.mitre.org)
  Fix some possible overflows in ab.c that could be exploited by
  a malicious server. Reported by David Wagner. [Jim Jagielski]
- SECURITY CAN-2002-0839 (cve.mitre.org)
  Add the new directive 'ShmemUIDisUser'. By default, Apache
  will no longer set the uid/gid of SysV shared memory scoreboard
  to User/Group, and it will therefore stay the uid/gid of
  the parent Apache process. This is actually the way it should
  be, however, some implementations may still require this, which
  can be enabled by 'ShmemUIDisUser On'.  Reported by iDefense.
  [Jim Jagielski]
2002-10-04 19:14:02 +00:00
grant
c15738ec00 Explicitly turn on large file support, as some Apache modules have
problems when it is not enabled, notably mod_perl. Fixes pkg/18070
from myself, ok'd by wiz.

Bump PKGREVISION.
2002-09-26 01:48:29 +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
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