Commit graph

25 commits

Author SHA1 Message Date
Philip M. Gollucci
fb2e8372fe stray $ 2010-05-25 20:59:42 +00:00
Philip M. Gollucci
335f8cb35d Mk/bsd.apache.mk can not sufficiently alter things before Mk/bsd.options.mk
in Mk/bsd.ports.mk due to ordering in Mk/bsd.port.mk.  This causes OPTIONSFILE
to be incorrectly set during some make phases as a result of the recent
PKGNAMEPREFIX for apache ports.

'Revert' some of the PKGNAMEPREFIX changes for apXX-.
   - Must be manually requested in tbe port Makefile either by
     a) AP_FAST_BUILD=yes
     b) PKGNAMEPREFIX=${APACHE_PKGNAMEPREFIX}
   - Going forward, we will only do this for ports where WITH_APACHE
       is NOT optional, but required.  mod_* ports are a good fit.

141 ports are mod_ ports
  80 of those use AP_FAST_BUILD and thus are auto hooked by this patch [a].
  61 remaining are then patched to mirror the other $lang frameworks [b].

PR:             ports/146956
Reported by:    Hans F. Nordhaug <Hans.F.Nordhaug@hiMolde.no>, several
Discussed with: pav, itectu on #bsdports
Tested by:      P6 TB run
Approved by:    portmgr (pav)
2010-05-25 20:17:37 +00:00
Philip M. Gollucci
99d3f4c2b0 - Enable,build, and install mod_reqtimeout.so which mitigates solaris attacks.
- Default on, so bump PORTREVISION

Reuested by:        Jonas Eckerman <jonas@fsdb.org> (via apache@)
With Hat:           apache@
2010-05-20 21:43:47 +00:00
Philip M. Gollucci
c4aff1ca1f *****************************************************************************
Implement PKGNAMEPREFIX=ap13|ap20|ap22
*****************************************************************************

- Create packages for USE_APACHE=x ports with PKGNAMEPREFIX [1]
- Rephrase IGNORE statement, kill EOL spaces, reformat in Mk/bsd.apache.mk [2]
- Remove USE_APACHE=yes, USE_APACHE=apr, and APR_DEPS=foo
- Remove APACHE_COMPAT=X
- Drop support for 21 [dev only release, not in tree for years now]

PR:             ports/115461 [1], ports/133197 [2], ports/141688
Submitted by:   myself (pgollucci@),
                Alexey Rubtsov <arubtsov@swsoft.com> [1],
                dafne [2]
Requested by:   Several [1]
Tested by:      2 -exp runs by pav
Approved by:    portmgr (pav)
With Hat:       apache@
2010-05-19 23:01:04 +00:00
Philip M. Gollucci
605d4bae06 - Make the SLAVE_DESIGNED_FOR message more useful and say what versions
didn't match.  Changes message text only.

With Hat:   apache@
2010-05-05 22:26:30 +00:00
Philip M. Gollucci
e353c85f90 - Fix builds that enable PROXY support.
This should have been part of the following previous commit to www/apache22

>- OPTIONS+= PROXY_SCGI
>
>PR:             ports/140137
>Submitted by:   olli hauer <ohauer@gmx.de>
2009-12-14 00:16:25 +00:00
Clement Laforet
ab8293d70e - Avoid "OPTIONS blackhole" during 'make make-options-list' 2007-09-19 21:03:59 +00:00
Clement Laforet
4d35566575 - cosmetic changes
- s/OPTIONS=/OPTIONS+=/
2007-09-18 20:01:17 +00:00
Clement Laforet
fc5126bc4c - fix pre/post includes for USE_APACHE=common*
We still perform a double inclusion for modules to ensure backward
  compatibility
- add "Apache servers"-wide support for OPTIONS.
  !! Warning !!
  If OPTIONS is defined, all other modes to select modules are disabled.
  Here's the logic behind:
    1) OPTIONS
    2) WITH_MODULES
    3) all others knobs.

  OPTIONS'ified list of modules can be obtained via:
  "make make-options-list"
2007-09-09 14:36:42 +00:00
Clement Laforet
a1bae9f6e3 - Fix index build: temporary remove pre/post stuff.
Pointy Hat to: clement
2007-07-22 12:43:00 +00:00
Clement Laforet
9173d040e4 - fix long standing bugs
* fix pre/post includes
  * fix local port overiding for apache > 2.1
  * Add a short notr about USE_APACHE=yes
2007-07-22 10:48:42 +00:00
Pav Lucistnik
ac049a67f3 - Fix leftover httpd.conf for AP_GEN_PLIST using ports. The problem is that
apxs does not remove module line from httpd.conf, it merely comments it out.
  Later, on Apache deinstall, the file differs from stock httpd.conf and is not
  deleted.

Tested by:	pointyhat exprun
2007-06-28 15:50:53 +00:00
Clement Laforet
5cf595bca5 - s/WITH_SUEXEC_UMASK/SUEXEC_UMASK/
Spotted by:		ksaveras.sakys@observer.lt
2006-11-07 09:11:53 +00:00
Mark Linimon
1ae2bc11da Fix typo in IGNORE message. 2006-06-20 04:58:12 +00:00
Clement Laforet
7e03ad6c0a - Add APACHEETCDIR to catch apache etc directory.
It can't be used with USE_APACHE=yes

Requested by:	pav, tmclaugh
2006-05-11 15:21:22 +00:00
Clement Laforet
c667e38ff2 - We have to explicitely disable proxy modules to avoid auto activation of
non desired proxy modules with WITH_CUSTOM_PROXY

PR:		ports/95728
Submitted by:	Tetsuya Uemura <t_uemura@macome.co.jp>
2006-04-30 16:38:07 +00:00
Clement Laforet
e2a2a30dfd - Fix USE_APACHE=22
Approved by:	portmgr (self)

Spotted by:	Larry Rosenman <ler at lerctr dot org>
2006-02-23 20:46:10 +00:00
Clement Laforet
c5d4c969c8 Cleanups and fixes
- remove useless options (and fix thread stuff) [1]
- move print-closest-mirror to bsd.apache.mk
- move threads configure options out of Makefile.modules
- Fix stupid logic to disable v4mapped address [2]
- and more...

Submitted/spotted by:   many, Hirohisa Yamaguchi <umq@ueo.co.jp> [1]
                        ume[2]
PR:                     ports/91813 [1]
2006-01-15 18:58:38 +00:00
Clement Laforet
7b8f2851be - Fix some suexec CONFIGURE_ARGS for 1.3.x
- add show-categories and show-modules targets, for server ports.
  Remove these targets from www/apache22/Makefile
2006-01-14 13:42:56 +00:00
Clement Laforet
d744e83391 - Add forgotten mod_filter
Spotted by:		Cheese Lottery <cheeselottery@gmail.com>
2005-12-07 20:54:42 +00:00
Clement Laforet
03d42e481c - export APACHEMODDIR and APACHEINCLUDEDIR to Makefile-land
- remove duplicated "code"
2005-12-04 17:13:42 +00:00
Clement Laforet
146dcd05a3 - Fix a condition in bsd.apache.mk
- all apache 1.3 only modules maintained by apache@ are now bsd.apache.mk
  compliant
2005-12-04 14:08:56 +00:00
Clement Laforet
05684b80dd - prepare removal of www/apache2 in favor of www/apache20 for naming
consistency
- add entries in UPDATING (for apache22 too)

PR:		ports/78119
Repocopied by:	marcus
2005-12-04 00:18:15 +00:00
Clement Laforet
b7e91940cc - Add support for upcoming www/apache22 port 2005-12-03 21:28:41 +00:00
Clement Laforet
a4b366df6a * Add bsd.database.mk [1]
- move out from bsd.port.mk USE_MYSQL and USE_PGSQL.
  - add support for Berkley DB and SQLite (via USE_BDB and USE_SQLITE
    knobs).

* Espace '+' in make search [2]

* Add "makepatch" target to simplify creation of patches during porting [3]

* Replace deprecated MACHINE_ARCH with ARCH [4]

* Remove support of OpenLDAP 2.1 [5]

* Add bsd.tcl.mk [6]
  It introduces USE_TCL/USE_TCL_BUILD knobs to support various
  version of tcl (8.0 -> 8.4)

* Fix cosmetic bugs in security-check target [7]

* Add support for INDEX-7 and above (up to INDEX-9 actually) [8]

* Add "package-recursive" to bsd.port.subdir.mk [9]

* Remove check for FreeBSD version < 460101 [10]

* New category: net-im [11]

* Add .desktop file facilities
  It introduces DESKTOPDIR and DESKTOP_ENTRIES knobs [12]

* Add SHA256 support to "*checksum" targets [13]

* Fix USE_PYTHON with OPTIONS [14]

* Force NO_LINT to MAKE_ENV to avoid library breaks [15]

* Fix typo: s/RC_ORDER/USE_RCORDER/g [16]

* Add support for PostgreSQL 8.1 [17]

* Add bsd.apache.mk
  USE_APACHE knob enhancements [18]

PR:		ports/85695 [1], ports/85669 [2], ports/85488 [3],
		ports/84489 [4], ports/83835 [5], ports/83718 [6],
		ports/83716 [7], ports/83710 [8], ports/82753 [9],
		ports/82138 [10], ports/81206 [11], ports/79509 [12],
		ports/79123 [13], ports/74866 [14], ports/85490 [15],
		ports/83514 [16], ports/88466 [17]

Submitted by:	vsevolod [1] [6], Ricardo Alves dos Reis
		<ricardo_bsd@yahoo.com.br> [2], markm [3] [15], obrien [4],
		krion [5] [8] , Petr Rehor <prehor@gmail.com> [7],
		clement [8] [18], jhs@berklix.org [9], edwin [10] [13],
		pav [11], jylefort [12], mnag [14], leeym [16], girgen [17]
2005-11-08 09:02:51 +00:00