kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update apache2 to 2.0.49. This includes various changes since last release

Browse source 
including:
  *) SECURITY: CAN-2004-0174 (cve.mitre.org)
     Fix starvation issue on listening sockets where a short-lived
     connection on a rarely-accessed listening socket will cause a
     child to hold the accept mutex and block out new connections until
     another connection arrives on that rarely-accessed listening socket.
     With Apache 2.x there is no performance concern about enabling the
     logic for platforms which don't need it, so it is enabled everywhere
     except for Win32.  [Jeff Trawick]

  *) SECURITY: CAN-2004-0113 (cve.mitre.org)
     mod_ssl: Fix a memory leak in plain-HTTP-on-SSL-port handling.
     PR 27106.  [Joe Orton]

  *) SECURITY: CAN-2003-0020 (cve.mitre.org)
     Escape arbitrary data before writing into the errorlog. Unescaped
     errorlogs are still possible using the compile time switch
     "-DAP_UNSAFE_ERROR_LOG_UNESCAPED".  [Geoffrey Young, Andr<E9> Malo]

Complete changelog is at http://www.apache.org/dist/httpd/CHANGES_2.0

Package changes include:

buildlink depends increased for apache2 (but not for apr).

apr package version changes, but APR_VERSION stays same.

more files installed and added to PLIST.
share/httpd/manual/search/manual-index.cgi removed from PLIST.
Also removing share/httpd/htdocs and share/httpd directories
removed from PLIST because already handled by MAKE_DIRS.
(I think this should use OWN_DIRS.)

(jlam@ said he would like this update done during freeze.)
This commit is contained in:
reed 2004-03-22 19:50:16 +00:00
parent 312f1fab55
commit a03322e020
8 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/apr/Makefile
View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.16 2004/03/09 19:34:14 snj Exp $
# $NetBSD: Makefile,v 1.17 2004/03/22 19:50:16 reed Exp $
PKGNAME= apr-${APR_VERSION}.${APACHE_VERSION}
PKGREVISION= 1
CATEGORIES= devel
HOMEPAGE= http://apr.apache.org/

6
devel/apr/distinfo
View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.6 2003/10/28 21:12:11 mason Exp $
$NetBSD: distinfo,v 1.7 2004/03/22 19:50:16 reed Exp $
SHA1 (httpd-2.0.48.tar.gz) = 1e7311d0a2ff845a0d0f60ca96981b82403db2d4
Size (httpd-2.0.48.tar.gz) = 6258490 bytes
SHA1 (httpd-2.0.49.tar.gz) = 7fe1f9bc835b91d5e55aa39a792b0050a634485b
Size (httpd-2.0.49.tar.gz) = 5919279 bytes
SHA1 (patch-aa) = 17e79d6c54c855c4210f68e5facca1002d2512fa
SHA1 (patch-ab) = bb9a9f0fbf5d48748f2a0826509a19b915d2bc72
SHA1 (patch-an) = 64006f0f1b5c3f20df6f47624e56aac0d99ae056

3
www/apache2/Makefile
View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.33 2004/03/07 22:43:08 minskim Exp $
# $NetBSD: Makefile,v 1.34 2004/03/22 19:50:16 reed Exp $
PKGNAME= apache-${APACHE_VERSION}
PKGREVISION= 3
CATEGORIES= www
HOMEPAGE= http://httpd.apache.org/

2
www/apache2/Makefile.common
View file

@ -1,5 +1,5 @@
DISTNAME= httpd-${APACHE_VERSION}
APACHE_VERSION= 2.0.48
APACHE_VERSION= 2.0.49
APR_VERSION= 0.9.5
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
${MASTER_SITE_APACHE:=httpd/old/} \

