Date: Fri, 18 May 2007 15:12:43 +0200 From: Dejan Lesjak <dejan.lesjak@ijs.si> To: freebsd-x11@freebsd.org, vd@freebsd.org Subject: Re: mergebase.sh and periodic.conf Message-ID: <200705181512.44752.dejan.lesjak@ijs.si> In-Reply-To: <20070518070219.GA24032@polejan.hw.v5d.org> References: <20070518070219.GA24032@polejan.hw.v5d.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Friday 18 of May 2007, Vasil Dimov wrote:
> Hi,
>
> After upgrading to X 7.2 (and running mergebase.sh) I get the PHP
> vulnerabilities twice in my nightly security mail. This is because
> /etc/defaults/periodic.conf reads:
>
> local_periodic="/usr/local/etc/periodic /usr/X11R6/etc/periodic"
>
> and there is this file /usr/local/etc/periodic/security/410.portaudit
> over there.
>
> /etc/periodic.conf (with corrected local_periodic) was not created by
> mergebase.sh
>
> The reason is this (this is from mergebase.sh):
>
> $ . /etc/defaults/periodic.conf && source_periodic_confs && echo
> ${local_periodic} $ echo $?
> 1
> $
>
> $ . /etc/defaults/periodic.conf && source_periodic_confs ; echo
> ${local_periodic} /usr/local/etc/periodic /usr/X11R6/etc/periodic
> $
>
> The following self-explanatory patch should be applied to
> /etc/defaults/periodic.conf:
>
> --- patch begins here ---
> --- periodic.conf.orig Fri May 18 09:36:27 2007
> +++ periodic.conf Fri May 18 09:56:25 2007
> @@ -254,7 +254,9 @@
> ;;
> *)
> sourced_files="${sourced_files}:$i:"
> - [ -r $i ] && . $i
> + if [ -r $i ] ; then
> + . $i
> + fi
> ;;
> esac
> done
> --- patch ends here ---
>
> Or mergebase.sh should be changed to
>
> . /etc/defaults/periodic.conf && source_periodic_confs ; echo
> ${local_periodic}
It has already been fixed in git repository exactly like this :-)
http://git.xbsd.org/?p=freebsd/ports.git;a=commitdiff;h=ad386ef316b531e769c9a97243455f04302278bd
so it will come in CVS. It happens when there are neither /etc/periodic.conf
nor /etc/periodic.conf.local present (see the archives of this list).
Dejan
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705181512.44752.dejan.lesjak>