Release 1.5.3

Makefile

@@ -69,6 +69,7 @@ install-dirs:
 
 install-programs:
 	@$(INSTALL_SCRIPT) autodist $(DESTDIR)$(bindir)/autodist
+	@$(INSTALL_SCRIPT) autodist-cleanold $(DESTDIR)$(bindir)/autodist-cleanold
 	@$(INSTALL_SCRIPT) autodist-git $(DESTDIR)$(bindir)/autodist-git
 	@$(INSTALL_SCRIPT) autodist-inspect $(DESTDIR)$(bindir)/autodist-inspect
 	@$(INSTALL_SCRIPT) autodist-launcher $(DESTDIR)$(bindir)/autodist-launcher
@@ -103,7 +104,6 @@ install-data:
 	@$(INSTALL_SCRIPT) etc/sysconfig/autoport $(DESTDIR)$(sysconfdir)/sysconfig/autoport
 	@$(INSTALL_SCRIPT) etc/cron.hourly/60-autodist-update $(DESTDIR)$(sysconfdir)/cron.hourly/
 	@$(INSTALL_SCRIPT) etc/cron.hourly/65-autoport $(DESTDIR)$(sysconfdir)/cron.hourly/
-	@$(INSTALL_SCRIPT) etc/cron.daily/40-autodist-cleanold $(DESTDIR)$(sysconfdir)/cron.daily/
 	@$(INSTALL_SCRIPT) etc/cron.daily/45-autodist-git-sync $(DESTDIR)$(sysconfdir)/cron.daily/
 	@$(INSTALL_SCRIPT) etc/logrotate.d/webbuild $(DESTDIR)$(sysconfdir)/logrotate.d/webbuild
 	@$(INSTALL_DATA) autospec-conf $(DESTDIR)$(pck_statedir)/.autospec

VERSION

@@ -1 +1 @@
-VERSION = 1.5.2
+VERSION = 1.5.3

autodist

@@ -5,7 +5,7 @@
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=1.5.2
+VERSION=1.5.3
 me=(${0##*/} $VERSION "Tue Jan 26 2016")
 exec 3>`readlink /proc/self/fd/0`
 
@@ -863,10 +863,12 @@ function launch_pkgs_loop() {
                      [ "$WEBBUILD_URL" -a "$WEBBUILD_USER" ] && {
                         SPEC_VERSION=`grep -m1 "^Version:" $spec_dir/$pkg.spec | sed "s|Version:[[:space:]]*||"`
                         if [ "$WEBBUILD_USER_CMDLINE" ]; then
-                           curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&SECRET=$WEBBUILD_SECRET&USER_EMAIL=$WEBBUILD_EMAIL&\
+                           curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&\
+SECRET=`cgi_encodevar ${WEBBUILD_SECRET}`&USER_EMAIL=$WEBBUILD_EMAIL&\
 MESSAGE=`cgi_encodevar \"(invoked by $WEBBUILD_USER_CMDLINE) sent <b>$pkg $SPEC_VERSION-$SPEC_RELEASE</b> for ${TARGETARCH} to <b>$SEND_SERVER</b>\"`" >/dev/null
                         else
-                           curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&SECRET=$WEBBUILD_SECRET&USER_EMAIL=$WEBBUILD_EMAIL&\
+                           curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&\
+SECRET=`cgi_encodevar ${WEBBUILD_SECRET}`&USER_EMAIL=$WEBBUILD_EMAIL&\
 MESSAGE=`cgi_encodevar \"sent <b>$pkg $SPEC_VERSION-$SPEC_RELEASE</b> for ${TARGETARCH} to <b>$SEND_SERVER</b>\"`" >/dev/null
                         fi
                      }

autodist-cleanold

@@ -2,13 +2,11 @@
 [ -e /etc/autodist/config ] && . /etc/autodist/config
 [ -e /etc/sysconfig/autoport ] && . /etc/sysconfig/autoport
 
-RPMS_CTIME_OLD="+3"
-BUILD_CTIME_OLD="+3"
-SOURCES_CTIME_OLD="+7"
-SOURCES_ARCHIVES_CTIME_OLD="+7"
-SOURCES_PATCH_CTIME_OLD="+365"
-SRPMS_CTIME_OLD="+3"
-TMP_CTIME_OLD="+2"
+[ "${RPMS_CTIME_OLD}" -a "${SRPMS_CTIME_OLD}" -a "${SOURCES_CTIME_OLD}" \
+  -a "${BUILD_CTIME_OLD}" -a "${TMP_CTIME_OLD}" ] || {
+   echo "autodist-cleanold: ERROR: *_CTIME_OLD variables need to be set in config; cleaning skipped."
+   exit 0
+}
 
 function clean() {
    dir=$1

autoport

@@ -1,10 +1,10 @@
 #!/bin/bash
 # autoport -- batch cross-build tool based on autodist
-# Copyright (C) 2011-2023 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2011-2024 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=1.5.2
+VERSION=1.5.3
 
 BASE_REPOSITORY=base
 PORT_REPOSITORY=base
@@ -700,10 +700,12 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
             autoport_log ${JOB_CURRENT} port ok $tmpfile
             if [ "$WEBBUILD_URL" -a "$WEBBUILD_USER" ]; then
                if [ "$WEBBUILD_USER_CMDLINE" ]; then
-                  curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&SECRET=$WEBBUILD_SECRET&USER_EMAIL=$WEBBUILD_EMAIL&\
+                  curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&\
+SECRET=`cgi_encodevar ${WEBBUILD_SECRET}`&USER_EMAIL=$WEBBUILD_EMAIL&\
 MESSAGE=`cgi_encodevar \"(invoked by $WEBBUILD_USER_CMDLINE) ported <b>$JOB_CURRENT</b> to <b>$TARGET_ARCH</b> and sent it to <b>$SEND_REPOSITORY</b>\"`" >/dev/null
                else
-                  curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&SECRET=$WEBBUILD_SECRET&USER_EMAIL=$WEBBUILD_EMAIL&\
+                  curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&\
+SECRET=`cgi_encodevar ${WEBBUILD_SECRET}`&USER_EMAIL=$WEBBUILD_EMAIL&\
 MESSAGE=`cgi_encodevar \"ported <b>$JOB_CURRENT</b> to <b>$TARGET_ARCH</b> and sent it to <b>$SEND_REPOSITORY</b>\"`" >/dev/null
                fi
             fi

autoport-launcher

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # autoport launcher
-# (c) 2021 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# (c) 2021-2024 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 #. /etc/sysconfig/openmamba-central
 . /etc/sysconfig/autoport
@@ -17,6 +17,8 @@ i=$1
 
 [ "`uname -m`" = "x86_64" ] && HOST_IS_X86_64=1
 
+autodist-cleanold
+
 [ "${AUTOPORT_DISABLE[$i]}" -a "${AUTOPORT_DISABLE[$i]}" != "0" ] && exit 0
 
 PIDFILE=/run/autodist/autoport-launcher-${i}.pid

etc/autodist/config

@@ -26,6 +26,16 @@ AUTOPORT_IGNORE_LIST=""
 AUTODIST_REBUILDOLD_MAX=20
 AUTODIST_REBUILDOLD_FROMDATE=20090101
 #AUTODIST_GIT_SYNC=1
+
+# Variables used by autodist-cleanold
+RPMS_CTIME_OLD="+3"
+BUILD_CTIME_OLD="+3"
+SOURCES_CTIME_OLD="+7"
+SOURCES_ARCHIVES_CTIME_OLD="+7"
+SOURCES_PATCH_CTIME_OLD="+365"
+SRPMS_CTIME_OLD="+3"
+TMP_CTIME_OLD="+2"
+
 #
 # Set to disable autodist-repository and use local list
 #

webbuild/html/scripts/webbuild.js

@@ -34,7 +34,6 @@ function checkEnter(event) {
 function checkMinLength(st,len) {
    if (st.length >= len) return true;
    return false;
-   return false;
 }
 
 function suggestSpecName(url) {

webbuild/html/webbuild.html

@@ -40,7 +40,6 @@ window.onbeforeunload = function (e) {
 <link rel="stylesheet" href="/scripts/codemirror/addon/dialog/dialog.css">
 <script src="/scripts/webbuild.js"></script>
 <script type="text/javascript">
-<!--
 var user = "";
 var user_email = "";
 var secret = "";
@@ -160,16 +159,15 @@ function ajax_getvalues(request,confirm) {
        } else if (document.getElementById(nodes[i].nodeName) != undefined) {
           $("#"+nodes[i].nodeName).html(nodes[i].childNodes[0].nodeValue);
           spectext = document.getElementById("spectext");
-          if ((nodes[i].nodeName == "editor") && (spectext != undefined) && (spectext.parentNode != undefined))
-              {
-             editor = CodeMirror.fromTextArea(spectext,
-                { lineNumbers: true,
+          if ((nodes[i].nodeName == "editor") && (spectext != undefined) && (spectext.parentNode != undefined)) {
+             editor = CodeMirror.fromTextArea(spectext,{
+                  lineNumbers: true,
                   fixedGutter: true,
                   tabSize: 4,
                   indentUnit: 4,
-                  indentWithTabs: true,
-                  onChange: function() { editorChanged(); }
-                });
+                  indentWithTabs: true
+                })
+             editor.on('change', editorChanged);
              editor.setSize(null, 500);
           } else if ((nodes[i].nodeName == "output") && (document.getElementById("outputbottom") != undefined)) {
              document.getElementById("outputbottom").scrollTop = document.getElementById("outputbottom").scrollHeight;
@@ -178,7 +176,6 @@ function ajax_getvalues(request,confirm) {
           }
        }
     }
-//alert("nodes done");
     document.getElementById("webbuildform").disabled = false;
     document.getElementById("status").innerHTML = "";
   }
@@ -302,9 +299,8 @@ function ajaxFileUpload(request)
   <span id="operationpanel"></span>
  </div>
  <div style="clear:both"></div>
- </div>
   <span id="window"></span>
-</div>
+ </div>
 </form>
 </span>
 

webbuild/webbuild-cgi

@@ -204,7 +204,7 @@ if [ "$REQUEST" = "refresh" -o "$REQUEST" = "refreshsocial" -o ! "$USER" ]; then
       SID=0
       if [ ! "$FROMID" -o "$FROMID" = "0" -o "$FROMID" = "NaN" ]; then
          # Find id of last row - 25
-         if [ "$WEBBUILD_URL" -a "$USER" ]; then
+         if [ "$USER" -a "$USER" != "autodist" ]; then
             LASTID_QUERY="SELECT id FROM (SELECT id FROM social_log WHERE user!='$USER' ORDER BY id DESC LIMIT 25) sub ORDER BY id ASC LIMIT 1;"
          else
             LASTID_QUERY="SELECT id FROM (SELECT id FROM social_log WHERE target!='developers' ORDER BY id DESC LIMIT 25) sub ORDER BY id ASC LIMIT 1;"