Commit graph

328 commits

Author SHA1 Message Date
Philip M. Gollucci
dac9992061 By default suexec doesn't enforces different resource limitations configured in
login.conf(5). This is probably because resource limitations are handled
differently on various different platforms.

This modifies suexec behaviour to set resource limits for CGI's
from /etc/login.conf before execing the customers CGI script.

Doesn't affect default package, so no PORTREVISION bumps.

I will follow up at dev@httpd.apache.org to see about adding this
with #ifdefs.

PR:             ports/136091
Submitted by:   Alexey V.Degtyarev <alexey@renatasystems.org>
With Hat:       apache@
2010-05-14 05:03:30 +00:00
Philip M. Gollucci
6aee801e30 - Remove use of $] which is deprecated in perl and gone in perl 5.12
This is already being discussed at dev@httpd and will be committed upstream

Reported by:    brad clawsie <clawsie@fastmail.fm> (on apache@ list)
With Hat:       apache@
2010-05-13 00:59:32 +00:00
Philip M. Gollucci
3f811ff308 - Continuation of ports/133704
apxs -A comments out the LoadModule line
  This adds custom FreeBSD mod to 'DELETE' the line so that it works with
  our pkg-plists in packages.
- Remove -s form the cmp httpd.conf in pkg-plist to be blatant about why
  it didn't get removed
- Tested with lang/php5
- Bump PORTREVISION

PR:             ports/133704
With Hat:       apache@
2010-05-07 21:46:21 +00:00
Philip M. Gollucci
3366a8de36 - Fix -A and -a options for apxs to correctly ignore whitespace.
This will fix about 100 pkg-plist left overs for httpd.conf
- Bump PORTREVISION
-  This will be in 2.2.16.

PR:             ports/133704
Obtained from:  http://svn.apache.org/viewvc?rev=942210&view=rev
Reported by:    olli hauer <ohauer@gmx.de> (and very good pr!)
With Hat:       apache@
2010-05-07 20:53:45 +00:00
Philip M. Gollucci
e8d8b59a91 - FreeBSD doesn't use EGD sockets. Also the option handling doesn't honor
without-egd.
  Carry the devel/apr fix through

PR:             ports/146376
Submitted by:   Guido Fals
2010-05-07 18:33:45 +00:00
Philip M. Gollucci
feb214d3d7 2/2: fix mod_auth_digest builds which needs EGD and DEVRANDOM.
This fixes both bundled apr using the port (devel/apr for WITH_APR_FROM_PORTS)

PR: ports/134577
Requested by: Pascal Vizeli <pvizeli@yahoo.de>
With Hat: apache@
2010-05-07 05:56:58 +00:00
Philip M. Gollucci
591d019abc - silence this warning -- libtool: ignoring unknown tag CXX
With Hat:   apache@
2010-05-07 05:16:39 +00:00
Philip M. Gollucci
02a2b9d8f0 - fix ldap support (duplicate www/apache20 fix)
--with-ldap switches on LDAP library linking in apr-util
    --enable-ldap option switches on the LDAP caching module
    --enable-authnz-ldap option switches on the LDAP authentication module
   [AAA was rewritten in 3 peices in 2.4.x, hence the option change]
  - no custom patch, the linking was fixed in 2.2.x
  - ldap is not in the default package, so no PORTREVISION bump

PR:             ports/128079
Reported by:    koitsu, skreuzer
With Hat:       apache@
2010-05-07 05:14:38 +00:00
Philip M. Gollucci
f3fd2dc043 - Fix the owner to be root:wheel on files* when running sudo make ...
This doesn't affect the package b/c pointyhat/tb run as root

PR:             ports/134456
With Hat:       apache@
2010-05-07 03:15:44 +00:00
Philip M. Gollucci
a0546af721 - Update CONFLICTS to make apr package names.
With Hat:   apache@
2010-05-07 00:06:21 +00:00
Philip M. Gollucci
63e45c24e6 - Regenerate patch files with make makepatch for they have
piled up and additional patches conflict.
  This also will help when we try to syncronize www/apache20&www/apache22
