Commit graph

383 commits

Author SHA1 Message Date
Philip M. Gollucci
83ee09589c - conflicts with www/apache22* 2010-05-26 23:03:07 +00:00
Philip M. Gollucci
1a686515a2 - Fix the exactly one s/REG_EXTENDED/AP_REG_EXTENDED/ I missed.
- This is a non default option in the compile so no PORTREVISION bump

Reported by:    henrik@iaeste.dk
With Hat:       apache@
2010-05-26 20:44:16 +00:00
Philip M. Gollucci
e84d7cc005 - I was so busy run-time testing this I didn't notice the new file.
fix the pkg-plist

Reported by:    QAT
2010-05-26 19:37:09 +00:00
Philip M. Gollucci
ea053a1000 - Partial httpd SVN MFC of r15338
[http://svn.apache.org/viewvc?view=revision&revision=153384]
  Essentially this internalizes the pcre POSIX API in the ap_ namespace.
  Thus fixing the use of an external pcre library and hence mod_redirect
  and other consumers.

- This includes an MMN bump which means you will need to recompile all your
  modules.  With ports this will happen when you upgrade via portmaster or
  portupgrade.  If you have any modules outside of ports they will need to
  be recompiled too.

- There is a small chance you will need to change some of your custom modules
  to adapt to the ap_regex_t and ap_regmatch_t api changes.

- For security, speed, maintenance, and simplification in the ports/ framework
  this route was chosen instead of reverting the devel/pcre change in 2.0.63_4.

PR:             ports/146604
Reported by:    Stefan Bethke <stb@lassitu.de>, serveral on ports@, apache@
With Hat:       apache@
2010-05-26 19:30:45 +00:00
Philip M. Gollucci
f3c62ab6c6 - Fix 5 seen in 3rd party module failures due to converting from bundled apr to ports apr.
Reported by:    pav via pointyhat
With Hat:       apache@
2010-05-23 23:59:35 +00:00
Philip M. Gollucci
ef30e305f3 - lib/apache2 is empty and doesn't exist
- Bump PORTREVISION

Reported by:    Geraint Edwards <gedge@yadn.org> via apache@
2010-05-19 19:38:16 +00:00
Philip M. Gollucci
9f5965f896 - whitespace only 2010-05-19 19:27:15 +00:00
Philip M. Gollucci
22e515e23e - Bump PORTREVISION
With Hat:   apache@
2010-05-18 04:51:59 +00:00
Philip M. Gollucci
94235cd8a1 - Whitespace
With Hat:   apache@
2010-05-18 04:51:06 +00:00
Philip M. Gollucci
5581fcace8 - Force devel/apr0. Bundled srclib/apr is never used now.
With Hat:   apache@
2010-05-18 04:49:52 +00:00
Philip M. Gollucci
33dcbbaadd - Whitespace only
With hat:   apache@
2010-05-18 04:47:08 +00:00
Philip M. Gollucci
34a1e65ca3 - drop KQUEUE_SUPPORT, patch doesn't apply cleaning to devel/apr0
Patches to devel/apr0 are welcome, send-pr.

With Hat:   apache@
2010-05-18 04:44:59 +00:00
Philip M. Gollucci
a2d781870f 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/136928
Submitted by:   Alexey V.Degtyarev <alexey@renatasystems.org>
With Hat:       apache@
2010-05-14 18:52:32 +00:00
Philip M. Gollucci
3868ada41c - Fix some runtime devel/pcre conversion fallout
the bundled pcre defined REG_NOSUB as 0 b/c its not used
  the devel/pcre port (8.0.0) defines it as 0x0020 which is causing havoc
  The REG_NOSUB was never used by pcre in www/apache20
  So, replace it with 0 in the www/apache20 code forcibly
- Bump PORTERVISION

PR:             ports/146399
Reported by:    ervin valentin <ervin23@gmail.com>
With Hat:       apache@
2010-05-13 04:36:07 +00:00
Philip M. Gollucci
21095e8320 - Carry the bundled apr patch through current freebsd versions.
clement@ added this patch in 1.201 of Makefile for fbsd 6.x
  This only adds -funsigned-char to CFLAGS and I haven't seen
  it break anything or anyone report any issues with not having the update.
  It was also only neccessary in apr 0.9.x not apr 1.x+
  This was remove entirely in http://svn.apache.org/viewvc?view=revision&revision=65257

- Bump PORTREVISION

With Hat:   apache@
2010-05-13 02:56:56 +00:00
Philip M. Gollucci
0497bd9e9f - Dupliate $] fix in apxs in www/apache22
- Rename rc.d script apache2.sh -> apache2
- Bump PORTREVISION

With Hat:   apache@
2010-05-13 01:13:19 +00:00
Philip M. Gollucci
a0a564f0bc - Fix openssl rengotiation patch [1]
- Fix the openssl from ports flag
- Bump PORTREVISION
- Also patch 2 more CVEs

 *) SECURITY: CVE-2010-0434 (cve.mitre.org)
     Ensure each subrequest has a shallow copy of headers_in so that the
     parent request headers are not corrupted.  Elimiates a problematic
     optimization in the case of no request body.  PR 48359
     [Jake Scott, William Rowe, Ruediger Pluem]

  *) SECURITY: CVE-2008-2364 (cve.mitre.org)
     mod_proxy_http: Better handling of excessive interim responses
     from origin server to prevent potential denial of service and high
     memory usage. Reported by Ryujiro Shibuya. [Ruediger Pluem,
     Joe Orton, Jim Jagielski]

PR:             ports/146389 [1]
Submitted by:   several [1]
With Hat:       apache@
2010-05-13 00:30:19 +00:00
Philip M. Gollucci
f534c1ac32 - Back out the OPTIONS framework for now. Makefile.modules MODULES options
also be in OPTIONS or they aren't passed to make.
  Thats one huge subtlety.  I'll fix this later, but don't have time now.

Reported by:    kevin brintnall <kbrint@qwest.net> via e-mail
Pointy hat:     myself
With Hat:       apache@
2010-05-07 23:57:57 +00:00
Philip M. Gollucci
bdbd7c703f - That was the wrong patch file, too much git/cvs for me 2010-05-07 21:54:13 +00:00
Philip M. Gollucci
48888ab32a - Fix -A and -a options for apxs to correctly ignore whitespace.
This will fix about 100 pkg-plist left overs for httpd.conf
  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
- Bump PORTREVISION
- This will be in 2.0.64

PR:             ports/133704
Obtained from:  http://svn.apache.org/viewvc?rev=942211&view=rev
Reported by:    olli hauer <ohauer@gmx.de> (and very good pr!)
With Hat:       apache@
2010-05-07 21:48:58 +00:00
Philip M. Gollucci
e1eeef8520 - This file is never included.
$ grep -R Makefile.modules.3rd ${PORTSDIR}/
UPDATING:  - Makefile.modules.3rd contains modules selection for apache 2.x and 1.3.x
www/apache20/CVS/Entries:/Makefile.modules.3rd/1.23/Sun Aug  2 19:35:56 2009//

With Hat:   apache@
2010-05-07 05:32:36 +00:00
Philip M. Gollucci
bad881dd75 - Add DBM=ndbm support
PR:             ports/83644
Submitted by:   Oliver Brandmueller <ob@gruft.de>
With Hat:       apache@
2010-05-07 05:04:43 +00:00
Philip M. Gollucci
bac9ac8d0a - fix ldap support
--with-ldap switches on LDAP library linking in apr-util
  --enable-ldap option switches on the LDAP caching module
  --enable-auth-ldap option switches on the LDAP authentication module
  also apply a custom patch to fix the linking
- add a missing quote to OPTIONS desc
- ldap is not in the default package, so no PORTREVISION bump

PR:             ports/128079
Reported by:    koitsu, skreuzer
With Hat:       apache@
2010-05-07 04:59:28 +00:00
Philip M. Gollucci
79f18f57cd - duplicate www/apache22 re-fix for /etc/ftpusers in www/apache20
PR:             ports/144422
Reported by:    several
With hat:       apache@
2010-05-07 03:22:09 +00:00
Philip M. Gollucci
8a7f1db738 - Apply SECURITY: CVE-2009-3555 (cve.mitre.org)
to www/apache20 as well.

PR:             ports/140357
Submitted by:   Eygene Ryabinkin <rea-fbsd@codelabs.ru>
With Hat:       apache@
2010-05-07 01:56:11 +00:00
Philip M. Gollucci
96e9a975c3 - Take stab at adding OPTIONS framework in limited capacity.
Some options were intentionally omitted.
- Remove a legacy option kludge

PR:             ports/146199
Requested by:   Nick Hibma <nick@anywi.com>
With Hat:       apache@
2010-05-07 01:42:59 +00:00
Philip M. Gollucci
6eb544aed8 - Force devel/pcre and abandon the bundled pcre:
0) its like 7yrs old
  0) the new version have speed,bug,&security fixes
  0) www/apache22 already does this
  0) www/apache23+ no longer bundle pcre [or apr* for that matter]
- Bump PORTREVISION

With Hat:   apache@
2010-05-07 01:29:47 +00:00
Philip M. Gollucci
27a9440bfc - Set the ITK version.
With Hat:   apache@
2010-05-06 23:44:51 +00:00
Philip M. Gollucci
775b822605 - Sync with the www/apache22 layout for mpm itk and *only* conditionally
apply this patch. [Note, they are different revisions]

With Hat:   apache@
2010-05-06 23:26:43 +00:00
Philip M. Gollucci
5ac76d39ce - 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

With Hat:   apache@
2010-05-06 23:10:20 +00:00
Philip M. Gollucci
3149c3ed2a - Fix build for !root users
duplicated from www/apache22 and devel/apr
  Originally:

PR:             ports/13876 [based on]
Submitted by:   Mel Flynn <mel@rachie.is-a-geek.net>
With Hat:       apache@
2010-05-06 21:18:20 +00:00
Philip M. Gollucci
d25d200c9f - Fix compile with security/openssl
- No PORTREVISION bump [security/openssl is not the default]

PR:             ports/146218
Submitted by:   Kazuo Dohzono <dohzono@axion-software.com>
Obtained from:  http://mail-index.netbsd.org/pkgsrc-users/2009/08/25/msg010537.html
With Hat:       apache@

[I will contemplate sending this back to dev@httpd for branches/2.0.x for 2.0.64]
2010-05-06 21:10:36 +00:00
Philip M. Gollucci
7f75d70ccf - openssl patch is unconditionally applied
With Hat:   apache@
2010-05-06 03:37:33 +00:00
Philip M. Gollucci
02c170cf68 - Fix another IGNORE message 2010-05-05 23:20:10 +00:00
Philip M. Gollucci
877cb6249b - Fix some whitespace
- Silence portlitn for IGNORE message
2010-05-05 23:19:19 +00:00
Philip M. Gollucci
69d9443a91 - CFLAGS is already in CONFIGURE_ENV
With Hat:   apache@
2010-05-05 23:17:33 +00:00
Philip M. Gollucci
896b930fda - add caudium14 conflict
- fix caudium12 conflict

With Hat:   apache@
2010-05-05 23:16:08 +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
0450304108 Cleanse uneeded RC_SUBR variables
Approved by:	pgolluci
2010-03-28 04:44:55 +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
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
bdd3a866cc - 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 05:11:09 +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
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
c2df5e59c9 - apache 2.0.x doesn't support BDB 4.7 2008-09-02 07:56:49 +00:00
Clement Laforet
a52a71b6f2 - Revert previous patch to "fix" missing rc.d scripts. It
actually breaks profiles.
- Fix CVE-2008-2939 for mod_proxy_ftp
  (XSS attacks when using wildcards in the path of the FTP URL)
- Bump PORTREVISION
2008-08-31 23:04:14 +00:00
Clement Laforet
ecb4cb53c9 - Fix grammatical error
Reported and fixed by: glarkin@
2008-08-31 19:56:12 +00:00