1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00
Commit Graph

197 Commits

Author SHA1 Message Date
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
6159a79eae Uncomment db42-related lines, since db42 is in the
ports tree now.

Reminded by:    lev
Approved by:    erwin (mentor) (implicitly)
2004-01-10 19:34:36 +00:00
Clement Laforet
83b52042c7 s/APACHE_USER/WWWOWN/.
I don't use APACHE_USER, so SUEXEC_CALLER is set to "".
Since apache only produce error at run time, I didn't catch it.
BTW, SUEXEC_CALLER is now correctly set.

Noticed by:     Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
Pointy hat to:  me
Approved by:    erwin (mentor) (implicity)
2004-01-10 10:14:06 +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
Hye-Shik Chang
7e9486d202 Set maintainer to ports@FreeBSD.org 2003-07-02 18:08:49 +00:00
Hye-Shik Chang
279955e178 Add a new knob WITH_LDAP that brings mod_auth_ldap and mod_ldap.
Submitted by:	Jean-Baptiste Quenot <jb.quenot@caraldi.com>
Requested by:	Moti Levy <moti@flncs.com>,
		Milan Andric <mandric@eecs.berkeley.edu>,
2003-06-12 09:35:21 +00:00
Hye-Shik Chang
e7d8f8fdf0 Change to use ${PKGINSTALL} instead of `pkg-install' to unbreak the build
when WRKDIRPREFIX is defined.

PR:		52973
Submitted by:	Morten Rodal <morten@rodal.no>
2003-06-06 01:01:13 +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
1cecad1ce9 - Utilize MASTER_SITE_APACHE_HTTPD [1]
- Allow to override SUEXEC_SAFEPATH [2]

Submitted by:	naddy [1],
		Eugene M. Kim <ab@astralblue.net> [2]
2003-04-16 21:33:58 +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
fbc660cb2c De-pkg-comment for my ports. 2003-02-25 06:25:35 +00:00
Hye-Shik Chang
1e89a01429 Remove buggy SSL warning which isn't working correctly for openssl's
version scheme change.

Submitted by:	Jos Backus <jos@catnook.com>,
		Tiller Beauchamp <tiller@cs.uoregon.edu>
2003-01-31 11:50:50 +00:00
Hye-Shik Chang
91865b9f4c Update to 2.0.44
New knob IPV6_V6ONLY=yes disables accepting v4 connection via v4-mapped
v6 socket.
2003-01-21 17:54:18 +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
Akinori MUSHA
00d0265dc9 Add MASTER_SITE_RINGSERVER to MASTER_SITES. 2002-10-12 21:55:47 +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
669b6457ee Update to 2.0.42
Approved by:	will (portmgr)
2002-09-25 16:42:24 +00:00
Jun Kuriyama
0120547e6d Bump PORTREVISION and expat shlib. 2002-09-17 07:41:05 +00:00
Hye-Shik Chang
447d43bde3 Update to 2.0.40 2002-08-10 00:56:52 +00:00
Hye-Shik Chang
d1619aea20 Fixed my stupid MAKE_ENV mistake on NOPORTDOCS=true
PR:		41292 [1]
Submitted by:	Clemens Oertel <oertel@uni-tuebingen.de>
		Oliver Eikemeier <eikemeier@fillmore-labs.com> [1]
2002-08-04 17:45:43 +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
Jun Kuriyama
a52ee364a9 Bump portrevision (textproc/expat2 shlib bump). 2002-07-21 02:17:49 +00:00
Hye-Shik Chang
cc75ab77f2 o Install mod_deflate by default
o Add mod_bucketeer and mod_optional_* modules to WITH_EXPERIMENTAL modules
o Bump port revision

PR:		40529
Submitted by:	Lawrence Ho <lawrenceho@fastmail.fm>
2002-07-14 03:57:59 +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
9e82e49e22 Use ${INSTALL_DATA} instead of ${CP} to set others readable on 077 umasks
PR:		38389
Submitted by:	abatko@cs.mcgill.ca
2002-06-28 00:10:18 +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
Christian Weisgerber
490ffcf406 * Always use /bin/sh for configure and build.
* Fix EXPAT_PATHS substitution on 4.4.

Submitted by:	maintainer Hye-Shik Chang <perky@fallin.lv>
2002-06-20 11:03:08 +00:00
Maxim Sobolev
4803463633 Add USE_REINPLACE where appropriate. 2002-06-19 08:18:10 +00:00