Commit graph

157 commits

Author SHA1 Message Date
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
c3c8edd6ef There's no need for CONFLICT between apache2 and apache22,
cube said so.
2006-12-09 00:51:21 +00:00
xtraeme
3474136862 This package cannot co-exist with apache22, update CONFLICTS
properly.

Bump PKGREVISION.
2006-12-08 23:51:37 +00:00
adrianp
7d95e4f164 Fix the path to libtool on build so that it gets set correctly in the
installed config_vars.mk.  Any package pulling in config_vars.mk will
now find libtool.
PKGREVISION++
ok'ed tron@
2006-11-05 17:52:38 +00:00
rillig
6a855c871d The directories for configuration files and log files are now set in the
config.layout file instead of CONFIGURE_ARGS, to avoid defining things
twice. No actual change, since the paths are still the same.

Added all necessary variables to BUILD_DEFS, as reported by pkglint.
2006-08-30 06:16:27 +00:00
tron
8d75a00588 Make sure that the directory "share/httpd/manual/style/lang" is created
when installing a binary package. Problem pointed out by Lubomir Sedlacik
in private e-mail.

Bump package revision because of this fix.
2006-07-28 13:35:37 +00:00
tron
659d0b0b2c Update "apr" package to version 0.9.12.2.0.59 and "apache2" package
to version 2.0.59. Changes since *2.0.58:
- SECURITY: CVE-2006-3747 (cve.mitre.org)
  mod_rewrite: Fix an off-by-one security problem in the ldap scheme
  handling. For some RewriteRules this could lead to a pointer being
  written out of bounds.  Reported by Mark Dowd of McAfee.
2006-07-28 10:38:36 +00:00
rillig
506171d445 Fixed some pkglint warnings. 2006-07-10 08:29:33 +00:00
jlam
c16221a4db Change the format of BUILDLINK_ORDER to contain depth information as well,
and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.

For example, "make show-buildlink3" in fonts/Xft2 displays:

	zlib
	fontconfig
	    iconv
	    zlib
	    freetype2
	    expat
	freetype2
	Xrender
	    renderproto
2006-07-08 23:10:35 +00:00
jlam
9430e49307 Track information in a new variable BUILDLINK_ORDER that informs us
of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.
2006-07-08 22:38:58 +00:00
tron
97d23b0a13 Update "apr" package to version 0.9.12.2.0.58 and "apache" package
to version 2.0.58. Change since Apache relase 2.0.55:
- Legal: Restored original years in copyright notices.
- mod_cgid: run the get_suexec_identity hook within the request-handler
  instead of within cgid. Apache#36410.
- core: Prevent read of unitialized memory in ap_rgetline_core.
  Apache#39282.
- mod_proxy: Report the proxy server name correctly in the "Via:" header,
  when UseCanonicalName is Off. Apache#11971.
- mod_isapi: Various trivial code-fixes to permit mod_isapi to load and
  run on Unix.
- HTML-escape the Expect error message.  Not classed as security as
  an attacker has no way to influence the Expect header a victim will
  send to a target site.  Reported by Thiago Zaninotti
  <thiango nstalker.com>.
- SECURITY: CVE-2005-3357 (cve.mitre.org)
  mod_ssl: Fix a possible crash during access control checks if a
  non-SSL request is processed for an SSL vhost (such as the
  "HTTP request received on SSL port" error message when an 400
  ErrorDocument is configured, or if using "SSLEngine optional").
  Apache#37791.
- SECURITY: CVE-2005-3352 (cve.mitre.org)
  mod_imap: Escape untrusted referer header before outputting in HTML
  to avoid potential cross-site scripting.  Change also made to
  ap_escape_html so we escape quotes.  Reported by JPCERT.
- Add APR/APR-Util Compiled and Runtime Version numbers to the
  output of 'httpd -V'.
- Ensure that the proper status line is written to the client, fixing
  incorrect status lines caused by filters which modify r->status without
  resetting r->status_line, such as the built-in byterange filter.
- Default handler: Don't return output filter apr_status_t values.
  Apache#31759.
- mod_speling: Stop crashing with certain non-file requests.
- keep the Content-Length header for a HEAD with no response body.
  Apache#18757
- Modify apr[util] .h detection to avoid breakage on VPATH builds
  using Solaris make (amoung others) and avoid breakage in ./buildconf
  when srclib/apr[-util] are symlinks rather than directories proper.
- Avoid server-driven negotiation when a CGI script has emitted an
  explicit "Status:" header. Apache#38070.
- mod_log_config now logs all Set-Cookie headers if the %{Set-Cookie}o
  format is used. Apache#27787.
- mod_cache: Correctly handle responses with a 301 status. Apache#37347.
- mod_proxy_http: Prevent data corruption of POST request bodies when
  client accesses proxied resources with SSL. Apache#37145.
- Elimiated the NET_TIME filter, restructuring the timeout logic.
  This provides a working mod_echo on all platforms, and ensures any
  custom protocol module is at least given an initial timeout value
  based on the <VirtualHost > context's Timeout directive.
- mod_ssl: Correct issue where mod_ssl does not pick up the
  ssl-unclean-shutdown setting when configured. Apache#34452.
- Document the ReceiveBufferSize change done in r157583.
- mod_deflate: Merge the Vary header, instead of Setting it. Fixes
  applications that send the Vary Header themselves. Apache#37559.
- mod_dav: Fix a null pointer dereference in an error code path during the
  handling of MKCOL.
- mod_mime_magic: Handle CRLF-format magic files so that it works with
  the default installation on Windows.
- Write message to error log if AuthGroupFile cannot be opened.
  Apache#37566.
- Add ReceiveBufferSize directive to control the TCP receive buffer.
- mod_cache: Fix 'Vary: *' behavior to be RFC compliant. Apache#16125.
- Remove the base href tag from proxy_ftp, as it breaks relative
  links for clients not using an Authorization header.
- http_request.c: Add missing va_end call.
- Add httxt2dbm to support/ for creating RewriteMap DBM Files.
- support/check_forensic: Fix temp file usage
- Chunk filter: Fix chunk filter to create correct chunks in the case that
  a flush bucket is surrounded by data buckets.
- mod_cgi(d): Remove block on OPTIONS method so that scripts can
  respond to OPTIONS directly rather than via server default.
  Apache#15242
- Added new module mod_version, which provides version dependent
  configuration containers.
- Add core version query function (ap_get_server_revision) and
  accompanying ap_version_t structure (minor MMN bump).
2006-05-07 12:35:27 +00:00
tv
9bee330e30 Set APACHE_MODULES with ?= *before* bsd.prefs.mk, because that's the only
way that using APACHE_MODULES+= (additive) in mk.conf can work correctly.
2006-04-24 20:10:02 +00:00
adrianp
30b5cd3612 Fix ownership permissions on installed files
Change behaviour of APACHE_MODULES and DFLT_APACHE_MODULES

If you do not define APACHE_MODULES this change will not impact you, the
default behaviour of the package modules has not been changed.

The new functionality is as follows:

1) If you need to add an additional module to be installed with apache
   you would use:

   APACHE_MODULES+= spelling

   This would include mod_spelling as a static module in addition to the
   default modules installed.

2) If you need a highly customised version of apache and would like to
   explicitly list which modules are installed by default you would use:

   APACHE_MODULES= spelling access auth include env autoindex

   This would install _only_ the listed modules as static modules with
   apache.

   If you use APACHE_MODULES= please read the apache documentation at:

	http://httpd.apache.org/docs/2.0/

   To determine which modules you will need to install to get the level
   of functionality you require. By default when using APACHE_MODULES=
   apache only includes with the following static modules:

	core.c
	prefork.c
	http_core.c
	mod_so.c
2006-04-23 11:42:38 +00:00
jlam
802ce74fcb Modify packages that set PKG_USERS and PKG_GROUPS to follow the new
syntax as specified in pkgsrc/mk/install/bsd.pkginstall.mk:1.47.
2006-04-23 00:12:35 +00:00
rillig
9fc2d7d281 Removed the superfluous "quotes" and 'quotes' from variables that don't
need them, for example RESTRICTED and SUBST_MESSAGE.*.
2006-04-22 09:22:05 +00:00
rillig
96fc47c14f Aligned the last line of the buildlink3.mk files with the first line, so
that they look nicer.
2006-04-12 10:26:59 +00:00
reed
5abef9be14 Over 1200 files touched but no revisions bumped :)
RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

I did not manually go through and fix any aesthetic tab/spacing issues.

I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.

I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.

As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.

As discussed on tech-pkg.

I will commit to revbump, pkglint, pkg_install, createbuildlink separately.

Note that if you use wip, it will fail!  I will commit to pkgsrc-wip
later (within day).
2006-04-06 06:21:32 +00:00
joerg
5911def816 Recursive revision bump / recommended bump for gettext ABI change. 2006-02-05 23:08:03 +00:00
tron
4ac27580c5 Add "pkg-config" to the list of tools required for building the
apache2" package. This should fix PR pkg/32622.
2006-01-25 18:08:33 +00:00
wiz
768c589c29 Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because
of the shlib major bump.
PKGREVISION++ for the dependencies.
2006-01-24 07:31:52 +00:00
tron
deaf868e81 Add fix for CVE-2005-3357 from Apache bug report 37791.
Bump package revision because of this fix.
2006-01-21 13:02:21 +00:00
ghen
dfb6734a85 Fix the default config and ServerRoot paths in apache and apache2 manpages,
as suggested by PR pkg/32300, bump PKGREVISION.  Ok by tron, wiz.
2006-01-05 10:01:20 +00:00
jlam
dc9594e09d Remove USE_PKGINSTALL from pkgsrc now that mk/install/pkginstall.mk
automatically detects whether we want the pkginstall machinery to be
used by the package Makefile.
2005-12-29 06:21:30 +00:00
tron
9b0ef43f3e Add fix for security vulnerability reported in CVE-2005-3352 taken from
Apache SVN repository. Bump package revision because of that.
2005-12-15 11:29:00 +00:00
rillig
579e977969 Ran "pkglint --autofix", which corrected some of the quoting issues in
CONFIGURE_ARGS.
2005-12-05 23:55:01 +00:00
rillig
b71a1d488b Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
2005-12-05 20:49:47 +00:00
jlam
813025b441 Add missing manpage to PLIST. Bump PKGREVISION for binary package change. 2005-10-23 20:14:43 +00:00
tron
8aed019681 Require at least version 0.9.7.2.0.55 of the "apr" package because
Apache 2.0.55 won't work with older versions. Bump package revision
because of this dependence change.

This fixes PR pkg/31872 by Carl Brewer.
2005-10-21 10:31:18 +00:00
tron
2a12e2c14d Update "apache2" package to version 2.0.55.
Patches supplied by Ben Collver. Addresses PR pkg/31817 by Zafer Aydogan.
2005-10-17 10:37:11 +00:00
tron
2563f528ef Update "apr" package to version 0.9.7. Changes since version 0.9.6:
- Fix crash in apr_dir_make_recursive() for relative path
  when the working directory has been deleted.  [Joe Orton]
- Win32: fix apr_proc_mutex_trylock() to handle WAIT_TIMEOUT,
  returning APR_EBUSY.  [Ronen Mizrahi <ronen@tversity.com>]
- Fix apr_file_read() to catch write failures when flushing pending
  writes for a buffered file.  [Joe Orton]
- Fix apr_file_write() infinite loop on write failure for buffered
  files.  [Erik Huelsmann <ehuels gmail.com>]
- Fix error handling where apr_uid_* and apr_gid_* could segfault
  or return APR_SUCCESS in failure cases.  PR 34053.  [Joe Orton,
  Paul Querna]
- Refactor Win32 condition variables code to address bugs 27654, 34336.
  [Henry Jen <henryjen ztune.net>, E Holyat <eholyat yahoo.com>]
- Support APR_SO_SNDBUF and APR_SO_RCVBUF on Windows.  PR 32177.
  [Sim <sgobbi datamanagement.it>, Jeff Trawick]
- Fix detection of rwlocks on Mac OS X. [Aaron Bannert]
- Fix issue with poll() followed by net I/O yielding EAGAIN on
  Mac OS 10.4 (Darwin 8). [Wilfredo Sanchez]

Update based on patches supplied by Ben Collver. Addresses first part
of PR pkg/31817 by Zafer Aydogan.
2005-10-17 10:28:46 +00:00
joerg
a79f9b73cc Allow mod_ssl to build with OpenSSL 0.9.8. The patch is from
Georg v. Zezschwitz on dev@httpd.apache.org.
2005-10-11 20:10:35 +00:00
rillig
5ac8ad7004 Removed trailing white-space. 2005-09-28 14:31:06 +00:00
tv
209c117dcf Remove old 2003 patch that is actually no longer used. apr is its own
package now, and this header file is only directly used by apr itself,
hidden from httpd.  (Clarifies bug 36750 that I have on file with Apache
Bugzilla.)
2005-09-26 17:21:21 +00:00
tron
40b74e8b4e Add patch from Apache SVN repository to fix weak client certificate
validation reported in CAN-2005-2700. Bump package revision.
2005-09-02 11:40:56 +00:00
tron
33368df221 - Add security patch for CAN-2005-2491 from Apache SVN repository.
- Add patch for high memory usage caused by "Byterange" support
  from Apache SVN repository.
Bump package revision because of the above changes.
2005-08-28 08:36:55 +00:00
rillig
7a95adad42 The real user name in PKG_USERS does not need to be escaped with double
backslashes anymore. A single backslash is enough. Changed the
definition in all affected packages. For those that are not caught, an
additional check is placed into bsd.pkginstall.mk.
2005-08-23 11:48:47 +00:00
jlam
35b3578065 The htdocs directory is under ${PREFIX}, so use REQD_DIRS instead of
MAKE_DIRS.  This causes the htdocs directory to be conditionally
removed every time, regardless of the value of PKG_CONFIG.  Bump the
PKGREVISION to 3.
2005-08-20 03:36:25 +00:00
jlam
bd2788d930 Merge CONF_FILES/SUPPORT_FILES and CONF_FILES_PERMS/SUPPORT_FILES_PERMS
as the INSTALL and DEINSTALL scripts no longer distinguish between
the two types of files.  Drop SUPPORT_FILES{,_PERMS} and modify the
packages in pkgsrc accordingly.
2005-08-19 18:12:36 +00:00
tron
92cff08c3c Add fixes for CAN-2005-1268 (not really a security problem) and
CAN-2005-2088 from the Apache SVN repository.
2005-08-08 18:30:26 +00:00
jlam
83147ffa68 Remove some unnecessarily strong dependencies on perl that resulted
from including perl5/buildlink3.mk.  These packages just need the Perl
interpreter, and can just add "perl" to USE_TOOLS instead.
2005-07-16 19:10:37 +00:00
jlam
3e474a90d8 Get rid of USE_PERL5. The new way to express needing the Perl executable
around at either build-time or at run-time is:

	USE_TOOLS+=	perl		# build-time
	USE_TOOLS+=	perl:run	# run-time

Also remove some places where perl5/buildlink3.mk was being included
by a package Makefile, but all that the package wanted was the Perl
executable.
2005-07-16 01:19:06 +00:00
jlam
f35b224a50 SUBST_FILES.* must be relative to ${WRKSRC}. 2005-05-21 04:10:17 +00:00
reed
566435a644 Move the PKGREVISION from the Makefile.common. It should be used
for revisions for a single package. I don't think this "suexec"
PKGREVISION was meant for the apr package, but since it was used
it is now there.

I noticed this problem when building wip/apachebench2 which has
nothing to do with suexec. Although, I did not make this change
for pkgsrc-wip's wip/apachebench2 since this is a work in progress.
2005-05-21 03:49:52 +00:00
adrianp
834e87969d - Add an option ${APACHE_SUEXEC_LOGFILE} so the user can specify
where they would like the suexec logfile to go.  Ok'ed tron@
- Bump pkgrevision
2005-05-18 19:10:01 +00:00
jlam
348ab57451 apr/buildlink3.mk defines PKG_BUILD_OPTIONS.apr as the result of the
PKG_OPTIONS computation for devel/apr.  Check that for the presence of
db4 instead.
2005-05-10 00:11:18 +00:00
dillo
8230b62526 Check if a variable is defined before matching against it in .if
Noted by kristerw.
2005-05-09 21:57:05 +00:00
reed
ee8be9d0c1 RCD_SCRIPTS_EXAMPLEDIR is no longer customizable.
And always is defined as share/examples/rc.d
which was the default before.

This rc.d scripts are not automatically added to PLISTs now also.
So add to each corresponding PLIST as required.

This was discussed on tech-pkg in late January and late April.

Todo: remove the RCD_SCRIPTS_EXAMPLEDIR uses in MESSAGES and elsewhere
and remove the RCD_SCRIPTS_EXAMPLEDIR itself.
2005-05-02 20:33:57 +00:00
adam
bba3dab699 Changes 2.0.54:
*) mod_cache: Add CacheIgnoreHeaders directive.
  *) mod_ldap: Added the directive LDAPConnectionTimeout to configure
     the ldap socket connection timeout value.
  *) Correctly export all mod_dav public functions.
  *) Add a build script to create a solaris package.
  *) worker MPM: Fix a problem which could cause httpd processes to
     remain active after shutdown.
  *) Unix MPMs: Shut down the server more quickly when child processes are
     slow to exit.
  *) Remove formatting characters from ap_log_error() calls.  These
     were escaped as fallout from CAN-2003-0020.
  *) mod_ssl: If SSLUsername is used, set r->user earlier.
  *) htdigest: Fix permissions of created files.
  *) core_input_filter: Move buckets to a persistent brigade instead of
     creating a new brigade. This stop a memory leak when proxying a
     Streaming Media Server.
  *) mod_win32: Ignore both PATH_INFO as well as PATH_TRANSLATED to avoid
     hiccups from additional path information passed in non-utf-8 format.
2005-04-25 09:13:02 +00:00
tron
53bd945a40 Remove custom "restart" code from startup script so that Apache really
gets restarted when "/etc/rc.d/apache restart" is used. This fixes
PR pkg/24179 for the "apache2" package.
2005-04-18 14:35:57 +00:00
wiz
c66a9cdd88 tron volunteered to maintain this package. 2005-04-18 13:20:40 +00:00