mergebase.sh and periodic.conf

[Vasil Dimov]

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 at vomid.lisav        Software Developer @ Oracle/Innobase Oy
gro.DSBeerF at dv                Committer @ FreeBSD.org
gro.d5v at dv                    Home @ Sofia, Bulgaria
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 155 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-x11/attachments/20070518/d63a0d8e/attachment.pgp