Commit graph

82 commits

Author SHA1 Message Date
Clement Laforet
310abe64ef - Yet Another Security Fix
Fix CAN-2004-0885:

  * modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Ensure that a
  correct cipher suite has been negotiated, else deny access.

  * modules/ssl/ssl_engine_init.c (ssl_init_ctx_protocol): With OpenSSL
  0.9.7, prevent session resumption during a renegotiation to force the
  client to negotiate a new (and acceptable) cipher suite.

Credits:	Hartmut Keil, Joe Orton
2004-10-13 09:17:38 +00:00
Clement Laforet
ee5d3c413a - Update to 2.0.52
- Use "PORTDOCS= #" and get rid of docs entry in plist.
- Support for FreeBSD 6 in apr
- Move of cache modules from THREADS to EXPERIMENTAL category and make
  sure we enable THREADS modules (cgid only) when a threaded MPM is
  selected.
- Resurect WITH_EXTRA_MODULES knob
- powerlogo.gif is now hosted by FreeBSD mirrors
- WITH_<category> is definitively no longer supported.
- Add Includes dir when installed via a package [1]

PR:             ports/72309 [1]
Submitted by:   Christian Kratzer <ck at cksoft dot de> [1]
2004-10-12 08:27:40 +00:00
Clement Laforet
222ecfdf5d Security fixes [1]:
*) SECURITY: CAN-2004-0786 (cve.mitre.org)
     Fix an input validation issue in apr-util which could be
     triggered by malformed IPv6 literal addresses.  [Joe Orton]

  *) SECURITY: CAN-2004-0747 (cve.mitre.org)
     Fix buffer overflow in expansion of environment variables in
     configuration file parsing.  [Andr<E9> Malo]

  *) SECURITY: CAN-2004-0809 (cve.mitre.org)
     mod_dav_fs: Fix a segfault in the handling of an indirect lock
     refresh.  PR 31183.  [Joe Orton]

- Update documentation (finally!) and fix WITH_<CATEGORY>_MODULES
  for special modules like LDAP or SSL [2]

Noticed by:     nectar [1]
Requested by:   Emile Heitor <imil at home dot imil dot net> [2]
Approved by:    portmgr (marcus)
2004-09-15 16:54:37 +00:00
Clement Laforet
83d8251d79 - Add a sanity check on apache2 configuration files before reloading or
restarting apache2 (to avoid an expected failure on restart)
2004-08-23 15:44:51 +00:00
Clement Laforet
a4dd64d032 - Backport security fixes in ssl_engine_io.c
* [SECURITY] mod_ssl: Fix potential input filter segfaults in
  SPECULATIVE mode. (rollback handling for AP_MODE_SPECULATIVE)
  "This issue has possible security implications; it's been assigned CVE
  CAN-2004-0751 (cve.mitre.org)."
  http://issues.apache.org/bugzilla/show_bug.cgi?id=30134

* [SECURITY] mod_ssl: Fix potential infinite loop.
  (potential infinite loop in ssl_io_input_getline if connection is
  aborted without inctx->rc being set.)
  http://issues.apache.org/bugzilla/show_bug.cgi?id=27945
  http://issues.apache.org/bugzilla/show_bug.cgi?id=29690

Obtained from:  Apache CVS (httpd-2.0 HEAD)
2004-08-18 19:40:07 +00:00
Clement Laforet
696614c16d - Bump PORTREVISION for all previous changes
- Allow access to /home if mod_userdir is loaded
- We don't need apache2libs.sh if apr is installed from ports.
- Add recent changes to UPGRADING
2004-08-17 12:41:26 +00:00
Clement Laforet
9e23477bc7 Remove our config.layout support. FreeBSD layout is in apache2's one
since 2.0.48
2004-08-07 20:25:02 +00:00
Clement Laforet
7d02c7c2aa - Add ldconfig -m to apache2's apr libs (install time and boot time)
Requested by, discussed with: lev
2004-08-05 21:46:17 +00:00
Clement Laforet
b26a90a102 apache2 NG patch 1/5.
o Changes in httpd.conf
  - mod_userdir:
        . set Userdir if mod_userdir is loaded [1]
        . Userdir is denied for users from /etc/ftpusers
  - set more "secure" permissions.
    By default, policy is to deny access to filesystem.
    You HAVE to _ENABLE_ access to your filesystem in httpd.conf.
  - Add an "Includes" directory to ${PREFIX}/etc/apache2/
    to make configuration more flexible
    ${PREFIX}/etc/apache2/*.conf files are now automatically loaded.

o apache.sh
  - be closer to apachectl, apache.sh need envvars [2]
    It should restore subversion behavior.

Partially submitted by:
                kuriyama [1],
                Gregory (Grisha) Trubetskoy <grisha at apache dot org> [2]

Future changes are mostly written, they should be committed during the
week-end.
If you're interrested in changes, feel free contact me.
2004-07-30 17:04:47 +00:00
Clement Laforet
c6f9f34532 - Update experimental apr/kqueue patch
Obtained from:	apr CVS
2004-07-13 09:53:43 +00:00
Clement Laforet
be548a19b6 - Fix hostname resolution if IPv4 are mapped. [1]
- Add WITHOUT_V4MAPPED knob and explicitly set --disable-v4-mapped
  if WITHOUT_V4MAPPED or WITH_IPV6_V6ONLY

Also submitted by:	Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> [1]
2004-07-13 09:32:44 +00:00
Clement Laforet
35843182ff - Make configure script define DEFAULT_SCOREBOARD.
- Add NOTICE file to respect Apache 2.0 license
2004-07-02 13:47:41 +00:00
Clement Laforet
d84ad3cbde - Update to 2.0.50
Important changes:
  *) SECURITY: CAN-2004-0493 (cve.mitre.org)
     Close a denial of service vulnerability identified by Georgi
     Guninski which could lead to memory exhaustion with certain
     input data.  [Jeff Trawick]
  *) SECURITY: CAN-2004-0488 (cve.mitre.org)
     mod_ssl: Fix a buffer overflow in the FakeBasicAuth code for a
     (trusted) client certificate subject DN which exceeds 6K in length.
     [Joe Orton]
  Details can be found here:
        http://www.apache.org/dist/httpd/CHANGES_2.0
- Use autoconf 2.59
- Add add SUEXEC_LOGFILE tunable to set suexec logfile [1]
- Silently ignore removal of libexec/apache2 directory
- Import latest version of apr_reslit.c from apr CVS which
  adds timeout feature to apr_reslist_acquire().
  This is required for future mod_logio-st.
- Add explicit dependency on libiconv (so nowwe support libiconv)
- Move Windows Update fix from MASTER_SITE_LOCAL to ports tree
- add WITH_EXPERIMENTAL_PATCHES knobs:
  These patches are backports from apache CVS HEAD or apr CVS HEAD.
  They have positive impacts on apache responsiveness but can be
instable
  and are NOT currently supported by apache/apr teams.
  * exp-http-ready.patch: add "httpready" support for ACCEPT_FILTER
    (currently apache 2 only support "dataready")
  * exp-apr-kqueue.patch: add support for kqueue in apr_poll().
    This patch greatly improves apache network performance (up to
    18% according to the author, on my test box, between 13% and 21%)
    Test and feedback on -STABLE are welcome ;)
    For more details, please see:
    http://marc.theaimsgroup.com/?t=108650227500001&r=1&w=2

Submitted by:   knu [1]

NOTE:
Please set MASTER_SITE_APACHE_HTTPD to closest mirrors.
you can easily find them from:
http://www.apache.org/dyn/closer.cgi/httpd/
Thanks :
2004-07-01 05:54:56 +00:00
Clement Laforet
3f4b32767a - Security fix.
CAN-2004-0493 - memory exhaustion denial of service
  http://www.freebsd.org/ports/portaudit/81a8c9c2-c94f-11d8-8898-000d6111a684.html

Noticed by:	eik
Obtained from:	apache CVS
2004-06-29 08:06:20 +00:00
Clement Laforet
f7130fadbb - change limits from user www to daemon class to be in sync with
apachectl
- fix limits (missing eval)
2004-06-07 14:56:53 +00:00
Clement Laforet
70fd25d3a0 -1- make show-options readable from a vt100 ;-)
-2- add WITH_DEBUG knob (supports DEBUG_FLAGS)
-3- convert start script to RCng [1]
    - add possibility to run limits(1) before apache starts
    - apache2.sh reload = apachectl graceful
-4- Add threadpool MPM
-5- Adapt COMMENT to fit MPM.
-6- Bump PORTREVISION

PR:             ports/66955 [1]
Submitted by:   nork [1] (partially)
Requested by:   ume [1]
2004-06-05 11:14:18 +00:00
Clement Laforet
858b6c8e39 - Import security fix from Apache CVS...
* modules/ssl/ssl_engine_kernel.c (ssl_hook_UserCheck): Fix buffer
overflow in FakeBasicAuth code if client's subject DN exceeds 6K in
length (CVE CAN-2004-0488); switch to using apr-util base64 encoder
functions.
- ... and of course bump PORTREVISION.

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0488
http://secunia.com/advisories/11534/

Reported by:    Charles-Damien Orbello <tazma@cultdeadsheep.org>
2004-05-28 15:27:02 +00:00
Clement Laforet
51b7685381 - import buildconf patch in ports tree.
It has been living out the tree for historical reason.
2004-05-18 11:58:56 +00:00
Clement Laforet
6b583c745f Update to 2.0.49
Full ChangeLogand announcement:
http://www.apache.org/dist/httpd/Announcement2.html

Port changes:
- buildconf patches improvement
- Fix typo [1]

PR:             64297 [1]
Submitted by:   TSUMAI Yasuyuki <ral@ta-ko.jp> [1]
2004-03-20 12:27:46 +00:00
Clement Laforet
87d90c973a Fix a mod_ssl denial-of-service.
http://www.vuxml.org/freebsd/492f8896-70fa-11d8-873f-0020ed76ef5a.html

Reported by:        nectar
Obtained from:      Apache CVS vis nectar
2004-03-08 12:51:54 +00:00
Clement Laforet
655d574472 - Remove thread support in apr. The code prevents apache from running
on > 4.8-STABLE (from september 2003) system because apache2 used
  libc_r instead of libc.
  Compiling with -lkse (on -CURRENT) was broken too.

- bump PORTREVISION to force users to upgrade.

NOTE: on -STABLE DO NOT DEFINE WITH_THREADS.
      (unless you use a threaded MPM)

Thanks to Fritz Heinrichmeyer <fritz.heinrichmeyer@fernuni-hagen.de>
who helped me to track the problem.

Noticed by:         Fritz Heinrichmeyer <fritz.heinrichmeyer@fernuni-hagen.de>
                    HAYASHI, "Lef" Tatsuya <lef@st.rim.or.jp> [1]
PR:                 61317 [1]
Approved by:        erwin (mentor) (implicitly)
2004-01-13 22:12:11 +00:00
Clement Laforet
617e1a4c38 - Per popular request, add "you can you use make show-modules"-like
message option in pre-everything:: target.
- Change OpenSSL fix. (specially when WITH_BERKELEYDB=FreeBSD is defined)
  There are too many cases of failure (at leat 3), so I can't force -STABLE
  users to use SSL_EXPERIMENT_ENGINE [1]
- Add WITH_SSL_EXPERIMENTAL_ENGINE knob [2]
- Better db42 apr-util detection [3]
- Add fastest mirror to PATCH_SITES
- Add db42 to "make show-options"

Note to users:
    Unless you have a *really* good request, no more features will be added.
    Please send me with your bug reports:
            - uname -a output
            - all config.log files
            - pkg_info output
            - your make command line

Noticed by:     apache2-test-ng.sh script [1]
                Barry Pederson <bp@barryp.org> [3]
Requested by:   jb@perso-web.com [2]
2004-01-10 22:24:52 +00:00
Clement Laforet
50cde3dbb3 Apache2 PORTREVISION 2:
- Move docs-related stuff to Makefile.doc
- Better MPM handling (for slave ports)
- Fix HTTP_PORT behaviour
- Make suExec more configurable [1]
- Now config script are regenerated by buildconfig, to improve slave
  ports support and minimize apr/apache2 ports conflict [2]
- Fix typo in AUTH_MODULES routine [3] [4]
- apr threaded support [5]
- Fix Segmentation fault with LDAP [6]
- Add db42 support. [7] (just uncomment related lines
  if you installed it from shar)
- add SLAVE_DESIGNED_FOR variable for slave ports to
  automaticaly mark them as BROKEN, if they are out of sync with
  apache2

PRs:                60444 [1], 61030 [4]
Requested by:       Matthias Andree <matthias.andree@gmx.de> [7]
Suggested by:       kuriyama [2] [5]
Submitted by:       Daniel Tasov <danielt@pilgerer.org> [1],
                    kuriyama [5],
                    motoyuki [3],
                    Scott Michel <scottm@cs.ucla.edu> [4]
Obtained from:      Apache CVS [6]
Reviewed by:        erwin, linimon
Approved by:        erwin (mentor)
2004-01-08 17:42:03 +00:00
Christian Weisgerber
c032fc783b - fix LDAP deps (typo) [1]
- fix nasty typo in DBM code (missing + in LIB_DEPENDS=)
- remove NO_{ERROR;WWWDATE;CGI;ICONS;WWW} and utilize WITHOUT_WWW and
  WITH_CUSTOM_WWW [2]
- HTTP_PORT => WITH_HTTP_PORT and IPV6_ONLY => WITH_IPV6_ONLY [3]
- add support for FreeBSD libc db [4]
- add db41 support [5]
- more typos and a few things...

Notified by:	Oliver Eikemeier <eikemeier@fillmore-labs.com> [1]
Discussed with:	Oliver Eikemeier <eikemeier@fillmore-labs.com> [2] [3]
Requested by:	Fritz Heinrichmeyer <fritz.heinrichmeyer@fernuni-hagen.de> [4]
Submitted by:	<swp@uni-altai.ru> [5]

PR:		58739
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org>
2003-11-09 03:22:49 +00:00
Trevor Johnson
15bb1ce95f Update to 2.0.48, which has corrections for two security bugs:
- CAN-2003-0789:  information leak in mod_cgid
<URL:http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0789>
- CAN-2003-0542:  buffer overflow in mod_alias and mod_rewrite
<URL:http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0542>

Use a DIST_SUBDIR.  Use the DOCSDIR macro.

Add options: HTTP_PORT, IPV6_V6ONLY, NO_CGI, NO_ERROR, NO_ICONS,
NO_WWW, NO_WWWDATA, WITHOUT_AUTH, WITHOUT_DAV, WITHOUT_MODULES,
WITHOUT_MODULES, WITHOUT_PROXY, WITH_ALL_STATIC_APACHE, WITH_BERKELEYDB,
WITH_CUSTOM_AUTH, WITH_CUSTOM_PROXY, WITH_DBM, WITH_EXTRA_MODULES,
WITH_MODULES, WITH_MPM, WITH_STATIC_APACHE, WITH_STATIC_MODULES and
WITH_STATIC_SUPPORT

PR:		58654
Submitted by:	Clement Laforet (maintainer)
2003-10-29 22:46:45 +00:00
Hye-Shik Chang
6d59a529a8 [SECURITY FIX]
Update to 2.0.46

See vulnerability details at:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0245
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0189

PR:		52768 [1]
Submitted by:	Xin Li <delphij@freebsdchina.org> [1],
		Miguel Mendez <flynn@energyhq.es.eu.org>,
		Trevor Johnson <trevor@FreeBSD.org>,
		Mark Gooderum <mark@verniernetworks.com>,
		John Walsh <zed@maths.tcd.ie>
2003-06-01 00:09:42 +00:00
Hye-Shik Chang
bf43aeb821 Add missed files on the previous commit. 2003-04-04 02:38:27 +00:00
Hye-Shik Chang
408824d8e0 Update to 2.0.45. This update fixes a DDOS vulnerability.
PR:		50564 [1]
Submitted by:	Cy Schubert <cy@FreeBSD.org>, delphij@hotmail.com [1]
Requested by:	many
2003-04-04 02:36:57 +00:00
Hye-Shik Chang
21de316435 Move bin/ap[ru]-config to lib/apache2/ to coexist with devel/apr-devel
Bumped PORTREVISION accordingly.

PR:		ports/39091
Submitted by:	Marc Recht <marc@informatik.uni-bremen.de>
2003-01-08 11:29:55 +00:00
Hye-Shik Chang
433e3d97bd o Change installbuilddir to $PREFIX/share/apache2/build to make porting
3rd party modules easy. [1]
o Include <limits.h> before <sys/syslimits.h> to reduce warnings on -CURRENT

PR:		44104 [1]
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org> [1]
2002-11-15 13:35:56 +00:00
Kris Kennaway
5c8de5fcae Update to apache 1.3.27 and 2.0.43. This fixes a security vulnerability.
Mark apache13-ssl FORBIDDEN because the new version does not yet exist.

Partially based on patches submitted by below authors.

Submitted by:	"Sergey A. Osokin" <osa@freebsd.org.ru>,
		Udo Schweigert <udo.schweigert@siemens.com>,
		Lev A. Serebryakov <lev@serebryakov.spb.ru>
PR:		ports/43682, ports/43688, ports/43666, ports/43681
2002-10-05 09:18:45 +00:00
Hye-Shik Chang
447d43bde3 Update to 2.0.40 2002-08-10 00:56:52 +00:00
Hye-Shik Chang
1e1df07282 - Add a small hack for worker MPM [1]
(worker MPM with this hack seems to work without visible problems.
   and still requires -DFORCE_THREADING_MPM to build for worker MPM.)
- Fix plist for worker MPM
- Comment out fancy modules from default httpd.conf

Tested on:      ref5.freebsd.org, several 4-stable machines [1]
2002-07-21 02:23:33 +00:00
Hye-Shik Chang
2a0ac18cea Correct envvars path on apachectl(1)
Submitted by:	Franco Venturi <fventuri@attbi.com>
2002-07-11 12:24:53 +00:00
Hye-Shik Chang
f3cc6576b2 - Add a patch for a bug on infinite loop in HTTP_IN
filter that allows DoS attack.
- Bump PORTREVISION
- Change maintainer address

Obtained from: Apache Group CVS (rev 1.150-1.151)
2002-07-09 11:22:19 +00:00
Hye-Shik Chang
0360be38d5 Fix more fatal bugs on htpasswd(1)
Requested by:	"Jon Noack" <noackjr@compgeek.com>
Obtained from:	Apache Group CVS (rev 1.49-1.51)
2002-07-08 07:42:04 +00:00
Hye-Shik Chang
d1eb2ba3f9 o Fix the htpasswd logic bug around -c and -n options
o Take away WITH_BUNDLED_EXPAT option (use textproc/expat2)
o Bump PORTREVISION

Prompted by:	Jon Noack <noackjr@rice.edu> (htpasswd)
Obtained from:	Apache Project's CVS (htpasswd)
2002-06-27 00:22:40 +00:00
Patrick Li
159c4b8012 - Sync www/apache13's change (.default -> -dist)
- Change default to WITH_BULDLED_EXPAT
- Reorder .if .endif blocks (.if WITH_MPM must appear earlier than .if
WITHOUT_CACHE)
- Some minor style fixes
- Bump PORTREVISION

PR:		ports/39635
Submitted by:	maintainer
2002-06-21 23:47:25 +00:00
Patrick Li
ea103f8b13 - Update to 2.0.39, the emergency security update.
- Unmark FORBIDDEN

PR:		ports/39477
Submitted by:	maintainer
2002-06-18 23:02:05 +00:00
Ying-Chieh Liao
e55081b766 - Better WITH_SUEXEC support
- Build with textproc/expat2 unless defined(WITH_BUNDLED_EXPAT)

PR:		38552
Submitted by:	maintainer
2002-05-26 13:25:04 +00:00
Cy Schubert
90cd8b73d7 1. Upgrade 2.0.35 --> 2.0.36
2.  Port printed message to "pw userdel www" if port removed permanently.
    However master.passwd 1.25.2.5 has user www by default, so this is no
    longer correct advice.  Removed pkg-deinstall to correct this.

PR:		37849 and 36907
Approved by:	MAINTAINER:  Hye-Shik Chang <perky@fallin.lv>
2002-05-09 03:55:18 +00:00
Ying-Chieh Liao
a7fe341967 Respect $DESTDIR for all paths
PR:		37211
Submitted by:	maintainer
2002-04-18 20:29:41 +00:00
Patrick Li
ff132cd6d8 Remove this patch since perl patch in port Makefile is used to
accomplish this.

PR:		37046
Submitted by:	Helge Oldach <send-pr@oldach.net>
Approved by:	maintainer
2002-04-14 20:37:28 +00:00
David E. O'Brien
890f276009 Fix 'expr' usage and allow to compile with GCC 3.1.
Submitted by:	Hye-Shik Chang <perky@fallin.lv> (maintainer)
2002-04-11 03:41:12 +00:00
Patrick Li
c856fac3ab Update to 2.0.35 (first GA release!)
PR:		36834
Submitted by:	maintainer
2002-04-08 06:45:33 +00:00
Patrick Li
499e0c4b79 Update to 2.0.32
PR:		36040
Submitted by:	maintainer
2002-03-23 08:31:55 +00:00
David W. Chapman Jr.
cb24f98430 Fix problem where installation would overwrite existing config files
Bump PORTREVISION

Submitted by:	maintainer
2002-01-22 16:01:35 +00:00
Ying-Chieh Liao
3662cec740 Fix invalid path problem on building extension module with apxs.
PR:		32638
Submitted by:	maintainer
2001-12-13 10:12:38 +00:00
David W. Chapman Jr.
6d2b11cde9 Update to 2.0.28
PR:		32043
Submitted by:	maintainer
2001-11-19 22:47:47 +00:00
Andrey A. Chernov
14850c029a Sync with main Apache
Submitted by:	MAINTAINER
2001-10-24 16:03:38 +00:00