Commit graph

136 commits

Author SHA1 Message Date
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
martti
2c203e550d Create /usr/pkg/etc/httpd/ssl.crl for Certificate Revocation Lists 2005-04-15 17:21:42 +00:00
martti
5dc4bec27c Updated apache to 2.0.53nb1
- added mkcert to help with certificate creation
2005-04-12 05:49:45 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
martti
bb33b9257e Install mkcert to help with certificate creation. The script was
taken from the ap-ssl package (which is for apache 1.3.x).
2005-04-11 18:56:05 +00:00
wiz
809ad6f2f7 Add RMD160 checksums. 2005-02-24 14:08:26 +00:00
salo
bf5c3ed06e add rcsid. 2005-02-10 13:29:10 +00:00
tron
ef75742c7d Update "apache2" package to version 2.0.53. Changes since version 2.0.52:
- Fix --with-apr=/usr and/or --with-apr-util=/usr.  Problem report 29740.
  [Max Bowsher <maxb ukf.net>]
- mod_proxy: Fix ProxyRemoteMatch directive.  Problem report 33170.
  [Rici Lake <rici ricilake.net>]
- mod_proxy: Respect errors reported by pre_connection hooks.
  [Jeff Trawick]
- --with-module can now take more than one module to be statically
  linked: --with-module=<modtype>:<modfile>,<modtype>:<modfile>,...
  If the <modtype>-subdirectory doesn't exist it will be created and
  populated with a standard Makefile.in.  [Erik Abele]
- Fix the RPM spec file so that an RPM build now works. An RPM
  build now requires system installations of APR and APR-util.
  Remove some arbitrary moving around of binaries - the RPM now
  maps to the ASF build of httpd.
  [Graham Leggett]
- mod_dumpio, an I/O logging/dumping module, added to the
  modules/expermimental subdirectory.  [Jim Jagielski]
- mod_auth_ldap: Handle the inconsistent way in which the MS LDAP
  library handles special characters.  Problem report 24437.
  [Jess Holle]
- Win32 MPM: Correct typo in debugging output.  [William Rowe]
- conf: Remove AddDefaultCharset from the default configuration because
  setting a site-wide default does more harm than good.
  Problem report 23421. [Roy Fielding]
- Add charset to example CGI scripts.  [Roy Fielding]
- mod_ssl: fail quickly if SSL connection is aborted rather than
  making many doomed ap_pass_brigade calls.
  Problem report 32699.  [Joe Orton]
- Remove compiled-in upper limit on LimitRequestFieldSize.
  [Bill Stoddard]
- Start keeping track of time-taken-to-process-request again for
  mod_status if ExtendedStatus is enabled. [Jim Jagielski]
- mod_proxy: Handle client-aborted connections correctly.
  Problem report 32443.  [Janne Hietamäki, Joe Orton]
- Fix handling of files >2Gb on all platforms (or builds) where
  apr_off_t is larger than apr_size_t.
  Problem report 28898.  [Joe Orton]
- mod_include: Fix bug which could truncate variable expansions
  of N*64 characters by one byte.  Problem report 32985.  [Joe Orton]
- Correct handling of certain bucket types in ap_save_brigade, fixing
  possible segfaults in mod_cgi with #include virtual.
  Problem report 31247.  [Joe Orton]
- Allow for the use of --with-module=foo:bar where the ./modules/foo
  directory is local only. Assumes, of course, that the required
  files are in ./modules/foo, but makes it easier to statically
  build/log "external" modules.  [Jim Jagielski]
- Util_ldap: Implemented the util_ldap_cache_getuserdn() API so that
  ldap authorization only modules have access to the util_ldap
  user cache without having to require ldap authentication as well.
  Problem report 31898.  [Jari Ahonen jah progress.com, Brad Nicholes]
- mod_auth_ldap: Added the directive "Requires ldap-attribute" that
  allows the module to only authorize a user if the attribute value
  specified matches the value of the user object. Problem report 31913
  [Ryan Morgan <rmorgan pobox.com>]
- SECURITY: CAN-2004-0942 (cve.mitre.org)
  Fix for memory consumption DoS in handling of MIME folded request
  headers.  [Joe Orton]
- SECURITY: CAN-2004-0885 (cve.mitre.org)
  mod_ssl: Fix a bug which allowed an SSLCipherSuite setting to be
  bypassed during an SSL renegotiation.  Problem report 31505.
  [Hartmut Keil <Hartmut.Keil adnovum.ch>, Joe Orton]
- mod_ssl: Fail at startup rather than segfault at runtime if a
  client cert is configured with an encrypted private key.
  Problem report 24030.  [Joe Orton]
- apxs: fix handling of -Wc/-Wl and "-o mod_foo.so".
  Problem report 31448 [Joe Orton]
- mod_ldap: Fix format strings to use %APR_PID_T_FMT instead of %d.
  [Jeff Trawick]
- mod_cache: CacheDisable will only disable the URLs it was meant to
  disable, not all caching. Problem report 31128.
  [Edward Rudd <eddie omegaware.com>, Paul Querna]
- mod_cache: Try to correctly follow RFC 2616 13.3 on validating stale
  cache responses.  [Justin Erenkrantz]
- mod_rewrite: Handle per-location rules when r->filename is unset.
  Previously this would segfault or simply not match as expected,
  depending on the platform.  [Jeff Trawick]
- mod_rewrite: Fix 0 bytes write into random memory position.
  Problem report 31036. [André Malo]
- mod_disk_cache: Do not store aborted content.  Problem report 21492.
  [Rüdiger Plüm <r.pluem t-online.de>]
- mod_disk_cache: Correctly store cached content type.
  Problem report 30278.
  [Rüdiger Plüm <r.pluem t-online.de>]
- mod_ldap: prevent the possiblity of an infinite loop in the LDAP
  statistics display. Problem report 29216. [Graham Leggett]
- mod_ldap: fix a bogus error message to tell the user which file
  is causing a potential problem with the LDAP shared memory cache.
  Problem report 31431 [Graham Leggett]
- mod_disk_cache: Do not store hop-by-hop headers.  [Justin Erenkrantz]
- Fix the re-linking issue when purging elements from the LDAP cache
  Problem report 24801.  [Jess Holle <jessh ptc.com>]
- mod_disk_cache: Fix races in saving responses.  [Justin Erenkrantz]
- Fix Expires handling in mod_cache.  [Justin Erenkrantz]
- Alter mod_expires to run at a different filter priority to allow
  proper Expires storage by mod_cache.  [Justin Erenkrantz]
2005-02-09 14:57:52 +00:00
martin
2e82e81616 Make deflate a default module; bump pkgrevision.
This closes PR 26824. Approved by Johnny C. Lam.
2005-02-07 08:37:22 +00:00
minskim
1c9528094d Do not use supplementary groups on Interix, which doesn't have setgroups.
Patch provided by HIRAMATSU Yoshifumi in PR pkg/27567.
2005-01-03 06:59:31 +00:00
minskim
228689ffd0 Add a patch missed in the previous commit.
Bump PKGREVISION becuase this patch will change the binary package.
2005-01-03 01:04:26 +00:00
minskim
9898eaeb50 Always use ${PERL5} as a perl path, instead of depending on PrintPath.
Bump PKGREVISION.
2005-01-01 17:24:25 +00:00
reed
32d8f290c2 The default location of the pkgsrc-installed rc.d scripts is now
under share/examples/rc.d. The variable name already was named
RCD_SCRIPTS_EXAMPLEDIR.

This is from ideas from Greg Woods and others.

Also bumped PKGREVISION for all packages using RCD_SCRIPTS mechanism
(as requested by wiz).
2004-12-28 02:47:40 +00:00
jlam
650b62997d Remove support for some variables that are supposed to go away after
pkgsrc-2004Q4 is branched.
2004-12-22 21:46:24 +00:00
adrianp
62c61758f0 - Bump to nb5 to specifically address a new apache vuln:
http://issues.apache.org/bugzilla/show_bug.cgi?id=31505
  http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0885
- Changes backported from apache CVS HEAD:
  http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/ssl/ssl_engine_kernel.c?r1=1.110&r2=1.111
  http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/ssl/ssl_engine_init.c?r1=1.128&r2=1.129
2004-12-18 08:42:12 +00:00
seb
14bffa0d36 Classes must be appended to SUBST_CLASSES. 2004-12-07 22:25:50 +00:00
jlam
3618dd36af Modify the apxs(8) script to use ${APR_LIBTOOL} as the libtool to
build modules if APR_LIBTOOL is defined in the environment.  Force
the use of the libtool wrapper by module packages by setting APR_LIBTOOL
in apache2/buildlink3.mk.  Bump the PKGREVISION.
2004-11-30 23:21:43 +00:00
jlam
6a52fe337f Pass DL_* flags to the compiler when linking httpd since it dlopens
shared modules.  Bump the PKGREVISION.
2004-11-26 23:07:58 +00:00
jlam
4835cf969a There are additional headers installed if APACHE_MPM == "worker".
Handle this with the usual PLIST_SUBST magic.
2004-11-24 07:39:50 +00:00
jlam
2b5da25de3 buildlink3.mk files should be included outside of the multiple inclusion
protected region (see mk/buildlink3/bsd.buildlink.mk).
2004-11-23 20:17:55 +00:00
jlam
0597d2a1f0 We don't need to check for APR_USE_* or generate our own _APR_OPTIONS
variable since the apr/buildlink3.mk file does the right thing for us
already; we simply need to include it and check the value of
PKG_OPTIONS.apr.
2004-11-23 00:37:04 +00:00
jlam
fb0842ff24 * Create APACHE_MPM variable that can be either "prefork" or "worker"
(defaulting to "prefork") that chooses the multi-processing model
  for apache to handle requests.  "Prefork" is the method used by
  Apache-1.3, which is non-threaded.  "Worker" uses threads to handle
  requests.

* Fix libtool usage in this package.  Apache uses libtool, but is
  hardcoded to use the libtool installed by devel/apr.  Patch the
  generated makefile fragment to use a local libtool instead, and
  allow the usual libtool wrapper to take its place.
2004-11-22 22:52:53 +00:00