From owner-freebsd-www@FreeBSD.ORG Sun Aug 19 12:03:01 2012 Return-Path: Delivered-To: freebsd-www@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF755106564A for ; Sun, 19 Aug 2012 12:03:01 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id 693918FC0A for ; Sun, 19 Aug 2012 12:03:01 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 44CF314E7F54; Sun, 19 Aug 2012 13:53:13 +0200 (CEST) X-Virus-Scanned: amavisd-new at server.mypc.hu Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id TtM4Vx0P_i6q; Sun, 19 Aug 2012 13:53:06 +0200 (CEST) Received: from [192.168.1.101] (D94162B4.catv.pool.telekom.hu [217.65.98.180]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id 93A5714E7C30; Sun, 19 Aug 2012 13:53:06 +0200 (CEST) Message-ID: <5030D3A1.1040804@FreeBSD.org> Date: Sun, 19 Aug 2012 13:53:05 +0200 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:13.0) Gecko/20120614 Thunderbird/13.0.1 MIME-Version: 1.0 To: "Bjoern A. Zeeb" References: <20120812172415.GB1301@glenbarber.us> In-Reply-To: X-Enigmail-Version: 1.4.3 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-www@freebsd.org Subject: Re: [Request for Review] Where to put SA texts and patches? X-BeenThere: freebsd-www@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD Project Webmasters List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Aug 2012 12:03:01 -0000 Em 19-08-2012 13:35, Bjoern A. Zeeb escreveu: > > This patch starts to install the the texts and patches to > data/security/{advisories,patches}/ and is custom Makefile > logic in two places. > > http://people.freebsd.org/~bz/20120818-01-dsvn-security.diff > +_FILES!= cd ${DATADIR} && ${FIND} . -type f > [...] > +.for f in ${_FILES} > + ${INSTALL_WEB} ${DATADIR}/${f} ${DOCINSTALLDIR}/${f:H}/ > +.endfor What if you do DATA!= cd ${DATADIR} && ${FIND} . -type f? I think it should work without extra code. > +# Things that went wrong in the past and had to be fixed. > +# Source Target > +FIXUPLINKS= > +FIXUPLINKS+= SA-04:04/tcp47.patch tcp47.patch > +FIXUPLINKS+= SA-04:04/tcp47.patch.asc tcp47.patch.asc > +FIXUPLINKS+= SA-04:04/tcp52.patch tcp52.patch > +FIXUPLINKS+= SA-04:04/tcp52.patch.asc tcp52.patch.asc > +FIXUPLINKS+= SA-10:05 SA-10-05 > +FIXUPLINKS+= SA-04:09/kadmin.patch SA-04:09/kadmind.patch Would you mind generalizing this and moving the code to share/mk? I think having support for general symlinks is a useful feature. And personally, I would call it simply SYMLINKS since using them is not necessarily bad. > +afterinstall: > +.if defined(DATADIR) && !empty(DATADIR) > + @${ECHO_CMD} "===> ${DATADIR} -> ${DOCINSTALLDIR}" > + @${INSTALL} -o ${WEBOWN} -g ${WEBGRP} -m ${WEBDIRMODE} -d ${DOCINSTALLDIR} > +.for d in ${_DIRS} > + @${INSTALL} -o ${WEBOWN} -g ${WEBGRP} -m ${WEBDIRMODE} -d ${DOCINSTALLDIR}/${d} > +.endfor > +.for f in ${_FILES} > + ${INSTALL_WEB} ${DATADIR}/${f} ${DOCINSTALLDIR}/${f:H}/ > +.endfor I think installing regular files should better be done in install, and afterinstall should be used for symlinks and such additional steps. Anyway, I think your solution is quite clean and simple. Gabor