On Sun, Feb 09, 2020 at 04:33:13PM +0100, Ingo Schwarze wrote:
>
> this is absolutely not OK.
> 
> How did you test this?

I changed weekly directly on the remote machine to detect and narrow 
down the issue and generated the diff later on my local machine source
tree. 

>    $ doas cat /var/log/weekly.part  
>   /etc/weekly[79]: no closing quote

Hah! Thanks for spotting this! Below the correct diff.
OK? 

FYI, this effectively reverts Revision 1.9 committed by mickey about 20
years ago.

> > Note, this might break existing setups, where one has set TMPDIR in
> > /etc/weekly.local to point elsewhere.  This might be handled with a
> > -current upgrade entry?

Please find below another possible diff for current.html
OK?


Index: etc/weekly
===================================================================
RCS file: /cvs/src/etc/weekly,v
retrieving revision 1.29
diff -u -p -r1.29 weekly
--- etc/weekly  30 Dec 2019 16:49:51 -0000      1.29
+++ etc/weekly  9 Feb 2020 19:51:31 -0000
@@ -48,7 +48,7 @@ if [ -f /var/db/locate.database ]; then
        if TMP=`mktemp /var/db/locate.database.XXXXXXXXXX`; then
                trap 'rm -f $TMP; exit 1' 0 1 15
                UPDATEDB="/usr/libexec/locate.updatedb"
-               echo "${UPDATEDB} --fcodes=- --tmpdir=${TMPDIR:-/tmp}" | \
+               echo "${UPDATEDB} --fcodes=-" | \
                    nice -5 su -m nobody 1>$TMP
                if [ $? -ne 0 ]; then
                        echo "Rebuilding locate database failed"





Index: faq/current.html
===================================================================
RCS file: /cvs/www/faq/current.html,v
retrieving revision 1.1025
diff -u -p -r1.1025 current.html
--- faq/current.html    8 Feb 2020 10:19:11 -0000       1.1025
+++ faq/current.html    9 Feb 2020 19:51:35 -0000
@@ -205,8 +205,17 @@ Old binaries should be deleted and scrip
 adapted.
 
 <pre class="cmdbox">
-# <b>rm -f /usr/sbin/{dig,host,nslookup}
+# <b>rm -f /usr/sbin/{dig,host,nslookup}</b>
 </pre>
+
+
+<h3 id="r20200209">2020/02/09 - /etc/weekly locate.updatedb TMPDIR</h3>
+
+<code>TMPDIR</code> is no longer propagated for <code>locate.updatedb</code> 
+in <a href="https://man.openbsd.org/weekly.8";>weekly(8)</a>.
+Custom <code>TMPDIR</code> values for <code>locate.updatedb</code> set in 
+root crontab or <code>/etc/weekly.local</code> should be moved into
+<code>/etc/locate.rc</code>.
 
 
 <!--

Reply via email to