Release 1.4.2

VERSION

@@ -1 +1 @@
-VERSION = 1.4.1
+VERSION = 1.4.2

autodist

@@ -5,7 +5,7 @@
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=1.4.1
+VERSION=1.4.2
 me=(${0##*/} $VERSION "Tue Jan 26 2016")
 exec 3>`readlink /proc/self/fd/0`
 

autodist-inspect

@@ -28,7 +28,7 @@ echo -e "\n=== distdb: ==="
 grep -i $checkpkg ${LOCAL_REPS_BASE_DIR}/base/distdb
 echo -e "\n=== legacy: ==="
 grep -i $checkpkg ${LOCAL_REPS_BASE_DIR}/base/legacy
-for repo in base devel-makedist devel-autodist devel-misc; do
+for repo in base devel-makedist devel-autodist devel-misc devel-future; do
    echo -e "\n=== ${repo}: ==="
    ls ${LOCAL_REPS_BASE_DIR}/${repo}/SRPMS.base/*$checkpkg* 2>/dev/null
    ls ${LOCAL_REPS_BASE_DIR}/${repo}/RPMS.*/*$checkpkg* 2>/dev/null

autoport

@@ -4,7 +4,7 @@
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=1.4.1
+VERSION=1.4.2
 
 BASE_REPOSITORY=base
 PORT_REPOSITORY=base

repology-openmamba.py

@@ -1,18 +1,22 @@
 #!/usr/bin/python3
 #
 # repology-openmamba.py - find upstream packages updates from repology.org
-# Copyright (c) 2021 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2021-2024 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 
-import json, urllib.request, time, sys
+import json
+import rpm
+import sys
+import time
+import urllib.request
 
 
-with open("/var/ftp/pub/openmamba/devel/legacy") as f:
+with open("/var/ftp/pub/openmamba/base/legacy") as f:
     legacy_packages = f.read().splitlines()
 
-with open("/var/ftp/pub/openmamba/devel/ignore") as f:
+with open("/var/ftp/pub/openmamba/base/updates-conf.json") as f:
     data = json.loads(f.read())
-    ignored_packages = data["repology"]
+    ignored_packages = data["repology"]["ignore"]
 
 from_package = ""
 last_from_package = "NONE"

webbuild/webbuild-cgi

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # webbuild cgi script
-# Copyright (c) 2012-2023 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2012-2024 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 . /usr/share/autodist/webbuild-functions
 . /usr/share/autodist/webbuild-functions-private
@@ -400,7 +400,7 @@ if [ "$REQUEST" = "refresh" -o "$REQUEST" = "refreshjobs" ]; then
       NOTIFIED=
       if [ "${ORIGRETCODE: -1}" == "+" ]; then
          NOTIFIED=1
-         RETCODE="${ORIGRETCODE::-1}"
+         RETCODE="${ORIGRETCODE/+*}"
       else
          RETCODE=$ORIGRETCODE
       fi

webbuild/webbuild-sudo

@@ -88,10 +88,11 @@ if [ "$MODE" = "specinfo" ]; then
       done < ${ENVPREFIX}${WORKINGHOME}/RPM/SPECS/$PACKAGE.spec
       [ "$AUTOBUILDREQ_BEGIN" -a "$AUTOBUILDREQ_END" -a ! "$AUTOBUILDREQ_UNDONE" ] || \
          echo "SPECVAR_CHECK_NOAUTOBUILDREQ=1"
-      $SUCMDPREFIX "rpmspec -P ${WORKINGHOME}/RPM/SPECS/$PACKAGE.spec > ${WORKINGHOME}/RPM/SPECS/$PACKAGE.spec.tmp 2>/dev/null"
+      # _setup: prevent %setup macro expansion
+      $SUCMDPREFIX "rpmspec -P ${WORKINGHOME}/RPM/SPECS/$PACKAGE.spec --define \"%setup _setup\" > ${WORKINGHOME}/RPM/SPECS/$PACKAGE.spec.tmp 2>/dev/null"
       if [ -e  $SPECFILE.tmp ]; then
          echo "SPECVAR_Specfile=\"$SPECFILE\""
-         BUILDDIR=`grep -m1 "^%setup.*-n " $SPECFILE.tmp | sed "s|.*-n \([^[:space:]]*\).*|\1|"`
+         BUILDDIR=`grep -m1 "^_setup.*-n " $SPECFILE.tmp | sed "s|.*-n \([^[:space:]]*\).*|\1|"`
          while read line; do
             set -- $line
             [ "$1" = "%package" -o "$1" = "%description" ] && break