Commit graph

343 commits

Author SHA1 Message Date
Clement Laforet
d3a7908876 - Apply openssl 0.9.8 fix by default. OpenSSL 0.9.8 is now the default
from ports

Reported by:	erwin
2005-09-20 08:39:50 +00:00
Clement Laforet
24ed4b55bc - Hook www/apache20 to the build. It fixes some errors in INDEX build with
exp build

Reported by:	kris
2005-09-18 22:29:16 +00:00
Clement Laforet
fa30142737 - Sync with www/apache2 2005-09-10 14:45:03 +00:00
Clement Laforet
d03aaaaa5e - make sure SSL dependency doesn't exists if WITHOUT_MODULES_SSL is defined 2005-08-01 10:04:18 +00:00
Clement Laforet
45df42849e - Add fix for CAN-2005-2088
From Changelog:
  *) SECURITY: CAN-2005-2088
     core: If a request contains both Transfer-Encoding and Content-Length
     headers, remove the Content-Length, mitigating some HTTP Request
     Splitting/Spoofing attacks.  [Paul Querna, Joe Orton]

- Rename previous patch to CVE ID
- bump PORTREVISION

Security:       CAN-2005-2088
Obtained From: Apache repository
2005-07-26 10:10:35 +00:00
Clement Laforet
7a67d06cd1 Security: fix a buffer overrun in ssl_callback_SSLVerify_CRL()
Reported by:	thierry
2005-07-26 08:25:13 +00:00
Clement Laforet
b9be9d957f - Remove debug line. 2005-06-01 17:49:31 +00:00
Clement Laforet
8978d00aab - Add support for multiple instances of apache2 to startup script.
It's a little bit experimental, but it works.
2005-06-01 17:47:53 +00:00
Clement Laforet
d20de50ad7 - Sync with www/apache2 2005-05-22 09:09:42 +00:00
Clement Laforet
e3590ec81f - Backport PORTDOCS fix from www/apache21.
Recent changes in bsd.port.mk prevent from using PORTDOCS= #
2005-02-24 09:52:29 +00:00
Clement Laforet
826434a289 - backout previous commit.
I blindly committed a change from my dev tree. Since USE_APACHE design
  is flacky, it had a very annoying impact.

PR:		   ports/77391 [1]
Also reported by: pointyhat via kris,
                  Scot Hetzel <swhetzel@gmail.com> [1]
Pointy hat to:    clement
2005-02-11 15:46:11 +00:00
Clement Laforet
a828e013aa - I want to keep APACHE_PORT overridable even with apache2. 2005-02-08 21:40:06 +00:00
Clement Laforet
2e6e1ded1c - Update to 2.0.53
- Download bz2'd tarball [1]
- Add print-closest-mirrors target.
  It allows you to find the 6 (3 http/3 ftp) closest mirror,
  base on http://www.apache.org/dyn/closer.cgi/httpd/
  make print-closest-mirrors >> /etc/make.conf automatically add
  the six closest mirror to the head of ${MASTER_SITE_APACHE_HTTPD}.

Requested by:	delphij
2005-02-08 15:17:06 +00:00
Clement Laforet
4e5a21d57a - Fix non DSO apache detection
Noticed by:	Xavier Beaudouin <kiwi@oav.net>
2005-01-26 14:06:35 +00:00
Clement Laforet
c54346f8c3 Changes in Makefile.modules.3rd
o Major change(s)
   - in some cases, modules are still built as static modules, making
     modules selection useless and generate a non-desired httpd

o Minor change(s)
   - apxs detection is done only if port isn't a server one.
   - Mark modules ports as IGNORED if apaxhe is built statically
   - fix make show-modules when when WITH_ALL_STATIC_MODULES is defined

Most issues discovered by:      Jason Mealins <jason_mealins@bigfix.com>
2005-01-26 10:00:11 +00:00
Clement Laforet
15f899a77d - make WITHOUT_<CATEGORY>_MODULES really works.
(it was still stuck with WITHOUT_<CATEGORY>)

Noticed by:	Jason Mealins <jason_mealins@bigfix.com>
2005-01-25 10:11:34 +00:00
Clement Laforet
ae9562845c - Add support for databases/db43 in apache2[1] and apache21.
- rename files/patch-srclib:apr-utils:build:dbm.m4 to
  files/patch-srclib:apr-util:build:dbm.m4

Based on PR:		ports/76152 [1]
Submitted by:		Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> [1]
2005-01-17 20:30:08 +00:00
Clement Laforet
4e80ec5376 o startup script:
- Use apache{2,21}flags variable in apache{2,21}_checkconfig().
  It fixes restart when apache2ssl_enable is set to YES in rc.conf
  and httpd.conf is "old" (i.e. non -DSSL safe) [1]

o Makefile
- split post-install target to add install-startup-script:
  User can now upgrade startup script without reinstalling apache2.
  NOTE: this is NOT package-safe and NOT supported, even if in most of
  cases they're no risk.

Noticed by:     many [1]
2005-01-11 13:45:05 +00:00
Clement Laforet
1bf03c0c63 - Add a note about the dangerousness of quotes in make.conf 2004-12-27 20:38:37 +00:00
Clement Laforet
a967a37908 - Bump PORTREVISION to refect recent changes.
Since www/mod_python3 needs envvars.d stuff to work.
2004-12-19 19:52:44 +00:00
Clement Laforet
d77a69574f - Fix a bug in mod_ssl. When client aborts connection, mod_ssl still try
to send its data, ad vitam eternam.

Noticed by:	Didier Bringer <bringer at echo dot fr>
Patched by:	Bruno Ducrot <ducrot at poupinou dot org>
2004-12-17 22:24:05 +00:00
Clement Laforet
2ab76c8193 - Remove useless APR_FROM_PORTS check in post-install
- Add support for modular sbin/envvars
  You can now put your own scripts you want to execute at envvars
  stage in ${PREFIX}/etc/apache2/envvars.d
  Only script ending by *.env are run.

  Example:
	/usr/local/etc/apache2/envvars.d/mod_python3.env

Discussed with:	perky on -apache@
2004-12-17 17:52:20 +00:00
Clement Laforet
91122c6017 - s/INSTALLS_SHILB/INSTALLS_SHLIB/ 2004-12-13 10:18:47 +00:00
Clement Laforet
be4ae2c39a - Remove installation of unused highperformance*.conf
- Move examples config files to ${EXAMPLESDIR}
- Relax permissions on ${PREFIX}/www instead of ${PREFIX}/www/data
2004-12-12 11:48:55 +00:00
Clement Laforet
c95fdac48a - Rename patch file. 2004-12-11 16:01:42 +00:00
Clement Laforet
7c168732cc - As discussed on apache@, don't create httpd.conf.bak, and remove stalled
httpd.conf.bak file at deinstall time.
2004-11-29 09:38:45 +00:00
Clement Laforet
c5d3398e2f - minor cleanups. 2004-11-13 18:23:34 +00:00
Clement Laforet
791aa3191a - Fix memory consumption DoS, CVE CAN-2004-0942
Reported by:    josef
Obtained from:  Apache CVS
2004-11-10 18:24:44 +00:00
Clement Laforet
eec92b731c - ldconfig'ify ${PREFIX}/lib/apache2 at install time.
PR:             ports/73566
Submitted by:   lev
2004-11-08 20:50:48 +00:00
Clement Laforet
3a52300e23 - Fix previous patch :-)
Huge pointy hat to: me
Noticed by:	Meno Abels <meno.abels@adviser.com>
2004-11-04 11:53:41 +00:00
Clement Laforet
3f55b3b4ac Makefile was errornously committed. Revert the changes 2004-10-31 09:22:21 +00:00
Clement Laforet
d189d69fdd - Fix apache2 build, I hope...
Noticed by:  many
Committed from: EuroBSDcon Hotel's bar.
Pointy hat to:	me
Under supervision from: mat, thierry, erwin (former mentor)
2004-10-30 19:44:41 +00:00
Clement Laforet
fa4c5a2a41 util_ald_cache_purge() fails to relink the cache entries during a cache purge.
So apply the official patch
2004-10-30 15:32:53 +00:00
Clement Laforet
c6d89630a7 - sync with real life 2004-10-21 07:08:46 +00:00
Clement Laforet
f247651bb8 - Fix shared module building when WITH_STATIC_MODULES is defined.
Noticed by:	Nicola Tiling <nti at w4w dot net>
2004-10-19 20:06:59 +00:00
Clement Laforet
3b4c9025f9 - Remove WITH_APR_FROM_PORTS knob
- Add a note to UPDATING, to warn users they won't be able to build apache2
  if they keep apr 0.9.x

Discussed with: Craig Rodrigues (apr maintainer), kuriyama
2004-10-16 14:45:40 +00:00
Clement Laforet
0a1a2dddcd - Fix apr detection
WARNING: apache2 + apr 1.0 is BROKEN
  I'm working on a small compat hack. But don't dream too much.
  apache 2.0.x is not designed to work with apr 1.x.

Forgotten by:	kuriyama
2004-10-16 09:15:52 +00:00
Jun Kuriyama
26dfd8e73d - Chase apr shlib version bump.
Pointy Hat Autumn Collection 2004 to:	kuriyama
2004-10-16 05:03:07 +00:00
Clement Laforet
17deeb0cd6 - Use ${WWWOWN} and ${WWWGRP} for apache's user. (instead of harcoded
www/www).
  It should help to keep consistancy in www-related ports.
2004-10-13 14:03:06 +00:00
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
8ffe568cee - Fix compilation with threads enabled on 5.x (due to PTHREAD_LIBS changes)
Approved by:	portmgr (krion)
2004-10-10 08:17:59 +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
6369afd447 - make AP_GENPLIST pseudo PREFFIX-safe until I find a correct fix.
Discussed with:	eik (long time ago)
2004-09-03 12:41:17 +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
ee18234277 - Add support for exception hook:
* WITH_EXCEPTION_HOOK now exists
  * Automatically add if WITH_DEBUG is set
  * Update still-outdated-documentation
- Remove automatic debuf mode if DEBUG_FLAGS is set

Exception hook is very useful for debugging (upcoming www/mod_backtrace
and www/mod_whatkilledus modules)

Makefile.modules.3rd:
- Fix CONFIGURE_ARGS for dynamic module selection.
  It's now fully usuable for apache13 ports
- Remove an useless WANT_APACHE check
- Move apxs detection at the beginning of the file, to use APXS_PREFIX
  for apache major version detection [1]
  The main advantage of this patch is to provide a nice way to
  have multiple apache versions, without altering ${LOCALBASE}.

Submitted by:    "ports/c0decafe.net" <ports at c0decafe dot net> [1]
2004-08-19 14:38:36 +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
7ee53773d5 We don't need -DFREEBSD_THREAD_HACK when using kse or thr as threading
library.
2004-08-07 19:47:16 +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
89b5fc4b1b - Fix brainless typo.
Noticed by: Roderick van Domburg <r.s.a.vandomburg@student.utwente.nl>
2004-08-02 13:21:36 +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
82c002d610 - Disable mod_cgi if MPM is threaded. 2004-07-13 13:32:42 +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
c36c607e27 - Improve plist generation.
It fixes problems when you deinstall a port with $PREFIX != $(apxs -q
  prefix). Now plist is aware of real location of apache module.
2004-07-11 09:43:17 +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
ddee6b6038 - remove from plist reference to share/nls/en_US.US-ASCII
and share/nls/POSIX

Noticed by:	thierry
2004-07-03 21:57:52 +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
Kris Kennaway
af18d6b419 Don't remove www/ now that it is created by the system. 2004-06-09 06:16:06 +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
f67f96c948 - Clarify pkg-message
Noticed by:	Hutterer Robert <robert.hutterer@univie.ac.at>
2004-06-06 21:53:18 +00:00
Clement Laforet
57ed01ffdf - Sync pkg-descr with reality. 2004-06-05 13:52:20 +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
6897c4721f - Fix plist after upgrading libtool to 1.5
Notice by:	 Fritz Heinrichmeyer <fritz.heinrichmeyer@fernuni-hagen.de>
2004-05-18 13:43:19 +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
5d1239a1c5 - s/BROKEN/IGNORE/
Per linimon's request correct {mis,ab}use of BROKEN.
2004-05-17 10:48:22 +00:00
Clement Laforet
9728f3a0ac - Do not activate module automatically [1]
- Cosmectic change in autogenerated plist (run apxs before the removal
  of the module file, it can make apxs fail if you change module
  name/shortname)

Forgotten by:   me [1]
Reminded by:    discussion with kris [1]
2004-04-17 14:26:01 +00:00
Clement Laforet
291e472f16 Add AP_EXTRA to support extra arguments to apxs during build.
AP_INC and AP_LIB were added.

Reminded by: mod_vdbh port
2004-04-16 14:07:16 +00:00
Clement Laforet
a15906aee6 Remove noisy apache version detection 2004-04-16 13:29:29 +00:00
Clement Laforet
e50672f6cf Add Makefile.modules.3rd, which should simplify apache modules porting.
It can not be used with USE_APACHE knob.

Most important knobs:
WANT_APACHE=    {13,2}
        Apache version required. if undefined, both apache version
        are allowed.
AP_FAST_BUILD
        Do ${APXS} -c ${APXS} -i for you
AP_GENPLIST
        Autogenerate a _SIMPLE_ plist:

See future commits to know how to use this file.
2004-04-16 12:24:42 +00:00
Clement Laforet
c7cb8394d2 - Fix install when people use a different /bin/sh
This shouldn't have been fixed, but I don't like setting UID and GID
  variables.
  so ${*} -> ${WWW*}

PR:		64032
Noticed by:	Patrick Schoenfeld <schoenfeld@in-medias-res.com>
2004-04-07 14:27:47 +00:00
Clement Laforet
b5b3209ef4 - s/ac_cv_pthreads/apr_cv_pthreads/ (due to changes in 2.0.49)
WITH_PTHREAD_LIBS and WITH_PTHREAD_CFLAGS are now working again

  WARNING: This option is still NOT offically supported.
  You can't flame me,but you still cansend me some backtrace ;-)
2004-03-26 17:05:03 +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