From edwin at FreeBSD.org Tue Jul 1 01:44:34 2008 From: edwin at FreeBSD.org (edwin@FreeBSD.org) Date: Tue Jul 1 01:44:36 2008 Subject: ports/125131: [PATCH] www/apache13-ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes Message-ID: <200807010144.m611iXC5088794@freefall.freebsd.org> Synopsis: [PATCH] www/apache13-ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes Responsible-Changed-From-To: freebsd-ports-bugs->apache Responsible-Changed-By: edwin Responsible-Changed-When: Tue Jul 1 01:44:33 UTC 2008 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=125131 From edwin at FreeBSD.org Tue Jul 1 01:44:38 2008 From: edwin at FreeBSD.org (edwin@FreeBSD.org) Date: Tue Jul 1 01:44:40 2008 Subject: ports/125132: [PATCH] www/apache13-ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes Message-ID: <200807010144.m611ic4Q088874@freefall.freebsd.org> Synopsis: [PATCH] www/apache13-ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes Responsible-Changed-From-To: freebsd-ports-bugs->apache Responsible-Changed-By: edwin Responsible-Changed-When: Tue Jul 1 01:44:38 UTC 2008 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=125132 From pgollucci at p6m7g8.com Tue Jul 1 01:49:29 2008 From: pgollucci at p6m7g8.com (Philip M. Gollucci) Date: Tue Jul 1 01:49:36 2008 Subject: [PATCH] www/apache+ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes Message-ID: <200807010133.m611XMrv024002@riderwayinc.com> >Submitter-Id: current-users >Originator: Philip M. Gollucci >Organization: Riderway Inc. >Confidential: no >Synopsis: [PATCH] www/apache+ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 7.0-RELEASE amd64 >Environment: System: FreeBSD riderwayinc.com 7.0-RELEASE FreeBSD 7.0-RELEASE #2: Thu Feb 28 21:20:48 UTC 2008 >Description: - Honor NO* vars (noticed by ionbot) - Silence some portlint warnings - Convert to new RC_SUBR style [repocopy] - Bump PORTREVISION Added file(s): - files/apache.sh.in - files/no_port_docs Removed file(s): - files/apache.sh Port maintainer (apache@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- apache+ssl-1.3.41.1.59_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/apache13-ssl/Makefile,v retrieving revision 1.122 diff -u -u -r1.122 Makefile --- Makefile 15 Apr 2008 11:50:10 -0000 1.122 +++ Makefile 1 Jul 2008 01:32:44 -0000 @@ -9,6 +9,7 @@ PORTNAME= apache+ssl PORTVERSION= ${APACHE_VERSION}.${APACHE_SSL_VERSION} +PORTREVISION= 1 CATEGORIES= www security MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITES_APACHE_SSL:S/$/:ssl/} @@ -17,10 +18,6 @@ apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}:ssl EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -#PATCH_SITES= ${MASTER_SITE_APACHE_HTTPD} -#PATCH_SITE_SUBDIR= patches/apply_to_${APACHE_VERSION} -#PATCHFILES= - MAINTAINER= apache@FreeBSD.org COMMENT= Apache secure webserver integrating OpenSSL @@ -28,7 +25,7 @@ apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \ apache+mod_ssl+mod_snmp+mod_accel-1.* \ apache+ipv6-1.* apache-1.* apache-2.* apache_fp-1.* \ - caudium-devel-1.* caudium10-1.* caudium12-* \ + caudium-devel-1.* caudium10-1.* caudium12-1.* \ ru-apache+mod_ssl-1.* ru-apache-1.* APACHE_VERSION= 1.3.41 @@ -36,12 +33,12 @@ USE_OPENSSL= yes USE_PERL5= yes HAS_CONFIGURE= yes -USE_RC_SUBR= yes -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} WWWOWN=${WWWOWN} +USE_RC_SUBR= apache.sh +SUB_LIST+= WWWOWN=${WWWOWN} MAKE_ENV+= EXAMPLESDIR=${EXAMPLESDIR} USE_APACHE= common13 -MASTER_SITES_APACHE_SSL= \ +MASTER_SITES_APACHE_SSL= \ ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \ ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \ ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/ @@ -100,10 +97,11 @@ post-patch: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch ${OPENSSLBASE} @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/post-patch-conf:httpd.conf-dist - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh @${REINPLACE_CMD} -e 's|echo aout|echo elf|' \ ${WRKSRC}/src/Configure +.if defined(NOPORTDOCS) + (cd ${WRKSRC} ; ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/no_port_docs) +.endif post-install: @${ECHO_CMD} "" @@ -112,7 +110,6 @@ @${ECHO_CMD} " http://www.apache-ssl.org/docs.html" @${ECHO_CMD} " to know how to configure correctly apache-ssl" @${ECHO_CMD} "" - @${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d certificate: -${MKDIR} ${PREFIX}/etc/apache/certs Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/apache13-ssl/pkg-plist,v retrieving revision 1.28 diff -u -u -r1.28 pkg-plist --- pkg-plist 15 Apr 2008 11:50:10 -0000 1.28 +++ pkg-plist 1 Jul 2008 01:32:44 -0000 @@ -4,7 +4,6 @@ bin/htdigest bin/htpasswd @exec mkdir -p %D/etc/apache 2> /dev/null -etc/rc.d/apache.sh @unexec if cmp -s %D/etc/apache/access.conf% %D/%%EXAMPLESDIR%%/access.conf-dist; then rm -f %D/etc/apache/access.conf%; fi %%EXAMPLESDIR%%/access.conf-dist @exec [ -f %D/etc/apache/access.conf% ] || cp %D/%%EXAMPLESDIR%%/access.conf-dist %D/etc/apache/access.conf @@ -660,13 +659,13 @@ @dirrm include/apache/xml @dirrm include/apache @dirrm libexec/apache -@dirrm %%PORTDOCS%%%%DOCSDIR%%/howto -@dirrm %%PORTDOCS%%%%DOCSDIR%%/images -@dirrm %%PORTDOCS%%%%DOCSDIR%%/misc -@dirrm %%PORTDOCS%%%%DOCSDIR%%/mod -@dirrm %%PORTDOCS%%%%DOCSDIR%%/programs -@dirrm %%PORTDOCS%%%%DOCSDIR%%/vhosts -@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/howto +%%PORTDOCS%%@dirrm %%DOCSDIR%%/images +%%PORTDOCS%%@dirrm %%DOCSDIR%%/misc +%%PORTDOCS%%@dirrm %%DOCSDIR%%/mod +%%PORTDOCS%%@dirrm %%DOCSDIR%%/programs +%%PORTDOCS%%@dirrm %%DOCSDIR%%/vhosts +%%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi @dirrm www/cgi-bin-dist Index: files/apache.sh =================================================================== RCS file: files/apache.sh diff -N files/apache.sh --- files/apache.sh 20 Feb 2006 20:47:46 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,62 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/www/apache13-ssl/files/apache.sh,v 1.2 2006/02/20 20:47:46 dougb Exp $ -# - -# PROVIDE: apache -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable apache: -# apache_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable apache -# apachelimits_enable (bool):Set to "NO" by default. -# Set it to yes to run `limits $limits_args` -# just before apache starts. -# apache_flags (str): Set to "" by default. -# Extra flags passed to start command. -# apachelimits_args (str): Default to "-e -C daemon" -# Arguments of pre-start limits run. -# -. %%RC_SUBR%% - -name="apache" -rcvar=`set_rcvar` - -start_precmd="apache_precmd" -restart_precmd="apache_checkconfig" -reload_precmd="apache_checkconfig" -command="%%PREFIX%%/sbin/httpsd" -pidfile="/var/run/httpsd.pid" -required_files=%%PREFIX%%/etc/apache/httpsd.conf - -[ -z "$apache_enable" ] && apache_enable="NO" -[ -z "$apache_flags" ] && apache_flags="" -[ -z "$apachelimits_enable" ] && apachelimits_enable="NO" -[ -z "$apachelimits_args" ] && apachelimits_args="-e -C daemon" - -load_rc_config $name - -apache_checkconfig() -{ - echo "Performing sanity check on apache configuration:" - ${command} -t -} - -apache_precmd() -{ - if checkyesno apachelimits_enable - then - eval `/usr/bin/limits ${apachelimits_args}` 2>/dev/null - else - return 0 - fi - -} - -sig_reload=SIGUSR1 - -extra_commands="reload" -run_rc_command "$1" Index: files/apache.sh.in =================================================================== RCS file: files/apache.sh.in diff -N files/apache.sh.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/apache.sh.in 1 Jul 2008 01:32:44 -0000 @@ -0,0 +1,62 @@ +#!/bin/sh +# +# $FreeBSD: ports/www/apache13-ssl/files/apache.sh,v 1.2 2006/02/20 20:47:46 dougb Exp $ +# + +# PROVIDE: apache +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable apache: +# apache_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable apache +# apachelimits_enable (bool):Set to "NO" by default. +# Set it to yes to run `limits $limits_args` +# just before apache starts. +# apache_flags (str): Set to "" by default. +# Extra flags passed to start command. +# apachelimits_args (str): Default to "-e -C daemon" +# Arguments of pre-start limits run. +# +. %%RC_SUBR%% + +name="apache" +rcvar=`set_rcvar` + +start_precmd="apache_precmd" +restart_precmd="apache_checkconfig" +reload_precmd="apache_checkconfig" +command="%%PREFIX%%/sbin/httpsd" +pidfile="/var/run/httpsd.pid" +required_files=%%PREFIX%%/etc/apache/httpsd.conf + +[ -z "$apache_enable" ] && apache_enable="NO" +[ -z "$apache_flags" ] && apache_flags="" +[ -z "$apachelimits_enable" ] && apachelimits_enable="NO" +[ -z "$apachelimits_args" ] && apachelimits_args="-e -C daemon" + +load_rc_config $name + +apache_checkconfig() +{ + echo "Performing sanity check on apache configuration:" + ${command} -t +} + +apache_precmd() +{ + if checkyesno apachelimits_enable + then + eval `/usr/bin/limits ${apachelimits_args}` 2>/dev/null + else + return 0 + fi + +} + +sig_reload=SIGUSR1 + +extra_commands="reload" +run_rc_command "$1" Index: files/no_port_docs =================================================================== RCS file: files/no_port_docs diff -N files/no_port_docs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/no_port_docs 1 Jul 2008 01:32:44 -0000 @@ -0,0 +1,22 @@ +--- Makefile.tmpl.orig 2008-07-01 01:08:04.000000000 +0000 ++++ Makefile.tmpl 2008-07-01 01:08:17.000000000 +0000 +@@ -228,7 +228,6 @@ + $(MKDIR) $(root)$(mandir)/man8 + $(MKDIR) $(root)$(sysconfdir) + $(MKDIR) $(root)$(htdocsdir)-dist +- $(MKDIR) $(root)$(manualdir) + $(MKDIR) $(root)$(iconsdir) + $(MKDIR) $(root)$(cgidir)-dist + $(MKDIR) $(root)$(includedir) +@@ -422,11 +421,6 @@ + (cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \ + find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \ + find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ; +- echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \ +- (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\ +- (cd $(root)$(manualdir)/ && $(TAR) -xf -); \ +- find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ +- find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; + if [ ! -d $(root)$(htdocsdir)/ ]; then \ + $(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \ + fi --- apache+ssl-1.3.41.1.59_1.patch ends here --- From pgollucci at p6m7g8.com Tue Jul 1 01:49:30 2008 From: pgollucci at p6m7g8.com (Philip M. Gollucci) Date: Tue Jul 1 01:49:36 2008 Subject: [PATCH] www/apache+ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes Message-ID: <200807010136.m611aR9J028010@riderwayinc.com> >Submitter-Id: current-users >Originator: Philip M. Gollucci >Organization: Riderway Inc. >Confidential: no >Synopsis: [PATCH] www/apache+ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 7.0-RELEASE amd64 >Environment: System: FreeBSD riderwayinc.com 7.0-RELEASE FreeBSD 7.0-RELEASE #2: Thu Feb 28 21:20:48 UTC 2008 >Description: - Honor NO* vars (noticed by ionbot) - Silence some portlint warnings - Convert to new RC_SUBR style [repocopy] - Bump PORTREVISION Added file(s): - files/apache.sh.in - files/no_port_docs Removed file(s): - files/apache.sh Port maintainer (apache@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- apache+ssl-1.3.41.1.59_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/apache13-ssl/Makefile,v retrieving revision 1.122 diff -u -u -r1.122 Makefile --- Makefile 15 Apr 2008 11:50:10 -0000 1.122 +++ Makefile 1 Jul 2008 01:35:52 -0000 @@ -9,6 +9,7 @@ PORTNAME= apache+ssl PORTVERSION= ${APACHE_VERSION}.${APACHE_SSL_VERSION} +PORTREVISION= 1 CATEGORIES= www security MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITES_APACHE_SSL:S/$/:ssl/} @@ -17,10 +18,6 @@ apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}:ssl EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -#PATCH_SITES= ${MASTER_SITE_APACHE_HTTPD} -#PATCH_SITE_SUBDIR= patches/apply_to_${APACHE_VERSION} -#PATCHFILES= - MAINTAINER= apache@FreeBSD.org COMMENT= Apache secure webserver integrating OpenSSL @@ -28,7 +25,7 @@ apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \ apache+mod_ssl+mod_snmp+mod_accel-1.* \ apache+ipv6-1.* apache-1.* apache-2.* apache_fp-1.* \ - caudium-devel-1.* caudium10-1.* caudium12-* \ + caudium-devel-1.* caudium10-1.* caudium12-1.* \ ru-apache+mod_ssl-1.* ru-apache-1.* APACHE_VERSION= 1.3.41 @@ -36,12 +33,12 @@ USE_OPENSSL= yes USE_PERL5= yes HAS_CONFIGURE= yes -USE_RC_SUBR= yes -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} WWWOWN=${WWWOWN} +USE_RC_SUBR= apache.sh +SUB_LIST+= WWWOWN=${WWWOWN} MAKE_ENV+= EXAMPLESDIR=${EXAMPLESDIR} USE_APACHE= common13 -MASTER_SITES_APACHE_SSL= \ +MASTER_SITES_APACHE_SSL= \ ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \ ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \ ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/ @@ -100,10 +97,11 @@ post-patch: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch ${OPENSSLBASE} @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/post-patch-conf:httpd.conf-dist - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh @${REINPLACE_CMD} -e 's|echo aout|echo elf|' \ ${WRKSRC}/src/Configure +.if defined(NOPORTDOCS) + (cd ${WRKSRC} ; ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/no_port_docs) +.endif post-install: @${ECHO_CMD} "" @@ -112,7 +110,6 @@ @${ECHO_CMD} " http://www.apache-ssl.org/docs.html" @${ECHO_CMD} " to know how to configure correctly apache-ssl" @${ECHO_CMD} "" - @${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d certificate: -${MKDIR} ${PREFIX}/etc/apache/certs Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/apache13-ssl/pkg-plist,v retrieving revision 1.28 diff -u -u -r1.28 pkg-plist --- pkg-plist 15 Apr 2008 11:50:10 -0000 1.28 +++ pkg-plist 1 Jul 2008 01:35:52 -0000 @@ -4,7 +4,6 @@ bin/htdigest bin/htpasswd @exec mkdir -p %D/etc/apache 2> /dev/null -etc/rc.d/apache.sh @unexec if cmp -s %D/etc/apache/access.conf% %D/%%EXAMPLESDIR%%/access.conf-dist; then rm -f %D/etc/apache/access.conf%; fi %%EXAMPLESDIR%%/access.conf-dist @exec [ -f %D/etc/apache/access.conf% ] || cp %D/%%EXAMPLESDIR%%/access.conf-dist %D/etc/apache/access.conf @@ -660,13 +659,13 @@ @dirrm include/apache/xml @dirrm include/apache @dirrm libexec/apache -@dirrm %%PORTDOCS%%%%DOCSDIR%%/howto -@dirrm %%PORTDOCS%%%%DOCSDIR%%/images -@dirrm %%PORTDOCS%%%%DOCSDIR%%/misc -@dirrm %%PORTDOCS%%%%DOCSDIR%%/mod -@dirrm %%PORTDOCS%%%%DOCSDIR%%/programs -@dirrm %%PORTDOCS%%%%DOCSDIR%%/vhosts -@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/howto +%%PORTDOCS%%@dirrm %%DOCSDIR%%/images +%%PORTDOCS%%@dirrm %%DOCSDIR%%/misc +%%PORTDOCS%%@dirrm %%DOCSDIR%%/mod +%%PORTDOCS%%@dirrm %%DOCSDIR%%/programs +%%PORTDOCS%%@dirrm %%DOCSDIR%%/vhosts +%%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi @dirrm www/cgi-bin-dist Index: files/apache.sh =================================================================== RCS file: files/apache.sh diff -N files/apache.sh --- files/apache.sh 20 Feb 2006 20:47:46 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,62 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/www/apache13-ssl/files/apache.sh,v 1.2 2006/02/20 20:47:46 dougb Exp $ -# - -# PROVIDE: apache -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable apache: -# apache_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable apache -# apachelimits_enable (bool):Set to "NO" by default. -# Set it to yes to run `limits $limits_args` -# just before apache starts. -# apache_flags (str): Set to "" by default. -# Extra flags passed to start command. -# apachelimits_args (str): Default to "-e -C daemon" -# Arguments of pre-start limits run. -# -. %%RC_SUBR%% - -name="apache" -rcvar=`set_rcvar` - -start_precmd="apache_precmd" -restart_precmd="apache_checkconfig" -reload_precmd="apache_checkconfig" -command="%%PREFIX%%/sbin/httpsd" -pidfile="/var/run/httpsd.pid" -required_files=%%PREFIX%%/etc/apache/httpsd.conf - -[ -z "$apache_enable" ] && apache_enable="NO" -[ -z "$apache_flags" ] && apache_flags="" -[ -z "$apachelimits_enable" ] && apachelimits_enable="NO" -[ -z "$apachelimits_args" ] && apachelimits_args="-e -C daemon" - -load_rc_config $name - -apache_checkconfig() -{ - echo "Performing sanity check on apache configuration:" - ${command} -t -} - -apache_precmd() -{ - if checkyesno apachelimits_enable - then - eval `/usr/bin/limits ${apachelimits_args}` 2>/dev/null - else - return 0 - fi - -} - -sig_reload=SIGUSR1 - -extra_commands="reload" -run_rc_command "$1" Index: files/apache.sh.in =================================================================== RCS file: files/apache.sh.in diff -N files/apache.sh.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/apache.sh.in 1 Jul 2008 01:35:52 -0000 @@ -0,0 +1,62 @@ +#!/bin/sh +# +# $FreeBSD: ports/www/apache13-ssl/files/apache.sh,v 1.2 2006/02/20 20:47:46 dougb Exp $ +# + +# PROVIDE: apache +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable apache: +# apache_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable apache +# apachelimits_enable (bool):Set to "NO" by default. +# Set it to yes to run `limits $limits_args` +# just before apache starts. +# apache_flags (str): Set to "" by default. +# Extra flags passed to start command. +# apachelimits_args (str): Default to "-e -C daemon" +# Arguments of pre-start limits run. +# +. %%RC_SUBR%% + +name="apache" +rcvar=`set_rcvar` + +start_precmd="apache_precmd" +restart_precmd="apache_checkconfig" +reload_precmd="apache_checkconfig" +command="%%PREFIX%%/sbin/httpsd" +pidfile="/var/run/httpsd.pid" +required_files=%%PREFIX%%/etc/apache/httpsd.conf + +[ -z "$apache_enable" ] && apache_enable="NO" +[ -z "$apache_flags" ] && apache_flags="" +[ -z "$apachelimits_enable" ] && apachelimits_enable="NO" +[ -z "$apachelimits_args" ] && apachelimits_args="-e -C daemon" + +load_rc_config $name + +apache_checkconfig() +{ + echo "Performing sanity check on apache configuration:" + ${command} -t +} + +apache_precmd() +{ + if checkyesno apachelimits_enable + then + eval `/usr/bin/limits ${apachelimits_args}` 2>/dev/null + else + return 0 + fi + +} + +sig_reload=SIGUSR1 + +extra_commands="reload" +run_rc_command "$1" Index: files/no_port_docs =================================================================== RCS file: files/no_port_docs diff -N files/no_port_docs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/no_port_docs 1 Jul 2008 01:35:52 -0000 @@ -0,0 +1,22 @@ +--- Makefile.tmpl.orig 2008-07-01 01:08:04.000000000 +0000 ++++ Makefile.tmpl 2008-07-01 01:08:17.000000000 +0000 +@@ -228,7 +228,6 @@ + $(MKDIR) $(root)$(mandir)/man8 + $(MKDIR) $(root)$(sysconfdir) + $(MKDIR) $(root)$(htdocsdir)-dist +- $(MKDIR) $(root)$(manualdir) + $(MKDIR) $(root)$(iconsdir) + $(MKDIR) $(root)$(cgidir)-dist + $(MKDIR) $(root)$(includedir) +@@ -422,11 +421,6 @@ + (cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \ + find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \ + find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ; +- echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \ +- (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\ +- (cd $(root)$(manualdir)/ && $(TAR) -xf -); \ +- find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ +- find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; + if [ ! -d $(root)$(htdocsdir)/ ]; then \ + $(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \ + fi --- apache+ssl-1.3.41.1.59_1.patch ends here --- From pgollucci at ridecharge.com Tue Jul 1 19:10:03 2008 From: pgollucci at ridecharge.com (Philip M. Gollucci) Date: Tue Jul 1 19:10:05 2008 Subject: ports/125132: [PATCH] www/apache13-ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes Message-ID: <200807011910.m61JA3g2014889@freefall.freebsd.org> The following reply was made to PR ports/125132; it has been noted by GNATS. From: "Philip M. Gollucci" To: bug-followup@FreeBSD.org, pgollucci@p6m7g8.com Cc: Subject: Re: ports/125132: [PATCH] www/apache13-ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes Date: Tue, 1 Jul 2008 15:04:16 -0400 not sure why I'm getting dupes, but please close this. duplicate of ports/125131 -- ------------------------------------------------------------------------ Philip M. Gollucci (philip@ridecharge.com) o:703.549.2050x206 Senior System Admin - Riderway, Inc. http://riderway.com / http://ridecharge.com 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching. From itetcu at FreeBSD.org Tue Jul 1 21:04:15 2008 From: itetcu at FreeBSD.org (itetcu@FreeBSD.org) Date: Tue Jul 1 21:04:17 2008 Subject: ports/125132: [PATCH] www/apache13-ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes Message-ID: <200807012104.m61L4Eh8025336@freefall.freebsd.org> Synopsis: [PATCH] www/apache13-ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes State-Changed-From-To: open->closed State-Changed-By: itetcu State-Changed-When: Tue Jul 1 21:04:14 UTC 2008 State-Changed-Why: dupicate of 125131 http://www.freebsd.org/cgi/query-pr.cgi?pr=125132 From bugmaster at FreeBSD.org Mon Jul 7 11:06:21 2008 From: bugmaster at FreeBSD.org (FreeBSD bugmaster) Date: Mon Jul 7 11:06:57 2008 Subject: Current problem reports assigned to apache@FreeBSD.org Message-ID: <200807071106.m67B6K8O061141@freefall.freebsd.org> Current FreeBSD problem reports Critical problems Serious problems S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/124375 apache www/mod_auth_kerb doesn't compile against heimdal 1 problem total. Non-critical problems S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/124208 apache Minor changes in www/mod_macro2 o ports/125131 apache [PATCH] www/apache13-ssl: repocopy(use_rc_subr), Fix 2 problems total. From itetcu at FreeBSD.org Wed Jul 9 20:57:01 2008 From: itetcu at FreeBSD.org (itetcu@FreeBSD.org) Date: Wed Jul 9 20:57:07 2008 Subject: ports/125131: [PATCH] www/apache13-ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes Message-ID: <200807092057.m69Kv1dB073590@freefall.freebsd.org> Synopsis: [PATCH] www/apache13-ssl: repocopy(use_rc_subr), Fix NO* vars, portlint fixes Responsible-Changed-From-To: apache->itetcu Responsible-Changed-By: itetcu Responsible-Changed-When: Wed Jul 9 20:57:01 UTC 2008 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=125131 From bugmaster at FreeBSD.org Mon Jul 14 11:06:21 2008 From: bugmaster at FreeBSD.org (FreeBSD bugmaster) Date: Mon Jul 14 11:06:47 2008 Subject: Current problem reports assigned to apache@FreeBSD.org Message-ID: <200807141106.m6EB6KZ8013642@freefall.freebsd.org> Current FreeBSD problem reports Critical problems Serious problems S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/124375 apache www/mod_auth_kerb doesn't compile against heimdal 1 problem total. Non-critical problems S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/124208 apache Minor changes in www/mod_macro2 1 problem total. From itetcu at FreeBSD.org Thu Jul 17 20:22:45 2008 From: itetcu at FreeBSD.org (QA Tindy) Date: Thu Jul 17 20:22:51 2008 Subject: www/apache20 - failes: mtree Message-ID: <20080717135121.D6DC412E4629@quark.ds9.tecnik93.com> Hi, The build which triggered this email is done under tinderbox-2.4.3, on 7-STABLE on amd64, with tinderd_flags="-nullfs -plistcheck -onceonly" and ccache support, with the official up-to-date Ports Tree (for commit-triggered builds the files are fetched via CVSWeb), with the following vars set: NOPORTDOCS=yes, NOPORTEXAMPLES=yes, NOPORTDATA=yes, FORCE_PACKAGE=yes. Excerpt from http://t64.tecnik93.com/logs/7-STABLE-FTP/apache-2.0.63.log: building apache-2.0.63 in directory /var/tinderbox/7-STABLE-FTP maintained by: clement@FreeBSD.org building for: 7.0-STABLE amd64 port directory: /usr/ports/www/apache20 Makefile ident: $FreeBSD: ports/www/apache20/Makefile,v 1.252 2008/02/08 03:07:25 clement Exp $ prefixes: LOCALBASE=usr/local X11BASE=usr/local NO* env vars: NOPORTDOCS=yes NOPORTEXAMPLES=yes NOPORTDATA=yes build started at Thu Jul 17 13:48:18 UTC 2008 ................................................... To run apache www server from startup, add apache2_enable="YES" in your /etc/rc.conf. Extra options can be found in startup script. ===> Installing rc.d startup script(s) ===> Compressing manual pages for apache-2.0.63 ===> Running ldconfig /sbin/ldconfig -m /usr/local/lib/apache2 ===> Installing ldconfig configuration file ===> Registering installation for apache-2.0.63 ===> SECURITY REPORT: This port has installed the following files which may act as network servers and may therefore pose a remote security risk to the system. /usr/local/lib/apache2/libapr-0.so.9 This port has installed the following startup scripts which may cause these network services to be started at boot time. /usr/local/etc/rc.d/apache2 If there are vulnerabilities in these programs there may be a security risk to the system. FreeBSD makes no guarantee about the security of ports included in the Ports Collection. Please type 'make deinstall' to deinstall the port if this is a concern. For more information, and contact details about the security status of this software, see the following webpage: http://httpd.apache.org/ ================================================================ ======================================== ===> Building package for apache-2.0.63 Creating package /tmp/packages/All/apache-2.0.63.tbz Registering depends: libiconv-1.11_1 perl-5.8.8_1 expat-2.0.1. Registering conflicts: apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* apache+mod_ssl+mod_snmp+mod_accel-1.* apache+ipv6-1.* apache+ssl-1.* apache-1.* apache_fp-1.* caudium-devel-1.* caudium10-1.* caudium12-* ru-apache+mod_ssl-1.* ru-apache-1.*. Creating bzip'd tar ball in '/tmp/packages/All/apache-2.0.63.tbz' Deleting apache-2.0.63 ================================================================ === Checking filesystem state list of extra files and directories in / (not present before this port was installed but present after it was deinstalled) 15455137 4 drwxr-xr-x 2 root wheel 512 Jul 17 13:51 usr/local/share/doc/apache2 ================================================================ build of /usr/ports/www/apache20 ended at Thu Jul 17 13:51:19 UTC 2008 A description of the testing process can be found here: http://T32.TecNik93.com/FreeBSD/QA-Tindy/testing_process.txt Thanks for your work on making FreeBSD better, -- IOnut - Un^d^dregistered ;) FreeBSD "user" "Intellectual Property" is nowhere near as valuable as "Intellect" FreeBSD committer -> itetcu@FreeBSD.org, PGP Key ID 057E9F8B493A297B From miwi at FreeBSD.org Fri Jul 18 17:34:39 2008 From: miwi at FreeBSD.org (miwi@FreeBSD.org) Date: Fri Jul 18 17:34:50 2008 Subject: ports/125733: [PATCH] www/apache: Fix pkg-plist with NO* vars Message-ID: <200807181734.m6IHYc15083827@freefall.freebsd.org> Synopsis: [PATCH] www/apache: Fix pkg-plist with NO* vars Responsible-Changed-From-To: freebsd-ports-bugs->apache Responsible-Changed-By: miwi Responsible-Changed-When: Fri Jul 18 17:34:38 UTC 2008 Responsible-Changed-Why: Over to maintainer. http://www.freebsd.org/cgi/query-pr.cgi?pr=125733 From edwin at FreeBSD.org Sat Jul 19 12:20:14 2008 From: edwin at FreeBSD.org (edwin@FreeBSD.org) Date: Sat Jul 19 12:20:21 2008 Subject: ports/125733: [PATCH] www/apache20: Fix pkg-plist with NO* vars Message-ID: <200807191218.m6JCI2LZ013931@freefall.freebsd.org> Old Synopsis: [PATCH] www/apache: Fix pkg-plist with NO* vars New Synopsis: [PATCH] www/apache20: Fix pkg-plist with NO* vars State-Changed-From-To: open->open State-Changed-By: edwin State-Changed-When: Sat Jul 19 12:14:24 UTC 2008 State-Changed-Why: n/a Responsible-Changed-From-To: apache->apache Responsible-Changed-By: edwin Responsible-Changed-When: Sat Jul 19 12:14:24 UTC 2008 Responsible-Changed-Why: n/a/ http://www.freebsd.org/cgi/query-pr.cgi?pr=125733 From bugmaster at FreeBSD.org Mon Jul 21 11:06:15 2008 From: bugmaster at FreeBSD.org (FreeBSD bugmaster) Date: Mon Jul 21 11:06:41 2008 Subject: Current problem reports assigned to apache@FreeBSD.org Message-ID: <200807211106.m6LB6F6f031119@freefall.freebsd.org> Current FreeBSD problem reports Critical problems Serious problems S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/124375 apache www/mod_auth_kerb doesn't compile against heimdal 1 problem total. Non-critical problems S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/124208 apache Minor changes in www/mod_macro2 o ports/125733 apache [PATCH] www/apache20: Fix pkg-plist with NO* vars 2 problems total. From bugmaster at FreeBSD.org Mon Jul 28 11:06:17 2008 From: bugmaster at FreeBSD.org (FreeBSD bugmaster) Date: Mon Jul 28 11:06:43 2008 Subject: Current problem reports assigned to apache@FreeBSD.org Message-ID: <200807281106.m6SB6Hw1078181@freefall.freebsd.org> Current FreeBSD problem reports Critical problems Serious problems S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/124375 apache www/mod_auth_kerb doesn't compile against heimdal 1 problem total. Non-critical problems S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/124208 apache Minor changes in www/mod_macro2 o ports/125733 apache [PATCH] www/apache20: Fix pkg-plist with NO* vars 2 problems total. From pgollucci at FreeBSD.org Mon Jul 28 20:51:06 2008 From: pgollucci at FreeBSD.org (pgollucci@FreeBSD.org) Date: Mon Jul 28 20:51:12 2008 Subject: ports/125733: [PATCH] www/apache20: Fix pkg-plist with NO* vars Message-ID: <200807282051.m6SKp6lg036150@freefall.freebsd.org> Synopsis: [PATCH] www/apache20: Fix pkg-plist with NO* vars Responsible-Changed-From-To: apache->pgollucci Responsible-Changed-By: pgollucci Responsible-Changed-When: Mon Jul 28 20:51:06 UTC 2008 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=125733 From dwiest at vailsys.com Tue Jul 29 02:18:16 2008 From: dwiest at vailsys.com (Damian Wiest) Date: Tue Jul 29 02:18:23 2008 Subject: FireFox error -12229 w/ apache+ssl-1.3.41.1.59 Message-ID: <20080729020012.GA56803@dfwdamian.vail> I've been tearing my hair out over a problem with the apache+ssl-1.3.41.1.59 port running under FreeBSD 7.0-release and am hoping that someone can provide some suggestions. We have a Perl CGI based web application that was using apache+ssl-1.3.27.1.48_2 on FreeBSD 4.8. When we upgraded to the latest version, we began getting strange errors from a few web browsers; specifically the latest release of Safari and FireFox 2.0. FireFox 2.0 will return error code -12229 when the client performs POST requests; GET requests work fine. FireFox 3.0 does not return this error, nor does IE 6 or 7. The latest version of Safari just generates an error about being "unable to establish a secure connection". I do not see any errors recorded in Apache's log file; the POST request shows a status code of 200. >From what I can tell this is most likely a browser error. I'm wondering if someone's seen this problem before? I also don't understand why the latest release of the apache13-ssl port causes this error to occur when a much older release did not. I suppose asking people to upgrade to FireFox 3 is an option, but I don't have a solution for Safari users. I'd really appreciate any help with this matter. If it would help, I can send my httpsd.conf file along with some packet dumps if you'd like. Thanks! -Damian From pgollucci at p6m7g8.com Tue Jul 29 03:15:28 2008 From: pgollucci at p6m7g8.com (Philip M. Gollucci) Date: Tue Jul 29 03:15:34 2008 Subject: FireFox error -12229 w/ apache+ssl-1.3.41.1.59 In-Reply-To: <20080729020012.GA56803@dfwdamian.vail> References: <20080729020012.GA56803@dfwdamian.vail> Message-ID: <488E88F1.9010701@p6m7g8.com> Damian Wiest wrote: > I've been tearing my hair out over a problem with the > apache+ssl-1.3.41.1.59 port running under FreeBSD 7.0-release and am > hoping that someone can provide some suggestions. I'd bet this is your issue -- from libapreq. =item 1.34 have fill_buffer() completely fill the multipart_buffer. This bug is tickled by the FireFox 2.0 when doing ssl uploads: https://bugzilla.mozilla.org/show_bug.cgi?id=356470 https://bugzilla.mozilla.org/show_bug.cgi?id=369414 1.34 is not yet released, you can try using subversion. $ svn co https://svn.apache.org/repos/asf/httpd/apreq/branches/1.x If you confirm it fixes your problem, I'll get off my lazy but and release it then update the freebsd port. You might also try apreq-dev@httpd.apache.org which I also read :) Earliest would be next week. -- ------------------------------------------------------------------------ Philip M. Gollucci (philip@ridecharge.com) o:703.549.2050x206 Senior System Admin - Riderway, Inc. http://riderway.com / http://ridecharge.com 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching.