From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 22 17:10:03 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 C37AC16A41F for ; Sun, 22 Jan 2006 17:10:03 +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 4992543D48 for ; Sun, 22 Jan 2006 17:10:03 +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 k0MHA2ME015420 for ; Sun, 22 Jan 2006 17:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0MHA2U8015419; Sun, 22 Jan 2006 17:10:02 GMT (envelope-from gnats) Resent-Date: Sun, 22 Jan 2006 17:10:02 GMT Resent-Message-Id: <200601221710.k0MHA2U8015419@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, Matthew Seaman Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DD9E16A41F for ; Sun, 22 Jan 2006 17:08:44 +0000 (GMT) (envelope-from m.seaman@infracaninophile.co.uk) Received: from smtp.infracaninophile.co.uk (imap.infracaninophile.co.uk [81.187.76.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 987B343D45 for ; Sun, 22 Jan 2006 17:08:42 +0000 (GMT) (envelope-from m.seaman@infracaninophile.co.uk) Received: from happy-idiot-talk.infracaninophile.co.uk (localhost [IPv6:::1]) by smtp.infracaninophile.co.uk (8.13.4/8.13.4) with ESMTP id k0MH8WXF002178 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 22 Jan 2006 17:08:32 GMT (envelope-from matthew@happy-idiot-talk.infracaninophile.co.uk) Received: (from matthew@localhost) by happy-idiot-talk.infracaninophile.co.uk (8.13.4/8.13.4/Submit) id k0MH8UuR002177; Sun, 22 Jan 2006 17:08:30 GMT (envelope-from matthew) Message-Id: <200601221708.k0MH8UuR002177@happy-idiot-talk.infracaninophile.co.uk> Date: Sun, 22 Jan 2006 17:08:30 GMT From: Matthew Seaman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/92161: [maintainer] net/phpldapadmin -- an @unexec rmdir that got away X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Matthew Seaman List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2006 17:10:04 -0000 >Number: 92161 >Category: ports >Synopsis: [maintainer] net/phpldapadmin -- an @unexec rmdir that got away >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jan 22 17:10:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Matthew Seaman >Release: FreeBSD 4.11-STABLE i386 >Organization: Infracaninophile >Environment: System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 4.11-STABLE FreeBSD 4.11-STABLE #96: Thu Dec 29 14:07:11 GMT 2005 root@happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386 >Description: Here's one that slipped through the net when Edwin purged the tree of '@unexec rmdir' type constructs in pkg-plist etc. >How-To-Repeat: >Fix: --- phpldapadmin.diff begins here --- diff -Nur /usr/ports/net/phpldapadmin/Makefile phpldapadmin/Makefile --- /usr/ports/net/phpldapadmin/Makefile Sat Jan 21 23:00:07 2006 +++ phpldapadmin/Makefile Sun Jan 22 16:58:48 2006 @@ -51,9 +51,6 @@ PLIST= ${WRKDIR}/plist PLIST_SUB+= PLADIR=${PLADIR} PLAGRP=${PLAGRP} -sedSTART= @unexec ${RMDIR} %D/%%PLADIR%% -sedEND= 2>/dev/null || true - .SILENT: pre-everything:: @@ -70,8 +67,8 @@ ${SORT} | ${SED} -e "s!^\.!%%PLADIR%%!" >${PLIST} ; \ ${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \ ${FIND} . -type d | ${SORT} -r | ${SED} \ - -e 's!^\./${CFGDIR}$$!${sedSTART}/${CFGDIR} ${sedEND}!' \ - -e 's!^\.$$!${sedSTART} ${sedEND}!' \ + -e 's!^\./${CFGDIR}$$!@dirrmtry %%PLADIR%%/${CFGDIR}!' \ + -e 's!^\.$$!@dirrmtry %%PLADIR%%!' \ -e 's!^\.!@dirrm %%PLADIR%%!' >>${PLIST} pre-install: --- phpldapadmin.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: