Commit graph

266 commits

Author SHA1 Message Date
bouyer
68f666d50c Add missing entry for a new file. Pointed out by Lubomir Sedlacik.
Close enouth to the package update to not bump pkgrevision.
2005-10-19 21:42:59 +00:00
bouyer
98d93c2013 Update to 1.3.34. This is a security fix release, fix pkg/31868 by
Zafer Aydogan. Changes from 1.3.33:
  *) hsregex: fix potential core dumping on 64 bit machines, such as
     AMD64. PR 31858. [Glenn Strauss < gs-apache-dev gluelogic.com>]

  *) SECURITY: core: If a request contains both Transfer-Encoding and
     Content-Length headers, remove the Content-Length, mitigating some
     HTTP Request Splitting/Spoofing attacks.  This has no impact on
     mod_proxy_http, yet affects any module which supports chunked
     encoding yet fails to prefer T-E: chunked over the Content-Length
     purported value.  [Paul Querna, Joe Orton]

  *) Added TraceEnable [on|off|extended] per-server directive to alter
     the behavior of the TRACE method.  This addresses a flaw in proxy
     conformance to RFC 2616 - previously the proxy server would accept
     a TRACE request body although the RFC prohibited it.  The default
     remains 'TraceEnable on'.
     [William Rowe]

  *) mod_digest: Fix another nonce string calculation issue.
     [Eric Covener]
2005-10-19 20:30:20 +00:00
wiz
5c11268df7 Remove some more *LEGACY* settings that are over a month old and
thus were before 2005Q3.
2005-10-05 13:29:49 +00:00
salo
7a0278e7c0 Update ap-ssl to version 2.8.24.
- Fix a security issue (CAN-2005-2700) where "SSLVerifyClient require"
  was not enforced in per-location context if "SSLVerifyClient optional"
  was configured in the global virtual host configuration.

Sync apache with the latest ap-ssl.
2005-09-16 13:53:56 +00:00
rillig
7a95adad42 The real user name in PKG_USERS does not need to be escaped with double
backslashes anymore. A single backslash is enough. Changed the
definition in all affected packages. For those that are not caught, an
additional check is placed into bsd.pkginstall.mk.
2005-08-23 11:48:47 +00:00
reed
21a4e3e966 Add DragonFly support.
(An httpd service was only briefly tested.)
2005-08-22 16:19:00 +00:00
jlam
cf4dfe44a5 Use REQD_DIRS instead of MAKE_DIRS for directories under ${PREFIX} so
that these directories will be conditionally removed (based on reference
counts), regardless of the value of PKG_CONFIG.  Bump the PKGREVISION
for packages that were modified as a result.
2005-08-20 19:16:21 +00:00
jlam
bd2788d930 Merge CONF_FILES/SUPPORT_FILES and CONF_FILES_PERMS/SUPPORT_FILES_PERMS
as the INSTALL and DEINSTALL scripts no longer distinguish between
the two types of files.  Drop SUPPORT_FILES{,_PERMS} and modify the
packages in pkgsrc accordingly.
2005-08-19 18:12:36 +00:00
jlam
3e474a90d8 Get rid of USE_PERL5. The new way to express needing the Perl executable
around at either build-time or at run-time is:

	USE_TOOLS+=	perl		# build-time
	USE_TOOLS+=	perl:run	# run-time

Also remove some places where perl5/buildlink3.mk was being included
by a package Makefile, but all that the package wanted was the Perl
executable.
2005-07-16 01:19:06 +00:00
wiz
5089e11744 Remove some obsolete variables from BUILD_DEFS. 2005-05-31 20:00:43 +00:00
dillo
f81ae835ad Packages have no business modifying PKG_DEFAULT_OPTIONS -- it's a
user settable variable.  Set PKG_SUGGESTED_OPTIONS instead.  Also,
make use of PKG_OPTIONS_LEGACY_VARS.

Reviewed by wiz.
2005-05-31 10:01:36 +00:00
jlam
c8c82c4af9 apxs needs perl. 2005-05-17 19:11:47 +00:00
wiz
5b11ac8c7e Revert:
Remove an instance of ${TYPE} from pkgsrc.  The use of the private
variable _INSTALL_CMD is only temporary until we switch over to the
new tools framework.

The committed version has an additional | (pipe) character in it,
breaking the sed and causing an empty apxs file.
Replacing the pipes with commas does not help either, because then
the backquoted command gets embedded into apxs instead of the
correct pathname.

Bump PKGREVISION because this broke at least ap-php and ap-ssl.
2005-05-06 00:14:21 +00:00
jlam
9fd1aadc0f Remove an instance of ${TYPE} from pkgsrc. The use of the private
variable _INSTALL_CMD is only temporary until we switch over to the
new tools framework.
2005-05-03 22:17:17 +00:00
reed
ee8be9d0c1 RCD_SCRIPTS_EXAMPLEDIR is no longer customizable.
And always is defined as share/examples/rc.d
which was the default before.

This rc.d scripts are not automatically added to PLISTs now also.
So add to each corresponding PLIST as required.

This was discussed on tech-pkg in late January and late April.

Todo: remove the RCD_SCRIPTS_EXAMPLEDIR uses in MESSAGES and elsewhere
and remove the RCD_SCRIPTS_EXAMPLEDIR itself.
2005-05-02 20:33:57 +00:00
wiz
ebca909aa8 Remove custom "restart" code from startup script so that Apache really
gets restarted when "/etc/rc.d/apache restart" is used. This fixes
PR pkg/24179 for the "apache" package.

Based on a similar change for the apache2 package.

Bump PKGREVISION.
2005-04-18 14:40:17 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
jlam
da2fc85390 Don't check for USE_BUILDLINK3 anymore in these files. These are included
by other package Makefiles, and with the deprecation of USE_BUILDLINK3
support in the infrastructure files, these had the potential to break
existing packages.
2005-03-24 22:42:58 +00:00
abs
e4191b33fd Update apache to apache_1-3.33nb3:
Previously rc.d/apache was updated to run stop & start for restart.
    '/etc/rc.d/apache restart' then picked up startssl if apache was not
    running, but if apache was running it has a large chance of the
    start running before the stop completes, leaving no httpd running.
    Instead, add a restartssl option to apachectl, and use it.
2005-02-28 23:30:48 +00:00
wiz
809ad6f2f7 Add RMD160 checksums. 2005-02-24 14:08:26 +00:00
reed
32d8f290c2 The default location of the pkgsrc-installed rc.d scripts is now
under share/examples/rc.d. The variable name already was named
RCD_SCRIPTS_EXAMPLEDIR.

This is from ideas from Greg Woods and others.

Also bumped PKGREVISION for all packages using RCD_SCRIPTS mechanism
(as requested by wiz).
2004-12-28 02:47:40 +00:00
grant
35616f80b5 when Apache is built with dlcompat present, the installed httpd/os.h
header file #includes <dlfcn.h>, so we need to include
dlopen.buildlink3.mk so that dlfcn.h can be found by packages which
use httpd/os.h.

XXX this is not entirely correct, but works around the problem
XXX sufficiently. the problem is that Darwin (7.7.x) has dlopen() and
XXX friends but does not provide prototypes in dlfcn.h (or anywhere else).
2004-12-19 04:02:43 +00:00
jlam
11d13bbb21 Pass the DL_* flags to the compiler when building httpd so that dlopen
will work correctly on NetBSD-2.x.  This should fix PR pkg/29398.
2004-11-26 18:52:47 +00:00
wiz
59c06ab9cb Replace USE_GCC_SHLIB with USE_LANGUAGES=c c++ and a nice big comment why
we add c++ to the variable.
2004-11-22 22:19:35 +00:00
tron
5eb34ff63e Regen after "patch-ai" was changed. (hi salo!) 2004-11-16 08:23:45 +00:00
salo
49085a6df6 Revert rev 1.9, do not expand @INSTALL@, it's done in post-patch. (hi abs!) 2004-11-15 19:13:41 +00:00
sketch
1ebcc3bfce Use ${VARBASE} instead of hardcoded /var. 2004-11-15 15:05:34 +00:00
abs
22c31d8d94 Update apache to 1.3.33
The main security vulnerabilities addressed in 1.3.33 are:

    * CAN-2004-0940 (cve.mitre.org)
      Fix potential buffer overflow with escaped characters in SSI tag string.
    * CAN-2004-0492 (cve.mitre.org)
      Reject responses from a remote server if sent an invalid
      (negative) Content-Length.

New features

    * Win32: Improve error reporting after a failed attempt to
      spawn a piped log process or rewrite map process.
    * Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT. It
      controls how UseCanonicalName Off determines the port value if
      the client doesn't provide one in the Host header. If defined
      during compilation, UseCanonicalName Off will use the physical
      port number to generate the canonical name. If not defined, it
      tries the current Port value followed by the default port for
      the current scheme.

The following bugs were found in Apache 1.3.31 (or earlier) and
have been fixed in Apache 1.3.33:

    * mod_rewrite: Fix query string handling for proxied URLs. PR 14518.
    * mod_rewrite: Fix 0 bytes write into random memory position. PR 31036.
    * mod_digest: Fix nonce string calculation since 1.3.31 which
      would force re-authentication for every connection if
      AuthDigestRealmSeed was not configured. PR 30920.
    * Fix trivial bug in mod_log_forensic that caused the child to
      seg fault when certain invalid requests were fired at it with
      forensic logging is enabled. PR 29313.
    * No longer breaks mod_dav, frontpage and others. Repair a
      patch in 1.3.31 which prevented discarding the request body
      for requests that will be keptalive but are not currently
      keptalive. PR 29237.
2004-10-29 13:48:31 +00:00
tron
b253036b97 Update "apache" package to version 1.3.32. Changes since version 1.3.31:
- mod_rewrite: Fix query string handling for proxied URLs. PR 14518.
  [michael teitler <michael.teitler cetelem.fr>,
   Jan Kratochvil <rcpt-dev.AT.httpd.apache.org jankratochvil.net>]
- mod_rewrite: Fix 0 bytes write into random memory position.
  PR 31036. [André Malo]
- mod_digest: Fix nonce string calculation since 1.3.31 which
  would force re-authentication for every connection if
  AuthDigestRealmSeed was not configured.  PR 30920.  [Joe Orton]
- Trigger an error when a LoadModule directive attempts to
  load a module which is built-in.  This is a common error when
  switching from a DSO build to a static build.
  [Jeff Trawick, Geoffrey Young]
- Fix trivial bug in mod_log_forensic that caused the child
  to seg fault when certain invalid requests were fired at it with
  forensic logging is enabled.  PR 29313.
  [Will Slater <Will Slater orbisuk.com>]
- Fix memory leak in the cache handling of mod_rewrite. PR 27862.
  [chunyan sheng <shengperson yahoo.com>, André Malo]
- mod_rewrite no longer confuses the RewriteMap caches if
  different maps defined in different virtual hosts use the
  same map name. PR 26462.  [André Malo]
- mod_setenvif: Remove "support" for Remote_User variable which
  never worked at all. PR 25725.  [André Malo]
- mod_usertrack: Escape the cookie name before pasting into the
  regexp.  [André Malo]
- Win32: Improve error reporting after a failed attempt to spawn a
  piped log process or rewrite map process.  [Jeff Trawick]
- SECURITY: CAN-2004-0492 (cve.mitre.org)
  Reject responses from a remote server if sent an invalid (negative)
  Content-Length.  [Mark Cox]
- Fix a bunch of cases where the return code of the regex compiler
  was not checked properly. This affects mod_usertrack and
  core. PR 28218.  [André Malo]
- No longer breaks mod_dav, frontpage and others.  Repair a patch
  in 1.3.31 which prevented discarding the request body for requests
  that will be keptalive but are not currently keptalive. PR 29237.
  [Jim Jagielski, Rasmus Lerdorf]
- COMPATIBILITY: Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT.
  It controls how UseCanonicalName Off determines the port value if
  the client doesn't provide one in the Host header. If defined during
  compilation, UseCanonicalName Off will use the physical port number to
  generate the canonical name. If not defined, it tries the current Port
  value followed by the default port for the current scheme.
  [Jim Jagielski]
2004-10-25 08:44:16 +00:00
tron
b458b93c70 Use "mod_ssl-2.8.20" sources for SSL hooks, bump package revision. 2004-10-18 09:28:08 +00:00
tv
c487cb967a Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
2004-10-03 00:12:51 +00:00
tron
1c3ab32f15 Apply fix for security vulnerability in proxy module reported in
CAN-2004-0492. Bump package revision package of this.
2004-09-24 06:04:00 +00:00
jlam
9d5426ff76 Change the way that legacy USE_* and FOO_USE_* options are converted
into the bsd.options.mk framework.  Instead of appending to
${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS.  This causes
the default options to be the union of PKG_DEFAULT_OPTIONS and any
old USE_* and FOO_USE_* settings.

This fixes PR pkg/26590.
2004-08-22 19:32:51 +00:00
abs
cc2884f7c4 Update apache to 1.3.31nb4:
Fix rc.d/apache restart to 'apache_doit stop; apache_doit start'
    Now in the case of apache_start=startssl and apache not running,
    'rc.d/apache restart' will start apache with startssl.
2004-08-02 19:54:17 +00:00
jlam
b460ce1ab5 Convert to use bsd.options.mk. The relevant options variable to set
for each package can be determined by invoking:

	make show-var VARNAME=PKG_OPTIONS_VAR

The old options are still supported unless the variable named in
PKG_OPTIONS_VAR is set within make(1) (usually via /etc/mk.conf).
2004-07-30 21:05:41 +00:00
tron
5d541583f3 Use "mod_ssl-2.8.19" sources for SSL hooks, bump package revision. 2004-07-17 12:44:28 +00:00
wiz
5a1ea1fb96 Remove references to buildlink2. 2004-07-06 22:51:34 +00:00
wiz
8ddc121ef8 Unused. 2004-07-02 22:08:37 +00:00
tron
5a1e04f79f Compile with version 2.8.18 of "mod_ssl" instead with the (reported to
be vulnerable) version 2.8.17. Bump package revision because of this.
2004-05-30 12:37:15 +00:00
seb
00cc0486ea Garbage collect BUILDLINK_PKGBASE.<pkg> from buildlink3: it is not anymore
used since revision 1.139 of mk/buildlink3/bsd.buildlink3.mk.
2004-05-17 21:32:33 +00:00
abs
2795d85558 Regenerate patch-aa to obtain correct offsets so this works with Linux 'patch'.
No functional change (other than building again on Linux)
2004-05-13 21:21:27 +00:00
taca
4f8eb2dba5 Update apache package to 1.3.31.
Apache 1.3.31 Major changes

  Security vulnerabilities

     * CAN-2003-0987 (cve.mitre.org)
       In mod_digest, verify whether the nonce returned in the client
       response is one we issued ourselves.  This problem does not affect
       mod_auth_digest.

     * CAN-2003-0020 (cve.mitre.org)
       Escape arbitrary data before writing into the errorlog.

     * CAN-2004-0174 (cve.mitre.org)
       Fix starvation issue on listening sockets where a short-lived
       connection on a rarely-accessed listening socket will cause a
       child to hold the accept mutex and block out new connections until
       another connection arrives on that rarely-accessed listening socket.

     * CAN-2003-0993 (cve.mitre.org)
       Fix parsing of Allow/Deny rules using IP addresses without a
       netmask; issue is only known to affect big-endian 64-bit
       platforms

  New features

   New features that relate to specific platforms:

     * Linux 2.4+: If Apache is started as root and you code
       CoreDumpDirectory, core dumps are enabled via the prctl() syscall.

   New features that relate to all platforms:

     * Add mod_whatkilledus and mod_backtrace (experimental) for
       reporting diagnostic information after a child process crash.

     * Add fatal exception hook for running diagnostic code after a
       crash.

     * Forensic logging module added (mod_log_forensic)

     * '%X' is now accepted as an alias for '%c' in the
       LogFormat directive. This allows you to configure logging
       to still log the connection status even with mod_ssl

  Bugs fixed

   The following noteworthy bugs were found in Apache 1.3.29 (or earlier)
   and have been fixed in Apache 1.3.31:

     * Fix memory corruption problem with ap_custom_response() function.
       The core per-dir config would later point to request pool data
       that would be reused for different purposes on different requests.

     * mod_usertrack no longer inspects the Cookie2 header for
       the cookie name. It also no longer overwrites other cookies.

     * Fix bug causing core dump when using CookieTracking without
       specifying a CookieName directly.

     * UseCanonicalName off was ignoring the client provided
       port information.
2004-05-13 11:39:09 +00:00
grant
9a9b0aaf12 include apache's buildlink3.mk if using buildlink3. 2004-05-08 15:12:52 +00:00
jlam
3ec9c44b26 Convert to use bdb.buildlink3.mk and fix sources so that we can use db4. 2004-04-26 20:06:58 +00:00
snj
243dfcc2c4 Convert to buildlink3. 2004-04-25 06:21:11 +00:00
jlam
e8132b3fbf Relinquish maintainership of packages to tech-pkg@NetBSD.org. 2004-04-24 22:46:08 +00:00
reed
9c790735db mk/bsd.pkg.install.mk now automatically registers
the RCD_SCRIPTS rc.d script(s) to the PLIST.

This GENERATE_PLIST idea is part of Greg A. Woods'
PR #22954.

This helps when the RC_SCRIPTS are installed to
a different ${RCD_SCRIPTS_EXAMPLEDIR}. (Later,
the default RCD_SCRIPTS_EXAMPLEDIR will be changed
to be more clear that they are the examples.)

These patches also remove the etc/rc.d/ scripts from PLISTs
(of packages that use RCD_SCRIPTS). (This also removes
now unused references from openssh* makefiles. Note that
qmail package has not been changed yet.)

I have been doing automatic PLIST registration for RC_SCRIPTS
for over a year. Not all of these packages have been tested,
but many have been tested and used.

Somethings maybe to do:
- a few packages still manually install the rc.d scripts to
  hard-coded etc/rc.d. These need to be fixed.
- maybe  remove from mk/${OPSYS}.pkg.dist mtree specifications too.
2004-04-23 22:07:52 +00:00
tron
30f4a35cf5 Fix patch checksums and bump package revision again because the security
patches weren't applied before.
2004-04-07 22:35:01 +00:00
reed
9e1d8c8a1c Add three patches to resolve security issue:
SECURITY [CAN-2003-0020]: escape arbitrary data before writing into the errorlog

The three patches are from Apache cvs.
http://cvs.apache.org/viewcvs.cgi/apache-1.3/src/

Also bump PKGREVISION too.
2004-04-07 19:53:27 +00:00
jlam
426cc1ce72 Add a BUILDLINK_PKGBASE.<pkg> definition where it's not equal to <pkg>,
e.g. "BUILDLINK_PKGBASE.gtk?= gtk+".  This is mandated by the example
buildlink[23].mk files in bsd.buildlink[23].mk.
2004-03-29 05:05:32 +00:00