Date: Fri, 18 May 2007 10:02:19 +0300 From: Vasil Dimov <vd@freebsd.org> To: freebsd-x11@freebsd.org Subject: mergebase.sh and periodic.conf Message-ID: <20070518070219.GA24032@polejan.hw.v5d.org>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
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}
--
Vasil Dimov
moc.elcaro@vomid.lisav Software Developer @ Oracle/Innobase Oy
gro.DSBeerF@dv Committer @ FreeBSD.org
gro.d5v@dv Home @ Sofia, Bulgaria
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
iD8DBQFGTU96Fw6SP/bBpCARAs2nAJ9QTIr+lE16owAkhbs8HwNJoWVX0wCcDLtE
EbJyBLv7MOdabgHMFO0iMnk=
=8fwk
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070518070219.GA24032>