pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2004Q2]: pkgsrc Pullup ticket 57 to the pkgsrc-2004Q2 branch, ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6b9c59c9acd9
branches: pkgsrc-2004Q2
changeset: 476729:6b9c59c9acd9
user: agc <agc%pkgsrc.org@localhost>
date: Wed Jul 14 12:39:00 2004 +0000
description:
Pullup ticket 57 to the pkgsrc-2004Q2 branch, requested by Grant Beattie.
Security and other bug fixes for apache2.
Module Name: pkgsrc
Committed By: adrianp
Date: Wed Jul 14 08:28:51 UTC 2004
Modified Files:
pkgsrc/www/apache2: Makefile Makefile.common PLIST buildlink3.mk
distinfo
pkgsrc/www/apache2/patches: patch-aa
Added Files:
pkgsrc/www/apache2: PLIST.deffiles
Removed Files:
pkgsrc/www/apache2/patches: patch-as
Log Message:
- Update to apache 2.0.50
- Add new build def APACHE_DEFAULT_FILES
and
Module Name: pkgsrc
Committed By: adrianp
Date: Wed Jul 14 08:31:12 UTC 2004
Modified Files:
pkgsrc/devel/apr: buildlink3.mk distinfo
Log Message:
- Update to apache 2.0.50
- Add new build def APACHE_DEFAULT_FILES
diffstat:
devel/apr/buildlink3.mk | 4 +-
devel/apr/distinfo | 6 +-
doc/CHANGES-pkgsrc-2004Q2 | 4 +-
www/apache2/Makefile | 85 +-
www/apache2/Makefile.common | 2 +-
www/apache2/PLIST | 1430 +----------------------------------------
www/apache2/PLIST.deffiles | 1420 +++++++++++++++++++++++++++++++++++++++++
www/apache2/buildlink3.mk | 5 +-
www/apache2/distinfo | 9 +-
www/apache2/patches/patch-aa | 15 +-
www/apache2/patches/patch-as | 35 -
11 files changed, 1575 insertions(+), 1440 deletions(-)
diffs (truncated from 3183 to 300 lines):
diff -r 7af2266633c2 -r 6b9c59c9acd9 devel/apr/buildlink3.mk
--- a/devel/apr/buildlink3.mk Wed Jul 14 11:17:18 2004 +0000
+++ b/devel/apr/buildlink3.mk Wed Jul 14 12:39:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2.4.1 2004/07/14 12:39:00 agc Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@
BUILDLINK_PACKAGES+= apr
.if !empty(APR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.apr+= apr>=0.9.5.2.0.48nb1
+BUILDLINK_DEPENDS.apr+= apr>=0.9.5.2.0.50
BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr
BUILDLINK_FILES.apr+= bin/apr-config
diff -r 7af2266633c2 -r 6b9c59c9acd9 devel/apr/distinfo
--- a/devel/apr/distinfo Wed Jul 14 11:17:18 2004 +0000
+++ b/devel/apr/distinfo Wed Jul 14 12:39:00 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2004/03/22 19:50:16 reed Exp $
+$NetBSD: distinfo,v 1.7.4.1 2004/07/14 12:39:00 agc Exp $
-SHA1 (httpd-2.0.49.tar.gz) = 7fe1f9bc835b91d5e55aa39a792b0050a634485b
-Size (httpd-2.0.49.tar.gz) = 5919279 bytes
+SHA1 (httpd-2.0.50.tar.gz) = 7b6f591b2e728473ebe0164bf5297b1fa86f4fe2
+Size (httpd-2.0.50.tar.gz) = 6338536 bytes
SHA1 (patch-aa) = 17e79d6c54c855c4210f68e5facca1002d2512fa
SHA1 (patch-ab) = bb9a9f0fbf5d48748f2a0826509a19b915d2bc72
SHA1 (patch-an) = 64006f0f1b5c3f20df6f47624e56aac0d99ae056
diff -r 7af2266633c2 -r 6b9c59c9acd9 doc/CHANGES-pkgsrc-2004Q2
--- a/doc/CHANGES-pkgsrc-2004Q2 Wed Jul 14 11:17:18 2004 +0000
+++ b/doc/CHANGES-pkgsrc-2004Q2 Wed Jul 14 12:39:00 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.22 2004/07/14 11:17:19 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.23 2004/07/14 12:39:00 agc Exp $
Changes to the packages collection and infrastructure on the
pkgsrc-2004Q2 branch:
@@ -40,3 +40,5 @@
Solaris afio build fix
Pullup ticket 56, requested by Martti Kuparinen [agc 2004-07-14]
Update xfce4 to 4.0.6 - bugfix release
+Pullup ticket 57, requested by Grant Beattie [agc 2004-07-14]
+ apache2 security and bug fix
diff -r 7af2266633c2 -r 6b9c59c9acd9 www/apache2/Makefile
--- a/www/apache2/Makefile Wed Jul 14 11:17:18 2004 +0000
+++ b/www/apache2/Makefile Wed Jul 14 12:39:00 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2004/06/05 16:21:44 taca Exp $
+# $NetBSD: Makefile,v 1.36.2.1 2004/07/14 12:39:00 agc Exp $
PKGNAME= apache-${APACHE_VERSION}
-PKGREVISION= 2
CATEGORIES= www
HOMEPAGE= http://httpd.apache.org/
@@ -10,7 +9,7 @@
CONFLICTS= apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]*
CONFLICTS+= ap-*-[0-9]* # Apache-1.x DSOs
-BUILD_DEFS+= USE_INET6
+BUILD_DEFS+= USE_INET6 APACHE_DEFAULT_FILES
USE_BUILDLINK3= YES
USE_PKGINSTALL= YES
@@ -28,6 +27,32 @@
CONFIGURE_ARGS+= --with-apr=${LOCALBASE}
CONFIGURE_ARGS+= --with-apr-util=${LOCALBASE}
+#
+# APACHE_DEFAULT_FILES Notes:
+#
+# If this is defined as YES then you will basically get all the default files
+# that apapche installs. On a default install this includes:
+#
+# ${PREFIX}/share/httpd/htdocs
+# ${PREFIX}/libexec/cgi-bin
+# ${PREFIX}/share/httpd/manual
+# ${PREFIX}/share/httpd/icons
+#
+# The basic idea is that if you have customised your web root and you don't
+# want the apache install/upgrade to add any files to your default web
+# directories simply set this to YES.
+#
+# NOTE: Default error pages will always be installed regardless of what
+# APACHE_DEFAULT_FILES is set to.
+#
+.if defined(APACHE_DEFAULT_FILES) && !empty(APACHE_DEFAULT_FILES:M[Nn][Oo])
+INSTALL_TARGET=install install-error install-other install-include \
+ install-suexec install-man install-build
+.else
+APACHE_DEFAULT_FILES?= YES
+PLIST_SRC+= ${PKGDIR}/PLIST.deffiles
+.endif
+
.include "../../mk/bsd.prefs.mk"
DFLT_APACHE_MODULES= all
@@ -79,6 +104,27 @@
OWN_DIRS= /var/log/httpd
OWN_DIRS+= /var/db/httpd
OWN_DIRS_PERMS+= /var/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
+FIX_PERMS= apachectl apxs dbmmanage envvars-std
+
+SUBST_CLASSES= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_FILES.paths= config.layout
+SUBST_SED.paths= -e "s|@PREFIX@|${PREFIX}|g"
+SUBST_MESSAGE.paths= "Fixing paths."
+
+SUBST_CLASSES+= confs
+SUBST_STAGE.confs= post-install
+SUBST_FILES.confs= ${EGDIR}/highperformance-std.conf \
+ ${EGDIR}/httpd-std.conf \
+ ${EGDIR}/ssl-std.conf
+SUBST_SED.confs= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g" \
+ -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g" \
+ -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g" \
+ -e "s|logs/|/var/log/httpd/|g" \
+ -e "s|/var/log/httpd/foo\.log|logs/foo.log/|g" \
+ -e "s|^\(User[ ]\).*|\1${APACHE_USER}|g" \
+ -e "s|^\(Group[ ]\).*|\1${APACHE_GROUP}|g"
+SUBST_MESSAGE.confs= "Fixing configuration files."
# Add dependencies for the modules that will be built. For each module
# ap_mod listed in ${APACHE_MODULES}, _AP_DEPENDS.ap_mod is a whitespace
@@ -107,32 +153,19 @@
. endif
.endfor
-AP_CONF_FILE_SED= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g"
-AP_CONF_FILE_SED+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g"
-AP_CONF_FILE_SED+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g"
-AP_CONF_FILE_SED+= -e "s|logs/|/var/log/httpd/|g"
-AP_CONF_FILE_SED+= -e "s|/var/log/httpd/foo\.log|logs/foo.log/|g"
-AP_CONF_FILE_SED+= -e "s|^\(User[ ]\).*|\1${APACHE_USER}|g"
-AP_CONF_FILE_SED+= -e "s|^\(Group[ ]\).*|\1${APACHE_GROUP}|g"
-
-pre-configure:
- ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${WRKSRC}/config.layout \
- > ${WRKSRC}/config.layout.new
- ${MV} ${WRKSRC}/config.layout.new ${WRKSRC}/config.layout
-
-post-install:
- ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${PREFIX}/share/httpd/build
+pre-install:
@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} install-conf sysconfdir="${EGDIR}"
+
+post-install:
+ @${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${PREFIX}/share/httpd/build
@cd ${EGDIR}; \
for file in \
highperformance-std.conf \
httpd-std.conf \
ssl-std.conf; \
do \
- ${CAT} $${file} \
- | ${SED} ${AP_CONF_FILE_SED} \
- | ${AWK} ' \
+ ${CAT} $${file} | ${AWK} ' \
/^Listen[ ]*80/ { \
print; \
printf "%s", "Listen 0.0.0.0:80\n"; \
@@ -148,6 +181,16 @@
${MV} -f $${file}.new $${file}; \
done
+.if defined(APACHE_DEFAULT_FILES) && !empty(APACHE_DEFAULT_FILES:M[Yy][Ee][Ss])
+ @${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/manual
+ @cd ${WRKSRC}/docs/manual && ${PAX} -rw . ${PREFIX}/share/httpd/manual
+.endif
+
+ for file in ${FIX_PERMS}; do \
+ ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/sbin/$$file && \
+ ${CHMOD} ${BINMODE} ${PREFIX}/sbin/$$file; \
+ done
+
.include "Makefile.common"
.include "../../devel/apr/buildlink3.mk"
diff -r 7af2266633c2 -r 6b9c59c9acd9 www/apache2/Makefile.common
--- a/www/apache2/Makefile.common Wed Jul 14 11:17:18 2004 +0000
+++ b/www/apache2/Makefile.common Wed Jul 14 12:39:00 2004 +0000
@@ -1,5 +1,5 @@
DISTNAME= httpd-${APACHE_VERSION}
-APACHE_VERSION= 2.0.49
+APACHE_VERSION= 2.0.50
APR_VERSION= 0.9.5
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
${MASTER_SITE_APACHE:=httpd/old/} \
diff -r 7af2266633c2 -r 6b9c59c9acd9 www/apache2/PLIST
--- a/www/apache2/PLIST Wed Jul 14 11:17:18 2004 +0000
+++ b/www/apache2/PLIST Wed Jul 14 12:39:00 2004 +0000
@@ -1,57 +1,55 @@
-@comment $NetBSD: PLIST,v 1.20 2004/04/23 22:07:59 reed Exp $
+@comment $NetBSD: PLIST,v 1.20.2.1 2004/07/14 12:39:00 agc Exp $
include/httpd/ap_compat.h
-include/httpd/ap_config.h
-include/httpd/ap_config_auto.h
-include/httpd/ap_config_layout.h
-include/httpd/ap_listen.h
-include/httpd/ap_mmn.h
-include/httpd/ap_mpm.h
-include/httpd/ap_provider.h
-include/httpd/ap_regkey.h
+include/httpd/util_time.h
+include/httpd/util_script.h
+include/httpd/util_md5.h
+include/httpd/util_ldap.h
+include/httpd/util_filter.h
+include/httpd/util_ebcdic.h
+include/httpd/util_charset.h
+include/httpd/util_cfgtree.h
+include/httpd/scoreboard.h
+include/httpd/rfc1413.h
+include/httpd/pcreposix.h
+include/httpd/mpm_common.h
+include/httpd/httpd.h
+include/httpd/http_vhost.h
+include/httpd/http_request.h
+include/httpd/http_protocol.h
+include/httpd/http_main.h
+include/httpd/http_log.h
+include/httpd/http_core.h
+include/httpd/http_connection.h
+include/httpd/http_config.h
include/httpd/ap_release.h
-include/httpd/http_config.h
-include/httpd/http_connection.h
-include/httpd/http_core.h
-include/httpd/http_log.h
-include/httpd/http_main.h
-include/httpd/http_protocol.h
-include/httpd/http_request.h
-include/httpd/http_vhost.h
-include/httpd/httpd.h
-include/httpd/mod_cgi.h
-include/httpd/mod_core.h
+include/httpd/ap_regkey.h
+include/httpd/ap_provider.h
+include/httpd/ap_mpm.h
+include/httpd/ap_mmn.h
+include/httpd/ap_listen.h
+include/httpd/ap_config_layout.h
+include/httpd/ap_config_auto.h
+include/httpd/ap_config.h
+include/httpd/util_xml.h
+include/httpd/os.h
+include/httpd/mpm_default.h
+include/httpd/mpm.h
include/httpd/mod_dav.h
include/httpd/mod_include.h
-include/httpd/mod_log_config.h
-include/httpd/mod_proxy.h
-include/httpd/mod_ssl.h
+include/httpd/mod_cgi.h
include/httpd/mod_status.h
-include/httpd/mpm.h
-include/httpd/mpm_common.h
-include/httpd/mpm_default.h
-include/httpd/os.h
-include/httpd/pcre.h
-include/httpd/pcreposix.h
-include/httpd/rfc1413.h
-include/httpd/scoreboard.h
+include/httpd/mod_log_config.h
+include/httpd/mod_core.h
+include/httpd/mod_proxy.h
+include/httpd/ssl_util_table.h
+include/httpd/ssl_util_ssl.h
include/httpd/ssl_expr.h
-include/httpd/ssl_expr_parse.h
include/httpd/ssl_toolkit_compat.h
-include/httpd/ssl_util_ssl.h
-include/httpd/ssl_util_table.h
+include/httpd/ssl_expr_parse.h
+include/httpd/mod_ssl.h
+include/httpd/pcre.h
include/httpd/unixd.h
-include/httpd/util_cfgtree.h
-include/httpd/util_charset.h
-include/httpd/util_ebcdic.h
-include/httpd/util_filter.h
-include/httpd/util_ldap.h
-include/httpd/util_md5.h
-include/httpd/util_script.h
-include/httpd/util_time.h
-include/httpd/util_xml.h
lib/httpd/httpd.exp
-libexec/cgi-bin/printenv
-libexec/cgi-bin/test-cgi
man/man1/dbmmanage.1
man/man1/htdigest.1
man/man1/htpasswd.1
@@ -89,1333 +87,33 @@
share/httpd/build/program.mk
Home |
Main Index |
Thread Index |
Old Index