Module Name:	pkgsrc
Committed By:	snj
Date:		Sat Jan 21 16:44:05 UTC 2006

Modified Files:
	pkgsrc/www/apache2 [pkgsrc-2005Q4]: Makefile distinfo
Added Files:
	pkgsrc/www/apache2/patches [pkgsrc-2005Q4]: patch-af

Log Message:
Pullup ticket 1044 - requested by Matthias Scheler
security fix for apache2

Revisions pulled up:
- pkgsrc/www/apache2/Makefile		1.91-1.92
- pkgsrc/www/apache2/distinfo		1.46
- pkgsrc/www/apache2/patches/patch-af	1.6

   Module Name:	pkgsrc
   Committed By:	ghen
   Date:		Thu Jan  5 10:01:20 UTC 2006

   Modified Files:
   	pkgsrc/www/apache: Makefile
   	pkgsrc/www/apache2: Makefile

   Log Message:
   Fix the default config and ServerRoot paths in apache and apache2 manpages,
   as suggested by PR pkg/32300, bump PKGREVISION.  Ok by tron, wiz.
---
   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Sat Jan 21 13:02:21 UTC 2006

   Modified Files:
           pkgsrc/www/apache2: Makefile distinfo
   Added Files:
           pkgsrc/www/apache2/patches: patch-af

   Log Message:
   Add fix for CVE-2005-3357 from Apache bug report 37791.
   Bump package revision because of this fix.


To generate a diff of this commit:
cvs rdiff -r1.89 -r1.89.2.1 pkgsrc/www/apache2/Makefile
cvs rdiff -r1.45 -r1.45.2.1 pkgsrc/www/apache2/distinfo
cvs rdiff -r0 -r1.5.2.1 pkgsrc/www/apache2/patches/patch-af

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.