- Unconditionally apply the mod_proxy_connect patch, you just may or may
  not actually compile the file to save some logic in Makefile

With Hat:   apache@
2010-05-07 00:02:16 +00:00
Philip M. Gollucci
ebe8e99859 - This file isn't even used, it doesn't matter anyway devel/apr(1.4.2) and
the apr bundled with www/apache22 include this file as the licensing
  issue was resolved ages ago

With Hat:   apache@
2010-05-06 23:19:56 +00:00
Philip M. Gollucci
f990cda8d4 - Install check_forensic script if mod_log_forensic is enabled
PR:             ports/144292
Submitted by:   Dan Mahoney <danm@prime.gushi.org>
With Hat:       apache@
2010-05-05 22:20:29 +00:00
Philip M. Gollucci
9ec88f3bc9 - move OPTION handling out of targets section [no-op]
With Hat:   apache@
2010-05-05 22:18:39 +00:00
Philip M. Gollucci
1c1a318d96 - whitespace only
With Hat:   apache@
2010-05-05 22:17:13 +00:00
Philip M. Gollucci
3c0948d01b - fix /etc/ftpusers [really this time], bump PORTREVISION
- DISTFILES is not needed
- CFLAGS is already in CONFIGURE_ENV
- drop apache21 from CONFLICTS
- fix caudium CONFLICTS
2010-05-05 22:12:43 +00:00
Philip M. Gollucci
830db6ab99 2/5: Update to httpd 2.2.15, default to using devel/apr instead of bundled apr
PR:             ports/146130
Approved by:    portmgr (pav)
Tested by:      -exp run (pav)
With Hat:       apache@
2010-05-05 21:43:30 +00:00
Philip M. Gollucci
33d49859a5 - Fix typo preventing install/deinstall when /etc/ftpusers was present
Note if you already have www/apache20 or www/apache22 installed this is
not worth updating for; however, you should verify your  [if you use it]
${PREFIX}/etc/apacheXX/extra/httpd-userdir.conf:
  DisableUser dir setting correct lists the users you don't want
  to have the ~/dir visible via http requests.

PR:             ports/144422
Reported by:    several
With hat:       apache@
2010-04-28 21:05:56 +00:00
Doug Barton
1d6b4b3f91 Begin the process of deprecating sysutils/rc_subr by
s#. %%RC_SUBR%%#. /etc/rc.subr#
2010-03-27 00:15:24 +00:00
Jun Kuriyama
f445e1918f - Fix plist with WITH_BDB case. 2009-12-12 13:44:13 +00:00
Jun Kuriyama
f8243fbfc9 - Add support for db48 (with WITH_BDB=t and WITH_BDB_VER=48) by
updating patch to dbm.m4.  Old patch for dbm.m4 is for db47.  But
  recent apache dist already includes code block for db47, so update a
  patch by replacing it to db48.
- No $PORTREVISION bump (no effect to packages with default options).

Submitted by:	ume
2009-12-12 10:42:51 +00:00
Philip M. Gollucci
ba53d00cf7 - Allow install by a user other then root
[Duplicate fix for devel/apr here in www/apache22 too]

PR:             ports/13876 [based on]
Submitted by:   Mel Flynn <mel at rachie.is-a-geek.net>
                miwi@
2009-12-12 00:43:27 +00:00
Philip M. Gollucci
f2633a8df6 whitespace fixes only 2009-12-11 23:56:52 +00:00
Philip M. Gollucci
05b7c932aa - envvars needs to be sourced before _all_ commands if it exists
PR:             ports/138466 (based on)
Submitted by:   Dmitry Pryanishnikov <lynx.ripe@gmail.com>
2009-12-11 23:43:25 +00:00
Philip M. Gollucci
d682b95cf7 - Fix handling of apache22_http_accept_enable="YES|NO"
o Note, don't use required_modules you can not check the return value
    to conditionalize the -DNOHTTPACCEPT flag

PR:             ports/138373
Submitted by:   Helmut Schneider <jumper99@gmx.de>
2009-12-11 23:37:04 +00:00
Philip M. Gollucci
e77426bf6c - Fix option WITH_PATCH_PROXY_CONNECT
PR:             ports/138846
Submitted by:   "George D." <gi@azagal.com>
2009-12-11 22:57:29 +00:00
Philip M. Gollucci
3484e0935d - OPTIONS+= PROXY_SCGI
PR:             ports/140137
Submitted by:   olli hauer <ohauer@gmx.de>
2009-12-10 08:09:45 +00:00
Philip M. Gollucci
a29f1d8090 - Update to 2.2.14
- With hat apache@

Note: The 3 CVE's are a no-op for the FreeBSD port --

date: 2009/08/25 05:33:03;  author: kuriyama;  state: Exp;  lines: +0 -0
(Forced commit)

- 2.2.13 (acutally 2.2.12) includes fixes for several CVEs. [1]
  but in our ports tree, APR related ones (CVE-2009-0023,
  CVE-2009-1955, CVE-2009-1956) were already backported in 2.2.11_5.

References:     http://www.apache.org/dist/httpd/CHANGES_2.2.12 [1]

Changes:
---------

  *) SECURITY: CVE-2009-2699 (cve.mitre.org)
     Fixed in APR 1.3.9.  Faulty error handling in the Solaris pollset support
     (Event Port backend) which could trigger hangs in the prefork and event
     MPMs on that platform.  PR 47645.  [Jeff Trawick]

  *) SECURITY: CVE-2009-3095 (cve.mitre.org)
     mod_proxy_ftp: sanity check authn credentials.
     [Stefan Fritsch <sf fritsch.de>, Joe Orton]

  *) SECURITY: CVE-2009-3094 (cve.mitre.org)
     mod_proxy_ftp: NULL pointer dereference on error paths.
     [Stefan Fritsch <sf fritsch.de>, Joe Orton]

  *) mod_proxy_scgi: Backport from trunk. [André Malo]

  *) mod_ldap: Don't try to resolve file-based user ids to a DN when AuthLDAPURL
     has been defined at a very high level.  PR 45946.  [Eric Covener]

  *) htcacheclean: 19 ways to fail, 1 error message. Fixed. [Graham Leggett]

  *) mod_ldap: Bring the LDAPCacheEntries and LDAPOpCacheEntries
     usage() in synch with the manual and the implementation (0 and -1
     both disable the cache). [Eric Covener]

  *) mod_ssl: The error message when SSLCertificateFile is missing should
     at least give the name or position of the problematic virtual host
     definition. [Stefan Fritsch sf sfritsch.de]

  *) htdbm: Fix possible buffer overflow if dbm database has very
     long values.  PR 30586 [Dan Poirier]

  *) Add support for HTTP PUT to ab. [Jeff Barnes <jbarnesweb yahoo.com>]

  *) mod_ssl: Fix SSL_*_DN_UID variables to use the 'userID' attribute
     type.  PR 45107.  [Michael Ströder <michael stroeder.com>,
     Peter Sylvester <peter.sylvester edelweb.fr>]

  *) mod_cache: Add CacheIgnoreURLSessionIdentifiers directive to ignore
     defined session identifiers encoded in the URL when caching.
     [Ruediger Pluem]

  *) mod_mem_cache: fix seg fault under load due to pool concurrency problem
     PR: 47672 [Dan Poirier <poirier pobox.com>]

  *) mod_autoindex: Correctly create an empty cell if the description
     for a file is missing. PR 47682 [Peter Poeml <poeml suse.de>]