20
www/apache2/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.18 2004/01/27 08:09:17 grant Exp $
@comment $NetBSD: PLIST,v 1.19 2004/03/22 19:50:16 reed Exp $
etc/rc.d/apache
include/httpd/ap_compat.h
include/httpd/ap_config.h
@ -26,6 +26,7 @@ include/httpd/mod_include.h
include/httpd/mod_log_config.h
include/httpd/mod_proxy.h
include/httpd/mod_ssl.h
include/httpd/mod_status.h
include/httpd/mpm.h
include/httpd/mpm_common.h
include/httpd/mpm_default.h
@ -651,9 +652,11 @@ share/httpd/manual/mod/allmodules.xml.ja
share/httpd/manual/mod/allmodules.xml.ko
share/httpd/manual/mod/allmodules.xml.ru
share/httpd/manual/mod/beos.html
share/httpd/manual/mod/beos.html.de
share/httpd/manual/mod/beos.html.en
share/httpd/manual/mod/beos.html.ko.euc-kr
share/httpd/manual/mod/beos.xml
share/httpd/manual/mod/beos.xml.de
share/httpd/manual/mod/beos.xml.ko
share/httpd/manual/mod/beos.xml.meta
share/httpd/manual/mod/core.html
@ -693,9 +696,11 @@ share/httpd/manual/mod/index.xml.ja
share/httpd/manual/mod/index.xml.ko
share/httpd/manual/mod/index.xml.meta
share/httpd/manual/mod/leader.html
share/httpd/manual/mod/leader.html.de
share/httpd/manual/mod/leader.html.en
share/httpd/manual/mod/leader.html.ko.euc-kr
share/httpd/manual/mod/leader.xml
share/httpd/manual/mod/leader.xml.de
share/httpd/manual/mod/leader.xml.ko
share/httpd/manual/mod/leader.xml.meta
share/httpd/manual/mod/mod_access.html
@ -1113,6 +1118,10 @@ share/httpd/manual/programs/apxs.html
share/httpd/manual/programs/apxs.html.en
share/httpd/manual/programs/apxs.xml
share/httpd/manual/programs/apxs.xml.meta
share/httpd/manual/programs/configure.html
share/httpd/manual/programs/configure.html.en
share/httpd/manual/programs/configure.xml
share/httpd/manual/programs/configure.xml.meta
share/httpd/manual/programs/dbmmanage.html
share/httpd/manual/programs/dbmmanage.html.en
share/httpd/manual/programs/dbmmanage.xml
@ -1151,7 +1160,6 @@ share/httpd/manual/programs/suexec.html
share/httpd/manual/programs/suexec.html.en
share/httpd/manual/programs/suexec.xml
share/httpd/manual/programs/suexec.xml.meta
share/httpd/manual/search/manual-index.cgi
share/httpd/manual/sections.html
share/httpd/manual/sections.html.en
share/httpd/manual/sections.html.ja.jis
@ -1215,6 +1223,7 @@ share/httpd/manual/stopping.xml.ja
share/httpd/manual/stopping.xml.ko
share/httpd/manual/stopping.xml.meta
share/httpd/manual/stopping.xml.ru
share/httpd/manual/style/build.properties
share/httpd/manual/style/chm/chm.de.xsl
share/httpd/manual/style/chm/chm.en.xsl
share/httpd/manual/style/chm/chm.ja.xsl
@ -1293,7 +1302,11 @@ share/httpd/manual/style/xsl/util/nbsp.xml
share/httpd/manual/style/xsl/util/tab.xml
share/httpd/manual/style/xsl/util/ul-end.xml
share/httpd/manual/style/xsl/util/ul-start.xml
share/httpd/manual/style/zip/zip.de.xsl
share/httpd/manual/style/zip/zip.en.xsl
share/httpd/manual/style/zip/zip.ja.xsl
share/httpd/manual/style/zip/zip.ko.xsl
share/httpd/manual/style/zip/zip.ru.xsl
share/httpd/manual/suexec.html
share/httpd/manual/suexec.html.en
share/httpd/manual/suexec.html.ja.jis
@ -1385,7 +1398,6 @@ share/httpd/manual/vhosts/name-based.xml.meta
@dirrm share/httpd/manual/mod
@dirrm share/httpd/manual/platform
@dirrm share/httpd/manual/programs
@dirrm share/httpd/manual/search
@dirrm share/httpd/manual/ssl
@dirrm share/httpd/manual/style/zip
@dirrm share/httpd/manual/style/xsl/util
@ -1401,11 +1413,9 @@ share/httpd/manual/vhosts/name-based.xml.meta
@dirrm share/httpd/manual
@dirrm share/httpd/icons/small
@dirrm share/httpd/icons
@dirrm share/httpd/htdocs
@dirrm share/httpd/error/include
@dirrm share/httpd/error
@dirrm share/httpd/build
@dirrm share/httpd
@dirrm share/examples/httpd
@unexec ${RMDIR} ${PREFIX}/libexec/cgi-bin 2>/dev/null || ${TRUE}
@dirrm lib/httpd

4
www/apache2/buildlink2.mk
View file

@ -1,10 +1,10 @@
# $NetBSD: buildlink2.mk,v 1.5 2003/12/03 15:40:02 epg Exp $
# $NetBSD: buildlink2.mk,v 1.6 2004/03/22 19:50:16 reed Exp $
.if !defined(APACHE_BUILDLINK2_MK)
APACHE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= apache
BUILDLINK_DEPENDS.apache?= apache>=2.0.48nb2
BUILDLINK_DEPENDS.apache?= apache>=2.0.49
BUILDLINK_PKGSRCDIR.apache?= ../../www/apache2
BUILDLINK_DEPMETHOD.apache?= build

4
www/apache2/buildlink3.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $
# $NetBSD: buildlink3.mk,v 1.3 2004/03/22 19:50:16 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napache}
BUILDLINK_PACKAGES+= apache
.if !empty(APACHE_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.apache+= apache>=2.0.48nb3
BUILDLINK_DEPENDS.apache+= apache>=2.0.49
BUILDLINK_PKGSRCDIR.apache?= ../../www/apache2
BUILDLINK_DEPMETHOD.apache?= build
. if defined(APACHE_MODULE)

6
www/apache2/distinfo
View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.23 2003/10/28 04:49:32 itojun Exp $
$NetBSD: distinfo,v 1.24 2004/03/22 19:50:16 reed Exp $
SHA1 (httpd-2.0.48.tar.gz) = 1e7311d0a2ff845a0d0f60ca96981b82403db2d4
Size (httpd-2.0.48.tar.gz) = 6258490 bytes
SHA1 (httpd-2.0.49.tar.gz) = 7fe1f9bc835b91d5e55aa39a792b0050a634485b
Size (httpd-2.0.49.tar.gz) = 5919279 bytes
SHA1 (patch-aa) = b04f73fcc090e64c7c7de480fe504bb7a9e305bd
SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a
SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01