Commit graph

55 commits

Author SHA1 Message Date
tron
03654d0750 Import improved version of the fix for CVE-2009-1195 to restore
backwards compatibility with e.g. "mod_perl".
2009-06-11 20:30:58 +00:00
tron
38b6d684ca Add patches from the Apache SVN repository to fix the security bypass
vulnerability reported in CVE-2009-1195.
2009-06-04 08:51:52 +00:00
tron
36394aa571 Set the license type to "apache-2.0". 2009-05-22 10:41:24 +00:00
tron
e82fea735c Add patch from the Apache SVN repository to fix the information leak
in the "mod_proxy_ajp" module reported in CVE-2009-1191.
2009-05-22 09:46:06 +00:00
seb
9d2f15190d Fix PLIST when LDAP support is activated, because apr-util package
has it, and shared modules option is not activated: LDAP related
modules are, like other modules, not installed as shared objects
so they should not be added to the PLIST.

Approved by MAINTAINER.
2009-04-24 11:21:16 +00:00
sno
52cd6293c5 PkgSrc changes:
- add entries for ldap related shared modules to PLIST in case of
    apr-util is build with ldap
  - PKGREVISION is not bumped, because ldap is no default option for
    apr-util so it wont change anything in default-case

Reviewed by tron@
2009-04-14 18:26:34 +00:00
tron
def2e43c4b Fix support for non-default options:
- If option "suexec" is used we must manually build the binary because
  the top level makefile doesn't do that. This fixes PR pkg/41141
  by Anton Blajev.
- Move the handling of the "all-shared" option into "options.mk" and
  don't use a seperate package list that will cause failure to remove
  the "lib/httpd" directory on deinstallation.
2009-04-08 17:03:25 +00:00
joerg
2d1ba244e9 Simply and speed up buildlink3.mk files and processing.
This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.
2009-03-20 19:23:50 +00:00
tron
6c86dfe8e5 Remove obsolete comment. 2009-02-25 22:05:40 +00:00
tron
727e6c0d5a Provide a new startup script based on a patch supplied by Roy Marples:
1.) On platforms which provide "/etc/rc.subr" we use its process id check
    to figure out when Apache actually has been stopped.
2.) On other platforms we just implement "restart" by "stop and a 10 second
    delay followed by "start". If you want a better fix for please submit
    a bug report to the Apache project.

This finally fixes PR pkg/39713.
2009-02-25 15:39:38 +00:00
rillig
94b48d7d82 QNX needs a little compatibility patch. 2009-02-15 23:14:40 +00:00
sborrill
501ad95b84 Re-introduce support for APACHE_CUSTOM_CFLAGS in mk.conf 2009-02-05 16:39:18 +00:00
tron
a1d89e0231 Fix broken patch. 2009-01-25 09:59:51 +00:00
darcy
3c82eef72c Patch mod_cgid to fix a known bug. Without this patch a CGI script will be
populated with an extra, empty argument.  Full details can be found at
https://issues.apache.org/bugzilla/show_bug.cgi?id=46380

Note, this fix has already been committed to the Apache trunk and will be
in the next version so this patch can be removed then.
2009-01-24 21:55:31 +00:00
tron
12036b1aed Update "apache22" package to version 2.2.11. This update is a bug-fix
only release.

Approved by Thomas Klausner.
2008-12-28 14:00:59 +00:00
tron
1c99353ec2 Update "apache22" package to version 2.2.10. Changes since 2.2.9:
- SECURITY: CVE-2008-2939 (cve.mitre.org)
  mod_proxy_ftp: Prevent XSS attacks when using wildcards in the path of
  the FTP URL. Discovered by Marc Bevand of Rapid7. [Ruediger Pluem]
- Allow for smax to be 0 for balancer members so that all idle
  connections are able to be dropped should they exceed ttl.
  Apache Bug #43371 [Phil Endecott <spam_from_apache_bugzilla chezphil.org>,
  Jim Jagielski]
- mod_proxy_http: Don't trigger a retry by the client if a failure to
  read the response line was the result of a timeout.
  [Adam Woodworth <mirkperl gmail.com>]
- Support chroot on Unix-family platforms
  Apache Bug #43596 [Dimitar Pashev <mitko banksoft-bg.com>]
- mod_ssl: implement dynamic mutex callbacks for the benefit of
  OpenSSL.  [Sander Temme]
- mod_proxy_balancer: Add 'bybusyness' load balance method.
  [Joel Gluth <joelgluth yahoo.com.au>, Jim Jagielski]
- mod_authn_alias: Detect during startup when AuthDigestProvider
  is configured to use an incompatible provider via AuthnProviderAlias.
  Apache Bug #45196 [Eric Covener]
- mod_proxy: Add 'scolonpathdelim' parameter to allow for ';' to also be
  used as a session path separator/delim  Apache Bug #45158. [Jim Jagielski]
- mod_charset_lite: Avoid dropping error responses by handling meta buckets
  correctly. Apache Bug #45687 [Dan Poirier <poirier pobox.com>]
- mod_proxy_http: Introduce environment variable proxy-initial-not-pooled to
  avoid reusing pooled connections if the client connection is an initial
  connection. Apache Bug #37770. [Ruediger Pluem]
- mod_rewrite: Allow Cookie option to set secure and HttpOnly flags.
  Apache Bug #44799 [Christian Wenz <christian wenz.org>]
- mod_ssl: Rewrite shmcb to avoid memory alignment issues.
  Apache Bug #42101. [Geoff Thorpe]
- mod_proxy: Add connectiontimeout parameter for proxy workers in order to
  be able to set the timeout for connecting to the backend separately.
  Apache Bug #45445. [Ruediger Pluem, rahul <rahul sun.com>]
- mod_dav_fs: Retrieve minimal system information about directory
  entries when walking a DAV fs, resolving a performance degradation on
  Windows.  Apache Bug #45464.  [Joe Orton, Jeff Trawick]
- mod_cgid: Pass along empty command line arguments from an ISINDEX
  query that has consecutive '+' characters in the QUERY_STRING,
  matching the behavior of mod_cgi.
  [Eric Covener]
- mod_headers: Prevent Header edit from processing only the first header
  of possibly multiple headers with the same name and deleting the
  remaining ones. Apache Bug #45333.  [Ruediger Pluem]
- mod_proxy_balancer: Move nonce field in the balancer manager page inside
  the html form where it belongs. Apache Bug #45578. [Ruediger Pluem]
- mod_proxy_http: Do not forward requests with 'Expect: 100-continue' to
  known HTTP/1.0 servers. Return 'Expectation failed' (417) instead.
  [Ruediger Pluem]
- mod_rewrite: Preserve the query string when [proxy,noescape].
  Apache Bug #45247. [Tom Donovan]

pkgsrc related note:
The security fix for CVE-2008-2939 has already been integrated as patch
before this update.
2008-11-01 19:49:38 +00:00
martti
3b5d0c70a5 Fix pkg/33191 (affects only SunOS 5.8 so I didn't bumpà revision). 2008-10-15 13:00:50 +00:00
tron
996ec77acc Use the pid file to determine whether "httpd" is still running. This should
make "/etc/rc.d/apache restart" work more reliable and fix PR pkg/39713 by
Martti Kuparinen.

Bump package revision because of this fix.
2008-10-12 12:22:25 +00:00
epg
0bdf50d644 When I broke apr/-util out to build separately from httpd on
2007/01/24 19:46:45, I left Makefile.common in apache22 for no
reason at all.  Drop it.

approved by tron
2008-09-17 15:39:06 +00:00
epg
bab5bb2e34 - drop non-existent configure args
- add missing modules to DFLT_APACHE_MODULES
- bump PKGREVISION for new modules
- replace APACHE_MODULES=all-shared with apache-shared-modules option
- '--enable-mods-shared=all' is not sufficient, that's why DFLT_APACHE_MODULES
  lists all those others; use DFLT_APACHE_MODULES instead of 'all'
- add apache-shared-modules to options.description

approved by tron
2008-09-16 01:47:06 +00:00
wiz
03b53774ba Recursive PKGREVISION/ABI-depends bump for db4 4.6->4.7 update (shlib
name change).
2008-09-06 20:54:31 +00:00
epg
9ee5a32ded Build all modules shared if APACHE_MODULES=all-shared. Bump PKGREVISION.
approved by tron
2008-08-26 20:42:38 +00:00
obache
dfd174bee0 Add DESTDIR support and fix PLIST(try to create two empty directories). 2008-08-22 04:36:00 +00:00
tron
805ca8f55f Add patch from Apache SVN repository to avoid cross-site scripting attacks
in the FTP proxy module. This fixes the security vulnerability reported
in CVE-2008-2939.
2008-08-09 22:16:44 +00:00
tron
14db98734a Update "apache22" package to version 2.2.9.
This version of Apache is principally a bug and security fix release.
The following potential security flaws are addressed:
- CVE-2008-2364: 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.
- CVE-2007-6420: mod_proxy_balancer: Prevent CSRF attacks against the
  balancer-manager interface.

pkgsrc related notes:
- CVE-2008-2364 was already fixed in "pkgsrc"
- CVE-2007-6420 doesn't affect the package in the default configuration
  because the "proxy_balancer" isn't enabled.
2008-06-18 21:38:00 +00:00
tron
66d6cfdda8 Add patch for CVE-2008-2364 from the Apache SVN repository. 2008-06-12 14:12:19 +00:00
joerg
3d8ef5a52d Second round of explicit pax dependencies. As reminded by tnn@,
many packages used to use ${PAX}. Use the common way of directly calling
pax, it is created as tool after all.
2008-05-26 02:13:14 +00:00
jlam
841dfa0e7a Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
2008-04-12 22:42:57 +00:00
xtraeme
87f9eaa73b Update to 2.2.8, please check http://www.apache.org/dist/httpd/CHANGES_2.2.8
for the list of changes.
2008-01-21 15:07:10 +00:00
tnn
ad6ceadd25 Per the process outlined in revbump(1), perform a recursive revbump
on packages that are affected by the switch from the openssl 0.9.7
branch to the 0.9.8 branch. ok jlam@
2008-01-18 05:06:18 +00:00
adam
707dd64033 db4 update related revision bump 2008-01-12 11:36:28 +00:00
abs
eda1229d25 Update www/apache to 2.2.6nb1
Add apache SVN revision 574884 to fix garbage characters in Server header
http://issues.apache.org/bugzilla/show_bug.cgi?id=43334

When it hits, this issue can completely screw up returned pages if the
Server header gets embedded newlines
2007-12-04 12:08:45 +00:00
tron
8c166fcf4a Remove duplicate entry for "share/httpd/icons/README.html".
Pointed out by Geert Hendrickx in private e-mail.
2007-09-10 20:36:40 +00:00
rillig
21d744075f Only fix the suexec permissions if the file exists. 2007-09-09 08:12:58 +00:00
rillig
40a4ea922e Disabled the use of rsync for faster installation. A path that will not
exist later had been embedded in config_vars.mk. PKGREVISION++
2007-09-08 18:48:18 +00:00
tron
84f5aa72f8 Update "apache22" package to version 2.2.6.
This update is a bug and security fix release. The following security
problem hasn't been fixed in "pkgsrc" before:
- CVE-2007-3847: mod_proxy: Prevent reading past the end of a buffer when
  parsing date-related headers.
2007-09-08 11:02:07 +00:00
jlam
07dd3147c6 Convert packages that test and use USE_INET6 to use the options framework
and to support the "inet6" option instead.

Remaining usage of USE_INET6 was solely for the benefit of the scripts
that generate the README.html files.  Replace:

	BUILD_DEFS+=	USE_INET6
with
	BUILD_DEFS+=	IPV6_READY

and teach the README-generation tools to look for that instead.

This nukes USE_INET6 from pkgsrc proper.  We leave a tiny bit of code
to continue to support USE_INET6 for pkgsrc-wip until it has been nuked
from there as well.
2007-09-07 22:12:10 +00:00
jnemeth
23ac004f25 PR/36855 - Michael -- don't create duplicate Listen directives 2007-08-28 23:56:26 +00:00
jlam
4390d56940 Make it easier to build and install packages "unprivileged", where
the owner of all installed files is a non-root user.  This change
affects most packages that require special users or groups by making
them use the specified unprivileged user and group instead.

(1) Add two new variables PKG_GROUPS_VARS and PKG_USERS_VARS to
    unprivileged.mk.  These two variables are lists of other bmake
    variables that define package-specific users and groups.  Packages
    that have user-settable variables for users and groups, e.g. apache
    and APACHE_{USER,GROUP}, courier-mta and COURIER_{USER,GROUP},
    etc., should list these variables in PKG_USERS_VARS and PKG_GROUPS_VARS
    so that unprivileged.mk can know to set them to ${UNPRIVILEGED_USER}
    and ${UNPRIVILEGED_GROUP}.

(2) Modify packages to use PKG_GROUPS_VARS and PKG_USERS_VARS.
2007-07-04 20:54:31 +00:00
lkundrak
31db872355 Fixes for security issues, PKGREVISION bump.
CVE-2007-3304 Denial of Service.
CVE-2006-5752 XSS in mod_status with ExtendedStatus on.
CVE-2007-1863 remote crash when mod_cache enabled.
2007-06-28 01:20:52 +00:00
wiz
5d4498b5fc PKGREVISION bump for db4 shlib name change. 2007-06-08 12:24:59 +00:00
lkundrak
840cbcb818 Bump apache22 to 2.2.4nb4 due to:
Security fix for CVE-2007-1862 sensitive information disclosure
http://issues.apache.org/bugzilla/show_bug.cgi?id=41551
http://issues.apache.org/bugzilla/attachment.cgi?id=20065
2007-06-05 01:43:44 +00:00
rillig
2b508ff00b The file httpd-languages.conf.in does not end with a newline character,
which causes nbsed on Solaris to create a file of unlimited size. Fixed
by appending a newline.
2007-05-30 18:06:38 +00:00
xtraeme
9ac67a4418 I don't have time to maintain packages that might be affected by
security vulnerabilities.
2007-05-22 10:53:20 +00:00
sborrill
d90f8ad563 apr-config is called apr-1-config now. 2007-02-25 00:02:35 +00:00
sborrill
25bac7e1a7 Correct path to apr-config in apxs.
Bump PKGREVISION
2007-02-02 18:06:27 +00:00
epg
e4f20d343c devel/apr:
Update to 1.2.8 (formerly in devel/apr1), no longer build from the
    httpd distfile.

devel/rapidsvn:
devel/subversion-base:
parallel/ganglia-monitor-core:
security/hydra:
www/apache2:
    Use devel/apr0.

www/apache22:
    Use devel/apr and devel/apr-util.
2007-01-24 19:46:45 +00:00
ghen
18677ff69b Fix perl interpreter path for libexec/cgi-bin/printenv. Bump PKGREVISION for
apache, apache2 and apache22.
2007-01-23 15:45:43 +00:00
xtraeme
455fe374b9 Do not use the external pcre library, looks like httpd has problems
with php if we use it, taking 100% cpu all the time.

For now restore previous behaviour (that works) and use the included
pcre.
2007-01-22 00:09:31 +00:00
xtraeme
f3d970469e Update www/apache22 to 2.2.4:
* Bugfixes, please see http://www.apache.org/dist/httpd/CHANGES_2.2

pkgsrc changes:

* Do not use the included pcre source in apache22.
* devel/apr1 now uses the apache22 version (increased to 1.2.8.2.2.4) to
  sync the source with the httpd distfile.
* Remove patches in devel/apr1 which were applied upstream.
2007-01-21 17:11:53 +00:00