2009-12-09 23:48:01 +00:00
Pav Lucistnik
50a634a8ec - Update MPM-ITK patch to 20090414-00
PR:		ports/137953
Submitted by:	Emil Mikulic <emikulic@gmail.com>
Feature safe:	yes
2009-09-16 14:17:57 +00:00
Jun Kuriyama
bbc5328732 - Upgrade to 2.2.13.
PR:		ports/137651
Submitted by:	Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
2009-08-25 04:58:53 +00:00
Jeremy Messenger
789d75c728 -Repocopy devel/libtool15 -> libtool22 and libltdl15 -> libltdl22.
-Update libtool and libltdl to 2.2.6a.
-Remove devel/libtool15 and devel/libltdl15.
-Fix ports build with libtool22/libltdl22.
-Bump ports that depend on libltdl22 due to shared library version change.
-Explain what to do update in the UPDATING.

It has been tested with GNOME2, XFCE4, KDE3, KDE4 and other many wm/desktop
and applications in the runtime.

With help:	marcus and kwm
Pointyhat-exp:	a few times by pav
Tested by:	pgollucci, "Romain Tartière" <romain@blogreen.org>, and
		a few MarcusCom CVS users. Also, I might have missed a few.
Repocopy by:	marcus
Approved by:	portmgr
2009-08-02 19:36:34 +00:00
Doug Barton
0175383f0a Fix a few "bad example" problems in the rc.d scripts that have been
propogated by copy and paste.

1. Primarily the "empty variable" default assignment, which is mostly
${name}_flags="", but fix a few others as well.
2. Where they are not already documented, add the existence of the _flags
(or other deleted empties) option to the comments, and in some cases add
comments from scratch.
3. Replace things that look like:
prefix=%%PREFIX%%
command=${prefix}/sbin/foo
to just use %%PREFIX%%. In many cases the $prefix variable is only used
once, and in some cases it is not used at all.
4. In a few cases remove ${name}_flags from command_args
5. Remove a long-stale comment about putting the port's rc.d script in
/etc/rc.d (which is no longer necessary).

No PORTREVISION bumps because all of these changes are noops.
2009-07-15 16:56:10 +00:00
Philip M. Gollucci
7e3a35cbf9 - Change OPTION help text for WITH_APR_FROM_PORTS
beware -> preferred

  In preparation for making it the default and dropping the option.

Discussed on:   ports@, apache@
2009-06-16 17:04:56 +00:00
Philip M. Gollucci
a06ffb4ba3 - Revert the bdb change in the last batch
- Reported by: Serveral

With Hat:   apache@
2009-06-12 17:24:58 +00:00
Philip M. Gollucci
b1cf7a7880 crap, that was supposed to be in the previous commit 2009-06-12 00:37:51 +00:00
Philip M. Gollucci
ab3f650bf9 - Drop .sh suffices on rc.d scripts, add note to UPDATING
- Commit the final part of the bdb patch improving the value passed
  to --with-berkely-db [1]
- Silence the blasted warnings about accf [2]
  (Will send this upstream)
- Address httpd issue 42829* -  graceful restart with multiple listeners
   using prefork MPM can result in hung processes [3]
- Address httpd issue 29744+ - CONNECT does not work over existing
   SSL connection [4]
- Drop .sh suffices on rc.d scripts, add note to UPDATING [5]
- Bump PORTREVISION

PRs:                ports/110651 [1], ports/132528 [2], ports/134457 [3]
                    ports/135478
Submitted by:       "Timur I. Bakeyev" <timur@gnu.org> [1]
                    bz@ [2]
                    Alexander <freebsd@nagilum.org> [4]
                    myself (pgollucci@) [5]
Requested by:       apache@ (several) [3]

Tested by:          P6 TB (running live > 5 days)
                    RideCharge TB (running live > 3 days)
                    Apache Software Foundation (ASF) TB (running live > 1 day)

