From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 20 18:20:08 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3115A16A41F for ; Fri, 20 Jan 2006 18:20:08 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AC2743D45 for ; Fri, 20 Jan 2006 18:20:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k0KIK6eg027333 for ; Fri, 20 Jan 2006 18:20:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0KIK61a027332; Fri, 20 Jan 2006 18:20:06 GMT (envelope-from gnats) Resent-Date: Fri, 20 Jan 2006 18:20:06 GMT Resent-Message-Id: <200601201820.k0KIK61a027332@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, Marcus Alves Grando Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 542F916A420 for ; Fri, 20 Jan 2006 18:16:14 +0000 (GMT) (envelope-from root@marcus.grupos.com.br) Received: from mail.grupos.com.br (mail.grupos.com.br [200.203.183.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF29E43D68 for ; Fri, 20 Jan 2006 18:16:10 +0000 (GMT) (envelope-from root@marcus.grupos.com.br) Received: from corp.grupos.com.br (unknown [200.102.2.99]) by mail.grupos.com.br (Postfix) with ESMTP id 9E17821258; Fri, 20 Jan 2006 16:16:09 -0200 (BRST) Received: from marcus.grupos.com.br (marcus.grupos.com.br [192.168.10.10]) by corp.grupos.com.br (Postfix) with ESMTP id 311CE551F; Fri, 20 Jan 2006 16:16:09 -0200 (BRST) Received: by marcus.grupos.com.br (Postfix, from userid 0) id 07D8324; Fri, 20 Jan 2006 16:16:08 -0200 (BRST) Message-Id: <20060120181609.07D8324@marcus.grupos.com.br> Date: Fri, 20 Jan 2006 16:16:08 -0200 (BRST) From: Marcus Alves Grando To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: hendrik@scholz.net Subject: ports/92069: Update port: www/lighttpf to 1.4.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Marcus Alves Grando List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2006 18:20:08 -0000 >Number: 92069 >Category: ports >Synopsis: Update port: www/lighttpf to 1.4.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jan 20 18:20:06 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Marcus Alves Grando >Release: FreeBSD 6.0-STABLE i386 >Organization: Grupos Internet S/A >Environment: System: FreeBSD marcus.grupos.com.br 6.0-STABLE FreeBSD 6.0-STABLE #8: Fri Jan 20 09:55:26 BRST 2006 root@marcus.grupos.com.br:/usr/obj/usr/src/sys/MARCUS i386 >Description: Update to 1.4.9 Reflect REQUIRE in rc.d if use OPENLDAP or MYSQL Reorganize Makefile and rc.d script Tinderbox test: http://marcus.grupos.com.br:8080/logs/4-STABLE-FreeBSD/lighttpd-1.4.9.log http://marcus.grupos.com.br:8080/logs/6-STABLE-FreeBSD/lighttpd-1.4.9.log >How-To-Repeat: >Fix: --- lighttpd.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/www/lighttpd/Makefile,v retrieving revision 1.33 diff -u -r1.33 Makefile --- Makefile 4 Jan 2006 23:40:57 -0000 1.33 +++ Makefile 19 Jan 2006 14:35:14 -0000 @@ -6,8 +6,7 @@ # PORTNAME= lighttpd -PORTVERSION= 1.4.8 -PORTREVISION= 1 +PORTVERSION= 1.4.9 CATEGORIES= www MASTER_SITES= http://www.lighttpd.net/download/ \ http://dl.fkb.wormulon.net/lighttpd/ \ @@ -18,12 +17,13 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre +USE_REINPLACE= yes +GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf:259 libtool:15 -USE_REINPLACE= yes -USE_RC_SUBR= lighttpd.sh -USE_GNOME= lthack +USE_GNOME= lthack +USE_RC_SUBR= lighttpd.sh +CONFIGURE_ARGS= --libdir=${PREFIX}/lib/lighttpd CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --libdir=${PREFIX}/lib/lighttpd MAN1= lighttpd.1 spawn-fcgi.1 @@ -35,6 +35,9 @@ .include +# Default REQUIRE to rc.d script +_REQUIRE= DEAMON + .if !defined(WITHOUT_OPENSSL) .include "${PORTSDIR}/Mk/bsd.openssl.mk" CONFIGURE_ARGS+= --with-openssl \ @@ -43,13 +46,15 @@ .endif .if defined(WITH_OPENLDAP) -USE_OPENLDAP= yes +USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap +_REQUIRE+= slapd .endif .if defined(WITH_MYSQL) -USE_MYSQL= yes +USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql +_REQUIRE+= mysql .endif .if defined(WITHOUT_IPV6) @@ -62,6 +67,8 @@ CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L/${LOCALBASE}/lib .endif +SUB_LIST+= REQUIRE="${_REQUIRE}" + post-install: @${INSTALL_DATA} ${FILESDIR}/lighttpd.conf.sample ${PREFIX}/etc .if !exists(${PREFIX}/etc/lighttpd.conf) Index: distinfo =================================================================== RCS file: /home/pcvs/ports/www/lighttpd/distinfo,v retrieving revision 1.24 diff -u -r1.24 distinfo --- distinfo 29 Nov 2005 10:40:14 -0000 1.24 +++ distinfo 19 Jan 2006 14:35:14 -0000 @@ -1,3 +1,3 @@ -MD5 (lighttpd-1.4.8.tar.gz) = 7d7790ef95ff5755f73bfcda4f13696d -SHA256 (lighttpd-1.4.8.tar.gz) = f3115cb4b9f9805c9a9e7d6cdc97512adaaebde01a84122fcbd1c0ca16bc2d69 -SIZE (lighttpd-1.4.8.tar.gz) = 769111 +MD5 (lighttpd-1.4.9.tar.gz) = 20a171774a0615069de3704db52483aa +SHA256 (lighttpd-1.4.9.tar.gz) = 7603b5eb204a84f654c66e5582197e4810df71175a3be11ecfc8675307d043a9 +SIZE (lighttpd-1.4.9.tar.gz) = 775524 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/www/lighttpd/pkg-plist,v retrieving revision 1.10 diff -u -r1.10 pkg-plist --- pkg-plist 10 Oct 2005 18:01:50 -0000 1.10 +++ pkg-plist 19 Jan 2006 14:35:14 -0000 @@ -11,6 +11,7 @@ lib/lighttpd/mod_cml.so lib/lighttpd/mod_compress.so lib/lighttpd/mod_dirlisting.so +lib/lighttpd/mod_evasive.so lib/lighttpd/mod_evhost.so lib/lighttpd/mod_expire.so lib/lighttpd/mod_fastcgi.so Index: files/lighttpd.sh.in =================================================================== RCS file: /home/pcvs/ports/www/lighttpd/files/lighttpd.sh.in,v retrieving revision 1.1 diff -u -r1.1 lighttpd.sh.in --- files/lighttpd.sh.in 29 Aug 2005 10:13:32 -0000 1.1 +++ files/lighttpd.sh.in 19 Jan 2006 14:35:14 -0000 @@ -2,42 +2,38 @@ # # $FreeBSD: ports/www/lighttpd/files/lighttpd.sh.in,v 1.1 2005/08/29 10:13:32 garga Exp $ # - # PROVIDE: lighttpd -# REQUIRE: DAEMON +# REQUIRE: %%REQUIRE%% # BEFORE: LOGIN # KEYWORD: FreeBSD shutdown - # # Add the following lines to /etc/rc.conf to enable lighttpd: # -#lighttpd_enable="YES" -# -# See lighttpd(1) for manual +# lighttpd_enable (bool): Set it to "YES" to enable lighttpd +# Default is "NO". +# lighttpd_conf (path): Set full path to config file. +# Default is "%%PREFIX%%/etc/lighttpd.conf". # . %%RC_SUBR%% -name=lighttpd +name="lighttpd" rcvar=`set_rcvar` +load_rc_config $name + +: ${lighttpd_enable="NO"} +: ${lighttpd_conf="%%PREFIX%%/etc/lighttpd.conf"} + command=%%PREFIX%%/sbin/lighttpd +command_args="-f ${lighttpd_conf}" pidfile=/var/run/lighttpd.pid required_files=${lighttpd_conf} - stop_postcmd=stop_postcmd stop_postcmd() { - rm -f $pidfile + rm -f ${pidfile} } -# set defaults - -lighttpd_enable=${lighttpd_enable:-"NO"} -lighttpd_conf=${lighttpd_conf:-"%%PREFIX%%/etc/lighttpd.conf"} - -load_rc_config $name - -command_args="-f ${lighttpd_conf}" run_rc_command "$1" --- lighttpd.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: