Commit graph

195 commits

Author SHA1 Message Date
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
63581d9287 apache2 NG patch 2/5.
Makefile.modules:
   - Export rewritten modules selection from Makefile.modules
     to Makefile.modules.3rd
   - Remove proxy support by default.

Makefile.modules.3rd:
   - Add support for WANT_APACHE common13/common2 to share
     code/functionalities between apache13 and apache2 server ports.

Rewrite of modules selection:
   - WITH_MODULES and WITHOUT_MODULES are no more conflicting
     WITHOUT_MODULES can be safely used internally to remove conflicting
     modules
   - Selection is based on modules categories to improve flexibility
        - WITH_${category}[_MODULES]
        - WITHOUT_${category}
        - WITH_CUSTOM_${category}
   -  Support apache13, apache2{0,1}
        This is EXPERIMENTAL. I'll test it IRL with www/apache13-ssl,
        and it should be easily usuable in future bsd.apache.mk
2004-08-02 08:40:05 +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
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
fcd42c3e27 - Add WITHOUT_IPV6 knob to workaround problem with IP resolution
when --enable-v4-mapped is used (default).
  Use WITHOUT_IPV6 knob if you have problem with "HostnameLookup On" on
  IPv4-only server(s).
  I hope I can provide a real fix soon.
2004-07-09 16:41:38 +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
1356695910 - revert ade's commit, since it breaks the ports due to something
looking like a reverse patching.
2004-07-01 18:06:35 +00:00
Ade Lovett
328b757bf2 Autotools cleanup. Remove autoconf257 (259), automake17 (18), and
libtool14 (13/15).

PR:		67768
Submitted by:	ade
Approved by:	4-exp bento runs (thanks, kris!)
2004-07-01 17:06: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
36102d1706 - remove quotes from "bogus" IGNORE string
Noticed by:	kris
2004-06-02 08:15:58 +00:00
Clement Laforet
2864efb22d - Fix IGNORE s,(,\(, 2004-05-29 22:17:16 +00:00
Clement Laforet
e4bf8af6bd - s/BROKEN/IGNORE/ 2004-05-29 22:07:37 +00:00
Clement Laforet
96f28baafc - Fix build if WITH_APR_FROM_PORTS is defined.
- Advertise ServerToken i.e.:
Apache/2.0.49 (FreeBSD) Server at satan.cultdeadsheep.org Port 80
2004-05-29 21:37:38 +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
a29fc87857 - use autoconf 2.57
- use libtool 1.5.6
2004-05-18 11:35:54 +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
Dirk Meyer
c1f71dd0e3 - CONFLICTS extended 2004-03-18 20:50:09 +00:00
Jun Kuriyama
4a868f8a2a o Bump $LIB_DEPENDS line to chase expat's shlib version.
o Bump $PORTREVISION.
2004-03-14 07:58:26 +00:00
Ade Lovett
3f651573ad Whoa there, boy, that's a mighty big commit y'all have there...
Begin autotools sanitization sequence by requiring ports to explicitly
specify which version of {libtool,autoconf,automake} they need, erasing
the concept of a "system default".

For ports-in-waiting:

	USE_LIBTOOL=YES		->	USE_LIBTOOL_VER=13
	USE_AUTOCONF=YES	->	USE_AUTOCONF_VER=213
	USE_AUTOMAKE=YES	->	USE_AUTOMAKE_VER=14

Ports attempting to use the old style system after June 1st 2004 will be
sorely disappointed.
2004-03-14 06:17:56 +00:00
Clement Laforet
90f251127c Fix configure. 2004-03-13 10:37:39 +00:00
Ade Lovett
91e0c8f1a7 Replace all known incantations of WANT_{AUTOMAKE,AUTOCONF,LIBTOOL}* with
the USE_<x> equivalents.  In the current scheme of things, the WANT_
variables in this case are synonymous with the USE_ ones, and thus need
to be exterminated.

First in a series of major autotools cleanups.
2004-03-12 02:48:25 +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
5455874985 - Add windowsupdate.com mod_proxy fix. [1]
you must define WITH_WINDOWSUPDATEFIX
- Fix typo/reword Makefile.doc [2]

PR:		62610 [1], 62757 [2]
Submitted by:	leafy <leafy@leafy.idv.tw> [1],
		Linh Pham <question+freebsdpr@closedsrc.org> [2]
2004-02-16 14:07:48 +00:00
Clement Laforet
b99ca6371f - Improve apr from ports support.
Thanks a lot to kuriyama.

Submitted by:   kuriyama
2004-02-08 15:40:41 +00:00
Clement Laforet
98593a39a5 - Fix typo in SLAVE_DESIGNED_FOR check [1]
- Make ldap fix optional, since it may break LDAP auth [2]
  Please use WITH_LDAPFIX if you need the fix.
- Improve pthreads support
- SIZEify distinfo

Submitted by:           mharo [1]
Discussed with:         Robin P. Blanchard <robin.blanchard@gactr.uga.edu> [2]
2004-02-08 11:53:55 +00:00
Jun Kuriyama
4362106d16 o Use appropriate comment for WITH_IPV6_V6ONLY knob.
o Fix apu-config command name in WITH_APR_FROM_PORTS condition.
2004-02-08 10:01:40 +00:00
Clement Laforet
17cfbfeee1 Add WITH_PTHREAD_LIBS and WITH_EXPERIMENTAL_THREADS.
These options are for people who want to directly link
apache against libkse and libthr.

Usage:
    WITH_EXPERIMENTAL_THREADS=YES
            Overrides default pthread detection behaviour.
    WITH_PTHREAD_LIBS={kse;thr}
            Lets you choose your pthread lib.
            Don't even try to use "c_r"...

*** These options are unsupported ***
But all gdb backtraces are welcome :-)
AFAIK, apache works well, but mod_php4 (worker MPM) behavior
is quite funny.
All modules which use apr mutexes may crash with KSE.
Since I'm working on it, if you have coredumps, feel free
to send me the backtrace (you must compile libkse, apache
and modules with debugging symbols).
Don't forget to set kern.sugid_coredump to 1.
(using CoreDumpDirectory in httpd.conf can help too)
2004-01-21 21:21:12 +00:00
Clement Laforet
aa99c82619 - Fix compilation for threaded MPM.
This is due to partial revert of apr improvment.
  setting LIBS=${PTHREAD_LIBS} conflicts with libtool.
  All should be OK now...
  If someone can explain me why libtool impose using
  -pthread (ltshmain), I'm all ears...
  Note:
  You CAN NOT override -lc_r (i.e. setting -lkse) at compile time.
  I must fix it...
- Move patchset to MASTER_SITE_LOCAL

Noticed by:         Martin Nilsson <martin@gneto.com>
Approved by:        erwin (mentor) (implicitly)
2004-01-16 00:30:22 +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
7433b9218c Mark apache2 as broken when devel/apr is installed and WITH_APR_FROM_PORTS
is not defined.
This workaround should avoid weird apache behaviours when apache is
linked against the wrong apr* libraries.
Time to add CONFLICTS_BUILD option to bsd.port.mk ?

Approved by:    erwin (mentor) (implicity)
2004-01-09 23:11:17 +00:00
Clement Laforet
c1786617e7 - fix SSL detection problem on stable with base OpenSSL [1]
Force the use of SSL_EXPERIMENTAL_ENGINE *only* if the user uses
  -STABLE and base OpenSSL.
  This is an *apache* problem. It's not the port.
  I strongly encourage users to use OpenSSL from ports.
   From httpd-2.0 Status:
   * mod_ssl: fix a link failure when the openssl-engine libraries are
     present but the engine headers are missing.
- fix a typo in WITH_DBM, should be bdb and not db [1]
  I keep db for backward compatibility
- Add WITH_APR_FROM_PORTS to use devel/apr with apache2.
  !!! WARNING !!! apache-2.0.48 is designed to work with apr 0.9.5.

Noticed by:     Fritz Heinrichmeyer <Fritz.Heinrichmeyer@Fernuni-Hagen.de> [1]
Approved by:    erwin (mentor)
2004-01-09 18:56:12 +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
Jun Kuriyama
049f4d4421 Remove duplicated WITH_EXPERIMENTAL comment.
Reviewed by:	maintainer
2003-12-13 14:16:15 +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
Hye-Shik Chang
c6445c3cc5 Fix build.
PR:		58711
Submitted by:	Yusuke Matsuoka <yusmat@iris.dti.ne.jp>
Approved by:	maintainer
2003-10-30 09:37:13 +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
Dirk Meyer
a49e1ce266 - fix spelling in CONFLICTS 2003-10-25 20:47:38 +00:00
Christian Weisgerber
c05f2db84d Add forgotten file to plist.
PR:		58211
Submitted by:	Dimitry Andric <dimitry@andric.com>
Approved by:	maintainer
2003-10-18 17:00:18 +00:00
Dirk Meyer
23a445abcc - add CONFLICTS
Submitted by:   eikemeier@fillmore-labs.com
Approved by:    kris
2003-10-14 15:47:28 +00:00
Edwin Groothuis
5b0bf6e947 Cease FreeBSD port maintainerships
I don't have the time to give to many of the ports I maintain at
	the moment. I wasn't expecting to be so busy this summer ...

	Please set all my ports back to ports@freebsd.org.

PR:		ports/56935
Submitted by:	Dominic Marks <dom@wirespeed.org.uk>,Clement Laforet <sheepkiller@cultdeadsheep.org>,Oliver Eikemeier <eikemeier@fillmore-labs.com>
2003-09-24 08:37:39 +00:00
Jun Kuriyama
b67a28791a Fix non-default dependency on openldap2[012] which is broken by splitting.
# I'm not bumped port revision of them because this should not affect
# packages built on bento...
2003-08-15 00:49:31 +00:00
Cy Schubert
73609b1f2a Update 2.0.46 --> 2.0.47
Approved by:	MAINTAINER (dominic.marks@btinternet.com)
Notified by:	striker@apache.org on announce@apache.org
2003-07-09 15:31:40 +00:00
Kris Kennaway
f07674fe04 Set GNU_CONFIGURE instead of HAS_CONFIGURE.
Reviewed by:	maintainer
2003-07-06 11:12:23 +00:00
Erwin Lansing
0ee7c78953 Hand maintainership to submitter
PR:		54053
Submitted by:	Dominic Marks <dom@cus.org.uk>
2003-07-03 08:09:31 +00:00