From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 17 07:20:12 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C4D01065679 for ; Fri, 17 Jul 2009 07:20:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 167D28FC1B for ; Fri, 17 Jul 2009 07:20:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6H7K5pK046039 for ; Fri, 17 Jul 2009 07:20:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6H7K5Bg046038; Fri, 17 Jul 2009 07:20:05 GMT (envelope-from gnats) Resent-Date: Fri, 17 Jul 2009 07:20:05 GMT Resent-Message-Id: <200907170720.n6H7K5Bg046038@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Philip M. Gollucci" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99F48106564A; Fri, 17 Jul 2009 07:15:21 +0000 (UTC) (envelope-from pgollucci@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8904D8FC15; Fri, 17 Jul 2009 07:15:21 +0000 (UTC) (envelope-from pgollucci@FreeBSD.org) Received: from freefall.freebsd.org (pgollucci@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6H7FLg1044721; Fri, 17 Jul 2009 07:15:21 GMT (envelope-from pgollucci@freefall.freebsd.org) Received: (from pgollucci@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6H7FL71044720; Fri, 17 Jul 2009 07:15:21 GMT (envelope-from pgollucci) Message-Id: <200907170715.n6H7FL71044720@freefall.freebsd.org> Date: Fri, 17 Jul 2009 07:15:21 GMT From: "Philip M. Gollucci" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: dinoex@FreeBSD.org Subject: ports/136853: [PATCH] www/apache+mod_ssl: USE_RC_SUBR != yes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jul 2009 07:20:12 -0000 >Number: 136853 >Category: ports >Synopsis: [PATCH] www/apache+mod_ssl: USE_RC_SUBR != yes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 17 07:20:05 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 7.2-STABLE i386 >Organization: RideCharge Inc. >Environment: System: FreeBSD freefall.freebsd.org 7.2-STABLE FreeBSD 7.2-STABLE #38 r194101: Sat Jun 13 11:12:24 UTC >Description: Added file(s): - files/apache.in Removed file(s): - files/rcng.sh Port maintainer (dinoex@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- apache+mod_ssl-1.3.41+2.8.31_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/www/apache13-modssl/Makefile,v retrieving revision 1.193 diff -u -u -r1.193 Makefile --- Makefile 7 Jul 2009 03:56:51 -0000 1.193 +++ Makefile 17 Jul 2009 07:15:10 -0000 @@ -7,7 +7,7 @@ PORTNAME= apache+mod_ssl PORTVERSION= ${VERSION_APACHE}+${VERSION_MODSSL} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= www security MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITES_MODSSL:S/$/:mod_ssl/} \ @@ -57,7 +57,7 @@ MODSNMP_FILE= mod_snmp_${VERSION_MODSNMP}${EXTRACT_SUFX} RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -USE_RC_SUBR= yes +USE_RC_SUBR= apache .include @@ -89,10 +89,6 @@ @${FALSE} .endif -APACHE_SH?= etc/rc.d/apache - -PLIST_FILES+= ${APACHE_SH} - .if defined(WITH_APACHE_SUEXEC) && !defined(WITHOUT_APACHE_SUEXEC) APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT} @@ -380,8 +376,6 @@ @${ECHO_MSG} "" post-extract: - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/rcng.sh > ${WRKSRC}/rcng.sh @${REINPLACE_CMD} -e 's|echo aout|echo elf|' \ ${WRKSRC}/src/Configure .if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP) @@ -428,7 +422,6 @@ @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/rcng.sh ${PREFIX}/${APACHE_SH} .if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP) @${MKDIR} ${DATADIR}/buckets @${CHOWN} www:www ${DATADIR}/buckets Index: files/apache.in =================================================================== RCS file: files/apache.in diff -N files/apache.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/apache.in 17 Jul 2009 07:15:10 -0000 @@ -0,0 +1,31 @@ +#!/bin/sh +# $FreeBSD: ports/www/apache13-modssl/files/rcng.sh,v 1.6 2008/05/12 11:40:28 dinoex Exp $ + +# PROVIDE: apache +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: shutdown + +# Define these apache_* variables in one of these files: +# /etc/rc.conf +# /etc/rc.conf.local +# /etc/rc.conf.d/apache +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# +apache_enable="${apache_enable-NO}" +apache_flags=${apache_flags-"-DSSL"} +apache_pidfile="/var/run/httpd.pid" + +. %%RC_SUBR%% + +name="apache" +rcvar=`set_rcvar` +command="%%PREFIX%%/sbin/httpd" + +load_rc_config $name + +pidfile="${apache_pidfile}" +start_precmd="`/usr/bin/limits -e -U www`" + +run_rc_command "$1" Index: files/rcng.sh =================================================================== RCS file: files/rcng.sh diff -N files/rcng.sh --- files/rcng.sh 12 May 2008 11:40:28 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,31 +0,0 @@ -#!/bin/sh -# $FreeBSD: ports/www/apache13-modssl/files/rcng.sh,v 1.6 2008/05/12 11:40:28 dinoex Exp $ - -# PROVIDE: apache -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown - -# Define these apache_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/apache -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -apache_enable="${apache_enable-NO}" -apache_flags=${apache_flags-"-DSSL"} -apache_pidfile="/var/run/httpd.pid" - -. %%RC_SUBR%% - -name="apache" -rcvar=`set_rcvar` -command="%%PREFIX%%/sbin/httpd" - -load_rc_config $name - -pidfile="${apache_pidfile}" -start_precmd="`/usr/bin/limits -e -U www`" - -run_rc_command "$1" --- apache+mod_ssl-1.3.41+2.8.31_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: