Date: Sun, 22 Jan 2006 17:08:30 GMT From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92161: [maintainer] net/phpldapadmin -- an @unexec rmdir that got away Message-ID: <200601221708.k0MH8UuR002177@happy-idiot-talk.infracaninophile.co.uk> Resent-Message-ID: <200601221710.k0MHA2U8015419@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601221708.k0MH8UuR002177>