Sponosored by:      RideCharge Inc.
2009-06-12 00:33:30 +00:00
Philip M. Gollucci
de83f0b16f - Backport apr-util security fixes pending the 2.2.12 release (forthcomming)
Security:       http://www.vuxml.org/freebsd/eb9212f7-526b-11de-bbf2-001b77d09812
PR:             ports/135310
Submitted by:   Eygene Ryabinkin <rea-fbsd@codelabs.ru>
With Hat:       apache
2009-06-08 03:10:25 +00:00
Philip M. Gollucci
fe0178de48 - Mark SAFE apache@ ports MAKE_JOBS_SAFE=yes 2009-05-17 07:24:35 +00:00
Philip M. Gollucci
581f26a718 Add note tp pkg-message informing users of FAQ:
your hostname must be resolvable via at least
  1 mechanism configured in /etc/nsswitch.conf
  or depending on the modules you hae loaded
  apache might not be able to start.

PRs:            ports/131563, ports/131564, ports/131565
Submitted by:   Glen Barber <glen.j.barber@gmail.com>
Discussed with: me
2009-04-10 06:39:46 +00:00
Jun Kuriyama
d3c74af9cf - Add a patch to fix ab(1) fails to connect with "Operation already in
progress (37)" errno.

References:	https://issues.apache.org/bugzilla/show_bug.cgi?id=44584
Obtained from:	http://svn.apache.org/viewvc/httpd/httpd/trunk/support/ab.c?r1=748396&r2=749438
Reviewed by:	apache@ (pgollucci@)
2009-04-02 01:22:58 +00:00
Philip M. Gollucci
a3839b478a - www/apache22-peruser-mpm overwrites the apache22.tbz package in Latest/
due to the Master/Slave relationship
  (Needs LATEST_LINK et al)

Discussed on:   apache@
Reported by:    John Hay <jhay@meraka.org.za>
Approved by:    Jille Timmermans <jille@quis.cx>

With hat:       apache
2009-01-29 23:51:46 +00:00
Philip M. Gollucci
42263e06cd remove now unused option WITH_SVN 2009-01-19 19:08:23 +00:00
Philip M. Gollucci
6ccd57a158 Chase devel/apr-svn removal
Reported by:    tabthorpe
Pointyhat:      me
2009-01-19 19:05:11 +00:00
Philip M. Gollucci
6ded56a341 - Re-assign www/apache* ports to apache@
- Previous MATAINERs please welcome yourself to the apache@ team.

Approved by: portmgr (pav, flz), secteam (simon), clement
2009-01-09 14:13:05 +00:00
Wesley Shields
9168603ee2 - Remove conditional checks for FreeBSD 5.x and older
Approved by:	pav
2009-01-06 16:53:07 +00:00
Clement Laforet
01a934f89c PR:
Submitted by:
Reviewed by:
Approved by:
Obtained from:
MFC after:
Security:
- Update to 2.2.11
- Always depend on pcre from ports [1]
- Fix plist with LDAP/without apr-util DSO
- source envvars as late as possible [2]

Requested by:           ale
                        Eygene Ryabinkin <rea-fbsd at codelabs dot ru> [2]
PR:                     ports/127418 [2]
2008-12-15 22:05:56 +00:00
Clement Laforet
bddb65da3a - Fix @comment string
Pointy hat to:  clement
Reported by:    Christer Solskogen
2008-09-03 19:08:17 +00:00
Clement Laforet
0280546275 - Fix @comment string
Pointy hat to:	clement
Reported by:	Christer Solskogen
2008-09-03 19:07:56 +00:00
Clement Laforet
6a38fa6371 - Fix plist where apr_dbd is used
- Fix Postgresql build, don't trust pg_config
- Don't overwrite apr_dbd_mysql.c
- Bump PORTREVISION

No cookie for:  clement
2008-09-03 13:19:24 +00:00
Clement Laforet
9ec0a77737 - Update MPM itk patch to 20080727-00 (it is actually a no op
on FreeBSD)
- Move mpm-itk patch to EXTRA_PATCHES to avoid conflicts with
  alternative mpm patches [1]
- update PLIST_SUBS when SLAVE_PORT_MPM is defined

Requested by:           Jille Timmermans [1]
2008-09-02 12:26:37 +00:00