From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 31 12:50:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 52E07606 for ; Wed, 31 Oct 2012 12:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 294788FC15; Wed, 31 Oct 2012 12:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9VCo1Rl024992; Wed, 31 Oct 2012 12:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9VCo0Ss024991; Wed, 31 Oct 2012 12:50:00 GMT (envelope-from gnats) Resent-Date: Wed, 31 Oct 2012 12:50:00 GMT Resent-Message-Id: <201210311250.q9VCo0Ss024991@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Cc: gabor@zahemszky.hu Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Rees Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ADA92366 for ; Wed, 31 Oct 2012 12:44:42 +0000 (UTC) (envelope-from crees@bayofrum.net) Received: from mk-outboundfilter-2.mail.uk.tiscali.com (mk-outboundfilter-2.mail.uk.tiscali.com [212.74.114.38]) by mx1.freebsd.org (Postfix) with ESMTP id 3959B8FC0A for ; Wed, 31 Oct 2012 12:44:41 +0000 (UTC) Received: from 212-139-242-85.dynamic.dsl.as9105.com (HELO pegasus.bayofrum.net) ([212.139.242.85]) by smtp.pipex.tiscali.co.uk with ESMTP; 31 Oct 2012 12:44:35 +0000 Received: by pegasus.bayofrum.net (Postfix, from userid 1001) id 7D2E44B253; Wed, 31 Oct 2012 12:43:47 +0000 (GMT) Message-Id: <20121031124347.7D2E44B253@pegasus.bayofrum.net> Date: Wed, 31 Oct 2012 12:43:47 +0000 (GMT) From: Chris Rees To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 X-GNATS-Notify: gabor@zahemszky.hu Subject: ports/173238: [PATCH] Stop www/owncloud clobbering customisations X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Chris Rees List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2012 12:50:01 -0000 >Number: 173238 >Category: ports >Synopsis: [PATCH] Stop www/owncloud clobbering customisations >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Oct 31 12:50:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Chris Rees >Release: FreeBSD 9.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD pegasus.bayofrum.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Sun Apr 29 12:29:02 BST 2012 root@pegasus.bayofrum.net:/usr/obj/usr/src/sys/PEGASUS amd64 >Description: www/owncloud uses an incorrect method to build its plist, such that on first install, the plist is correct, but once it has been installed again it also includes all files under ${WWWDIR}, including a carefully hand-crafted config.php.... >How-To-Repeat: >Fix: The correct way to build a plist when this install method is used is to use WRKSRC. An UPDATING note and probably a heads-up on ports@ would be nice to warn people to backup before upgrading so they don't lose their config files! --- owncloud-noclobber.diff begins here --- Index: Makefile =================================================================== --- Makefile (revision 306739) +++ Makefile (working copy) @@ -30,9 +30,11 @@ post-install: @${CAT} ${PKGMESSAGE} - @${FIND} -s -d ${WWWDIR} -type f -print | \ - ${SED} -e "s#${PREFIX}/##g" >> ${TMPPLIST} - @${FIND} -s -d ${WWWDIR} -type d -print | \ - ${SED} -E -e "s#${PREFIX}/#@dirrm #g" >> ${TMPPLIST} + @cd ${WRKSRC} && \ + ${FIND} -s -d . -type f -print | \ + ${SED} -e "s#^\.#${WWWDIR_REL}#" >> ${TMPPLIST} + @cd ${WRKSRC} && \ + ${FIND} -s -d . -type d -print | \ + ${SED} -e "s#^\.#@dirrm ${WWWDIR_REL}#" >> ${TMPPLIST} .include --- owncloud-noclobber.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: