Commit graph

142 commits

Author SHA1 Message Date
Martin Matuska
205f1ac23d Bump pcre library dependency due to 8.30 update
Add (vendor) patch for deprecated pcre_info()
2012-02-14 12:44:23 +00:00
Philip M. Gollucci
3ca1d8b46d - use $SYSCTL
- use full path setfib

PR:             ports/153264
Submitted by:   Jeremy Chadwick <freebsd@jdc.parodius.com>
With Hat:       apache@
Sponsored by:   Apache Software Foundation (ASF)
2012-02-09 02:49:55 +00:00
Philip M. Gollucci
8f547039c4 - Convert to USERS/GROUPS [1]
- Resync proxy connect patch [2]
- Bump PORTREVISION since the proxy patch is unconditionally applied
  which means we can remove that OPTION too

PR:             ports/164698 [1], ports/164711 [2]
Submitted by:   jgh@ [1], freebsd@nagilum.org [2]
With Hat:       apache@
Sponsored by:   RideCharge Inc. / TaxiMagic
2012-02-08 04:35:31 +00:00
Jason Helfman
09c57f862b - Update to 2.2.22
Addresses:
* SECURITY: CVE-2011-3607 (cve.mitre.org)
Integer overflow in the ap_pregsub function in server/util.c in the Apache HTTP
Server 2.0.x through 2.0.64 and 2.2.x through 2.2.21, when the mod_setenvif
module is enabled, allows local users to gain privileges via a .htaccess file
with a crafted SetEnvIf directive, in conjunction with a crafted HTTP request
header, leading to a heap-based buffer overflow.

* SECURITY: CVE-2012-0021 (cve.mitre.org)
The log_cookie function in mod_log_config.c in the mod_log_config module in the
Apache HTTP Server 2.2.17 through 2.2.21, when a threaded MPM is used, does not
properly handle a %{}C format string, which allows remote attackers to cause a
denial of service (daemon crash) via a cookie that lacks both a name and a
value.

* SECURITY: CVE-2012-0031 (cve.mitre.org)
scoreboard.c in the Apache HTTP Server 2.2.21 and earlier might allow local
users to cause a denial of service (daemon crash during shutdown) or possibly
have unspecified other impact by modifying a certain type field within a
scoreboard shared memory segment, leading to an invalid call to the free
function.

* SECURITY: CVE-2011-4317 (cve.mitre.org)
The mod_proxy module in the Apache HTTP Server 1.3.x through 1.3.42, 2.0.x
through 2.0.64, and 2.2.x through 2.2.21, when the Revision 1179239 patch is in
place, does not properly interact with use of (1) RewriteRule and (2)
ProxyPassMatch pattern matches for configuration of a reverse proxy, which
allows remote attackers to send requests to intranet servers via a malformed URI
containing an @ (at sign) character and a : (colon) character in invalid
positions. NOTE: this vulnerability exists because of an incomplete fix for
CVE-2011-3368.

* SECURITY: CVE-2012-0053 (cve.mitre.org)
protocol.c in the Apache HTTP Server 2.2.x through 2.2.21 does not properly
restrict header information during construction of Bad Request (aka 400) error
documents, which allows remote attackers to obtain the values of HTTPOnly
cookies via vectors involving a (1) long or (2) malformed header in conjunction
with crafted web script.

* SECURITY: CVE-2011-3368 (cve.mitre.org)
The mod_proxy module in the Apache HTTP Server 1.3.x through 1.3.42, 2.0.x
through 2.0.64, and 2.2.x through 2.2.21 does not properly interact with use of
(1) RewriteRule and (2) ProxyPassMatch pattern matches for configuration of a
reverse proxy, which allows remote attackers to send requests to intranet
servers via a malformed URI containing an initial @ (at sign) character.

PR: ports/164675
Reviewed by: pgollucci
Approved by: pgollucci, crees, rene (mentors, implicit)
With Hat: apache@
2012-02-01 18:56:08 +00:00
Philip M. Gollucci
bccdbf2387 - Restore inadvertently removed log renames from previous commit
Noticed by:	sunpoet@
Pointy Hat:	pgollucci@
2012-01-23 23:24:38 +00:00
Philip M. Gollucci
91fae18456 - Pull r1227293 from httpd svn
Note, you have to actually uncomment the include for this to take affect
- No PORTREVISION bump since nothing changes by default

PR:		ports/156987
Reported by:	Adrian Dimcev <adimcev@carbonwind.net>
With Hat:	apache@
2012-01-18 03:44:39 +00:00
Doug Barton
83eb2c3700 In the rc.d scripts, change assignments to rcvar to use the
literal name_enable wherever possible, and ${name}_enable
when it's not, to prepare for the demise of set_rcvar().

In cases where I had to hand-edit unusual instances also
modify formatting slightly to be more uniform (and in
some cases, correct). This includes adding some $FreeBSD$
tags, and most importantly moving rcvar= to right after
name= so it's clear that one is derived from the other.
2012-01-14 08:57:23 +00:00
Olli Hauer
26894a3437 - unbreak mpm-itk-20110321-01 patch
PR:		ports/157041
Submitted by:	zlopi.ru <zlopi.ru _at gmail.com>
2011-05-14 21:53:21 +00:00
Olli Hauer
611bdd4c01 - update Apache 2 ITK MPM patch to version 20110321-01 [1]
- add additional patch for mpm-itk [2]
 - add mod_substitute to apache22 [3]
 - add some documentation into the mpm-itk* patches
 - bump portrevision

 Changes:
 [1] apache2.2-mpm-itk 2.2.17-01, released 2011-03-21:
  * Fixed CVE-2011-1176: If NiceValue was set, the default with no
    AssignUserID was to run as root:root instead of the default Apache user
    and group, due to the configuration merger having an incorrect default
    configuration.
  * Rebase against Apache 2.2.17.
  * Fix an issue where users can sometimes get spurious 403s on persistent
    connections, if the .htaccess files are not world readable.
  * In the config merger, don't reallocate the username, since it's already
    in the correct pool. (This is not a memory leak, only a small inefficiency.)

 [2] http://httpd.apache.org/docs/2.2/mod/mod_substitute.html

 Source:
  http://mpm-itk.sesse.net/ [1]
  http://www.pvv.ntnu.no/~knuta/mpm-itk/ [2]
  http://lists.freebsd.org/pipermail/freebsd-apache/2011-March/002184.html [3]

 With Hat:  apache@

PR:		ports/156024 [1][2]
Submitted by:	Lukasz Wasikowski <lukasz _at_ wasikowski.net> [1][2]
		Nick Gieczewski <sorongo _at_ gmail.com> [3]
2011-03-31 17:00:37 +00:00
Philip M. Gollucci
96fa3156a8 - The previous update to the rc.d script didn't quite maintain the old behavior
correctly.  This fixes the pid file name

PR:				ports/151623
Submitted by:	Vivek Khera <vivek@khera.org>
With Hat:		apache@
Point hat to:	myself (pgollucci)
2010-10-21 18:00:15 +00:00
Philip M. Gollucci
a47922410b - s,/usr/local,%%PREFIX%%,'
Reported by:	stas
2010-10-14 20:20:06 +00:00
Philip M. Gollucci
e5d53ce9b2 - Allow overriding of the following on a profile basis.
pidfile
    command
    envvars

Without profiles, the old defaults remain unchanged.  With profiles the old defaults
remain unchanged.

Sponsored by:		RideCharge Inc. / TaxiMagic
Tested by:			RideCharge Inc. / TaxiMagic (> 1 yr in production)
With Hat:			apache@
2010-10-14 19:53:25 +00:00
Jun Kuriyama
4766daabfe - Upgrade to 2.2.16.
Security:	CVE-2010-1452 (mod_{cache,dev} remote DoS),
		CVE-2010-2068 (mod_{proxy_{ajp,http},reqtimeout} related on some platforms)
2010-07-26 01:28:40 +00:00
Philip M. Gollucci
4ec4974de3 - Fix misnamed patch that was unconditionally applied.
PR:             ports/146789
Submitted by:   Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
With Hat:       apache@
2010-05-21 16:27:10 +00:00
Philip M. Gollucci
61a0dda84e - remove apr/apr-util vestiges
- fullbuild not needed anymore
- buildconf not needed anymore
- scripts_env not needed anymore

With Hat:   apache@
2010-05-18 04:55:15 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
Clement Laforet
4cd7e7d85c - Fix incorrect redirection order in startup script
- Bump PORTREVISION

PR:             ports/127038 [1]
Submitted by:   edwin@ [1]
Reported by:    Tod McQuillin
2008-09-02 07:34:21 +00:00
Clement Laforet
2846acd7a8 - Yet Another Plist Fix [1]
- Completely shut up rc.d script when no profiles are enabled
  (add add support to disable profiles) [2]
- Fix CVE-2008-2939 for mod_proxy_ftp
  (XSS attacks when using wildcards in the path of the FTP URL)
- Add "apache22_fib" to start apache22 prefixed by
  "setfib -F ${apache22_fib}", so apache can use an alternate
  network view (not carefully tested yet)
- Revert previous patch to "fix" missing rc.d scripts. It
  actually breaks profiles.
- Bump PORTREVISION

PR:             ports/126670 [1],
                ports/116627 [2]
Submitted by:   Joseph S. Atkinson [1],
                Eygene Ryabinkin [2]
Security:       CVE-2008-2939

Special thanks to: pgollucci@
2008-08-31 23:00:27 +00:00
Clement Laforet
338936cee4 - Fix plist when NOPORTDOCS is defined [1]
- Add WITH_SVN knob. It enables BDB for apache22 port and
  force dependency on dev/apr-svn when WITH_APR_FROM_PORTS is
  defined. (should help fixing [2]).
  Introduce APR_PORT.
- Add support for db-4.7 [3]
- Add mod_ldap OPTIONS fixup [4]
- Sometimes, rc scripts aren't included in package
  Try to fix this. [5]

PR:    ports/126053 [2], ports/125520 [3]
       ports/124651 [4], ports/126670 [5] (partially)

Reported by: QA Tindy [1],
             Crazig Leres [2],
             Larry Rosenman [4]
             Kirk Strauser [3],
             Joseph S. Atkinson [5]
2008-08-31 16:51:38 +00:00
Clement Laforet
c526e611b0 - Update to 2.2.9
- Add a note to UPDATING about the forced build of subversion
   because of apr/apu bumped version.
2008-06-23 21:11:15 +00:00
Clement Laforet
0cf36460fb - Update to 2.2.8
- Update documentation
- Use BDB from bsd.databases.mk instead of homebrew [1]

PR:             ports/119711 [1]
Submitted by:   mm [1]
2008-01-20 11:29:31 +00:00
Clement Laforet
2c8b7a5330 - Fix slave ports [1]
- Fix plist [2]
- Fix CONFLICTS with devel/apr-svn [3]
- Fix install when index.html is modified
- Bump PORT_REVISION

PR:             ports/118348 [1], ports/118338 [2],ports/117097 [2]
                ports/90088 [3], ports/118349 [3]
Submitted by:   Andrey Beresovsky <and at sfedu dot ru> [1],
                Dimitry Andric <dimitry at andric dot com> [2],
                YAMAMOTO Takao <yamamoto at computec dot co dot jp>
                Melvyn Sopacua <melvyn atmelvyn dot homeunix dot org> [3],
                Dominic Fandrey <lon_kamikaze at gmx dot de> [3]
2007-12-11 20:22:16 +00:00
Clement Laforet
d4538af23f - Fix PCRE_FROM_PORTS. it wasn't processed by OPTIONS stff [1]
- Preserve index.html
- We no longer install images in default DocumentRoot (there're still in icons/)
- Various plist cleanup
- bump PORTREVISION since we are now safe with index.html

Reminded by:	bland@
2007-09-20 07:57:36 +00:00
Clement Laforet
db9219af7d - remove duplicate entry of mod_charset_lite [1]
- add PCRE_FROM_PORTS to OPTIONS
- use @dirrmtry for include/apache22
- workaround plist issues when upgrading, but it's not as safe as I
  would expect, it requires more work.

Spotted by:     bland@ [1]
2007-09-19 21:05:23 +00:00
Clement Laforet
f829e11f2e - Add experimental support of OPTIONS.
From UPDATING:

  By popular request, OPTIONS support has been added. When actived
  (default), these knobs are ignored:
          * WITH_<CATEGORY>_MODULES
          * WITHOUT_<CATEGORY>_MODULES
          * WITH_CUSTOM_<CATEGORY>
          * WITH_MODULES
          * WITHOUT_MODULES
          * WITH_STATIC_MODULES
  However, you can disable OPTIONS by defining WITHOUT_APACHE_OPTIONS.

- move envvars support to the beginning of apache22_checkconfig() to be
  sure we're using envvars during configtest [1]

PR:             ports/116329 [1]
Submitted by:   Ruud Althuizen <ruud@il.fontys.nl> [1]
2007-09-18 20:03:15 +00:00
Clement Laforet
126240de1d - Fix build when WITHOUT_IPV6 is defined and system is IPv6-free
PR:			ports/115200
Submitted by:		anray
Also reported by:	Peter Jeremy
2007-09-16 19:05:41 +00:00
Clement Laforet
655f69a7ba - Import MySQL DBD backend
This will definitively fix checksum mismatches. Time to investigate...

Reported by:	many
2007-09-16 15:46:10 +00:00
Clement Laforet
002890da33 \
- Cleanup MPM selection
- Update mpm itk to 20070425-00
2007-09-10 19:15:48 +00:00