Release 1.6.1

webbuild-sudo: parse %setup macro to retrieve build dir with rpm 5.20

Makefile

@@ -1,34 +1,34 @@
 # Makefile for autodist
-# Copyright (C) 2006-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2006-2021 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 PACKAGE = autodist
 
 include VERSION
 
-prefix = /usr
-exec_prefix = ${prefix}
-sysconfdir = /etc
-sbindir = ${exec_prefix}/sbin
-bindir = ${exec_prefix}/bin
-datadir = ${prefix}/share
-initrddir = ${sysconfdir}/rc.d/init.d
-libexecdir = ${prefix}/libexec
-mandir = ${prefix}/usr/share/man
-sysconfigdir= ${sysconfdir}/sysconfig
-configdir = ${sysconfdir}/autodist
-localstatedir= /var
-piddir= ${localstatedir}/run/autodist
-cgidir = ${localstatedir}/www/cgi-bin
-htmldir = ${localstatedir}/www/html
+prefix := /usr
+exec_prefix := ${prefix}
+sysconfdir := /etc
+sbindir := ${exec_prefix}/sbin
+bindir := ${exec_prefix}/bin
+datadir := ${prefix}/share
+unitdir := ${prefix}/lib/systemd/system
+libexecdir := ${prefix}/libexec
+mandir := ${prefix}/usr/share/man
+sysconfigdir := ${sysconfdir}/sysconfig
+configdir := ${sysconfdir}/autodist
+localstatedir := /var
+piddir := /run/autodist
+cgidir := ${localstatedir}/www/cgi-bin
+htmldir := ${localstatedir}/www/html
 
 srcdir = .
 DESTDIR =
 
-INSTALL = /usr/bin/install
-INSTALL_PROGRAM = ${INSTALL} -m 755
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_DIR = ${INSTALL} -d -m 755
-INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+INSTALL := /usr/bin/install
+INSTALL_PROGRAM := ${INSTALL} -m 755
+INSTALL_DATA := ${INSTALL} -m 644
+INSTALL_DIR := ${INSTALL} -d -m 755
+INSTALL_SCRIPT := ${INSTALL_PROGRAM}
 
 pck_datadir = $(datadir)/$(PACKAGE)
 pck_statedir = $(localstatedir)/$(PACKAGE)
@@ -52,6 +52,7 @@ install-dirs:
 	@$(INSTALL_DIR) $(DESTDIR)$(sbindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(cgidir)
 	@$(INSTALL_DIR) $(DESTDIR)$(htmldir)
+	@$(INSTALL_DIR) $(DESTDIR)$(unitdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(pck_datadir)
 	@$(INSTALL_DIR) $(DESTDIR)$(pck_statedir)
 	@$(INSTALL_DIR) $(DESTDIR)$(pck_statedir)/template/autoupdate/spec-patches-build/old
@@ -61,20 +62,25 @@ install-dirs:
 	@$(INSTALL_DIR) $(DESTDIR)$(pck_logdir)/build/{ok,failed}
 	@$(INSTALL_DIR) $(DESTDIR)$(pck_logdir)/install/{ok,failed}
 	@$(INSTALL_DIR) $(DESTDIR)$(pck_logdir)/send/{ok,failed}
-	@$(INSTALL_DIR) $(DESTDIR)$(pck_statedir)/RPM/{SPECS,SRPMS,BUILD,SOURCES,RPMS/{noarch,i586,ppc,x86_64,arm}}
-	@$(INSTALL_DIR) $(DESTDIR)$(piddir)
+	@$(INSTALL_DIR) $(DESTDIR)$(pck_statedir)/RPM/{SPECS,SRPMS,BUILD,SOURCES,RPMS/{noarch,i586,x86_64,arm,aarch64}}
 	@$(INSTALL_DIR) $(DESTDIR)$(libexecdir)
-	@$(INSTALL_DIR) $(DESTDIR)$(localstatedir)/webbuild/{cache,home,notes,tmp,users}
+	@$(INSTALL_DIR) $(DESTDIR)$(localstatedir)/webbuild/{cache,home,notes,tmp,users,uploads}
+	@$(INSTALL_DIR) $(DESTDIR)$(prefix)/lib/tmpfiles.d/
 
 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
+	@$(INSTALL_SCRIPT) autodist-repository $(DESTDIR)$(bindir)/autodist-repository
 	@$(INSTALL_SCRIPT) autodist-tool $(DESTDIR)$(bindir)/autodist-tool
+	@$(INSTALL_SCRIPT) autodist-upstream-updates $(DESTDIR)$(bindir)/autodist-upstream-updates
 	@$(INSTALL_SCRIPT) autoport $(DESTDIR)$(bindir)/autoport
-	@$(INSTALL_SCRIPT) automaint $(DESTDIR)$(sbindir)/automaint
-	@$(INSTALL_SCRIPT) autoport-chroot $(DESTDIR)$(sbindir)/autoport-chroot
-	@$(INSTALL_SCRIPT) autodist-repository $(DESTDIR)$(sbindir)/autodist-repository
-	@$(INSTALL_SCRIPT) autodist-upstream-updates $(DESTDIR)$(sbindir)/autodist-upstream-updates
+	@$(INSTALL_SCRIPT) autoport-chroot $(DESTDIR)$(bindir)/autoport-chroot
 	@$(INSTALL_SCRIPT) autoport-fix-environment $(DESTDIR)$(bindir)/autoport-fix-environment
+	@$(INSTALL_SCRIPT) autoport-launcher $(DESTDIR)$(bindir)/autoport-launcher
+	@$(INSTALL_SCRIPT) automaint $(DESTDIR)$(bindir)/automaint
 	@$(INSTALL_SCRIPT) etc/autodist/scripts/* $(DESTDIR)$(configdir)/scripts/
 	@$(INSTALL_SCRIPT) autodist-cgi $(DESTDIR)$(cgidir)/autodist
 	@$(INSTALL_SCRIPT) webbuild/webbuild-cgi $(DESTDIR)$(cgidir)/webbuild
@@ -82,22 +88,14 @@ install-programs:
 	@$(INSTALL_SCRIPT) webbuild/webbuild-checkpassword $(DESTDIR)$(libexecdir)/webbuild-checkpassword
 	@$(INSTALL_SCRIPT) webbuild/webbuild-functions $(DESTDIR)$(pck_datadir)/webbuild-functions
 	@$(INSTALL_SCRIPT) webbuild/webbuild-functions-private $(DESTDIR)$(pck_datadir)/webbuild-functions-private
+	@$(INSTALL_SCRIPT) telegram/openmamba_bot.py $(DESTDIR)$(pck_datadir)/openmamba_bot.py
+	@$(INSTALL_SCRIPT) telegram/requirements.txt $(DESTDIR)$(pck_datadir)/requirements.txt
+	@$(INSTALL_SCRIPT) repology-openmamba.py $(DESTDIR)$(pck_datadir)/repology-openmamba.py
 	@cp -a webbuild/html/* $(DESTDIR)$(htmldir)
 
 install-data:
 	@$(INSTALL_DATA) etc/autodist/config $(DESTDIR)$(configdir)/config
-	@$(INSTALL_DATA) etc/autodist/distdb $(DESTDIR)$(configdir)/distdb
-	@$(INSTALL_DATA) etc/autodist/distdb.i586 $(DESTDIR)$(configdir)/distdb.i586
-	@$(INSTALL_DATA) etc/autodist/distdb.arm $(DESTDIR)$(configdir)/distdb.arm
-	@$(INSTALL_DATA) etc/autodist/distdb.x86_64 $(DESTDIR)$(configdir)/distdb.x86_64
-	@$(INSTALL_DATA) etc/autodist/distdb.ppc $(DESTDIR)$(configdir)/distdb.ppc
-	@$(INSTALL_DATA) etc/autodist/legacy $(DESTDIR)$(configdir)/legacy
-	@$(INSTALL_DATA) etc/autodist/unstage $(DESTDIR)$(configdir)/unstage
-	@$(INSTALL_DATA) etc/autodist/unstage.i586 $(DESTDIR)$(configdir)/unstage.i586
-	@$(INSTALL_DATA) etc/autodist/unstage.arm $(DESTDIR)$(configdir)/unstage.arm
-	@$(INSTALL_DATA) etc/autodist/unstage.x86_64 $(DESTDIR)$(configdir)/unstage.x86_64
-	@$(INSTALL_DATA) etc/autodist/unstage.ppc $(DESTDIR)$(configdir)/unstage.ppc
-	@$(INSTALL_DATA) etc/autodist/distdb.d/*.db $(DESTDIR)$(configdir)/distdb.d/
+	@$(INSTALL_DATA) etc/autodist/config-git $(DESTDIR)$(configdir)/config-git
 	@$(INSTALL_DATA) etc/autodist/blacklist $(DESTDIR)$(configdir)/blacklist
 	@$(INSTALL_DATA) etc/autodist/distdb.d/* $(DESTDIR)$(configdir)/distdb.d/
 	@$(INSTALL_DATA) etc/sudoers.d/autoport $(DESTDIR)$(sysconfdir)/sudoers.d/autoport
@@ -105,14 +103,14 @@ install-data:
 	@$(INSTALL_DATA) webbuild/webbuild-admin $(DESTDIR)$(localstatedir)/webbuild/users/admin.conf
 	@$(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-native $(DESTDIR)$(sysconfdir)/cron.hourly/
-	@$(INSTALL_SCRIPT) etc/cron.hourly/66-autoport-chroot $(DESTDIR)$(sysconfdir)/cron.hourly/
-	@$(INSTALL_SCRIPT) etc/cron.daily/40-autodist-cleanold $(DESTDIR)$(sysconfdir)/cron.daily/
-	@$(INSTALL_SCRIPT) etc/cron.daily/40-autodist-upstream-updates $(DESTDIR)$(sysconfdir)/cron.daily/
+	@$(INSTALL_SCRIPT) etc/cron.hourly/65-autoport $(DESTDIR)$(sysconfdir)/cron.hourly/
+	@$(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
 	@$(INSTALL_DATA) autodist-bashrc $(DESTDIR)$(pck_statedir)/.bashrc
 	@$(INSTALL_DATA) autodist-bash_profile $(DESTDIR)$(pck_statedir)/.bash_profile
+	@$(INSTALL_DATA) autodist-tmpfilesd $(DESTDIR)$(prefix)/lib/tmpfiles.d/autodist.conf
+	@$(INSTALL_DATA) telegram/openmambabot.service $(DESTDIR)$(unitdir)/openmambabot.service
 	@touch $(DESTDIR)$(pck_statedir)/template/autoupdate/auto.success
 	@touch $(DESTDIR)$(pck_statedir)/template/autoupdate/auto.skip
 

VERSION

@@ -1 +1 @@
-VERSION = 0.9.10
+VERSION = 1.6.1

autodist

@@ -1,24 +1,24 @@
 #!/bin/bash
 #
 # Autodist -- batch build tool for RPM based distributions
-# Copyright (C) 2006-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2006-2016 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=0.9.10
-me=(${0##*/} $VERSION "Sat Aug 20 2010")
+VERSION=1.6.1
+me=(${0##*/} $VERSION "Tue Jan 26 2016")
 exec 3>`readlink /proc/self/fd/0`
 
 function usage() {
    echo "\
 ${me[0]} ${me[1]}
-"$"Copyright (C) 2006-2012 Silvan Calarco <silvan.calarco@mambasoft.it>""
+"$"Copyright (C) 2006-2016 Silvan Calarco <silvan.calarco@mambasoft.it>""
 "$"Released under the terms of the GNU GPL v3 license"
    echo "
 "$"Batch build tool for bulding a whole distribution and much more.""
 
 "$"Usage"":
-   $me [operations ...] [options ...] [job ...] [-- autospec_args]
+   $me [operations ...] [options ...] [job ...] [-- autospec_args] [--- script_args]
 
 "$"Operations"":
    -a,--autobuild     "$"Start batch build operations (implies -p -u -b -s --severity 1)""
@@ -40,38 +40,37 @@ ${me[0]} ${me[1]}
    -v,--verbose       "$"Be verbose""
    --force            "$"Pass force parameter to autospec""
    --repository       "$"Pass given repository as base for operations""
+   --repository-strict "$"Only prepare packages from base repository specified with --repository""
    --server num       "$"Pass given server number to autospec for send operation""
    --severity num     "$"Error handling level:
-                            0: don't stop (default)
-                            1: skip current job on error
+                            0: don't stop
+                            1: skip current job on error (default)
                             2: abort on error""
    --arch             "$"Build packages for specified target architecture""
    --user user        "$"Pass calling user name for Webbuild social messages""
+   --rebuild-srpms    "$"Rebuild SRPMs when sending""
 
    job                "$"Job specification in the form pkg#version, job#version, job/pkg#version, examples:
                             glibc#2.11.1
                             kernel-extra
                             kernel-packages/lirc""
    autospec_args      "$"Send specified arguments to autospec""
+   script_args        "$"Send specified arguments to update-specfile script""
 "
 
 }
 
-function fetch_repository_list() {
-   local REPOLIST=$1
-
-   if [ -r ${LOCAL_REPS_BASE_DIR}/$REPOLIST ]; then
-      echo ${LOCAL_REPS_BASE_DIR}/$REPOLIST
+function fetch_repository_file() {
+   local REPOFILE=$1
+   if [ -r ${LOCAL_REPS_BASE_DIR}/$REPOFILE ]; then
+      echo ${LOCAL_REPS_BASE_DIR}/$REPOFILE
       return 0
    else
-      if [ ! -r $USERCONFDIR/$REPOLIST -o "`find $USERCONFDIR/$REPOLIST -mmin +60 2>/dev/null`" ]; then
-         mkdir -p `dirname $USERCONFDIR/$REPOLIST`
-         curl -s $REPS_BASE_URL/$REPOLIST -o $USERCONFDIR/$REPOLIST || {
-            echo "Error: unable to fetch $REPS_BASE_DIR/$REPOLIST"
-            exit 1
-         }
+      if [ ! -r $USERCONFDIR/$REPOFILE -o "`find $USERCONFDIR/$REPOFILE -mmin +60 2>/dev/null`" ]; then
+         mkdir -p `dirname $USERCONFDIR/$REPOFILE`
+         curl -f -L -s $REPS_BASE_URL/$REPOFILE -o $USERCONFDIR/$REPOFILE || return 1
       fi
-      echo $USERCONFDIR/$REPOLIST
+      echo $USERCONFDIR/$REPOFILE
       return 0
    fi
 }
@@ -95,8 +94,9 @@ BUILDARCH=`rpm --eval %{_build_cpu}`
 TARGETARCH=$BUILDARCH
 CONFIGFILE=$SYSCONFDIR/config
 SCRIPT_UPDATE_SPECFILE=$SCRIPTDIR/update-specfile
+SCRIPT_UPDATE_SPECFILE_CUSTOM=$SCRIPTDIR/update-specfile-custom
 AUTOSPEC_CMD="/usr/bin/autospec"
-PIDFILE="/var/run/autodist/autodist.pid"
+PIDFILE="/run/autodist/autodist.pid"
 
 # Configuration defaults normally overriden in configuration file
 AUTOBUILD_MAXNUM=50
@@ -123,13 +123,6 @@ for ((i=1; i<=$#; i++)); do
                       do_build=1;
                       do_send=1; 
                       SEVERITY=1
-		      [ -e $PIDFILE ] && {
-	                 PIDCHECK=`cat $PIDFILE`
-		         [ "$PIDCHECK" -a -e /proc/$PIDCHECK -a ! "$DISABLE_PID_CHECK" ] && {
-		            echo "Error: autodist -a already running with PID=$PIDCHECK.Aborting."
-		            exit 1
-		         }
-		      }
 		      ;;
       -c|--cleanlogs) do_cleanlogs=1 ;;
       -h|--help) usage 
@@ -171,6 +164,9 @@ for ((i=1; i<=$#; i++)); do
                 }
                 AUTODIST_REPOSITORY="${!i}"
                 ;;
+      --repository-strict)
+               REPOSITORY_STRICT=1
+               ;;
       --severity) let i+=1
                 [ "${!i}" ] || {
                     echo "Error: --severity parameter not given, aborting."
@@ -192,30 +188,57 @@ for ((i=1; i<=$#; i++)); do
                 }
                 WEBBUILD_USER_CMDLINE="${!i}"
                 ;;
+        --rebuild-srpms)
+                REBUILD_SRPMS=1
+                ;;
       -*) if [ "${!i}" = "--" ]; then
              AUTOSPEC_ARGS_MODE=1
+             SCRIPT_ARGS_MODE=
+          elif [ "${!i}" = "---" ]; then
+             SCRIPT_ARGS_MODE=1
+             AUTOSPEC_ARGS_MODE=
           elif [ "$AUTOSPEC_ARGS_MODE" ]; then
              AUTOSPEC_ARGS="$AUTOSPEC_ARGS ${!i}"
+          elif [ "$SCRIPT_ARGS_MODE" ]; then
+             SCRIPT_ARGS="$SCRIPT_ARGS ${!i}"
           else
              echo "ERROR: invalid option \`${!i}'; aborting."
              exit 1
           fi
           ;;
-      *) if [ "$AUTOSPEC_ARGS_MODE" != "1" ]; then
-            JOBNAME[${#JOBNAME[@]}]="${!i/\#*}"
-	       [ "${!i/*\#}" != "${!i}" ] && JOBVER[${#JOBNAME[@]}]="+${!i/*\#}"
-	 else
+      *) if [ "$AUTOSPEC_ARGS_MODE" ]; then
             if [ "${!i/ }" != "${!i}" ]; then
                # pass multiple word arguments inside quotation marks
                AUTOSPEC_ARGS="$AUTOSPEC_ARGS \"${!i}\""
             else
                AUTOSPEC_ARGS="$AUTOSPEC_ARGS ${!i}"
             fi
+         elif [ "$SCRIPT_ARGS_MODE" ]; then
+            if [ "${!i/ }" != "${!i}" ]; then
+               # pass multiple word arguments inside quotation marks
+               SCRIPT_ARGS="$SCRIPT_ARGS \"${!i}\""
+            else
+               SCRIPT_ARGS="$SCRIPT_ARGS ${!i}"
+            fi
+         else
+            JOBIDX=${#JOBNAME[@]}
+            JOBNAME[$JOBIDX]="${!i/\#*}"
+            [ "${!i/*\#}" != "${!i}" ] && JOBVER[$JOBIDX]="+${!i/*\#}"
 	 fi
          ;;
    esac
 done
 
+if [ "$do_autobuild" ]; then
+   if [ -e $PIDFILE ]; then
+      PIDCHECK=`cat $PIDFILE`
+      if [ "$PIDCHECK" -a -e /proc/$PIDCHECK -a ! "$DISABLE_PID_CHECK" ]; then
+         echo "Error: autodist -a already running with PID=$PIDCHECK.Aborting."
+         exit 0
+      fi
+   fi
+fi
+
 [ "$AUTODIST_REPOSITORY" ] || AUTODIST_REPOSITORY=devel-autodist
 [ "$SEND_SERVER" ] || SEND_SERVER=$AUTODIST_REPOSITORY
 
@@ -498,7 +521,7 @@ function launch_pkgs_loop() {
    # launch loop for each package
    for pkg in ${JOB_PKGS[*]}; do
 
-      unset LOGFILE_SUFFIX
+      unset LOGFILE_SUFFIX AUTOUPDATE_SCRIPT_ALREADY_RUN
       for a in ${JOB_VALUES[*]}; do
          tr_job=`echo $a | tr / _`
          LOGFILE_SUFFIX=${LOGFILE_SUFFIX}__$tr_job
@@ -548,8 +571,31 @@ function launch_pkgs_loop() {
 		  [ "$operation" = "update" -o "$operation" = "autoupdate" ] && continue
 	       fi
 	    fi
-            $SCRIPT_UPDATE_SPECFILE $spec_dir/$pkg.spec
-	    ;;
+            if [ -x $SCRIPT_UPDATE_SPECFILE ]; then
+               $SCRIPT_UPDATE_SPECFILE $spec_dir/$pkg.spec ${passed_arguments/ *} $SCRIPT_ARGS || {
+                  case $SEVERITY in
+                     0) ;;
+                     1) echo "%! Error: update-specfile script returned $?; skipping $pkg package."
+                        ret=1
+                        continue ;;
+                     *) echo "!! Error: update-specfile script returned $?; aborting."
+                        exit 1 ;;
+                  esac
+               }
+            fi
+            if [ -x $SCRIPT_UPDATE_SPECFILE_CUSTOM ]; then
+               $SCRIPT_UPDATE_SPECFILE_CUSTOM $spec_dir/$pkg.spec ${passed_arguments/ *} $SCRIPT_ARGS || {
+               case $SEVERITY in
+                  0) ;;
+                  1) echo "%! Error: update-specfile-custom script returned $?; skipping $pkg package."
+                     ret=1
+                     continue ;;
+                  *) echo "!! Error: update-specfile-custom script returned $?; aborting."
+                     exit 1 ;;
+               esac
+            }
+            fi
+            ;;
       esac
 
       [ -e $spec_dir/$pkg.spec ] && {
@@ -592,6 +638,15 @@ function launch_pkgs_loop() {
             if [ "$PKGLINE" ]; then
                set -- $PKGLINE
                [[ $4 =~ "^[0-9]+$" ]] && REPNAME=${AUTODIST_REPOSITORIES[$4]} || REPNAME="$4"
+               if [ "$REPNAME" != "$AUTODIST_REPOSITORY" -a "$REPOSITORY_STRICT" ]; then
+                  case $SEVERITY in
+                     0) echo "!! Warning: package comes from $REPNAME instead of $AUTODIST_REPOSITORY" ;;
+                     1) echo "!! Error: package comes from $REPNAME instead of $AUTODIST_REPOSITORY; skipping $pkg package."
+                        continue ;;
+                     *) echo "!! Error: package comes from $REPNAME instead of $AUTODIST_REPOSITORY; aborting."
+                        exit 1 ;;
+                  esac
+               fi
                if [ "$REPNAME" ]; then
                   command_opts="$command_opts --server ${REPNAME}"
                else
@@ -608,7 +663,7 @@ function launch_pkgs_loop() {
             if [ "$PKGLINE" ]; then
                set -- $PKGLINE
                pkglinever=$2
-               # warning: asasuming version is passed first
+               # warning: assuming version is passed first
                version_find_bigger "${passed_arguments/ *}" "$pkglinever"
                [ $? -eq 1 ] || {
                   echo "!! Warning: skipping ${pkg} package already up to date ($pkglinever >= ${passed_arguments/ *})."
@@ -618,6 +673,11 @@ function launch_pkgs_loop() {
                   continue
                }
             fi
+            if [ -e $source_dir/$pkg-autoupdate ]; then
+               echo "?= Running $pkg-autoupdate script with version ${passed_arguments/ *}"
+               (cd $source_dir; sh ./$pkg-autoupdate ${passed_arguments/ *} >/dev/null)
+               AUTOUPDATE_SCRIPT_ALREADY_RUN=1
+            fi
             command_opts="-a3:4" ;;
          build)
             # skip package in job if it is in the delayed repository
@@ -631,7 +691,9 @@ function launch_pkgs_loop() {
                   continue
                fi
             fi
-            command_opts="-a5:6" ;;
+            command_opts="-a5:6 -b" ;;
+         buildsrpm)
+            command_opts="-a5:6 --norpm" ;;
          buildinstall)
             # skip package in job if up to date
             if [ "$PKGLINE" -a "$BUILDSLINE" ]; then
@@ -704,7 +766,7 @@ function launch_pkgs_loop() {
          echo "Command: $command"
       else
 #         eval "$command 2>&1 && echo '0'>$tmpfile1 || echo '1'>$tmpfile1" | tail_file $tmpfile "== $pkg (${JOB_VALUES[*]})..."
-         (export LANG=C; $command 2>&1; echo $? >$tmpfile1) | tail_file $tmpfile "== $pkg (${JOB_VALUES[*]})..."
+         (export LANG=en_US.UTF-8; $command 2>&1; echo $? >$tmpfile1) | tail_file $tmpfile "== $pkg (${JOB_VALUES[*]})..."
 	 if [ -e $tmpfile1 ]; then
 	    ret=`cat $tmpfile1`
             rm -f $tmpfile1
@@ -730,20 +792,6 @@ function launch_pkgs_loop() {
 	    mv $LOGFILE_PKG $LOGDIR/failed/
             echo "?= See $LOGDIR/failed/${LOGFILE_PKG_NAME}"
             [ "$do_autobuild" ] && autobuild_log $pkg $operation $ret $JOB_NAME $LOGDIR/failed/${LOGFILE_PKG_NAME}
-	    case $operation in
-	       autoupdate|update)
-	          ;;
-	       build|buildinstall)
-	          # copy new patches to sourcesdir for sharing
-	          [ "$do_autobuild" ] && {
-	             PATCHES=`diff $spec_dir/$pkg.spec $spec_dir/.$pkg.spec.autodist.preupdate | grep "> Patch" | sed "s|.*[[:space:]]\([^[:space:]]*\)|\1|"`
-		     for p in $PATCHES; do
-		         echo "== Copying patch $p to public dir"
-		        [ -e $source_dir/$p ] && cp $source_dir/$p $SOURCESDIR/
-		     done
-		  }
-	          ;;
-	    esac
 	    [ $SEVERITY -gt 0 -a ! "$continue_on_error" ] && {
                rm -f $tmpfile
 	       return $ret
@@ -789,6 +837,11 @@ function launch_pkgs_loop() {
                              }
                         fi
                      fi
+                     if [ "$2" != "$SPEC_VERSION" -a -e $source_dir/$pkg-autoupdate -a ! "$AUTOUPDATE_SCRIPT_ALREADY_RUN" ]; then
+                        echo "?= Running $pkg-autoupdate script with version ${passed_arguments/ *}"
+                        (cd $source_dir; sh ./$pkg-autoupdate ${passed_arguments/ *} >/dev/null)
+                        AUTOUPDATE_SCRIPT_ALREADY_RUN=1
+                     fi
                   fi
                   ;;
                buildinstall|send)
@@ -810,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
                      }
@@ -846,11 +901,6 @@ function log_date() {
    echo -n `LANG=C date +%Y%m%d@%H%M%S`
 }
 
-[ -e "$DISTDB" ] || {
-   echo "ERROR: missing distdb file $DISTDB; aborting."
-   exit 1
-}
-
 [ -e $LOGBASEDIR ] || {
    mkdir -p $LOGBASEDIR/prepare/{ok,failed}
    mkdir -p $LOGBASEDIR/update/{ok,failed}
@@ -859,10 +909,24 @@ function log_date() {
    mkdir -p $LOGBASEDIR/send/{ok,failed}
 }
 
-DISTDBFILES="$DISTDB"
-[ -e $DISTDB.$TARGETARCH ] && DISTDBFILES="$DISTDBFILES $DISTDB.$TARGETARCH"
-[ -e ~/.autodist/distdb ] && DISTDBFILES="$DISTDBFILES ~/.autodist/distdb"
-[ -e ~/.autodist/distdb.$TARGETARCH ] && DISTDBFILES="$DISTDBFILES ~/.autodist/distdb.$TARGETARCH"
+#
+# Main
+#
+
+DISTDBFILES=
+
+DISTDB=`fetch_repository_file ${AUTODIST_REPOSITORY/-*}/distdb`
+[ "$DISTDB" ] && DISTDBFILES="$DISTDB"
+
+DISTDBARCH=`fetch_repository_file ${AUTODIST_REPOSITORY/-*}/distdb.$TARGETARCH`
+if [ "$DISTDBARCH" ]; then
+   DISTDBFILES="$DISTDBFILES $DISTDBARCH"
+fi
+
+if [ ! "$DISTDBFILES" ]; then
+   [ -e $SYSCONFDIR/distdb ] && DISTDBFILES="$SYSCONFDIR/distdb"
+   [ -e $SYSCONFDIR/distdb.$TARGETARCH ] && DISTDBFILES="$DISTDBFILES $SYSCONFDIR/distdb.$TARGETARCH"
+fi
 
 if [ "$do_listjobs" ]; then
    for f in $DISTDBFILES; do
@@ -920,12 +984,19 @@ SOURCESDIR=$AUTOUPDATEDIR/sources/
 SUCCESSLISTDIR=$AUTOUPDATEDIR
 SKIPPEDLISTDIR=$AUTOUPDATEDIR
 
-SRCPKGLIST=`fetch_repository_list $AUTODIST_REPOSITORY/srcpkglist`
-[ "$AUTODIST_DELAYED_REPOSITORY" ] && SRCPKGLIST_DELAYED=`fetch_repository_list $AUTODIST_DELAYED_REPOSITORY/srcpkglist`
+SRCPKGLIST=`fetch_repository_file $AUTODIST_REPOSITORY/srcpkglist`
+[ $? -eq 0 ] || echo "Warning: unable to fetch $SRCPKGLIST">&2
 
-BUILDSLIST=`fetch_repository_list distromatic/$AUTODIST_REPOSITORY/builds-$TARGETARCH`
-[ "$AUTODIST_DELAYED_REPOSITORY" ] && BUILDSLIST_DELAYED=`fetch_repository_list distromatic/$AUTODIST_DELAYED_REPOSITORY/builds-$TARGETARCH`
+[ "$AUTODIST_DELAYED_REPOSITORY" ] && SRCPKGLIST_DELAYED=`fetch_repository_file $AUTODIST_DELAYED_REPOSITORY/srcpkglist`
+[ $? -eq 0 ] || echo "Warning: unable to fetch $SRCPKGLIST_DELAYED">&2
 
+BUILDSLIST=`fetch_repository_file distromatic/$AUTODIST_REPOSITORY/builds-$TARGETARCH`
+[ "$AUTODIST_DELAYED_REPOSITORY" ] && BUILDSLIST_DELAYED=`fetch_repository_file distromatic/$AUTODIST_DELAYED_REPOSITORY/builds-$TARGETARCH`
+[ $? -eq 0 ] || echo "Warning: unable to fetch $BUILDSLIST">&2
+
+LEGACYLIST=`fetch_repository_file ${AUTODIST_REPOSITORY/-*}/legacy`
+[ "$LEGACYLIST" ] || LEGACYLIST=$SYSCONFDIR/legacy
+[ $? -eq 0 ] || echo "Warning: unable to fetch $LEGACYLIST">&2
 
 echo "%% Autodist started with PID $$ @ `LANG=C date`"
 
@@ -1053,8 +1124,8 @@ if [ "$do_autobuild" = "1" ]; then
        [ $AUTOBUILD_NUMADDED -ge $AUTOBUILD_MAXNUM ] && break
 
        # FIXME: hardcoded skipped packages
-       [ "${PKGNAME:0:5}" = "java-" -o "${PKGNAME:0:7}" = "apache-" -o \
-         "${PKGNAME:0:8}" = "jakarta-" -o "${PKGNAME:0:6}" = "compiz" ] && continue
+       #[ "${PKGNAME:0:5}" = "java-" -o "${PKGNAME:0:7}" = "apache-" -o \
+       # "${PKGNAME:0:8}" = "jakarta-" -o "${PKGNAME:0:6}" = "compiz" ] && continue
 
        if [ $BUILDDATE -ge $AUTOBUILD_DATEFROM -o $BUILDDATE -eq 0 ]; then
           AUTOBUILD_NUMADDED=`expr $AUTOBUILD_NUMADDED + 1`
@@ -1284,7 +1355,12 @@ for JOB_NUM in `seq 1 ${#JOBNAME[*]}`; do
       }
       # avoid calling autospec with --nosrpm --norpm (not working as expected and not useful)
       if [ "${AUTOSPEC_ARGS/--nosrpm}" = "$AUTOSPEC_ARGS" ]; then
-         echo "== sending source rpms"
+         if [ $REBUILD_SRPMS ]; then
+            echo "== rebuilding and sending source rpms"
+            launch_pkgs_loop buildsrpm "$AUTOSPEC_ARGS --norpm"
+         else
+            echo "== sending source rpms"
+         fi
          launch_pkgs_loop send "$AUTOSPEC_ARGS --norpm $SEND_SERVER_CMD"
          if [ $? -gt 0 ]; then
             case $SEVERITY in

autodist-cgi

@@ -10,6 +10,7 @@ SHOWLOG=`echo "$QUERY_STRING" | sed -n 's/^.*SHOWLOG=\([^&]*\).*$/\1/p' | sed "s
 SHOWINDEX=`echo "$QUERY_STRING" | sed -n 's/^.*SHOWINDEX=\([^&]*\).*$/\1/p' | sed "s/%20/ /g"`
 LINES=`echo "$QUERY_STRING" | sed -n 's/^.*LINES=\([^&]*\).*$/\1/p' | sed "s/%20/ /g"`
 FORMAT=`echo "$QUERY_STRING" | sed -n 's/^.*FORMAT=\([^&]*\).*$/\1/p' | sed "s/%20/ /g"`
+FULL=`echo "$QUERY_STRING" | sed -n 's/^.*FULL=\([^&]*\).*$/\1/p' | sed "s/%20/ /g"`
 
 function resolve_logname() {
    local l=$1
@@ -77,7 +78,7 @@ fi
 [ ! "$SHOWLOG" -a "$HOST" = "$AS_HOST" ] && echo "<h2>Host: `hostname -s` (`uname -m`, kernel `uname -r`)</h2>"
 
 if [ "$SHOWLOG" -a "$HOST" != "$AS_HOST" ]; then
-   curl "${AUTOPORT_CGI_HOST[$HOST]}?AS_HOST=$HOST&SHOWLOG=$SHOWLOG&NUM=$NUM&REP=$REP&LOG=$LOG" 2>/dev/null
+   curl "${AUTOPORT_CGI_HOST[$HOST]}?AS_HOST=$HOST&SHOWLOG=$SHOWLOG&NUM=$NUM&REP=$REP&LOG=$LOG&FULL=$FULL" 2>/dev/null
 else
 
 for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
@@ -120,7 +121,7 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
       AUTODISTSTATEFILE="$AUTOPORTLOGDIR/autoport-$r-current"
    elif [ "${AUTOPORT_NATIVE[$i]}" ]; then
       LOGFILE="/var/autodist/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}.log"
-      LASTLOGFILE="/var/autodist/log/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}-last.log"
+      LASTLOGFILE="/var/autodist/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}-last.log"
       AUTODISTLOGFILE="$AUTOPORTLOGDIR/${AUTOPORT_ARCH[$i]}/$r-current.log"
       AUTODISTSTATEFILE="$AUTOPORTLOGDIR/autoport-$r-current"
    elif [ "${AUTOPORT_CROSS[$i]}" ]; then
@@ -145,9 +146,8 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
          [ "${SHOWLOG}" = "current" -o "${SHOWLOG}" = "last" -a ! "${AUTOPORT_UPDATE[$i]}" ] && echo -n " ($r)"
          echo -n ":</h2>"
          cat << _EOF
-<div class=downloadbox align=center>
-<div class=output align=left style="height:550px;width:850px;">
-<!--overflow:auto;font-size:8pt;border:1px solid #2b6600;margin:4px;padding:2px;color:lightgray;background-color:black;"-->
+<div class="downloadbox" align="center">
+  <div class="output outputbox">
 _EOF
          echo -n "<pre><code>"
          if [ "$SHOWLOG" = "current" ]; then
@@ -164,7 +164,7 @@ _EOF
             if [ "${SHOWLOG/\/ok\/}" != "${SHOWLOG}" -o "${SHOWLOG/\failed\/}" != "${SHOWLOG}" ]; then
                SHOWLOGPKG=${SHOWLOG/*\/}
                [ "${SHOWLOGPKG}" ] || continue
-               echo "<table style=\"color:black\"><tr><td colspan=3>Last ${SHOWLOGPKG} logs:</td>"
+               echo "<table style=\"color:black;width:auto;\"><tr><td colspan=3>Last ${SHOWLOGPKG} logs:</td>"
                for t in prepare update build install send; do
                   echo -n "<tr><td>$t:</td><td>"
                   [ -e ${BUILDLOGDIR}${t}/ok/${SHOWLOGPKG} ] && echo -n "<td><a style=\"color:green;text-decoration:none\" target=_autodist href=\"?NUM=$i&REP=$RNUM$HOST_ADD&SHOWLOG=${t}/ok/${SHOWLOGPKG}\">OK</a></td>" || echo "<td></td>"
@@ -177,12 +177,12 @@ _EOF
                LOGFILESIZE=`stat -c %s ${BUILDLOGDIR}${SHOWLOG}`
                LOGDATE=`stat -c %y ${BUILDLOGDIR}${SHOWLOG}`
                echo -n "<b>${SHOWLOG} ($LOGDATE; $LOGFILESIZE):</b>"
-               if [ $LOGFILESIZE -lt 131072 ]; then
+               if [ $LOGFILESIZE -lt 2097152 -o "$FULL" != "" ]; then
                   cat ${BUILDLOGDIR}${SHOWLOG} | parse_build_output
                else
-                  head -c 65535 ${BUILDLOGDIR}${SHOWLOG} | parse_build_output
+                  head -c 1048576 ${BUILDLOGDIR}${SHOWLOG} | parse_build_output
                   echo "<br><font style=\"background-color:yellow;color:black\">&lt;------ CUT (long file) ------&gt;</font>"
-                  tail -c 65535 ${BUILDLOGDIR}${SHOWLOG} | parse_build_output
+                  tail -c 1048576 ${BUILDLOGDIR}${SHOWLOG} | parse_build_output
                fi
             fi
          fi
@@ -192,7 +192,7 @@ _EOF
       fi
       [ "${AUTOPORT_UPDATE[$i]}" ] && break
    elif [ ! "$SHOWLOG" ]; then
-      RELOADTIME=60000
+      RELOADTIME=600000
       [[ "$NUM" && "$NUM" != "$i" ]] && continue
       [[ "$HOST" = "$AS_HOST" ]] || continue
       if [ "${AUTOPORT_UPDATE[$i]}" ]; then
@@ -215,10 +215,10 @@ _EOF
          echo " [ <a target=_autodist href=\"?SHOWLOG=current&NUM=$i&REP=$RNUM$HOST_ADD\">last</a> ]</b>"
       fi
       cat << _EOF
-      <div class=downloadbox align=center>
-<div align=left style="background-color: white; height: 250px; width: 850px; overflow: auto; font-size: 8pt; border:1px solid #2b6600; margin: 4px; padding:4; background-color: #e0f2d0;">
+      <div class="downloadbox" align="center">
+        <div align="left" class="showlogbox">
 _EOF
-      echo -n "<pre style='margin:1px'>"
+      echo -n "<pre style='margin:1px;word-wrap:normal;white-space:pre;'>"
       unset BUILDNOWIDX BUILDLOG BUILDNOW BUILDNOWSTATUS SCHEDULED STARTTIME AUTODIST_PID ENDTIME
       if [ "${AUTOPORT_UPDATE[$i]}" ]; then
          BUILDNOWIDX=0
@@ -358,10 +358,14 @@ done
 # only root host (0) calls other hosts
 if [ "$AS_HOST" = "0" -a ! "$SHOWLOG" ]; then
    for h in `seq 1 ${#AUTOPORT_CGI_HOST[*]}`; do
-      if [ "$NUM" -a "$HOST" = "$h" ]; then
-         curl "${AUTOPORT_CGI_HOST[$h]}?AS_HOST=$h&LINES=$LINES&NUM=$NUM&REP=$RNUM&HOST=$HOST" 2>/dev/null
-      elif [ ! "$NUM" ]; then
-         curl "${AUTOPORT_CGI_HOST[$h]}?AS_HOST=$h&LINES=$LINES" 2>/dev/null
+      WBHOSTURL=`echo ${AUTOPORT_CGI_HOST[$h]} | sed "s|^\(http[s]*://[^/]*\).*$|\1|"`
+      if [ "$WBHOSTURL" ]; then
+         curl -m1 -s -I ${WBHOSTURL} >/dev/null || continue
+         if [ "$NUM" -a "$HOST" = "$h" ]; then
+            curl "${AUTOPORT_CGI_HOST[$h]}?AS_HOST=$h&LINES=$LINES&NUM=$NUM&REP=$RNUM&HOST=$HOST" 2>/dev/null
+         elif [ ! "$NUM" ]; then
+            curl "${AUTOPORT_CGI_HOST[$h]}?AS_HOST=$h&LINES=$LINES" 2>/dev/null
+         fi
       fi
    done
 fi

autodist-cleanold

@@ -0,0 +1,63 @@
+#!/bin/bash
+[ -e /etc/autodist/config ] && . /etc/autodist/config
+[ -e /etc/sysconfig/autoport ] && . /etc/sysconfig/autoport
+
+[ "${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
+   [ "$VERBOSE" ] && echo "Cleaning from base directory $dir..."
+   [ -e $dir/ ] && find $dir/ -mindepth 1 -maxdepth 1 -name "pipe\:\[*" -exec rm -f {} \;
+   [ -e $dir/RPM/SPECS/ ] && find $dir/RPM/SPECS/ -mindepth 1 -maxdepth 1 -type f -not -name "*.spec*" -exec rm -f {} \;
+   for arch in ${AUTODIST_ARCHS[*]}; do
+     [ -e $dir/RPM/RPMS/$arch/ ] && find $dir/RPM/RPMS/$arch/ -mindepth 1 -maxdepth 1 -type f -mtime ${RPMS_CTIME_OLD} -exec rm -f {} \;
+   done
+   [ -e $dir/RPM/RPMS/noarch/ ] && find $dir/RPM/RPMS/noarch/ -mindepth 1 -maxdepth 1 -type f -mtime ${RPMS_CTIME_OLD} -exec rm -f {} \;
+   if [ -e $dir/RPM/BUILD/ ]; then
+      find $dir/RPM/BUILD/ -mindepth 1 -maxdepth 1 -type d -ctime ${BUILD_CTIME_OLD} -exec rm -rf {} \;
+      # delete older package duplicates
+      find $dir/RPM/BUILD/ -maxdepth 1 | grep -V SPECPARTS | sort -V | \
+      while read curr; do
+         if [ "${curr/-[0-9._]*}" = "${last/-[0-9._]*}" -a "${last}" ]; then
+            rm -rf $last
+         fi
+         last=$curr;
+      done
+   fi
+   [ -e $dir/RPM/SOURCES/ ] && {
+      find $dir/RPM/SOURCES/ -mindepth 1 -maxdepth 1 -type f -ctime ${SOURCES_CTIME_OLD} -a ! -name "*.patch" -exec rm -rf {} \;
+      find $dir/RPM/SOURCES/ -mindepth 1 -maxdepth 1 -type f -ctime ${SOURCES_ARCHIVES_CTIME_OLD} -a -name "*.tar.xz" -exec rm -rf {} \;
+      find $dir/RPM/SOURCES/ -mindepth 1 -maxdepth 1 -type f -ctime ${SOURCES_ARCHIVES_CTIME_OLD} -a -name "*.tar.bz2" -exec rm -rf {} \;
+      find $dir/RPM/SOURCES/ -mindepth 1 -maxdepth 1 -type f -ctime ${SOURCES_ARCHIVES_CTIME_OLD} -a -name "*.tar.gz" -exec rm -rf {} \;
+      find $dir/RPM/SOURCES/ -mindepth 1 -maxdepth 1 -type f -ctime ${SOURCES_PATCH_CTIME_OLD} -a -name "*.patch" -exec rm -rf {} \;
+   }
+   [ -e $dir/RPM/SRPMS/ ] && find $dir/RPM/SRPMS/ -mindepth 1 -maxdepth 1 -type f -mtime ${SRPMS_CTIME_OLD} -exec rm -f {} \;
+}
+
+for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
+   if [ "${AUTOPORT_CHROOT[$i]}" ]; then
+      a=${AUTOPORT_CHROOT[$i]}
+      clean /var/autoport/$a/usr/src
+      [ -e /var/autoport/$a/var/autodist/RPM/RPMS/ ] && \
+         clean /var/autoport/$a/var/autodist
+      [ -e /var/autoport/$a/var/tmp/autodist ] && \
+         find /var/autoport/$a/var/tmp/autodist/ -mindepth 1 -maxdepth 1 -type f -ctime ${TMP_CTIME_OLD} -exec rm -rf {} \;
+      find /var/autoport/$a/tmp/ -mindepth 1 -maxdepth 1 -type f -ctime ${TMP_CTIME_OLD} -exec rm -rf {} \;
+      autoport-chroot $a ccache -C
+   elif [ "${AUTOPORT_UPDATE[$i]}" ]; then
+      clean /var/autodist
+      find /var/autodist-tmp/ -mindepth 1 -maxdepth 1 -ctime ${TMP_CTIME_OLD} -exec rm -rf {} \;
+      sudo -u autodist ccache -C
+      sudo -u autodist yarn cache clean
+   elif [ "${AUTOPORT_NATIVE[$i]}" -a "${AUTOPORT_CHROOT_USER[$i]}" ]; then
+      WORKINGHOME=`getent passwd ${AUTOPORT_CHROOT_USER[$i]} | cut -d: -f6`
+      if [ -e $WORKINGHOME ]; then
+         clean $WORKINGHOME
+      fi
+      find /var/autodist-tmp/ -mindepth 1 -maxdepth 1 -ctime ${TMP_CTIME_OLD} -exec rm -rf {} \;
+   fi
+done

autodist-git

@@ -0,0 +1,422 @@
+#!/usr/bin/python3
+"""
+autodist git integration
+"""
+import argparse
+import glob
+import os
+import re
+import subprocess
+import sys
+import tempfile
+from shutil import copyfile
+from functools import cmp_to_key
+from gitea import Gitea, NotFoundException, Organization, Repository
+import rpm
+from pyrpm.spec import Spec, replace_macros
+from git import Repo
+from configobj import ConfigObj
+
+
+cfg = ConfigObj(infile='/etc/autodist/config-git')
+gitea = Gitea(cfg["GITEA_URL"], cfg["GITEA_TOKEN"])
+org = Organization.request(gitea, cfg["GITEA_ORGANIZATION"])
+
+def comparePkgInfo(item1, item2):
+    return rpm.labelCompare(
+        (str(item1['e']), item1['v'], item1['r']),
+        (str(item2['e']), item2['v'], item2['r']))
+
+def giteaGetRepoTags(repo_name):
+    try:
+        path = f'/repos/{cfg["GITEA_ORGANIZATION"]}/{repo_name}/tags'
+        return gitea.requests_get(path)
+    except NotFoundException:
+        return None
+
+def giteaGetRepository(repo_name):
+    try:
+        path = f'/repos/{cfg["GITEA_ORGANIZATION"]}/{repo_name}'
+        result = gitea.requests_get(path)
+        return Repository.parse_response(gitea, result)
+    except NotFoundException:
+        return None
+
+def giteaGetRepositories(page, limit):
+    try:
+        path = f'/orgs/{cfg["GITEA_ORGANIZATION"]}/repos?page={page}&limit={limit}'
+        results = gitea.requests_get(path)
+        return [Repository.parse_response(gitea, result) for result in results]
+    except NotFoundException:
+        return None
+
+def findOrCreateRepo(pkg_name, pkg_description=None, create=True):
+    # Replace '+' for repository name as it is not allowed
+    repo_name = pkg_name.replace('+','Plus')
+
+    # Get gitea repository instance
+    gitea_repo = giteaGetRepository(repo_name)
+    if gitea_repo is not None:
+        return gitea_repo
+
+    # Return None if requested to not create
+    if not create:
+        return None
+
+    # Repository does not exist -> create
+    org.create_repo(
+        repoName=repo_name,
+        description=pkg_description,
+        private=False,
+        autoInit=True,
+        gitignores=None,
+#        license=spec.license,
+#        readme=spec.description,
+        issue_labels=None,
+        default_branch="main",
+    )
+    gitea_repo = giteaGetRepository(repo_name)
+    return gitea_repo
+
+def archiveRepo(pkg_name):
+    # Replace '+' for repository name as it is not allowed
+    repo_name = pkg_name.replace('+','Plus')
+
+    # Get gitea repository instance
+    #try:
+    #    gitea_repo = org.get_repository(repo_name)
+    gitea_repo = giteaGetRepository(repo_name)
+
+    if gitea_repo is None:
+        print(f'archiveRepo: repository {repo_name} not found')
+        return
+
+    if getattr(gitea_repo, "archived"):
+        print(f'Repository {repo_name} is already archived')
+        return False
+
+    setattr(gitea_repo, "archived", True)
+    gitea_repo.commit()
+    return True
+
+
+def commitReleaseFromDir(options, pkg_info, gitea_repo, repo, temp_dir):
+    src_dir = pkg_info["src"]
+
+    if src_dir.endswith(".src.rpm"):
+        # src is a SRPM, use autospec to extract in a temporary folder
+        #print(f'Extracting {pkg_info["name"]} release {pkg_info["v"]}-{pkg_info["r"]} from {pkg_info["src"]}...')
+        src_temp_dir = tempfile.TemporaryDirectory()
+        src_dir = src_temp_dir.name
+        subprocess.run(["autospec", "-x", pkg_info["src"], f'--destdir={src_dir}'],
+            stdout=subprocess.PIPE, check=False)
+        # Delete binary source archives
+        for pattern in [
+            '*.zip','*.tar.bz2','*.tar.xz','*.tar.gz','*.tar.lz','*.tgz','*.txz',
+            '*.iso','*.run','*.dll','*.bin','*.jar','*.msi','*.deb','*.rpm']:
+            for filename in glob.glob(f'{src_dir}/{pattern}'):
+                os.remove(filename)
+
+    # Parse spec file
+    spec = Spec.from_file(f'{src_dir}/{pkg_info["name"]}.spec')
+    #specfiletemp_dir = tempfile.TemporaryDirectory()
+    #spec = Specfile(f'{src_dir}/{pkg_info["name"]}.spec',
+    #                sourcedir=specfiletemp_dir.name)
+
+    # Get used information from specfile
+    commit_text = ""
+    header_split = []
+    commit_user = cfg["COMMITTER_USER"]
+    commit_email = cfg["COMMITTER_EMAIL"]
+    for c in spec.changelog.split('\n'):
+        if c == "":
+            break
+        if c[0:2] == "* ":
+            header_split = c.split(" ")
+            # Get committer name end email from changelog
+            commit_user = " ".join(header_split[5:len(header_split)-2])
+            commit_email = header_split[-2][1:-1]
+        else:
+            if commit_text != "":
+                commit_text += "\n"
+            if c[0:2] == "- ":
+                commit_text += c[2:]
+            else:
+                commit_text += c
+    commit_text = f'{commit_text} [release {header_split[-1]};' + \
+        f'{header_split[1]} {header_split[2]} {header_split[3]} {header_split[4]}]'
+
+    # Remove commented sections following spec description
+    spec_description = ""
+    if spec.description is not None:
+        for line in spec.description.split("\n"):
+            if line.startswith("#"):
+                break
+            if spec_description != "":
+                spec_description += '\n'
+            spec_description += line
+        spec_description = replace_macros(spec_description, spec)
+
+    # Set/update gitea repository description and website url
+    spec_url = replace_macros(spec.url, spec)
+    spec_summary = replace_macros(spec.summary, spec)
+    if gitea_repo.description != spec_summary or gitea_repo.website != spec_url:
+        gitea_repo.description = spec_summary
+        gitea_repo.website = spec_url
+        gitea_repo.commit()
+
+    # Check if tag already exists
+    new_tag = f'{pkg_info["v"]}-{pkg_info["r"]}'.replace('~','+')
+    if new_tag in repo.tags:
+        if options.verbose:
+            print(f'Skipping {pkg_info["name"]} release '
+                f'{pkg_info["e"]}:{pkg_info["v"]}-{pkg_info["r"]}: tag {new_tag} already exists')
+        return
+
+    # Create/update README.md
+    with open(file=f'{temp_dir.name}/README.md', mode="w", encoding="utf-8") as readme_file:
+        readme_file.write(f"# {pkg_info['name']}\n\n{spec_description}")
+    repo.index.add(['README.md'])
+
+    # Update files
+    dir_list = os.listdir(src_dir)
+    for dir_file in dir_list:
+        copyfile(f'{src_dir}/{dir_file}',
+            f'{temp_dir.name}/{dir_file}')
+        # Add/modify files
+        repo.index.add([dir_file])
+
+    # Remove deleted files
+    temp_dir_list = os.listdir(temp_dir.name)
+    for temp_dir_file in temp_dir_list:
+        if temp_dir_file == ".git" or temp_dir_file == "README.md":
+            continue
+        if not temp_dir_file in dir_list:
+            repo.index.remove([temp_dir_file], working_tree = True)
+
+    # Set committer user and email
+    repo.config_writer().set_value("user", "name", commit_user).release()
+    repo.config_writer().set_value("user", "email", commit_email).release()
+
+    # Commit
+    print(f'Committing {pkg_info["name"]} release {new_tag}...')
+    repo.index.commit(commit_text)
+
+    #origin = repo.remote(name='origin')
+    #origin.push()
+
+    # Create and commit tag
+    repo.create_tag(new_tag, message=f'Release {new_tag}')
+    #origin.push(new_tag)
+
+def findAndCommitPackageReleases(options, pkgname, pkgvr):
+    print(f'Processing package {pkgname} on {cfg["GITEA_URL"]}...')
+
+    pkgs_info = []
+
+    # Find from archive dir
+    pkgnamere = pkgname.replace('+','\+')
+    dirs = [f for f in os.listdir(f'{cfg["ARCHIVE_DIR"]}/{pkgname[0:1]}') if re.match(f'{pkgnamere}-[^-]*-[^-]*$', f)]
+    for _dir in dirs:
+        pkg_dir = f'{cfg["ARCHIVE_DIR"]}/{pkgname[0:1]}/{_dir}'
+        spec = Spec.from_file(f'{pkg_dir}/{pkgname}.spec')
+        parts = re.split(f'{pkgnamere}-([^-]*)-([^-]*)$', _dir)
+
+        epoch = 0 if spec.epoch is None else int(spec.epoch)
+        version = parts[1]
+        release = parts[2]
+        pkgs_info.append(
+            {'name': pkgname, 'e': epoch, 'v': version, 'r': release, 'src': pkg_dir})
+
+    # Find from OLD_DIR
+    dirs = [f for f in os.listdir(f'{cfg["OLD_DIR"]}') if re.match(f'{pkgnamere}_[0-9]*.[0-9]*$', f)]
+    for _dir in dirs:
+        srpms_list = glob.glob(f'{cfg["OLD_DIR"]}/{_dir}/{pkgname}-*.src.rpm')
+        for srpm in srpms_list:
+            parts = re.split('.*-([^-]*)-([^-]*).src.rpm$', srpm)
+            epoch = subprocess.run(['rpm', '-q', '--queryformat=%{epoch}', '-p', srpm],
+                stdout=subprocess.PIPE, check=False).stdout.decode('utf-8')
+            # result is "(none)" if no Epoch is set
+            if len(epoch) > 2:
+                epoch = "0"
+            version = parts[1]
+            release = parts[2]
+            pkgs_info.append(
+                {'name': pkgname, 'e': epoch, 'v': version, 'r': release, 'src': srpm})
+
+    # Find from SRPMS_DIR
+    srpms_list = [f for f in os.listdir(cfg["SRPMS_DIR"]) if re.match(f'{pkgnamere}-[^-]*-[^-]*$', f)]
+    for srpm in srpms_list:
+        src_path = f'{cfg["SRPMS_DIR"]}/{srpm}'
+        parts = re.split('.*-([^-]*)-([^-]*).src.rpm$', srpm)
+        epoch = subprocess.run(['rpm', '-q', '--queryformat=%{epoch}', '-p', src_path],
+            stdout=subprocess.PIPE, check=False).stdout.decode('utf-8')
+        # result is "(none)" if no Epoch is set
+        if len(epoch) > 2:
+            epoch = "0"
+        version = parts[1]
+        release = parts[2]
+        pkgs_info.append(
+            {'name': pkgname, 'e': epoch, 'v': version, 'r': release, 'src': src_path })
+
+    # Sort releases
+    pkgs_info.sort(key=cmp_to_key(comparePkgInfo))
+
+    # Find or create and get repository instance
+    gitea_repo = findOrCreateRepo(pkgname)
+
+    # Clone repository to temporary folder
+    repo_url = f'{cfg["GITEA_SSH_URL"]}{gitea_repo.name}.git'
+    temp_dir = tempfile.TemporaryDirectory()
+    repo = Repo.clone_from(repo_url, temp_dir.name)
+
+    # Set to push annotated tags with commits
+    repo.config_writer().set_value('push', 'followTags', 'true').release()
+
+    new_commits = False
+
+    for pkg_info in pkgs_info:
+        vr = f'{pkg_info["v"]}-{pkg_info["r"]}'
+        if pkgvr is not None and pkgvr != vr:
+            continue
+        # Check if tag already exists
+        new_tag = f'{vr}'.replace('~','+')
+        if new_tag in repo.tags:
+            if options.verbose:
+                print(f'Skipping {pkgname} release '
+                    f'{pkg_info["e"]}:{vr}: tag {new_tag} already exists')
+            continue
+
+        #for line in sys.stdin:
+        #    line = line.rstrip()
+        #    break
+        #exit(1)
+
+        #pkg_dir = f'{cfg["ARCHIVE_DIR"]}/{pkgname[0:1]}/{pkgname}-{vr}'
+        commitReleaseFromDir(options, pkg_info, gitea_repo, repo, temp_dir)
+        new_commits = True
+
+    if new_commits:
+        print(f"Pushing commits and tags for {pkgname}...")
+        origin = repo.remote(name='origin')
+        origin.push()
+    else:
+        print(f"No new commits for {pkgname}.")
+
+    temp_dir.cleanup()
+
+
+def main():
+    # argparse options
+    options = None
+
+    parser = argparse.ArgumentParser(prog='autodist-git',
+                                     description='RPM repository sync and management with git service.',
+                                     epilog="Copyright (c) 2023-2024 by Silvan Calarco <silvan.calarco@mambasoft.it> - GPL v3 License")
+    subparsers = parser.add_subparsers(help='sub-command help', dest='mode')
+    parser.add_argument('-v', '--verbose', help="verbose output", action='store_true')
+
+    parser_syncpkg = subparsers.add_parser('syncpkg', help="sync a specified package")
+    parser_syncpkg.add_argument('pkgname', help="name of package")
+    parser_syncpkg.add_argument('pkgver', help="version of package", nargs='?')
+    parser_syncpkg.add_argument('-d', '--delete', action='store_true', help="delete and recreate existing repository",
+                             required=False)
+
+    parser_archiverepo = subparsers.add_parser('archiverepo', help="archive a specified repository package on git server")
+    parser_archiverepo.add_argument('pkgname', help="name of package")
+
+    parser_syncrepo = subparsers.add_parser('syncrepo', help="sync base repository with git server")
+    parser_syncrepo.add_argument('--from', dest='frompkg', help="from package name", required=False)
+    parser_syncrepo.add_argument('--to', dest='topkg', help="to package name", required=False)
+    parser_syncrepo.add_argument('-d', '--delete', action='store_true', help="delete and recreate existing repositories",
+                             required=False)
+
+    try:
+        options = parser.parse_args()
+    except:
+       sys.exit(1)
+
+    if options.mode == 'syncpkg':
+        if options.delete:
+            if options.pkgver is not None:
+                print("ERROR: specifying pkgver is not allowed with -d option")
+                exit(1)
+            repo_name = options.pkgname.replace('+','Plus')
+            gitea_repo = giteaGetRepository(repo_name)
+            if gitea_repo is not None:
+                print(f'Deleting repository for {options.pkgname}...')
+                gitea_repo.delete()
+        findAndCommitPackageReleases(options, options.pkgname, options.pkgver)
+
+    elif options.mode == 'archiverepo':
+        print(f'Archiving repository for {options.pkgname}...')
+        archiveRepo(options.pkgname)
+
+    elif options.mode == 'syncrepo':
+        # Get list for packages from SRPMS dir
+        dir_list = sorted(filter(os.path.isfile, glob.glob(f'{cfg["SRPMS_DIR"]}/*.src.rpm')))
+
+        # Check for package updates to sync with git repositories
+        print("Checking for package updates to sync with git repositories...")
+        for dir_file in dir_list:
+            parts = re.split('.*/([^/]*)-([^-]*)-([^-]*).src.rpm$', dir_file)
+            pkg_name = parts[1]
+            if options.topkg is not None and pkg_name > options.topkg:
+                break
+            if options.frompkg is not None and pkg_name < options.frompkg:
+                continue
+            pkg_item = { 'e': 0, 'v': parts[2].replace('~','+'), 'r': parts[3]}
+            pkg_vr = f'{parts[2]}-{parts[3]}'
+            # Replace '+' for repository name as it is not allowed
+            repo_name = pkg_name.replace('+','Plus')
+            if options.delete:
+                gitea_repo = giteaGetRepository(repo_name)
+                if gitea_repo is not None:
+                    print(f'Deleting repository for {pkg_name}...')
+                    gitea_repo.delete()
+            repo_tags = giteaGetRepoTags(repo_name)
+            found_equal = False
+            found_newer = False
+            found_older = False
+            if repo_tags is None:
+                found_newer = True
+            else:
+                for repo_tag in repo_tags:
+                    parts = re.split('([^-]*)-([^-]*)$', repo_tag["name"])
+                    tag_item = { 'e':0, 'v': parts[1], 'r': parts[2]}
+                    compare = comparePkgInfo(pkg_item, tag_item)
+                    if compare == 0:
+                        found_equal = True
+                    elif compare > 0:
+                        found_older = True
+                    elif compare < 0:
+                        found_newer = True
+            if not found_equal:
+                if repo_tags is not None:
+                    print(f'{pkg_name} ({pkg_vr}): needs update')
+                findAndCommitPackageReleases(options, pkg_name, None)
+            if found_newer:
+                if options.verbose:
+                    print(f'{pkg_name} ({pkg_vr}): found_equal={found_equal} found_newer={found_newer} found_older={found_older}')
+
+        # Check for git repositories to archive
+        print("Checking for git repositories to archive...")
+        pkg_names = []
+        for dir_file in dir_list:
+            parts = re.split('.*/([^/]*)-([^-]*)-([^-]*).src.rpm$', dir_file)
+            pkg_names.append(parts[1])
+        page = 1
+        while True:
+            gitea_repos = giteaGetRepositories(page, 50)
+            for gitea_repo in gitea_repos:
+                if not getattr(gitea_repo, "archived") and not gitea_repo.name.replace('Plus','+') in pkg_names:
+                    print(f'Archiving repository {gitea_repo.name}')
+                    archiveRepo(gitea_repo.name)
+            if len(gitea_repos) < 50:
+                break
+            page += 1
+
+    else:
+        parser.print_help()
+
+main()

autodist-inspect

@@ -0,0 +1,35 @@
+#!/bin/bash
+[ -e /etc/autodist/config ] || {
+   echo "ERROR: missing configuration file /etc/autodist/config."
+   exit 1
+}
+
+. /etc/autodist/config
+
+shopt -s nocaseglob
+checkpkg=$1
+
+if [ ! "$checkpkg" ]; then
+   echo "Usage:
+$0 query"
+   exit 1
+fi
+
+[ "$LOCAL_REPS_BASE_DIR" -a -e "$LOCAL_REPS_BASE_DIR" ] || {
+   echo "ERROR: LOCAL_REPS_BASE_DIR needs to be defined and local repositories to exists."
+   exit 1
+}
+
+echo "=== distromatic sources: ==="
+head -n2 ${LOCAL_REPS_BASE_DIR}/distromatic/base/sources
+grep -i $checkpkg ${LOCAL_REPS_BASE_DIR}/distromatic/base/sources
+#tail -n+2 ${PREFIX}/distromatic/base/deps-* | grep -i $checkpkg 
+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 devel-contrib 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
+done

autodist-launcher

@@ -0,0 +1,77 @@
+#!/bin/bash
+#
+# autodist launcher
+# (c) 2021 by Silvan Calarco <silvan.calarco@mambasoft.it>
+#
+. /etc/autodist/config
+. /etc/sysconfig/autoport
+
+# Disable icecc
+export PATH=/usr/bin:$PATH
+
+i=$1
+
+[ "$i" ] || {
+   echo "Usage: autodist-launcher autodist_conf"
+   exit 1
+}
+
+PIDFILE=/run/autodist/autodist-launcher-${i}.pid
+[ -e $PIDFILE ] && {
+   PIDCHECK=`cat $PIDFILE`
+   [ "$PIDCHECK" -a -e /proc/$PIDCHECK ] && {
+      echo "autodist-launcher for configuration $i already running; exiting."
+      exit 0
+   }
+}
+echo $$ > $PIDFILE
+trap "rm -f $PIDFILE; exit 1" SIGQUIT SIGINT SIGKILL SIGTERM
+
+HOUR=`date +%H`
+[ "`uname -m`" = "x86_64" ] && HOST_IS_X86_64=1
+
+AUTODIST_PIDFILE=/run/autodist/autodist.pid
+LOGFILE=/var/autodist/log/autodist.log
+LASTLOGFILE=/var/autodist/log/autodist-last.log
+
+if [ -e $AUTODIST_PIDFILE ]; then
+  PIDCHECK=`cat $AUTODIST_PIDFILE`
+  if [ "$PIDCHECK" -a -e /proc/$PIDCHECK ]; then
+     echo "autodist already running; exiting."
+     exit 0
+  fi
+fi
+
+for r in ${AUTOPORT_REPOSITORIES[$i]}; do
+   [ "${AUTOPORT_ARCH[$i]}" ] || continue
+   [ "${AUTOPORT_DISABLE[$i]}" -a "${AUTOPORT_DISABLE[$i]}" != "0" ] && continue
+
+   if [ "$HOST_IS_X86_64" -a "${AUTOPORT_ARCH[$i]}" != "x86_64" ]; then
+      CMD_PREFIX=linux32
+   else
+      CMD_PREFIX=
+   fi
+
+   # TODO: parametrize DISTROMATIC_REPOSITORY and following log files
+   DISTROMATIC_REPOSITORY=devel-future
+
+   REPLOGFILE=$LOCAL_REPS_BASE_DIR/$r/autodist.log
+   REPLASTLOGFILE=$LOCAL_REPS_BASE_DIR/$r/autodist-last.log
+
+   if [ "${AUTOPORT_UPDATE[$i]}" ]; then
+
+      if [ ! "$AUTOPORT_UPDATE_NO_DISTROMATIC" ]; then
+         distromatic -q -t $DISTROMATIC_REPOSITORY --gensrcpkglist > $LOCAL_REPS_BASE_DIR/$DISTROMATIC_REPOSITORY/srcpkglist 2>/dev/null
+      fi
+
+      #autodist-upstream-updates -q -h -u -r $DISTROMATIC_REPOSITORY -o $r \
+        # > $LOCAL_REPS_BASE_DIR/distromatic/$r/_popular.html
+      autodist-upstream-updates -q -u -r $DISTROMATIC_REPOSITORY -o $r
+
+      [ -e $LOGFILE ] && mv $LOGFILE $LASTLOGFILE
+      su -l autodist -c "$CMD_PREFIX autodist -a --server $r" > $LOGFILE
+      [ -e $REPLOGFILE ] && mv $REPLOGFILE $REPLASTLOGFILE
+      cp $LOGFILE $REPLOGFILE
+   fi
+done
+rm -f ${PIDFILE}

autodist-repository

@@ -1,6 +1,6 @@
 #
 # autodist repositories maintainance script
-# Copyright (c) 2007-2014 by Silvan Calarco
+# Copyright (c) 2007-2024 by Silvan Calarco
 #
 . /etc/autodist/config
 [ -r /etc/autodist/config-secret ] && . /etc/autodist/config-secret
@@ -15,21 +15,22 @@ function usage() {
    echo "Copyright (c) 2007-2014 by Silvan Calarco"
    echo 
    echo "Usage:"
-   echo "$me list"
-   echo "$me import REPOSITORY [PKGS ...] [-d REPOSITORY] [-s] [-y]"
-   echo "$me release REPOSITORY [PKGS ...] [-d REPOSITORY] [-s] [-y]"
    echo "$me archive REPOSITORY PKGS ..."
-   echo "$me restore REPOSITORY PKGS ..."
-   echo "$me query REPOSITORY PKGS ..."
-   echo "$me search [-i] [-r regexp] STRING"
-   echo "$me verify REPOSITORY [PKGS ...]"
-   echo "$me inspect REPOSITORY {PKGS ...} [-d REPOSITORY]"
-   echo "$me setwarning REPOSITORY {PKG ...} -t \"TEXT\""
    echo "$me diff REPOSITORY [PKGS ...] [-d REPOSITORY]"
    echo "$me distromatic REPOSITORY"
+   echo "$me install REPOSITORY [PKGS ...] [-f]"
+   echo "$me import REPOSITORY [PKGS ...] [-d REPOSITORY] [-s] [-y]"
+   echo "$me inspect REPOSITORY {PKGS ...} [-d REPOSITORY]"
+   echo "$me list"
+   echo "$me query REPOSITORY PKGS ..."
+   echo "$me release REPOSITORY [PKGS ...] [-d REPOSITORY] [-s] [-y]"
+   echo "$me restore REPOSITORY PKGS ..."
+   echo "$me search [-i] [-r regexp] STRING"
+   echo "$me setwarning REPOSITORY {PKG ...} -t \"TEXT\""
+   echo "$me verify REPOSITORY [PKGS ...]"
    echo
-   echo " -d      use given repository as destination (default: devel)"
-   echo " -f      force import to destination repository"
+   echo " -d      use given repository as destination (default: base)"
+   echo " -f      force operation"
    echo " -r      match repositories with given regexp"
    echo " -s      simulate operations to see if it would work"
    echo " -t      warning text"
@@ -40,8 +41,8 @@ function get_packages_from_last_build() {
    local rep=$1
    [ "$rep" ] || return
    [ -r $SRCPKGLIST ] || {
-      echo "Error: srcpkglist file missing for $origrepository repository; aborting."
-      exit 1
+      echo "ERROR: srcpkglist file missing for $origrepository repository; aborting." >&2
+      exit 200
    }
    tmpfile=`mktemp`
    packages=()
@@ -61,8 +62,8 @@ get_pkg_srcinfo() {
 
    local rep pkg line
 
-   [ $1 ] && rep=$1 || exit 1
-   [ $2 ] && pkg=$2 || exit 1
+   [ $1 ] && rep=$1 || exit 200
+   [ $2 ] && pkg=$2 || exit 200
 
    unset pkg_archs pkg_name pkg_version pkg_release
 
@@ -93,8 +94,8 @@ function get_pkg_buildinfo() {
 
    local pkg i a
 
-   [ $1 ] && rep=$1 || exit 1
-   [ $2 ] && buildarch=$2 || exit 1
+   [ $1 ] && rep=$1 || exit 200
+   [ $2 ] && buildarch=$2 || exit 200
    [ $3 ] && pkg=$3
 
    pkg_archs=();
@@ -120,7 +121,7 @@ function get_pkg_buildinfo() {
          pkg_group pkg_license pkg_size pkg_buildtime pkg_altrep pkg_repository
 
    if [ "$buildarch" = "any" ]; then
-#      echo "Error: package $pkg does not exist in $rep; aborting."
+#      echo "ERROR: package $pkg does not exist in $rep; aborting." >&2
       return;
    fi
 
@@ -152,8 +153,40 @@ function get_pkg_buildinfo() {
    return 0
 }
 
+# get_pkg_info - uses distromatic generated build file to get packages information from the repository
+# 
+# $1: repository name
+# $2: architecture
+# $3: pkg name
+function get_pkg_info() {
+
+   local pkg buildarch rep line
+
+   [ $1 ] && rep=$1 || exit 200
+   [ $2 ] && buildarch=$2 || exit 200
+   [ $3 ] && pkg=$3 || exit 200
+
+   [ -e ${PKGLIST}.$buildarch ] || {
+      echo "ERROR: get_pkg_info: file ${PKGLIST}.$buildarch missing; aborting."
+      exit 1
+   }
+
+   line=`grep "^$pkg " ${PKGLIST}.$buildarch 2>/dev/null | tail -n1`
+   set -- $line
+   pkg_name=$1
+   pkg_version=$2
+   pkg_size=$3
+   pkg_unknown=$4
+   pkg_repository=$5
+   pkg_unknown2=$6
+   pkg_release=$7
+   pkg_arch=$buildarch
+
+   return 0
+}
+
 function import_file() {
- [ $1 ] || exit 1
+ [ $1 ] || exit 200
 
  local f import_mode
  f=$1
@@ -168,7 +201,7 @@ function import_file() {
 
  if [ "$ORIG_MODE" = "remote" ]; then
      if [ $ORIG_URL_LOCAL_ARCH -a ! -f $ORIG_URL_LOCAL_ARCH/$f ]; then
-       echo "Warning: package missing in local mirror; setting copy from remote repository."
+       echo "WARNING: package missing in local mirror; setting copy from remote repository." >&2
      fi
  
      if [ "$DEST_MODE" = "local" ]; then
@@ -177,8 +210,8 @@ function import_file() {
            echo -n "(L) "
            # if file exists in a local mirror use it by preference
            cp $ORIG_URL_LOCAL_ARCH/$f $DEST_URL_ARCH/ || {
-	      echo "Error: cannot move file $ORIG_URL_LOCAL_ARCH/$f to $DEST_URL_ARCH/$f; aborting."
-	      exit 1
+	      echo "ERROR: cannot move file $ORIG_URL_LOCAL_ARCH/$f to $DEST_URL_ARCH/$f; aborting." >&2
+	      exit 200
            }
            #chown ftp$DEST_REPOSITORY:users $DEST_URL_ARCH/$f
            eval curl -s -u${AUTODIST_REPOSITORIES_REMOTE_FTPUSER}:${AUTODIST_REPOSITORIES_REMOTE_FTPPASS} $ORIG_URL_ARCH $curl_delete_add >/dev/null && {
@@ -186,7 +219,7 @@ function import_file() {
 	      touch $ORIG_URL_LOCAL_ARCH
 	   } || {
 	      echo
-	      echo "Warning: cannot delete remote file $ORIG_URL_ARCH/$f; you'll have to delete it."
+	      echo "WARNING: cannot delete remote file $ORIG_URL_ARCH/$f; you'll have to delete it." >&2
            }
         else
            echo -n "(R) "
@@ -194,28 +227,28 @@ function import_file() {
               --get $ORIG_URL_ARCH/$f \
               -o $DEST_URL_ARCH/$f $curl_delete_add || {
                  echo
-	         echo "Error: cannot get file $ORIG_URL_ARCH/$f; aborting."
-	         exit 1
+	         echo "ERROR: cannot get file $ORIG_URL_ARCH/$f; aborting." >&2
+	         exit 200
               }
         fi
      else
         # remote -> remote
-        echo "Error: remote to remote file import is not implemented yet; aborting."
-	exit 1
+        echo "ERROR: remote to remote file import is not implemented yet; aborting." >&2
+	exit 200
      fi
  else
      if [ "$DEST_MODE" = "local" ]; then
         # local -> local
         cp $ORIG_URL_ARCH/$f $DEST_URL_ARCH/ || {
-           echo "Error: cannot copy file $ORIG_URL_ARCH/$f to $DEST_URL_ARCH/$f; aborting."
-           exit 1
+           echo "ERROR: cannot copy file $ORIG_URL_ARCH/$f to $DEST_URL_ARCH/$f; aborting." >&2
+           exit 200
         }
         #chown ftp$DEST_REPOSITORY:users $DEST_URL_ARCH/$f
         touch $DEST_URL_ARCH
 	if [ "$import_mode" = "backup" ]; then
            rm -f $ORIG_URL_ARCH/$f || {
-              echo "Error: cannot remove file $ORIG_URL_ARCH/$f; aborting."
-              exit 1
+              echo "ERROR: cannot remove file $ORIG_URL_ARCH/$f; aborting." >&2
+              exit 200
            }
            touch $ORIG_URL_ARCH
 	fi
@@ -226,12 +259,12 @@ function import_file() {
            -T $ORIG_URL_ARCH/$f \
            $DEST_URL_ARCH/ || {
               echo
-              echo "Error: cannot send file $ORIG_URL_ARCH/$f; aborting."
-              exit 1
+              echo "ERROR: cannot send file $ORIG_URL_ARCH/$f; aborting." >&2
+              exit 200
         }
         rm -f $ORIG_URL_ARCH/$f || {
               echo
-              echo "Warning: cannot delete local file $ORIG_URL_ARCH/$f; you'll have to delete it."
+              echo "WARNING: cannot delete local file $ORIG_URL_ARCH/$f; you'll have to delete it." >&2
         }
         touch $ORIG_URL_ARCH
      fi
@@ -250,8 +283,8 @@ function backup_local_file() {
     echo "backing up $m"
     if [ "$simulate" != "1" ]; then
        mv $m $LOCAL_BACKUP/ || {
-          echo "Error: can't move $m to $LOCAL_BACKUP; aborting."
-          exit 1
+          echo "ERROR: can't move $m to $LOCAL_BACKUP; aborting." >&2
+          exit 200
        }
        touch `dirname $m`
     fi
@@ -273,7 +306,7 @@ function backup_package() {
    if [ ! "$pkg_name" ]; then
       get_pkg_srcinfo $rep $archive_pkg
       if [ "$pkg_name" ]; then
-         echo "Warning: only source package has been found in repository"
+         echo "WARNING: only source package has been found in repository" >&2
       fi
    fi
 
@@ -284,12 +317,12 @@ function backup_package() {
       if [ -f $DEST_URL_LOCAL/$rep/SRPMS.base/$PKG_FILENAME ]; then
          backup_local_file $DEST_URL_LOCAL/$rep/SRPMS.base/$PKG_FILENAME
       else
-         echo "Warning: package $PKG_FILENAME does not exist in local repository"
+         echo "WARNING: package $PKG_FILENAME does not exist in local repository">&2
       fi
 
       if [ "$simulate" != "1" -a "$DEST_MODE" = "remote" ]; then
          curl -s -u${AUTODIST_REPOSITORIES_REMOTE_FTPUSER}:${AUTODIST_REPOSITORIES_REMOTE_FTPPASS} $DEST_URL/$rep/SRPMS.base/ -Q "-DELE $PKG_FILENAME" >/dev/null || {
-            echo "Warning: cannot delete remote file $DEST_URL/$rep/SRPMS.base/$PKG_FILENAME; you'll have to delete it."
+            echo "WARNING: cannot delete remote file $DEST_URL/$rep/SRPMS.base/$PKG_FILENAME; you'll have to delete it." >&2
          }
       fi
 
@@ -301,12 +334,12 @@ function backup_package() {
              if [ -f $DEST_URL_LOCAL/$rep/RPMS.$a/$PKG_FILENAME ]; then
                 backup_local_file $DEST_URL_LOCAL/$rep/RPMS.$a/$PKG_FILENAME
              else
-                echo "Warning: package $PKG_FILENAME does not exist in local repository"
+                echo "WARNING: package $PKG_FILENAME does not exist in local repository" >&2
              fi
 
              if [ "$simulate" != "1" -a "$DEST_MODE" = "remote" ]; then
                 curl -s -u${AUTODIST_REPOSITORIES_REMOTE_FTPUSER}:${AUTODIST_REPOSITORIES_REMOTE_FTPPASS} $DEST_URL/$rep/RPMS.$a/ -Q "-DELE $PKG_FILENAME" >/dev/null || {
-	           echo "Warning: cannot delete remote file $DEST_URL/$rep/RPMS.$pkg_arch/$PKG_FILENAME; you'll have to delete it."
+	           echo "WARNING: cannot delete remote file $DEST_URL/$rep/RPMS.$pkg_arch/$PKG_FILENAME; you'll have to delete it." >&2
 	        }
              fi
           done
@@ -320,7 +353,7 @@ function backup_package() {
 #          echo "`date +%Y%m%d%H%M` \"\" \"package $pkg_name ($pkg_version-$pkg_release) archived from $rep\"" >> $reg
       }
    else
-      echo "Warning: package $archive_pkg does not exists in $rep; skipping."
+      echo "WARNING: package $archive_pkg does not exists in $rep; skipping." >&2
    fi
 }
 
@@ -340,8 +373,8 @@ function restore_local_file() {
     echo "restoring $r to $restorerepository"
     if [ "$simulate" != "1" ]; then
        cp ${backupprefix}/$r $restoredest || {
-          echo "Error: can't copy $p to $restoredest; aborting."
-          exit 1
+          echo "ERROR: can't copy $p to $restoredest; aborting." >&2
+          exit 200
        }
        touch $restoredest
     fi
@@ -414,7 +447,7 @@ function restore_package() {
 }
 
 function import_package() {
- [ $1 ] || exit 1
+ [ $1 ] || exit 200
  
  local import_pkg import_mode
 
@@ -439,14 +472,14 @@ function import_package() {
           done
           if [ "$dest_ver-$dest_rel" != "$pkg_version-$pkg_release" ]; then
              [ "$a" == "$basearch" -a "$force" != "1" ] && {
-                echo "Error: package $import_pkg for $a does not exist in $origrepository and can't merge due to different versions; skipping."
-                return 255
+                echo "ERROR: package $import_pkg for $a does not exist in $origrepository and can't merge due to different versions; skipping." >&2
+                return 254
              }
              if [ "$force" = "1" ]; then
-                echo "Warning: package $import_pkg for $a is missing in $origrepository but present in $destrepository."
-                echo "Import forced. You will need to port package to the missing arch."
+                echo "WARNING: package $import_pkg for $a is missing in $origrepository but present in $destrepository." >&2
+                echo "Import forced. You will need to port package to the missing arch." >&2
              else
-                echo "Error: package $import_pkg for $a is missing in $origrepository. This would break package in $destrepository($a) repository."
+                echo "ERROR: package $import_pkg for $a is missing in $origrepository. This would break package in $destrepository($a) repository." >&2
                 return 255
              fi
           fi
@@ -472,8 +505,8 @@ function import_package() {
  } || origpkgversion="none"
 
  [ $origpkgname ] || { 
-    echo "Error: package $import_pkg does not exist in $origrepository; aborting."
-    exit 1
+    echo "ERROR: package $import_pkg does not exist in $origrepository; aborting." >&2
+    exit 200
  }
 
  DEST_URL_ARCH=$DEST_URL/$destrepository/SRPMS.base/
@@ -495,7 +528,7 @@ function import_package() {
  if [ $check_existence = 1 ]; then
 
     [ "$destpkgversion" = "$origpkgversion" ] && {
-       echo "Warning: same version of $origpkgname exists in destination"
+       echo "WARNING: same version of $origpkgname exists in destination" >&2
     }
 
     if [ "$assume_yes" != "1" ]; then
@@ -539,14 +572,17 @@ function import_package() {
        # remove distromatic extra files associated with this package
        [ -e ${LOCAL_REPS_BASE_DIR}/distromatic/$rep/warnings/$import_pkg.in ] && {
           rm -f ${LOCAL_REPS_BASE_DIR}/distromatic/$rep/warnings/$import_pkg.in ||
-            echo "Warning: cannot remove file ${LOCAL_REPS_BASE_DIR}/distromatic/$rep/warnings/$import_pkg.in"
+            echo "WARNING: cannot remove file ${LOCAL_REPS_BASE_DIR}/distromatic/$rep/warnings/$import_pkg.in" >&2
        }
 #    fi
 
+    # Sync new release with autodist-git
+    [ "$AUTODIST_GIT_SYNC" != "" ] && autodist-git syncpkg ${import_pkg}
+
     #for i in ${pkg_obsoletes}; do
     #   PKG_FILENAME="$i-$pkg_version-$pkg_release.$namearch.rpm"
     #   DEST_URL_ARCH=$DEST_URL/$destrepository/RPMS.$namearch/$PKG_FILENAME
-    #   [ -e $DEST_URL_ARCH ] && echo "Warning: obsoleted package $i exists"
+    #   [ -e $DEST_URL_ARCH ] && echo "WARNING: obsoleted package $i exists" >&2
     #   backup_package $i $destrepository $DESTREGFILE
     #   #echo rm $DEST_URL_ARCH
     #done
@@ -554,8 +590,10 @@ function import_package() {
    } # ans = y
 
  else # check_existence != 1
-    echo "Warning: $import_pkg reported by distromatic does no longer exist"
+    echo "ERROR: $import_pkg reported by distromatic does no longer exist" >&2
+    return 253
  fi
+ return 0
 }
 
 # FIXME: only works with basearch
@@ -569,31 +607,31 @@ function extract_diffinfo() {
    if [ "$pkg_name" ]; then
      PKG_FILENAME="${LOCAL_REPS_BASE_DIR}/$REP/SRPMS.base/$pkg_name-$pkg_version-$pkg_release.src.rpm"
      [ -e "$PKG_FILENAME" ] || {
-        echo "Error: package $PKG_FILENAME missing in $origrepository; skipping"
+        echo "ERROR: package $PKG_FILENAME missing in $origrepository; skipping" >&2
         return 1     
      }
      local filesize=`stat -c %s $PKG_FILENAME`
      [ $filesize -gt 1073741824 ] && {
-        echo "Warning: $PKG_FILENAME size of $filesize is more than 1GB; skipping"
+        echo "WARNING: $PKG_FILENAME size of $filesize is more than 1GB; skipping" >&2
         return 1
      }
      rpm -qp $PKG_FILENAME --requires > $TMP/buildrequires
 
      autospec -q -x $PKG_FILENAME -F \*.spec --destdir $TMP >/dev/null || {
-        echo "Error: could not extract specfile from $PKG_FILENAME; skipping package"
+        echo "ERROR: could not extract specfile from $PKG_FILENAME; skipping package" >&2
 	return 1
      }
      [ -e "$TMP_SPEC_DIR/$pkg_name.spec" ] || {
         SPEC_FOUND="`ls $TMP_SPEC_DIR/*.spec`"
 	mv $SPEC_FOUND $TMP_SPEC_DIR/$pkg_name.spec
-        echo "Warning: specfile name should be $pkg_name.spec instead of ${SPEC_FOUND/*\//} in $REP repository"
+        echo "WARNING: specfile name should be $pkg_name.spec instead of ${SPEC_FOUND/*\//} in $REP repository" >&2
      }
      > $TMP/requires
      > $TMP/provides
      for i in ${pkg_builds[*]}; do
           PKG_FILENAME="${LOCAL_REPS_BASE_DIR}/$REP/RPMS.$basearch/$i-$pkg_version-$pkg_release.$pkg_arch.rpm"
 	  [ -e "$PKG_FILENAME" ] || {
-	      echo "Error: package $PKG_FILENAME missing in $origrepository; skipping"
+	      echo "ERROR: package $PKG_FILENAME missing in $origrepository; skipping" >&2
 	      return 1
 	  }
           rpm -qp $PKG_FILENAME --requires >> $TMP/requires
@@ -601,16 +639,16 @@ function extract_diffinfo() {
           rpm -qlp $PKG_FILENAME >> $TMP/files
      done
    else
-     #echo "Warning: can't find package $PKG in $REP repository"
+     #echo "WARNING: can't find package $PKG in $REP repository" >&2
      return 1
    fi
    return 0
 }
 
-[ $1 ] || { usage; exit 1; }
+[ $1 ] || { usage; exit 0; }
 
 origrepository=
-destrepository=devel
+destrepository=base
 packages=
 command=
 simulate=0
@@ -636,26 +674,26 @@ while [ "$1" ]; do
       *)
          if [ "$command" ]; then
                case "$command" in
-	          "import"|"release"|"query"|"verify"|"archive"|"restore"|"diff"|"inspect"|"setwarning"|"distromatic")
+	          "import"|"release"|"query"|"verify"|"archive"|"restore"|"diff"|"inspect"|"install"|"setwarning"|"distromatic")
 		      [ "$origrepository" ] &&
 		         packages="$packages $1" ||
 			 origrepository=$1
 		      ;;
 		  "search")
 		     [ "$searchstring" ] && {
-		        echo "Error: invalid option $1; aborting."
+		        echo "ERROR: invalid option $1; aborting." >&2
 		        exit 1
 		     }
 		     searchstring="$1"
 		     ;;
 		  *)  usage
-		      echo "Error: invalid option $1; aborting."
+		      echo "ERROR: invalid option $1; aborting." >&2
 		      exit 1
 		      ;;
 	       esac
 	 else
 	    case "$1" in
-	       "import"|"release"|"query"|"verify"|"archive"|"restore"|"list"|"diff"|"inspect"|"setwarning"|"distromatic"|"search") command=$1 ;;
+	       "import"|"release"|"query"|"verify"|"archive"|"restore"|"list"|"diff"|"inspect"|"install"|"setwarning"|"distromatic"|"search") command=$1 ;;
 	       *)
 	           usage
 	           echo "Errror: $1 is not a valid command; aborting."
@@ -667,7 +705,7 @@ while [ "$1" ]; do
     esac
     shift
 done
-[ "$command" = "" ] && { usage; exit 1; }
+[ "$command" = "" ] && { usage; exit 0; }
 
 #[ "$command" = "list" ] && echo "Local repositories:"
 for a in ${AUTODIST_REPOSITORIES_LOCAL_REPS[*]}; do
@@ -688,7 +726,7 @@ done
    for rep in ${AUTODIST_REPOSITORIES_LOCAL_REPS[*]} ${AUTODIST_REPOSITORIES_REMOTE_REPS[*]}; do
       [[ "$rep" =~ "$searchrep" ]] || continue
       [ -r ${LOCAL_REPS_BASE_DIR}/$rep/SRPMS.base ] || continue
-      ls ${LOCAL_REPS_BASE_DIR}/$rep/SRPMS.base | grep $GREP_OPTS "$searchstring" 2>/dev/null | \
+      ls --color=none ${LOCAL_REPS_BASE_DIR}/$rep/SRPMS.base | grep $GREP_OPTS "$searchstring" 2>/dev/null | \
       while read PKGLINE; do
         [ "$PKGLINE" ] && {
            echo "$rep(source): ${PKGLINE/ *}"
@@ -696,7 +734,7 @@ done
      done
      for a in ${AUTODIST_ARCHS[*]}; do
         [ -r ${LOCAL_REPS_BASE_DIR}/$rep/RPMS.$a ] || continue
-         ls ${LOCAL_REPS_BASE_DIR}/$rep/RPMS.$a | grep $GREP_OPTS "$searchstring" 2>/dev/null | \
+         ls --color=none ${LOCAL_REPS_BASE_DIR}/$rep/RPMS.$a | grep $GREP_OPTS "$searchstring" 2>/dev/null | \
          while read PKGLINE; do
             [ "$PKGLINE" ] && {
                echo "$rep($a): ${PKGLINE/ *}"
@@ -707,11 +745,12 @@ done
    exit 0
 }
 
-[ "$origrepository" ] || { usage; exit 1; }
+[ "$origrepository" ] || { usage; exit 200; }
 SRCPKGLIST="${LOCAL_REPS_BASE_DIR}/$origrepository/srcpkglist"
+PKGLIST="${LOCAL_REPS_BASE_DIR}/$origrepository/pkglist"
 
-[ "$DEST_MODE" ] || { echo "Error: $destrepository is not a valid repository; aborting."; exit 1; }
-[ "$ORIG_MODE" ] || { echo "Error: $origrepository is not a valid repository; aborting."; exit 1; }
+[ "$DEST_MODE" ] || { echo "ERROR: $destrepository is not a valid repository; aborting." >&2; exit 200; }
+[ "$ORIG_MODE" ] || { echo "ERROR: $origrepository is not a valid repository; aborting." >&2; exit 200; }
 [ "$DEST_MODE" = "remote" ] && { echo "Waring: destination is a remote repository; this is an EXPERIMENTAL feature."; }
 
 [ "$command" = "query" ] && {
@@ -754,7 +793,7 @@ SRCPKGLIST="${LOCAL_REPS_BASE_DIR}/$origrepository/srcpkglist"
       else
          PKG_FILENAME="$i-$pkg_version-$pkg_release.src.rpm"
          rpm2cpio ${LOCAL_REPS_BASE_DIR}/${origrepository}/SRPMS.base/$PKG_FILENAME &>/dev/null || {
-         echo "Warning: source package $PKG_FILENAME is empty or corrupted."
+         echo "WARNING: source package $PKG_FILENAME is empty or corrupted." >&2
          }
 
          for a in ${AUTODIST_ARCHS[*]}; do
@@ -763,7 +802,7 @@ SRCPKGLIST="${LOCAL_REPS_BASE_DIR}/$origrepository/srcpkglist"
                for l in ${pkg_builds[*]}; do
                   PKG_FILENAME="$l-$pkg_version-$pkg_release.$pkg_arch.rpm"
                   rpm2cpio ${LOCAL_REPS_BASE_DIR}/${origrepository}/RPMS.$a/$PKG_FILENAME &>/dev/null || {
-                     echo "Warning: package $PKG_FILENAME($a) is empty or corrupted."
+                     echo "WARNING: package $PKG_FILENAME($a) is empty or corrupted." >&2
                   }
                done
             fi
@@ -787,7 +826,7 @@ SRCPKGLIST="${LOCAL_REPS_BASE_DIR}/$origrepository/srcpkglist"
 
       extract_diffinfo $i $origrepository $TMP_SPEC_DIR || continue
       [ -e $TMP_SPEC_DIR/$i.spec ] || {
-         echo "Error: could not extract specfile for $i in $origrepository repository; skipping"
+         echo "ERROR: could not extract specfile for $i in $origrepository repository; skipping" >&2
 	 continue
       }
       mv $TMP_SPEC_DIR/$i.spec $TMP_SPEC_DIR/$i.spec.origrep
@@ -817,7 +856,7 @@ SRCPKGLIST="${LOCAL_REPS_BASE_DIR}/$origrepository/srcpkglist"
          continue
       }
       [ -e $TMP_SPEC_DIR/$i.spec ] || {
-         echo "Error: could not extract specfile for $i in $destrepository repository; skipping"
+         echo "ERROR: could not extract specfile for $i in $destrepository repository; skipping" >&2
       }
       mv $TMP_SPEC_DIR/$i.spec $TMP_SPEC_DIR/$i.spec.destrep
       mv $TMP_SPEC_DIR/files $TMP_SPEC_DIR/files.destrep
@@ -858,7 +897,7 @@ SRCPKGLIST="${LOCAL_REPS_BASE_DIR}/$origrepository/srcpkglist"
    for i in $packages; do
       extract_diffinfo $i $origrepository $TMP_SPEC_DIR
       [ -e $TMP_SPEC_DIR/$i.spec ] || {
-         echo "Error: could not extract specfile for $i in $origrepository repository; aborting."
+         echo "ERROR: could not extract specfile for $i in $origrepository repository; aborting." >&2
 	 exit 1
       }
       echo "$warningtext" > ${LOCAL_REPS_BASE_DIR}/distromatic/$origrepository/warnings/$i.in
@@ -873,7 +912,7 @@ SRCPKGLIST="${LOCAL_REPS_BASE_DIR}/$origrepository/srcpkglist"
    for i in $packages; do
       extract_diffinfo $i $origrepository $TMP_SPEC_DIR
       [ -e $TMP_SPEC_DIR/$i.spec ] || {
-         echo "Error: could not extract specfile for $i in $origrepository repository; aborting."
+         echo "ERROR: could not extract specfile for $i in $origrepository repository; aborting." >&2
 	 exit 1
       }
       echo "$i: details of package in $origrepository repository"
@@ -894,9 +933,63 @@ SRCPKGLIST="${LOCAL_REPS_BASE_DIR}/$origrepository/srcpkglist"
    exit 0;
 }
 
+[ "$command" = "install" ] && {
+   [ "$packages" ] || { usage; exit 1; }
+   myarch=`uname -p`
+   if [ "$myarch" = "*686" -o "$myarch" = "athlon" -o "$myarch" = "pentium*" ]; then
+      myarch="i586"
+   fi
+   for i in $packages; do
+      pkg=$i
+      pkgarch=
+      if [ "${i/.*}" != "${i}" ]; then
+         pkg=${i/.*}
+         pkgarch=${i/*.}
+      fi
+      if [ "$pkgarch" -a "$pkgarch" != "$myarch" ]; then
+         get_pkg_info $origrepository $pkgarch $pkg
+         [ "$pkg_name" ] || {
+            echo "WARNING: $pkg not found in $origrepository for arch $pkgarch; skipping."
+            continue
+         }
+      else
+         get_pkg_info $origrepository $myarch $pkg
+         [ "$pkg_name" ] || {
+            echo "WARNING: $pkg not found in $origrepository for arch $myarch; skipping."
+            continue
+         }
+      fi
+      pkg_file=${pkg_name}-${pkg_version}-${pkg_release}.$pkg_arch.rpm
+      pkg_path=${LOCAL_REPS_BASE_DIR}/$pkg_repository/RPMS.$pkg_arch/${pkg_file}
+      [ -r $pkg_path ] || {
+         echo "WARNING: file $pkg_path should exist but doesn't; skipping."
+         continue
+      }
+      echo "Installing $pkg_file..."
+      if [ "$force" = "1" ]; then
+         rpm -i $pkg_path --force
+         rpmret=$?
+         [ $rpmret -gt 0 ] && echo "WARNING: rpm returned $rpmret"
+         if [ "$pkg_arch" != "$myarch" ]; then
+            pkg_file=${pkg_name}-${pkg_version}-${pkg_release}.$myarch.rpm
+            pkg_path=${LOCAL_REPS_BASE_DIR}/$pkg_repository/RPMS.$myarch/${pkg_file}
+            echo "Other arch installation forced; reinstalling native arch package after..."
+            rpm -i $pkg_path --force
+            rpmret=$?
+            [ $rpmret -gt 0 ] && echo "WARNING: rpm returned $rpmret"
+         fi
+      else
+         rpm -i $pkg_path
+         rpmret=$?
+         [ $rpmret -gt 0 ] && echo "WARNING: rpm returned $rpmret"
+      fi
+   done
+   exit 0;
+}
+
 [ "$command" = "distromatic" ] && {
    [ -r $SRCPKGLIST ] || {
-      echo "Error: srcpkglist file missing for $origrepository repository; aborting."
+      echo "ERROR: srcpkglist file missing for $origrepository repository; aborting." >&2
       exit 1
    }
    [ -d ${LOCAL_REPS_BASE_DIR}/$origrepository/specs ] || mkdir ${LOCAL_REPS_BASE_DIR}/$origrepository/specs
@@ -969,7 +1062,7 @@ DESTREGFILE=${LOCAL_REPS_BASE_DIR}/$destrepository/operations.log.html
    DEST_MODE=$ORIG_MODE
 
    [ "$ORIG_MODE" = "remote" ] && {
-      echo "Error: restore is only implemented in local repository; exiting."
+      echo "ERROR: restore is only implemented in local repository; exiting." >&2
       exit 1
    }
    [ "$packages" ] || { usage; exit 1; }
@@ -985,7 +1078,7 @@ DESTREGFILE=${LOCAL_REPS_BASE_DIR}/$destrepository/operations.log.html
 [ "$command" = "import" -o "$command" = "release" ] && {
 
    [ "$origrepository" = "$destrepository" ] && {
-      echo "Error: source and destination repository cannot be the same; aborting."; exit 1; }
+      echo "ERROR: source and destination repository cannot be the same; aborting." >&2; exit 200; }
 
    if [ "$command" = "import" ]; then
       echo "Importing $1: $origrepository ($ORIG_MODE) => $destrepository ($DEST_MODE)"
@@ -999,9 +1092,11 @@ DESTREGFILE=${LOCAL_REPS_BASE_DIR}/$destrepository/operations.log.html
       get_packages_from_last_build $origrepository
    fi
 
+   RET=0
    for i in ${packages[*]}; do
       import_package $i $backup_mode
-      if [ $? -eq 255 -a "${AUTODIST_REPOSITORIES_TRANSITIONAL_REP}" -a \
+      IMPORT_RET=$?
+      if [ $IMPORT_RET -eq 255 -a "${AUTODIST_REPOSITORIES_TRANSITIONAL_REP}" -a \
            "${AUTODIST_REPOSITORIES_TRANSITIONAL_REP}" != "$destrepository" -a \
            "${AUTODIST_REPOSITORIES_TRANSITIONAL_REP}" != "$origrepository" -a \
            "${AUTODIST_REPOSITORIES_TRANSITIONAL_REP/-*}" = "${destrepository/-*}" ]; then
@@ -1009,13 +1104,17 @@ DESTREGFILE=${LOCAL_REPS_BASE_DIR}/$destrepository/operations.log.html
          destrepositorysave=$destrepository
          destrepository=${AUTODIST_REPOSITORIES_TRANSITIONAL_REP}
          import_package $i $backup_mode
+         IMPORT_RET=$?
          destrepository=$destrepositorysave
       fi
+      if [ $IMPORT_RET -ne 0 ]; then
+         RET=`expr $RET + 1`
+      fi
    done
 
-   exit 0
+   exit $RET
 }
 
 usage
-echo "Error: $command is not a valid command; aborting."
+echo "ERROR: $command is not a valid command; aborting." >&2
 exit 1

autodist-tmpfilesd

@@ -0,0 +1 @@
+d /run/autodist 775 autodist packager

autodist-tool

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # autodist-tool
-# Copyright (c) 2008-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2008-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 . /etc/autodist/config
 me=(${0##*/} $VERSION "Tue Oct 28 2008")
@@ -14,7 +14,6 @@ SOURCESDIR=$AUTOUPDATEDIR/sources/
 SRCPKGLIST=/var/ftp/pub/openmamba/$AUTODIST_REPOSITORY/srcpkglist
 SUCCESSLISTDIR=$AUTOUPDATEDIR
 SKIPPEDLISTDIR=$AUTOUPDATEDIR
-DISTDBFILE=/etc/autodist/distdb
 
 #eval `autospec -q --eval="srpms_dir"`
 #eval `autospec -q --eval="rpms_dir"`
@@ -133,7 +132,7 @@ elif [ "$COMMAND" = "schedule" ]; then
 #   while read line; do
 #      set -- $line
 #      if [ "`echo \" $1 \" | grep \" $JOB \"`" ]; then
-   if [ "`grep \"^$JOB \" $SRCPKGLIST`" -o "`grep \"^$JOB=(\" $DISTDBFILE`" ]; then
+   if [ "`grep \"^$JOB \" $SRCPKGLIST`" -o "`autodist --list-jobs | grep ^$JOB$`" ]; then
      echo "Job $JOB scheduled for automatic update or rebuild"
      sed -i "/^$JOB .*/d" $AUTOUPDATEDIR/manual.in
      echo "$JOB $JOBVER 0" >> $AUTOUPDATEDIR/manual.in || exit 1
@@ -165,7 +164,7 @@ elif [ "$COMMAND" = "skip" ]; then
    if [ "$SKIPPEDLINE" ]; then
       sed -i "/^$PKGNAME /d" $SKIPPEDLISTDIR/*.skip
    fi
-   if [ "`grep \"^$JOB \" $SRCPKGLIST`" -o "`grep \"^$JOB=(\" $DISTDBFILE`" ]; then
+   if [ "`grep \"^$JOB \" $SRCPKGLIST`" -o "`autodist --list-jobs | grep ^$JOB$`" ]; then
       echo "$JOB $DATE_NOW 101" >> $SKIPPEDLISTDIR/auto.skip
       echo "Job $JOB skipped from automatic builds"
    else

autodist-upstream-updates

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # autodist upstream updates - find upstream packages updates from different internet resources
-# Copyright (c) 2004-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2004-2023 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 
 #[ -r /etc/sysconfig/openmamba-central ] || { 
@@ -10,7 +10,7 @@
 #}
 . /etc/autodist/config
 DISTROMATIC_PREFIX=/distribution/distromatic.html?
-DISTROMATIC_REPOSITORY=devel
+DISTROMATIC_REPOSITORY=base
 DISTDB=/etc/autodist/distdb
 BLACKLISTDB=/etc/autodist/blacklist
 DISTDBDIR=/etc/autodist/distdb.d
@@ -24,16 +24,6 @@ XORG_RELEASE=current
       done
 }
 
-[ -r $PKGLIST_FILE ] || {
-   echo "Error: file $PKGLIST_FILE cannot be read; aborting." >&2
-   exit 1
-}
-
-[ -r $ALIASES_DB ] || {
-   echo "Error: file $ALIASES_DB cannot be read; aborting." >&2
-   exit 1
-}
-
 function usage() 
 {
    echo "openmamba-upstream-updates - finds upstream packages updates from different internet resources"
@@ -46,7 +36,7 @@ function usage()
    echo " -s: skip fetching and parsing upstream updates"
    echo " -u: output not up-to-date packages only"
    echo " -q: produces quite output"
-   echo " -r repository: specify the distromatic base (default: devel)"
+   echo " -r repository: specify the distromatic base (default: base)"
    echo " -o repository: specify the repository for output data (default: same as base repository)"
    echo
 }
@@ -56,7 +46,7 @@ get_job_vector() {
    local JNAME_ESCAPED=`echo $JNAME | tr - _ | tr . _ | tr @ _`
 
    # resolve JOB_NAME from distdb
-   local jobtmpfile=`tempfile`
+   local jobtmpfile=`mktemp`
    # hack to get an array variable named as $j assigned to the JOB array
    echo "echo \${$JNAME_ESCAPED[*]}" > $jobtmpfile
    JOB=(`. $jobtmpfile`)
@@ -86,7 +76,7 @@ function version_compare()
          return 2
       fi
   else
-      if [[ "$A" > "$B" ]]; then
+      if [[ ${1} =~ ^[0-9]+$ || "$A" > "$B" ]]; then
          return 1
       elif [[ "$A" < "$B" ]]; then
          return 2
@@ -167,7 +157,17 @@ CONFIG_DIR=$CACHE_DIR
 UPDATES_DB=$CACHE_DIR/upstream-updates
 ALIASES_DB=$CACHE_DIR/aliases
 MANUALVER_DB=$CACHE_DIR/manualver
+BLACKLIST_DB_PREFIX=$CACHE_DIR/blacklist.
 
+[ -s $PKGLIST_FILE ] || {
+   echo "Error: file $PKGLIST_FILE is missing or empty; aborting." >&2
+   exit 1
+}
+
+[ -r $ALIASES_DB ] || {
+   echo "Error: file $ALIASES_DB cannot be read; aborting." >&2
+   exit 1
+}
 
 parse_arch_linux() {
    # parse Arch Linux package list
@@ -175,15 +175,18 @@ parse_arch_linux() {
    #for page in `seq 1 45`; do
    for rep in core community extra; do
    #   SOURCEURL="https://www.archlinux.org/packages/?page=$page&sort=-last_update&q=&arch=i686&maintainer=&flagged="
-      SOURCEURL="http://lug.mtu.edu/archlinux/$rep/os/i686/"
+      SOURCEURL="http://lug.mtu.edu/archlinux/$rep/os/x86_64/"
       curl -L -s "$SOURCEURL" | \
       grep ".pkg." | grep -v ".sig\"" | \
       while read line; do
          line=`echo $line | sed "s|.*href=\"\([^\"]*\)\">.*|\1|"`
          pkg=`echo $line | sed "s|\(.*\)-[^-]*-[^-]*-[^-]*|\1|"`
-         ver=`echo $line | sed "s|.*-\([^-]*\)-[^-]*-[^-]*|\1|;s|.*%3a||"`
+         ver=`echo $line | sed "s|.*-\([^-]*\)-[^-]*-[^-]*|\1|;s|.*%3a||i;s|%2b.*||i"`
          alias=`grep "^$pkg " $ALIASES_DB`
-
+         # Skip blackisted
+         if [ -e ${BLACKLIST_DB_PREFIX}arch ]; then
+            grep -q "^$pkg$" ${BLACKLIST_DB_PREFIX}arch && continue
+         fi
          [ "$alias" ] || alias=`grep "^lib$pkg " $ALIASES_DB`
          [ "$alias" ] && pkgalias=${alias/* /} || pkgalias=$pkg
          line=`grep -i "^$pkgalias:" $buildstmp || grep -i "^lib$pkgalias:" $buildstmp || grep -i " $pkgalias[^-_A-Za-z0-9]" $buildstmp`
@@ -207,6 +210,9 @@ parse_xorg() {
       if [ "$line" ]; then
          ver=`echo $line | sed "s|.*-||"`
          pkg="${line/-$ver}"
+         if [ -e ${BLACKLIST_DB_PREFIX}xorg ]; then
+            grep -q "^$pkg$" ${BLACKLIST_DB_PREFIX}xorg && continue
+         fi
          alias=`grep "^$pkg " $ALIASES_DB`
          if [ ! "$alias" -a "${pkg:0:5}" == "xf86-" ]; then
             alias="$pkg xorg-drv-${pkg/xf86-}"
@@ -229,10 +235,22 @@ parse_gnome() {
             IFS=":"
             set -- $line
             pkg="$2"
+            if [ -e ${BLACKLIST_DB_PREFIX}gnome ]; then
+               grep -q "^$pkg$" ${BLACKLIST_DB_PREFIX}gnome && continue
+            fi
             ver="$3"
             alias=`grep "^$pkg " $ALIASES_DB`
             [ "$alias" ] || alias=`grep "^lib$pkg " $ALIASES_DB`
-            [ "$pkg" -a "$ver" ] && echo "$pkg $ver $SOURCEURL ${alias/* /}" >> $tmpfile
+            if [ "$pkg" -a "$ver" ]; then
+               ver1=$(echo $ver | cut -d. -f1)
+               ver2=$(echo $ver | cut -d. -f2)
+               if [ "$ver2" -a $(($ver2 % 2)) -ne 0 ]; then
+                  # skip unstable versions with odd numbers
+                  continue
+               else
+                  echo "$pkg $ver $SOURCEURL ${alias/* /}" >> $tmpfile
+               fi
+            fi
          fi
       done
    done
@@ -241,7 +259,7 @@ parse_gnome() {
 parse_distromatic() {
    # parse distrowatch.com packages list
    [ "$quiet" ] || echo "Parsing Distrowatch packages list..." >&2
-   SOURCEURL="http://distrowatch.com/packages.php"
+   SOURCEURL="https://distrowatch.com/packages.php"
    lynx -width 300 -dump $SOURCEURL |
    while read line; do
       [ "`echo $line | grep "Package Version Note"`" ] && start_print=1
@@ -258,41 +276,43 @@ parse_distromatic() {
 }
 
 if [ ! "$skip_parsing" ]; then
-   tmpfile=`mktemp -q -t autodist-upstream-updates.XXXXXXXX`
+   #tmpfile=`mktemp -q -t autodist-upstream-updates.XXXXXXXX`
    buildstmp=`mktemp -q -t autodist-upstream-updates.XXXXXXXX`
    tail -n+2 $BUILDS_FILE > $buildstmp
 
-   parse_arch_linux
-   parse_xorg
-   parse_gnome
-   parse_distromatic
+   #parse_arch_linux
+   #parse_xorg
+   #parse_gnome
+   #parse_distromatic
+   /usr/share/autodist/repology-openmamba.py > $UPDATES_DB.tmp
+   if [ $? -eq 0 ]; then
+      #cat $tmpfile | sort -uf > $UPDATES_DB.tmp
+      #rm -f $tmpfile
 
-   cat $tmpfile | sort -uf > $UPDATES_DB.tmp
-   rm -f $tmpfile
-
-   > $UPDATES_DB
-   unset lastpkg
-   while read pkg ver upsource alias; do
-      # skip updates to unstable versions
-      unset found_beta
-      for b in alpha beta rc "~"; do
-         [ "${ver/$b}" != "${ver}" ] && found_beta=1
-      done
-      [ "$found_beta" ] && continue
-      if [ "$pkg" = "$lastpkg" ]; then
-#      echo "Warning: duplicate found: $pkg lastver: $lastver ver: $ver" >&2
-         version_find_bigger $lastver $ver
-         vercmp=$?
-         if [ $vercmp -eq 2 ]; then
-            sed -i "/^$lastpkg $lastver /d" $UPDATES_DB
+      > $UPDATES_DB
+      unset lastpkg
+      while read pkg ver upsource alias; do
+         # skip updates to unstable versions
+         unset found_beta
+         for b in alpha beta rc "~"; do
+            [ "${ver/$b}" != "${ver}" ] && found_beta=1
+         done
+         [ "$found_beta" ] && continue
+         if [ "$pkg" = "$lastpkg" ]; then
+#         echo "Warning: duplicate found: $pkg lastver: $lastver ver: $ver" >&2
+            version_find_bigger $lastver $ver
+            vercmp=$?
+            if [ $vercmp -eq 2 ]; then
+               sed -i "/^$lastpkg $lastver /d" $UPDATES_DB
+               echo "$pkg $ver $upsource $alias" >> $UPDATES_DB
+            fi
+         else
             echo "$pkg $ver $upsource $alias" >> $UPDATES_DB
          fi
-      else
-         echo "$pkg $ver $upsource $alias" >> $UPDATES_DB
-      fi
-      lastpkg=$pkg
-      lastver=$ver
-   done < $UPDATES_DB.tmp
+         lastpkg=$pkg
+         lastver=$ver
+      done < $UPDATES_DB.tmp
+   fi
    rm -f $UPDATES_DB.tmp
 fi
 

automaint

@@ -1,13 +1,11 @@
 #!/bin/bash
 # automaint -- batch automatic maintainance tool of the autodist suite
-# Copyright (C) 2013-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2013-2021 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPL release 3 license
 #
 VERSION=0.9.7
 # First in vector is base arch
-ARCHS=(i586 arm x86_64)
-
 . /etc/autodist/config
 
 me=(${0##*/} $VERSION "Sat Mar 20 2011")
@@ -15,7 +13,7 @@ me=(${0##*/} $VERSION "Sat Mar 20 2011")
 function usage() {
    echo "\
 ${me[0]} ${me[1]}
-"$"Copyright (C) 2013 Silvan Calarco <silvan.calarco@mambasoft.it>""
+"$"Copyright (C) 2013-2021 Silvan Calarco <silvan.calarco@mambasoft.it>""
 "$"Released under the terms of the GNU GPL v3 license"
    echo "
 "$"Batch automatic maintainance tool of the autodist suite.""
@@ -152,8 +150,8 @@ done
 
 [ "$TESTMODE" ] && echo "** TEST MODE enabled: no changes will be made **"
 
-for a in `seq 1 ${#ARCHS[*]}`; do
-   . $LOCAL_REPS_BASE_DIR/distromatic/$SOURCE_REPOSITORY/builds-${ARCHS[$a-1]}.sh
+for a in `seq 1 ${#AUTODIST_ARCHS[*]}`; do
+   . $LOCAL_REPS_BASE_DIR/distromatic/$SOURCE_REPOSITORY/builds-${AUTODIST_ARCHS[$a-1]}.sh
    pkglist[$a-1]="${pkg_list[*]}"
    warningslist[$a-1]="${warnings_list[*]}"
    needportlist[$a-1]="${needport_list[*]}"
@@ -164,7 +162,7 @@ tmpfile=`mktemp -q -t $me.XXXXXXXX` || {
       exit 1
    }
 
-for a in `seq 1 ${#ARCHS[*]}`; do
+for a in `seq 1 ${#AUTODIST_ARCHS[*]}`; do
    echo -n "${pkglist[$a-1]} " >> $tmpfile
 done
 allpkgs="`cat $tmpfile | xargs -n 1 | sort -u | xargs`"
@@ -173,46 +171,55 @@ rm -f $tmpfile
 for p in ${allpkgs}; do
    pkgcontinue=
    needsport=
+
    for w in ${warningslist[*]}; do
       [ "$p" = "$w" ] && { pkgcontinue=1; break; }
    done
    [ "$pkgcontinue" ] && continue
 
-   for a in `seq 1 ${#ARCHS[*]}`; do
-      get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$DEST_REPOSITORY ${ARCHS[$a-1]} $p
+   for a in `seq 1 ${#AUTODIST_ARCHS[*]}`; do
+      # Get pkg info from port repository
+      get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$PORT_REPOSITORY ${AUTODIST_ARCHS[$a-1]} $p
+      # If not found get info from main repository
+      if [ ! "$pkg_name" ]; then
+         get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$DEST_REPOSITORY ${AUTODIST_ARCHS[$a-1]} $p
+      fi
+
       if [ "$pkg_name" ]; then
-         spkg_version=$pkg_version
-         spkg_release=$pkg_release
+         old_pkg_version=$pkg_version
+         old_pkg_release=$pkg_release
+         old_pkg_repository=$pkg_repository
          break
       fi
    done
 
    [ "$pkg_name" ] || {
-      echo "$p: not present in $DEST_REPOSITORY; skipping."
+      [ "$VERBOSE" ] && echo "$p: not present in $DEST_REPOSITORY; skipping."
       continue
    }
 
-   [ "$VERBOSE" ] && echo "$p: old release in $DEST_REPOSITORY is $spkg_version-$spkg_release"
+   [ "$VERBOSE" ] && echo "$p: old release in $DEST_REPOSITORY is $old_pkg_version-$old_pkg_release"
 
    for o in ${needportlist[*]}; do
       [ "$p" = "$o" ] && { needsport=1; break; }
    done
+   #[ "$needsport" ] && continue
    [ "$needsport" -a ! "$PORT_REPOSITORY" ] && continue
 
-   for a in `seq 1 ${#ARCHS[*]}`; do
-      get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$SOURCE_REPOSITORY ${ARCHS[$a-1]} $p
+   for a in `seq 1 ${#AUTODIST_ARCHS[*]}`; do
+      get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$SOURCE_REPOSITORY ${AUTODIST_ARCHS[$a-1]} $p
       [ "$pkg_name" ] && break
    done
 
    [ "$pkg_name" ] || {
-      echo "$p: not present in $SOURCE_REPOSITORY; skipping."
+      [ "$VERBOSE" ] && echo "$p: not present in $SOURCE_REPOSITORY; skipping."
       continue
    }
 
    [ "$VERBOSE" ] && echo "$p: new release in $SOURCE_REPOSITORY is $pkg_version-$pkg_release"
 
-   if [ "$pkg_version" = "$spkg_version" ]; then
-      if [ "$pkg_release" = "$spkg_release" ]; then
+   if [ "$pkg_version" = "$old_pkg_version" ]; then
+      if [ "$pkg_release" = "$old_pkg_release" ]; then
          echo "$p: same release as upstream; skipping."
             continue
       fi
@@ -220,7 +227,7 @@ for p in ${allpkgs}; do
    else
       OIFS=$IFS
       IFS='.'
-      read -ra SVER <<< "$spkg_version"
+      read -ra SVER <<< "$old_pkg_version"
       read -ra VER <<< "$pkg_version"
       IFS=$OIFS
       dotdiff=`expr ${#VER[*]} - ${#SVER[*]}`
@@ -234,40 +241,51 @@ for p in ${allpkgs}; do
             continue
          fi
          update_type="minor"
-      elif [ $dotdiff -lt 0 ]; then
-         [ "$VERBOSE" ] && echo "$p: newer version has less dots than older ${#VER[*]} < ${#SVER[*]}; skipping."
-         continue
-      elif [ "$i" != "${#SVER[*]}" ]; then
-         # e.g. SVER=0.11 -> VER=1.0
-         [ "$VERBOSE" ] && echo "$p: not a minor version update at position $i/${#SVER[*]}: ${SVER[i-1]} != ${VER[i-1]}; skipping."
-         continue
+      #elif [ $dotdiff -lt 0 ]; then
+      #   [ "$VERBOSE" ] && echo "$p: newer version has less dots than older ${#VER[*]} < ${#SVER[*]}; skipping."
+      #   continue
+      #elif [ "$i" != "${#SVER[*]}" ]; then
+      #   # e.g. SVER=0.11 -> VER=1.0
+      #   [ "$VERBOSE" ] && echo "$p: not a minor version update at position $i/${#SVER[*]}: ${SVER[i-1]} != ${VER[i-1]}; skipping."
+      #   continue
       elif [ "${SVER[i-1]}" = "${VER[i-1]}" -a $dotdiff -ge 1 ]; then
          # e.g. SVER=0.11.2 -> VER=0.11.2.3
          update_type="minor"
-      else
-         echo "$p: UNEXPECTED CASE - CHECK CODE; skipping."
+      elif [[ 64#${VER[i-1]} -gt 64#89 && 64#${SVER[i-1]} -lt 64#80 ]]; then
+         [ "$VERBOSE" ] && echo "$p: dubious beta upgrade from ${SVER[i-1]} to ${VER[i-1]}; skipping."
          continue
+      elif [[ 64#${VER[i-1]} -gt 64#${SVER[i-1]} && $i -gt 1 ]]; then
+         # e.g. SVER=1.0.2 -> VER=1.0.3.dev1234
+         update_type="minor"
+      #else
+      #  [ "$VERBOSE" ] && echo "$p: major version update ${SVER[i-1]} vs ${VER[i-1]}; skipping"
+      #  continue
       fi
    fi
-   if [ "$needsport" ]; then
-      echo "$p: importing from $SOURCE_REPOSITORY to $PORT_REPOSITORY ($pkg_version-$pkg_release -> $spkg_version-$spkg_release)"
-      if [ ! "$TESTMODE" ]; then
-         autodist-repository import $SOURCE_REPOSITORY $p -d $PORT_REPOSITORY -y >/dev/null
-         if [ $? -eq 0 -a "$WEBBUILD_URL" -a "$WEBBUILD_USER" ]; then
-            curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&SECRET=${WEBBUILD_SECRET}&USER_EMAIL=$WEBBUILD_EMAIL&\
+   #if [ ! "${needsport}" ]; then
+      if [ "$old_pkg_repository" == "$PORT_REPOSITORY" -o "$old_pkg_repository" == "$DEST_REPOSITORY" ]; then
+         echo "$p: importing from $SOURCE_REPOSITORY to $PORT_REPOSITORY ($pkg_version-$pkg_release -> $old_pkg_version-$old_pkg_release)"
+         if [ ! "$TESTMODE" ]; then
+            autodist-repository import $SOURCE_REPOSITORY $p -d $PORT_REPOSITORY -y >/dev/null
+            if [ $? -eq 0 -a "$WEBBUILD_URL" -a "$WEBBUILD_USER" ]; then
+               curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&SECRET=${WEBBUILD_SECRET}&USER_EMAIL=$WEBBUILD_EMAIL&\
 MESSAGE=`cgi_encodevar \"imported <b>$p</b> from <b>$SOURCE_REPOSITORY</b> to <b>$PORT_REPOSITORY</b> for porting\"`" >/dev/null
+            fi
          fi
       fi
-   else
-      echo "$p: importing from $SOURCE_REPOSITORY to $DEST_REPOSITORY ($pkg_version-$pkg_release -> $spkg_version-$spkg_release; update type: $update_type)"
-      if [ ! "$TESTMODE" ]; then
-         autodist-repository import $SOURCE_REPOSITORY $p -d $DEST_REPOSITORY -y >/dev/null
-         if [ $? -eq 0 -a "$WEBBUILD_URL" -a "$WEBBUILD_USER" ]; then
-            curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&SECRET=${WEBBUILD_SECRET}&USER_EMAIL=$WEBBUILD_EMAIL&\
-MESSAGE=`cgi_encodevar \"imported <b>$p</b> from <b>$SOURCE_REPOSITORY</b> to <b>$DEST_REPOSITORY</b>\"`" >/dev/null
-         fi
-      fi
-   fi
+   #fi
+   #elif [ "$old_pkg_repository" == "$DEST_REPOSITORY" ]; then
+    #  echo "$p: importing from $SOURCE_REPOSITORY to $DEST_REPOSITORY ($pkg_version-$pkg_release -> $old_pkg_version-$old_pkg_release; update type: $update_type)"
+     # if [ ! "$TESTMODE" ]; then
+    #     autodist-repository import $SOURCE_REPOSITORY $p -d $DEST_REPOSITORY -y >/dev/null
+    #     if [ $? -eq 0 -a "$WEBBUILD_URL" -a "$WEBBUILD_USER" ]; then
+    #        curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&SECRET=${WEBBUILD_SECRET}&USER_EMAIL=$WEBBUILD_EMAIL&\
+#MESSAGE=`cgi_encodevar \"imported <b>$p</b> from <b>$SOURCE_REPOSITORY</b> to <b>$DEST_REPOSITORY</b>\"`" >/dev/null
+#         fi
+#      fi
+#   else
+#      echo "$p: upstream package repository $pkg_repository does not match with $DEST_REPOSITORY; skipping."
+#   fi
 done
 
 exit 0

autoport

@@ -1,14 +1,13 @@
 #!/bin/bash
 # autoport -- batch cross-build tool based on autodist
-# Copyright (C) 2011-2012 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=0.9.10
+VERSION=1.6.1
 
-BASE_ARCH=i586
-BASE_REPOSITORY=devel
-PORT_REPOSITORY=devel
+BASE_REPOSITORY=base
+PORT_REPOSITORY=base
 
 . /etc/autodist/config
 
@@ -17,13 +16,13 @@ me=(${0##*/} $VERSION "Sat Mar 20 2011")
 function usage() {
    echo "\
 ${me[0]} ${me[1]}
-"$"Copyright (C) 2011-2012 Silvan Calarco <silvan.calarco@mambasoft.it>""
+"$"Copyright (C) 2011-2023 Silvan Calarco <silvan.calarco@mambasoft.it>""
 "$"Released under the terms of the GNU GPL v3 license"
    echo "
 "$"Batch port and cross-build tool based on autodist.""
 
 "$"Usage"":
-   $me [-a][-f][-x arch1[,arch2],..][-r repository][-d release_repository]{--fix|job ...}
+   $me [-a][-f][-x arch1[,arch2],..][-r repository][-d release_repository][-s \"script_args\"]{--fix|job ...}
 
    -a                 "$"Automatic mode (use cache)
    -b                 "$"Batch port all packages in port repository to sync with base repository
@@ -33,12 +32,14 @@ ${me[0]} ${me[1]}
    -nr                "$"Don't recurse build
    --fix              "$"Fix .la files for cross linking and exit
    -r                 "$"Work on given repository (default: $PORT_REPOSITORY)
-   -d                 "$"Release packages to given repository (default: $PORT_REPOSITORY)
+   -d                 "$"Release packages to given repository (default: work repository)
    -h                 "$"Show this help and exit
+   -s \"script_args\"   "$"Send script_args as arguments for autodist update-specfile script
    -u changelog       "$"Rebuild packages with given changelog
+   -ud                "$"Rebuild dependent packages that need rebuild
    -v                 "$"More verbose output
    -x                 "$"Operate in cross build mode
-   --user user        "$"Pass calling user name for Webbuild social messages""
+   --user user        "$"Pass calling user name for Webbuild social messages
 
    arch               "$"Target architecture
    job                "$"Job specification for autodist""
@@ -123,7 +124,7 @@ function get_pkg_buildinfo() {
    fi
 
    pkg_archs=();
-   for a in ${archs[*]}; do
+   for a in ${AUTODIST_ARCHS[*]}; do
       [ "$a" = "${local_arch}" ] && continue
       pkg_header=();
       DISTROMATIC_BUILD_FILE=$local_distromatic/builds-$a.sh
@@ -146,24 +147,23 @@ function get_pkg_buildinfo() {
 #   }
 #  . $DISTROMATIC_BUILD_FILE
 
-   for i in ${pkg_list[*]}; do
-      if [ "$i" == "${pkg_header[0]}" ]; then
-         pkg_name=${pkg_header[0]};
-         # Note: pkg_arch reported in builds file is just last arch source was
-         # built for, so we use repository arch instead
-         pkg_arch=${pkg_header[1]};
-         [ "$pkg_arch" = "noarch" ] || pkg_arch=${local_arch}
-         pkg_version=${pkg_header[2]};
-         pkg_release=${pkg_header[3]};
-         pkg_group=${pkg_header[4]};
-         pkg_license=${pkg_header[5]};
-         pkg_size=${pkg_header[6]};
-         pkg_buildtime=${pkg_header[7]};
-         pkg_altrep=${pkg_header[8]};
-         pkg_repository=${pkg_header[9]};
-         return 0
-      fi
-   done
+    if [ "${pkg_header[0]}" ]; then
+       pkg_name=${pkg_header[0]};
+       # Note: pkg_arch reported in builds file is just last arch source was
+       # built for, so we use repository arch instead
+       pkg_arch=${pkg_header[1]};
+       [ "$pkg_arch" = "noarch" ] || pkg_arch=${local_arch}
+       pkg_version=${pkg_header[2]};
+       pkg_release=${pkg_header[3]};
+       pkg_group=${pkg_header[4]};
+       pkg_license=${pkg_header[5]};
+       pkg_size=${pkg_header[6]};
+       pkg_buildtime=${pkg_header[7]};
+       pkg_altrep=${pkg_header[8]};
+       pkg_repository=${pkg_header[9]};
+       pkg_epoch=${pkg_header[10]};
+       return 0
+   fi
    unset pkg_name pkg_arch pkg_version pkg_release \
          pkg_group pkg_license pkg_size pkg_buildtime pkg_altrep pkg_repository
 
@@ -184,7 +184,7 @@ _EOF
 
 function find_source_by_provide() {
    local pkg=`echo $2 | sed "s|(|\\\\\[|g;s|)|\\\\\]|g;s|:|_|g"`
-   grep "^$pkg:" $DATADIR/$1/sources-$BASE_ARCH | \
+   grep "^$pkg:" $DATADIR/$1/sources-* | \
       awk '{ $1=""; print $0 }' | \
       sed "s|[[:space:]]_| |g"
 }
@@ -211,9 +211,16 @@ function find_requirements() {
       > $tf
       sort -u $tf1 | while read line; do
          REQ=`find_source_by_provide $PORT_REPOSITORY ${line}`
-         [ "$REQ" ] && \
-            echo "${REQ}" >> $tf || \
+         if [ "$REQ" ]; then
+            get_pkg_buildinfo $DATADIR/$PORT_REPOSITORY $TARGET_ARCH $REQ
+            if [ "$pkg_name" ]; then
+               echo -n "$line(notrebuilding) "
+            else
+               echo "${REQ}" >> $tf
+            fi
+         else
             echo -n "$line(unresolved) "
+         fi
       done
       > $tf1
       cat $tf | sort -u 2>/dev/null | while read line; do
@@ -232,20 +239,45 @@ function find_requirements() {
 }
 
 fetch_repfiles() {
-   curl -s ${REPS_BASE_URL}/$PORT_REPOSITORY/srcpkglist -o $DATADIR/$PORT_REPOSITORY/srcpkglist ||
-      echo "Warning: unable to fetch ${REPS_BASE_URL}/$PORT_REPOSITORY/srcpkglist"
-   curl -s $PORT_REPOSITORY_DISTROMATIC_URL/sources-$BASE_ARCH -o $DATADIR/$PORT_REPOSITORY/sources-$BASE_ARCH ||
-      echo "Warning: unable to fetch $PORT_REPOSITORY_DISTROMATIC_URL/sources-$BASE_ARCH"
-   curl -s $PORT_REPOSITORY_DISTROMATIC_URL/builds-$TARGET_ARCH.sh -o $DATADIR/$PORT_REPOSITORY/builds-$TARGET_ARCH.sh ||
-      echo "Error: unable to fetch $PORT_REPOSITORY_DISTROMATIC_URL/builds-$TARGET_ARCH.sh"
+   local u
+
+   f=${DATADIR}/${PORT_REPOSITORY}/srcpkglist
+   if [ ! -e ${f} -o "`find ${f} -mmin +60 2>/dev/null`" ]; then
+      [ "$VERBOSE_MODE" = "1" ] && echo "Fetching ${REPS_BASE_URL}/$PORT_REPOSITORY/srcpkglist"
+      curl -f -L -s ${REPS_BASE_URL}/$PORT_REPOSITORY/srcpkglist -o ${f} ||
+         echo "Warning: unable to fetch ${REPS_BASE_URL}/$PORT_REPOSITORY/srcpkglist"
+   fi
+   for a in ${AUTODIST_ARCHS[*]}; do
+      f=${DATADIR}/${PORT_REPOSITORY}/sources-${a}
+      if [ ! -e ${f} -o "`find ${f} -mmin +60 2>/dev/null`" ]; then
+         [ "$VERBOSE_MODE" = "1" ] && echo "Fetching $PORT_REPOSITORY_DISTROMATIC_URL/sources-${a}"
+         curl -f -L -s $PORT_REPOSITORY_DISTROMATIC_URL/sources-${a} -o ${f} ||
+            echo "Warning: unable to fetch $PORT_REPOSITORY_DISTROMATIC_URL/sources-${a}"
+      fi
+      f=${DATADIR}/${PORT_REPOSITORY}/builds-${a}.sh
+      if [ ! -e ${f} -o "`find ${f} -mmin +60 2>/dev/null`" ]; then
+         [ "$VERBOSE_MODE" = "1" ] && echo "Fetching $PORT_REPOSITORY_DISTROMATIC_URL/builds-${a}.sh"
+         curl -f -L -s $PORT_REPOSITORY_DISTROMATIC_URL/builds-${a}.sh -o ${f} ||
+            echo "Warning: unable to fetch $PORT_REPOSITORY_DISTROMATIC_URL/builds-${a}.sh"
+      fi
+   done
+   for u in ${AUTOPORT_UNSTAGE_ARCHS}; do
+      [ "$u" = "$TARGET_ARCH" ] && {
+         rm -f $DATADIR/$PORT_REPOSITORY/unstage.$TARGET_ARCH
+         return
+      }
+   done
+   [ "$VERBOSE_MODE" = "1" ] && echo "Fetching ${REPS_BASE_URL}/${PORT_REPOSITORY/-*}/unstage.$TARGET_ARCH"
+   curl -f -L -s ${REPS_BASE_URL}/${PORT_REPOSITORY/-*}/unstage.$TARGET_ARCH -o $DATADIR/$PORT_REPOSITORY/unstage.$TARGET_ARCH ||
+      echo "Warning: unable to fetch ${REPS_BASE_URL}/${PORT_REPOSITORY/-*}/unstage.$TARGET_ARCH"
 }
 
 [ $# -gt 0 ] || { usage ; exit 1; }
 
-BUILD_ARCH=`uname -i`
+[ "$BUILD_ARCH" ] || BUILD_ARCH=`uname -m`
 
 case $BUILD_ARCH in
-   i386|i486|i686) BUILD_ARCH=i586; BASE_ARCH=x86_64 ;;
+   i386|i486|i686) BUILD_ARCH=i586 ;;
    arm*) BUILD_ARCH=arm ;;
 esac
 
@@ -267,6 +299,9 @@ for ((i=1; i<=$#; i++)); do
              exit 1
           }
           ;;
+      -ud) REBUILD_DEPENDANT_MODE=1
+           DONT_RECURSE=1
+           ;;
       -npa) DONT_PREPARE_ANY=1
             DONT_PREPARE=1 ;;
       -np) DONT_PREPARE=1 ;;
@@ -275,6 +310,9 @@ for ((i=1; i<=$#; i++)); do
       -r) shift
           PORT_REPOSITORY="${!i}"
           ;;
+      -s) shift
+          SCRIPT_ARGS="${!i}"
+          ;;
       -d) shift
           DEST_REPOSITORY="${!i}"
           ;;
@@ -300,14 +338,21 @@ done
 
 [ "$DEST_REPOSITORY" ] || DEST_REPOSITORY=$PORT_REPOSITORY
 
+if [ "$BATCH_MODE" ]; then
+  PIDFILE="/run/autodist/autoport-${BUILD_ARCH}-${PORT_REPOSITORY}.pid"
+  [ -e $PIDFILE ] && {
+     PIDCHECK=`cat $PIDFILE`
+     [ "$PIDCHECK" -a -e /proc/$PIDCHECK -a ! "$DISABLE_PID_CHECK" ] && {
+        echo "Error: autoport -b already running with PID=$PIDCHECK.Aborting."
+        exit 1
+     }
+  }
+  echo $$ > $PIDFILE
+  trap "rm -f $PIDFILE; exit 1" SIGQUIT SIGINT SIGKILL SIGTERM
+fi
+
 for TARGET_ARCH in ${TARGET_ARCHS}; do
 
-   [ "$BASE_ARCH" = "$TARGET_ARCH" -a "$PORT_REPOSITRY" = "$DEST_REPOSITORY" ] && {
-      echo "Error: base and target arch ($BASE_ARCH) are the same as well as port and release repositories ($PORT_REPOSITORY); skipping."
-      continue
-   }
-
-   archs=($BASE_ARCH $TARGET_ARCH)
    JOBS_SKIPPED=()
    JOBS_CANTPREPARE=()
    JOBS_CANTINSTALL=()
@@ -321,10 +366,6 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
    BASE_REPOSITORY_DISTROMATIC_URL=${DISTROMATIC_BASE_URL}$BASE_REPOSITORY
    PORT_REPOSITORY_DISTROMATIC_URL=${DISTROMATIC_BASE_URL}$PORT_REPOSITORY
 
-   [ "$AUTO_MODE" -a -e $DATAARCHDIR/last ] && . $DATAARCHDIR/last
-   JOB=(${JOB_CMDLINE[*]} ${JOB_MISSINGREQ[*]} ${JOB_FAILED[*]})
-   [ "$FIX_MODE" -o "$BATCH_MODE" -o "${JOB[*]}" ] || { usage ; exit 1; }
-
    [ -d $DATAARCHDIR ] || mkdir -p $DATAARCHDIR
    [ -d $DATADIR/$BASE_REPOSITORY ] || mkdir -p $DATADIR/$BASE_REPOSITORY
    [ -d $DATADIR/$PORT_REPOSITORY ] || mkdir -p $DATADIR/$PORT_REPOSITORY
@@ -351,22 +392,56 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
    echo "Port repository is $PORT_REPOSITORY"
    echo "Release repository is $DEST_REPOSITORY"
 
-
-   # old files cleanup
-   rm -f $DATADIR/$PORT_REPOSITORY/sources-$TARGET_CPU
-   rm -f $DATADIR/$PORT_REPOSITORY/builds-$BASE_ARCH.sh
-
-   
    fetch_repfiles
 
+   [ "$AUTO_MODE" -a -e $DATAARCHDIR/last ] && . $DATAARCHDIR/last
+   if [ "$REBUILD_DEPENDANT_MODE" ]; then
+      for j in ${JOB_CMDLINE[*]}; do
+         get_pkg_buildinfo $DATADIR/$PORT_REPOSITORY $TARGET_ARCH $j
+         port_pkg_list=${pkg_needrebuild[*]}
+         port_pkg_builds=" ${pkg_builds[*]} "
+         port_pkg_epoch=$pkg_epoch
+         port_pkg_version=$pkg_version
+         port_pkg_release=$pkg_release
+         currrebuild=
+         currjobscriptargs=
+         JOBNUM=0
+         for p in ${port_pkg_list}; do
+            if [ "${p/@*}" != "$currrebuild" ]; then
+               [ $JOBNUM -gt 0 ] && JOB_SCRIPTARGS[$JOBNUM-1]="$currjobscriptargs"
+               currjobscriptargs=
+               currrebuild=${p/@*}
+               get_pkg_buildinfo $DATADIR/$PORT_REPOSITORY $TARGET_ARCH $currrebuild
+               for ignore_pkg in ${AUTOPORT_IGNORE_LIST}; do
+                  [ "${currrebuild}" == "${ignore_pkg}" ] && continue
+               done
+               JOB=(${JOB[*]} $currrebuild)
+               let JOBNUM+=1
+            fi
+            currprovider=${p/*@}
+            if [ "${currprovider/-devel}" == "$currprovider" ]; then
+               currprovider=${currprovider}-devel
+            fi
+            add_epoch=""
+            [ "${port_pkg_epoch}" ] && add_epoch="${port_pkg_epoch}:"
+            currjobscriptargs="$currjobscriptargs --buildreq ${currprovider} >= ${add_epoch}${port_pkg_version}-${port_pkg_release} "
+         done
+         [ "$currjobscriptargs" ] && JOB_SCRIPTARGS[$JOBNUM-1]="$currjobscriptargs"
+         echo "Package dependant from $j to rebuild: ${JOB[*]}"
+      done
+   else
+      JOB=(${JOB_CMDLINE[*]} ${JOB_MISSINGREQ[*]} ${JOB_FAILED[*]})
+   fi
+   [ "$FIX_MODE" -o "$BATCH_MODE" -o "${JOB[*]}" ] || { echo "Nothing to do."; exit 0; }
+
    if [ "$BATCH_MODE" ]; then
+
       [ "${JOB[*]}" ] && {
          echo "Error: no jobs allowed in batch mode; aborting."
          exit 1
       }
       # old files cleanup
-      rm -f $DATADIR/$BASE_REPOSITORY/builds-$BASE_ARCH.sh
-      rm -f $DATADIR/$BASE_REPOSITORY/builds-$TARGET_ARCH.sh
+      rm -f $DATADIR/$BASE_REPOSITORY/builds-*.sh
 
       get_pkg_buildinfo $DATADIR/$PORT_REPOSITORY $TARGET_ARCH
       port_pkg_list=${pkg_list[*]}
@@ -383,12 +458,11 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
             fi
          done
          echo "Packages to rebuild: ${JOB[*]}"
-      else
-         echo "Packages to port: ${needport_list[*]}"
-         for p in ${needport_list[*]}; do
-             JOB=(${JOB[*]} $p)
-         done
       fi
+      echo "Packages to port: ${needport_list[*]}"
+      for p in ${needport_list[*]}; do
+         JOB=(${JOB[*]} $p)
+      done
 
       [ -e $DATADIR/autoport-$PORT_REPOSITORY-current ] && \
           mv $DATADIR/autoport-$PORT_REPOSITORY-current $DATADIR/autoport-$PORT_REPOSITORY-last
@@ -408,6 +482,11 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
       > $DATAARCHDIR/preparedjobs
    }
 
+   [ -e $DATAARCHDIR/updatedjobs ] || > $DATAARCHDIR/updatedjobs
+   find $DATAARCHDIR/updatedjobs -ctime 1 >/dev/null && {
+      > $DATAARCHDIR/updatedjobs
+   }
+
    sudo autoport-fix-environment $TARGET_ARCH
 
    [ "$FIX_MODE" ] && exit 0
@@ -438,8 +517,9 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
          else
             JOB_CURRENT_VERSION=
          fi
-         if [ "`grep "^${JOB_CURRENT}$" /etc/autodist/unstage 2>/dev/null`" -o \
-              "`grep "^${JOB_CURRENT}$" /etc/autodist/unstage.${TARGET_ARCH} 2>/dev/null`" ]; then
+         if [ ! -s $DATADIR/$PORT_REPOSITORY/unstage.${TARGET_ARCH} -o \
+              "`grep "^${JOB_CURRENT}$" /etc/autodist/unstage.${TARGET_ARCH} 2>/dev/null`" -o \
+              "`grep "^${JOB_CURRENT}$" $DATADIR/$PORT_REPOSITORY/unstage.${TARGET_ARCH} 2>/dev/null`" ]; then
             echo -n "^ $JOB_CURRENT: "
             STAGEOPTS=
          else
@@ -477,40 +557,50 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
          fi
 
          DONT_PREPARE_THIS=
+         RELEASE_UPDATED=
+         grep -q ^$JOB_CURRENT\$ $DATAARCHDIR/preparedjobs && RELEASE_UPDATED=1
          for p in ${JOB_CMDLINE[*]}; do
             [ "$p" = "${JOB_CURRENT}" -o "$DONT_PREPARE_ANY" ] || continue
             [ -e ${SPECDIR}/${JOB_CURRENT}.spec ] && DONT_PREPARE_THIS="$DONT_PREPARE"
          done
          [ ! "$DONT_PREPARE_THIS" -a ! "`grep ^$JOB_CURRENT\$ $DATAARCHDIR/preparedjobs`" ] && {
             echo -n "prepare"
-            [ "$VERBOSE_MODE" ] && echo "
-%% COMMAND: LANG=C LC_ALL=C autodist -p ${JOB_CURRENT} --server $PORT_REPOSITORY --repository $PORT_REPOSITORY --severity 2 -- $STAGEOPTS"
-            LANG=C LC_ALL=C autodist -p ${JOB_CURRENT} --server $PORT_REPOSITORY --repository $PORT_REPOSITORY --severity 2 -- $STAGEOPTS &>$tmpfile
-            cat $tmpfile >> $logfile
+            if [ ! "$REBUILD_DEPENDANT_MODE" -a "$step" = "1" ]; then
+               REPOSITORY_STRICT_ADD="--repository-strict"
+            else
+               REPOSITORY_STRICT_ADD=""
+            fi
+#            [ "$VERBOSE_MODE" ] && echo "
+#%% COMMAND: LANG=C LC_ALL=C autodist -p ${JOB_CURRENT} --server $PORT_REPOSITORY --repository $PORT_REPOSITORY $REPOSITORY_STRICT_ADD --severity 2 -- $STAGEOPTS"
+            LANG=C LC_ALL=C autodist -p ${JOB_CURRENT} --server $PORT_REPOSITORY --repository $PORT_REPOSITORY $REPOSITORY_STRICT_ADD --severity 2 -- $STAGEOPTS &>$tmpfile
             [ $? -gt 0 ] && {
-               RES=`find_source_by_provide $PORT_REPOSITORY $JOB_CURRENT`
-               for j in ${RES}; do
-                  [ "$j" != "$JOB_CURRENT" ] && RESOLVED_JOB="$RESOLVED_JOB $j"
-               done
-               if [ "$RESOLVED_JOB" ]; then
-                  echo "(FAILED) [but scheduling $RESOLVED_JOB]"
-                  JOB_FAILED=(${JOB_FAILED[*]} $RESOLVED_JOB)
-               else
-                  echo "(FAILED) "
-               fi
+               echo "(FAILED) "
                JOB_CANTPREPARE=(${JOB_CANTPREPARE[*]} $JOB_CURRENT)
                autoport_log ${JOB_CURRENT} prepare failed $tmpfile
                continue
             } || {
+               spec_version=`grep -m1 "^Version:" ${SPECDIR}/${JOB_CURRENT}.spec | awk '{ print $2}'`
+               spec_release=`grep -m1 "^Release:" ${SPECDIR}/${JOB_CURRENT}.spec | awk '{ print $2}'`
+               if [ "${spec_version}-${spec_release}" != "$src_version-$src_release" ]; then
+                  echo "< (FAILED) [wrong version ${src_version}-${src_release} != ${spec_version}-${spec_release}]"
+                  JOB_CANTPREPARE=(${JOB_CANTPREPARE[*]} $JOB_CURRENT)
+                  autoport_log ${JOB_CURRENT} prepare failed $tmpfile
+                  continue
+               fi
                echo $JOB_CURRENT >> $DATAARCHDIR/preparedjobs
                echo -n "(OK) "
                autoport_log ${JOB_CURRENT} prepare ok $tmpfile
             }
-            if [ "$REBUILD_MODE" = "1" ]; then
+            if [ "$REBUILD_MODE" = "1" -o "$REBUILD_DEPENDANT_MODE" = "1" ]; then
                echo -n "update"
-               [ "$VERBOSE_MODE" ] && echo "
-%% COMMAND: LANG=C LC_ALL=C autodist -u --rebuild -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"$REBUILD_CHANGELOG\""
-               LANG=C LC_ALL=C autodist -u --rebuild -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"$REBUILD_CHANGELOG\" &>$tmpfile
+               if [ "$REBUILD_DEPENDANT_MODE" ]; then
+                  SCRIPT_ARGS="${JOB_SCRIPTARGS[$JOB_NUM-1]}"
+                  changelogadd="`echo ${SCRIPT_ARGS} | sed "s|--buildreq|,|g;s| ||g;s|^,||g"`"
+                  REBUILD_CHANGELOG="rebuilt by autoport with build requirements: '${changelogadd}'"
+               fi
+#               [ "$VERBOSE_MODE" ] && echo "
+#%% COMMAND: LANG=C LC_ALL=C autodist -u --rebuild -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"$REBUILD_CHANGELOG\" --- \"$SCRIPT_ARGS\""
+               LANG=C LC_ALL=C autodist -u --rebuild -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"$REBUILD_CHANGELOG\" --- $SCRIPT_ARGS &>$tmpfile
                [ $? -gt 0 ] && {
                   echo "(FAILED) "
                   autoport_log ${JOB_CURRENT} update failed $tmpfile
@@ -518,12 +608,14 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
                } || {
                   autoport_log ${JOB_CURRENT} update ok $tmpfile
                   echo -n "(OK) "
+                  RELEASE_UPDATED=1
+                  echo $JOB_CURRENT >> $DATAARCHDIR/updatedjobs
                }
             elif [ "$PORT_REPOSITORY" != "$DEST_REPOSITORY" ]; then
                echo -n "update"
-               [ "$VERBOSE_MODE" ] && echo "
-%% COMMAND: LANG=C LC_ALL=C autodist -u -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"automatic port from $PORT_REPOSITORY\""
-               LANG=C LC_ALL=C autodist -u -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"automatic port from $PORT_REPOSITORY\" &>$tmpfile
+#               [ "$VERBOSE_MODE" ] && echo "
+#%% COMMAND: LANG=C LC_ALL=C autodist -u -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"automatic port from $PORT_REPOSITORY\""
+               LANG=C LC_ALL=C autodist -u -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"automatic port from $PORT_REPOSITORY\" --- $SCRIPT_ARGS &>$tmpfile
                cat $tmpfile >> $logfile
                [ $? -gt 0 ] && {
                   echo "(FAILED) "
@@ -532,6 +624,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
                } || {
                   autoport_log ${JOB_CURRENT} update ok $tmpfile
                   echo -n "(OK) "
+                  RELEASE_UPDATED=1
                }
             elif [ "$REBUILD_MILESTONE" -a "$src_milestone" != "$REBUILD_MILESTONE" ]; then
                echo -n "update"
@@ -539,10 +632,11 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
                   echo "(FAILED) [can't get repository information for this package]"
                   continue
                }
-               [ "$VERBOSE_MODE" ] && echo "
-%% COMMAND: LANG=C LC_ALL=C autospec -u ${JOB_CURRENT} -a4 --rebuild --changelog \"$REBUILD_MILESTONE milestone rebuild\""
+               src_release_num=`echo $src_release | sed "s|\([0-9.]*\).*|\1|"`
+#               [ "$VERBOSE_MODE" ] && echo "
+#%% COMMAND: LANG=C LC_ALL=C autospec -u ${JOB_CURRENT} -a4 --changelog \"$REBUILD_MILESTONE milestone rebuild\" $src_version $src_release_num${REBUILD_MILESTONE}"
                # FIXME: should be implemented in autodist
-               LANG=C LC_ALL=C autospec -u ${JOB_CURRENT} -a4 --rebuild --changelog "$REBUILD_MILESTONE milestone rebuild" &>$tmpfile
+               LANG=C LC_ALL=C autospec -u ${JOB_CURRENT} -a4 --changelog "$REBUILD_MILESTONE milestone rebuild" $src_version $src_release_num${REBUILD_MILESTONE} &>$tmpfile
                [ $? -gt 0 ] && {
                   if [ "$VERBOSE_MODE" ]; then
                      echo
@@ -563,6 +657,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
                   cat $tmpfile >> $logfile
                   echo -n "(OK) "
                   autoport_log ${JOB_CURRENT} update ok $tmpfile
+                  RELEASE_UPDATED=1
                }
             fi
          }
@@ -572,15 +667,14 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
             autoport_log ${JOB_CURRENT} port failed
             continue
          fi
-         if [ "$DONT_PREPARE_THIS" = "1" -a "$src_repository" != "$PORT_REPOSITORY" ]; then
-            # if both -np and -r were given send to PORT_REPOSITORY instead of src_repository
-            src_repository=$PORT_REPOSITORY
+         SEND_REPOSITORY=$DEST_REPOSITORY
+         if [ ! "$RELEASE_UPDATED" -a ! "$DONT_PREPARE_THIS" ]; then
+            SEND_REPOSITORY=$src_repository
          fi
-         [ "$PORT_REPOSITORY" != "$DEST_REPOSITORY" ] && src_repository="$DEST_REPOSITORY"
-         [ ! "$DONT_PREPARE_THIS" -a "$PORT_REPOSITORY" = "$DEST_REPOSITORY" -a ! "$REBUILD_MILESTONE" ] && NOSRPM_OPTS="--nosrpm" || NOSRPM_OPTS="--force"
-         [ "$VERBOSE_MODE" ] && echo "
-%% COMMAND: LANG=C LC_ALL=C autodist -b -s ${JOB_CURRENT} --arch $TARGET_ARCH --server $src_repository --repository $PORT_REPOSITORY --severity 2 $FORCE_FLAG -- $STAGEOPTS $NOSRPM_OPTS"
-         LANG=C LC_ALL=C autodist -b -s ${JOB_CURRENT} --arch $TARGET_ARCH --server $src_repository --repository $PORT_REPOSITORY --severity 2 $FORCE_FLAG -- $STAGEOPTS $NOSRPM_OPTS &>$tmpfile
+         [ ! "$DONT_PREPARE_THIS" -a ! "$RELEASE_UPDATED" ] && NOSRPM_OPTS="--nosrpm" || NOSRPM_OPTS="--force"
+#         [ "$VERBOSE_MODE" ] && echo "
+#%% COMMAND: LANG=C LC_ALL=C autodist -b -s ${JOB_CURRENT} --arch $TARGET_ARCH --server $SEND_REPOSITORY --repository $PORT_REPOSITORY --severity 2 $FORCE_FLAG -- $STAGEOPTS $NOSRPM_OPTS"
+         LANG=C LC_ALL=C autodist -b -s ${JOB_CURRENT} --arch $TARGET_ARCH --server $SEND_REPOSITORY --repository $PORT_REPOSITORY --severity 2 $FORCE_FLAG -- $STAGEOPTS $NOSRPM_OPTS &>$tmpfile
          [ $? -gt 0 ] && {
             if [ "$VERBOSE_MODE" ]; then
                echo
@@ -606,11 +700,13 @@ 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&\
-MESSAGE=`cgi_encodevar \"(invoked by $WEBBUILD_USER_CMDLINE) ported <b>$JOB_CURRENT</b> to <b>$TARGET_ARCH</b> and sent it to <b>$src_repository</b>\"`" >/dev/null
+                  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&\
-MESSAGE=`cgi_encodevar \"ported <b>$JOB_CURRENT</b> to <b>$TARGET_ARCH</b> and sent it to <b>$src_repository</b>\"`" >/dev/null
+                  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
          }
@@ -654,8 +750,8 @@ MESSAGE=`cgi_encodevar \"ported <b>$JOB_CURRENT</b> to <b>$TARGET_ARCH</b> and s
          JOB_CANTINSTALL=()
          for JOB_NUM in `seq 1 ${#JOB_CANTINSTALL_OLD[*]}`; do
             JOB_CURRENT=${JOB_CANTINSTALL_OLD[$JOB_NUM-1]}
-            if [ "`grep "^${JOB_CURRENT}$" /etc/autodist/unstage 2>/dev/null`" -o \
-                 "`grep "^${JOB_CURRENT}$" /etc/autodist/unstage.${TARGET_ARCH} 2>/dev/null`" ]; then
+            if [ "`grep "^${JOB_CURRENT}$" /etc/autodist/unstage.${TARGET_ARCH} 2>/dev/null`" -o \
+                 "`grep "^${JOB_CURRENT}$" $DATADIR/$PORT_REPOSITORY/unstage.$TARGET_ARCH 2>/dev/null`" ]; then
                echo -n "$JOB_CURRENT: "
                STAGEOPTS=
             else
@@ -718,4 +814,5 @@ MESSAGE=`cgi_encodevar \"ported <b>$JOB_CURRENT</b> to <b>$TARGET_ARCH</b> and s
    rm -f $tmpfile $tmpfile1
 done
 echo "* All jobs completed. See $logfile for details."
-exit 0
+[ "$BATCH_MODE" ] && rm -f $PIDFILE
+exit ${#JOB_FAILED[*]}

autoport-fix-environment

@@ -30,7 +30,7 @@ function fix_la_files() {
          sed -i "s|libdir='/usr/$TARGET_PLATFORM/${_lib}'|libdir='/usr/${_lib}'|g" /usr/${_lib}/*.la
          sed -i "s|libdir='/$TARGET_PLATFORM/${_lib}'|libdir='/usr/${_lib}'|g" /usr/${_lib}/*.la
          sed -i "s|/usr/$TARGET_PLATFORM/${_lib}|/usr/${_lib}|g" /usr/${_lib}/*.la
-         sed -i "s|[:space:]/usr/$TARGET_PLATFORM/${_lib}|[:space:]/usr/${_lib}/lib|g" /usr/${_lib}/*.la
+         sed -i "s|[[:space:]]/usr/$TARGET_PLATFORM/${_lib}|[[:space:]]/usr/${_lib}/lib|g" /usr/${_lib}/*.la
       }
    done
 }
@@ -41,7 +41,7 @@ function fix_la_files_cross() {
          sed -i "s|libdir='/usr/${_lib}'|libdir='/usr/$TARGET_PLATFORM/${_lib}'|g" /usr/$TARGET_PLATFORM/${_lib}/*.la
          sed -i "s|libdir='/${_lib}'|libdir='/usr/$TARGET_PLATFORM/${_lib}'|g" /usr/$TARGET_PLATFORM/${_lib}/*.la
          sed -i "s|/usr/${_lib}|/usr/$TARGET_PLATFORM/${_lib}|g" /usr/$TARGET_PLATFORM/${_lib}/*.la
-         sed -i "s|[:space:]/lib/${_lib}|[:space:]/usr/$TARGET_PLATFORM/${_lib}/lib|g" /usr/$TARGET_PLATFORM/${_lib}/*.la
+         sed -i "s|[[:space:]]/lib/${_lib}|[[:space:]]/usr/$TARGET_PLATFORM/${_lib}/lib|g" /usr/$TARGET_PLATFORM/${_lib}/*.la
       }
    done
 }

autoport-launcher

@@ -0,0 +1,115 @@
+#!/bin/bash
+#
+# autoport launcher
+# (c) 2021-2024 by Silvan Calarco <silvan.calarco@mambasoft.it>
+#
+#. /etc/sysconfig/openmamba-central
+. /etc/sysconfig/autoport
+
+[ "$AUTOPORT_ENABLE" = "1" -o "$AUTOPORT_ENABLE" = "true" ] || exit 0
+
+i=$1
+
+[ "$i" ] || {
+   echo "Usage: autoport-launcher autoport_conf"
+   exit 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
+[ -e $PIDFILE ] && {
+   PIDCHECK=`cat $PIDFILE`
+   [ "$PIDCHECK" -a -e /proc/$PIDCHECK ] && {
+      echo "autoport-launcher for configuration $i already running; exiting."
+      exit 0
+   }
+}
+echo $$ > $PIDFILE
+trap "rm -f $PIDFILE; exit 1" SIGQUIT SIGINT SIGKILL SIGTERM
+
+if [ "$HOST_IS_X86_64" -a "${AUTOPORT_ARCH[$i]}" != "x86_64" ]; then
+   CMD_PREFIX=linux32
+else
+   CMD_PREFIX=
+fi
+
+UPDATE_DONE=
+
+for r in ${AUTOPORT_REPOSITORIES[$i]}; do
+
+   if [ "${AUTOPORT_NATIVE[$i]}" ]; then
+      AUTOPORT_PIDFILE="/run/autodist/autoport-${AUTOPORT_ARCH[$i]}-$r.pid"
+      LOGFILE="/var/autodist/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}.log"
+      LASTLOGFILE="/var/autodist/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}-last.log"
+   elif [ "${AUTOPORT_CHROOT[$i]}" ]; then
+      AUTOPORT_PIDFILE="/var/autoport/${AUTOPORT_CHROOT[$i]}/run/autodist/autoport-${AUTOPORT_ARCH[$i]}-$r.pid"
+      LOGFILE="/var/autodist/log/autoport-chroot-$r-${AUTOPORT_CHROOT[$i]}.log"
+      LASTLOGFILE="/var/autodist/log/autoport-chroot-$r-${AUTOPORT_CHROOT[$i]}-last.log"
+   elif [ "${AUTOPORT_CROSS[$i]}" ]; then
+      AUTOPORT_PIDFILE="/run/autoport/autoport-${AUTOPORT_ARCH[$i]}-$r.pid"
+      LOGFILE="/var/autodist/log/autoport-cross-$r-${AUTOPORT_CROSS[$i]}.log"
+      LASTLOGFILE="/var/autodist/log/autoport-cross-$r-${AUTOPORT_CROSS[$i]}-last.log"
+   else
+      continue
+   fi
+
+   if [ "$UPDATE_DONE" == "" ]; then
+      if [ "${AUTOPORT_NATIVE[$i]}" ]; then
+         [[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Updating packages in ${AUTOPORT_ARCH[$i]} native environment"
+         echo "= Updating packages in ${AUTOPORT_ARCH[$i]} native environment..." >> $LOGFILE
+         LANG=C dnf refresh >> $LOGFILE
+         LANG=C dnf update -y >> $LOGFILE
+         UPDATE_DONE=1
+      elif [ "${AUTOPORT_CHROOT[$i]}" ]; then
+         [[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Updating packages in ${AUTOPORT_CHROOT[$i]} chroot environment"
+         #echo "= Updating packages in ${AUTOPORT_CHROOT[$i]} chroot environment..." >> $LOGFILE
+         LANG=C /usr/sbin/chroot /var/autoport/${AUTOPORT_CHROOT[$i]} dnf refresh > /dev/null
+         LANG=C /usr/sbin/chroot /var/autoport/${AUTOPORT_CHROOT[$i]} dnf update -y > /dev/null
+         #[ "${AUTOPORT_CHROOT_ICECREAM[$i]}" ] && LANG=C /usr/sbin/chroot /var/autoport/${AUTOPORT_CHROOT[$i]} /etc/init.d/icecream start
+         UPDATE_DONE=1
+      fi
+   fi
+
+   if [ -e $AUTOPORT_PIDFILE ]; then
+      PIDCHECK=`cat $AUTOPORT_PIDFILE`
+      if [ "$PIDCHECK" -a -e /proc/$PIDCHECK ]; then
+         echo "autoport for configuration $i already running; continuing."
+         continue
+      fi
+   fi
+
+   [ -e $LOGFILE ] && mv $LOGFILE $LASTLOGFILE
+
+   echo "+ Autoport start at `date`" > $LOGFILE
+   echo "============================================" >> $LOGFILE
+
+   if [ "${AUTOPORT_NATIVE[$i]}" ]; then
+      echo "= Working on $r(${AUTOPORT_ARCH[$i]}) in native mode" >> $LOGFILE
+      su -l ${AUTOPORT_CHROOT_USER[$i]} -c "$CMD_PREFIX autoport -b -r $r" >> $LOGFILE
+      AUTODIST_HOME=`getent passwd ${AUTOPORT_CHROOT_USER[$i]} | cut -d: -f6`
+      cat $AUTODIST_HOME/.autoport/${AUTOPORT_ARCH[$i]}/$r-current.log >> $LOGFILE
+   elif [ "${AUTOPORT_CHROOT[$i]}" ]; then
+      echo "= Working on $r(${AUTOPORT_CHROOT[$i]}) in chroot mode..." >> $LOGFILE
+      $CMD_PREFIX /usr/sbin/chroot /var/autoport/${AUTOPORT_CHROOT[$i]} su -l ${AUTOPORT_CHROOT_USER[$i]} -c "autoport -b -r $r" >> $LOGFILE
+      if [ "${AUTOPORT_CHROOT_USER[$i]}" = "autodist" ]; then
+         cat /var/autoport/${AUTOPORT_CHROOT[$i]}/var/autodist/.autoport/${AUTOPORT_ARCH[$i]}/$r-current.log >> $LOGFILE
+      else
+         cat /var/autoport/${AUTOPORT_CHROOT[$i]}/home/${AUTOPORT_CHROOT_USER[$i]}/.autoport/${AUTOPORT_ARCH[$i]}/$r-current.log >> $LOGFILE
+      fi
+   elif [ "${AUTOPORT_CROSS[$i]}" ]; then
+      [[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Working on $r(${AUTOPORT_CROSS[$i]}) in cross-platform mode"
+      echo "= Working on $r(${AUTOPORT_CROSS[$i]}) in cross-platform mode" >> $LOGFILE
+      su -l autodist -c "autoport -b -x ${AUTOPORT_CROSS[$i]} -r $r" >> $LOGFILE
+      cat /var/autodist/.autoport/${AUTOPORT_CROSS[$i]}/$r-current.log >> $LOGFILE
+   fi
+
+   echo "- Autoport end at `date`" >> $LOGFILE
+   echo "============================================" >> $LOGFILE
+
+done
+rm -f ${PIDFILE}

autospec-conf

@@ -6,7 +6,7 @@ VENDOR="openmamba"
 curl_opts_netlink="--connect-timeout 15 --retry 3 -s"
 
 packager_fullname="Automatic Build System"
-packager_email="autodist@mambasoft.it"
+packager_email="autodist@openmamba.org"
 
 ftp_rw_server_num_default=0
 colorize=0
@@ -20,72 +20,58 @@ source_dir="/var/autodist/RPM/SOURCES"
 build_dir="/var/autodist/RPM/BUILD"
 tmppath_dir="/var/tmp/autodist"
 
-ftp_alias[0]="devel"
-ftpurl_ro_rpms[0]="ftp://ftp.openmamba.org/pub/openmamba/devel/RPMS.@arch@"
-ftpurl_ro_srpms[0]="ftp://ftp.openmamba.org/pub/openmamba/devel/SRPMS.base"
-ftp_rw_server[0]="ftp://ftp.openmamba.org"
+ftp_alias[0]="base"
+ftpurl_ro_rpms[0]="https://push.openmamba.org/pub/openmamba/base/RPMS.@arch@"
+ftpurl_ro_srpms[0]="https://push.openmamba.org/pub/openmamba/base/SRPMS.base"
+ftp_rw_server[0]="https://push.openmamba.org/pub/openmamba/base"
 ftp_rw_port[0]=
 ftp_rw_passive_mode[0]=on
 ftp_rw_user[0]=
 ftp_rw_passwd[0]=
 ftp_rw_rpms_dir[0]="/RPMS.@arch@"
 ftp_rw_srpms_dir[0]="/SRPMS.base"
-arch_list[0]="i586 ppc arm x86_64"
-arch_noarch_upload[0]="${arch_list[0]}"
+arch_list[0]="i586 x86_64 aarch64"
+arch_noarch_upload[0]="@arch@"
 ftpdir_rw_old[0]="/old"
 
-ftp_alias[1]="devel-games"
-ftpurl_ro_rpms[1]="ftp://ftp.openmamba.org/pub/openmamba/devel-games/RPMS.@arch@"
-ftpurl_ro_srpms[1]="ftp://ftp.openmamba.org/pub/openmamba/devel-games/SRPMS.base"
-ftp_rw_server[1]="ftp://ftp.openmamba.org"
+ftp_alias[1]="devel-makedist"
+ftpurl_ro_rpms[1]="https://push.openmamba.org/pub/openmamba/devel-makedist/RPMS.@arch@"
+ftpurl_ro_srpms[1]="https://push.openmamba.org/pub/openmamba/devel-makedist/SRPMS.base"
+ftp_rw_server[1]="https://push.openmamba.org/pub/openmamba/devel-makedist"
 ftp_rw_port[1]=
 ftp_rw_passive_mode[1]=on
 ftp_rw_user[1]=
 ftp_rw_passwd[1]=
 ftp_rw_rpms_dir[1]="/RPMS.@arch@"
 ftp_rw_srpms_dir[1]="/SRPMS.base"
-arch_list[1]="i586"
-arch_noarch_upload[1]="${arch_list[1]}"
+arch_list[1]="i586 x86_64 aarch64"
+arch_noarch_upload[1]="@arch@"
 ftpdir_rw_old[1]="/old"
 
-ftp_alias[2]="devel-makedist"
-ftpurl_ro_rpms[2]="ftp://ftp.openmamba.org/pub/openmamba/devel-makedist/RPMS.@arch@"
-ftpurl_ro_srpms[2]="ftp://ftp.openmamba.org/pub/openmamba/devel-makedist/SRPMS.base"
-ftp_rw_server[2]="ftp://ftp.openmamba.org"
+ftp_alias[2]="devel-misc"
+ftpurl_ro_rpms[2]="https://push.openmamba.org/pub/openmamba/devel-misc/RPMS.@arch@"
+ftpurl_ro_srpms[2]="https://push.openmamba.org/pub/openmamba/devel-misc/SRPMS.base"
+ftp_rw_server[2]="https://push.openmamba.org/pub/openmamba/devel-misc"
 ftp_rw_port[2]=
 ftp_rw_passive_mode[2]=on
 ftp_rw_user[2]=
 ftp_rw_passwd[2]=
 ftp_rw_rpms_dir[2]="/RPMS.@arch@"
 ftp_rw_srpms_dir[2]="/SRPMS.base"
-arch_list[2]="i586"
-arch_noarch_upload[2]="${arch_list[2]}"
+arch_list[2]="i586 x86_64 aarch64"
+arch_noarch_upload[2]="@arch@"
 ftpdir_rw_old[2]="/old"
 
 ftp_alias[3]="devel-autodist"
-ftpurl_ro_rpms[3]="ftp://ftp.openmamba.org/pub/openmamba/devel-autodist/RPMS.@arch@"
-ftpurl_ro_srpms[3]="ftp://ftp.openmamba.org/pub/openmamba/devel-autodist/SRPMS.base"
-ftp_rw_server[3]="ftp://ftp.openmamba.org"
+ftpurl_ro_rpms[3]="https://push.openmamba.org/pub/openmamba/devel-autodist/RPMS.@arch@"
+ftpurl_ro_srpms[3]="https://push.openmamba.org/pub/openmamba/devel-autodist/SRPMS.base"
+ftp_rw_server[3]="https://push.openmamba.org/pub/openmamba/devel-autodist"
 ftp_rw_port[3]=
 ftp_rw_passive_mode[3]=on
 ftp_rw_user[3]=
 ftp_rw_passwd[3]=
 ftp_rw_rpms_dir[3]="/RPMS.@arch@"
 ftp_rw_srpms_dir[3]="/SRPMS.base"
-arch_list[3]="i586"
-arch_noarch_upload[3]="${arch_list[3]}"
+arch_list[3]="i586 x86_64 aarch64"
+arch_noarch_upload[3]="@arch@"
 ftpdir_rw_old[3]="/old"
-
-ftp_alias[4]="devel-future"
-ftpurl_ro_rpms[4]="ftp://ftp.openmamba.org/pub/openmamba/devel-future/RPMS.@arch@"
-ftpurl_ro_srpms[4]="ftp://ftp.openmamba.org/pub/openmamba/devel-future/SRPMS.base"
-ftp_rw_server[4]="ftp://ftp.openmamba.org"
-ftp_rw_port[4]=
-ftp_rw_passive_mode[4]=on
-ftp_rw_user[4]=
-ftp_rw_passwd[4]=
-ftp_rw_rpms_dir[4]="/RPMS.@arch@"
-ftp_rw_srpms_dir[4]="/SRPMS.base"
-arch_list[4]="i586"
-arch_noarch_upload[4]="${arch_list[4]}"
-ftpdir_rw_old[4]="/old"

etc/autodist/blacklist

@@ -4,15 +4,13 @@ openmamba-sound-theme
 desktop-base-openmamba
 autodist
 kernel27
-rpm
-apt
+rootfiles
 soundfont-2rock9
 livecd-tools
 makedist
 makedist-openmamba
 postplug
 grub-theme-openmamba
-kdevelop
 lxde
 distromatic
 u-boot

etc/autodist/config

@@ -1,7 +1,8 @@
 # Global configuration file for autodist
 #
-AUTODIST_ARCHS=(i586 x86_64 arm)
-REPS_BASE_URL=http://www.openmamba.org/pub/openmamba
+AUTODIST_ARCHS=(i586 x86_64 arm aarch64)
+SITE_BASE_URL=https://openmamba.org
+REPS_BASE_URL=https://push.openmamba.org/pub/openmamba
 LOCAL_REPS_BASE_DIR=/var/ftp/pub/openmamba
 SEND_SERVER=devel-autodist
 #WEBBUILD_URL=http://localhost/cgi-bin/webbuild
@@ -10,41 +11,50 @@ SEND_SERVER=devel-autodist
 #WEBBUILD_SECRET=
 WEBBUILD_STATEDIR=/var/webbuild
 WEBBUILD_DISTROQUERY_URL="http://www.openmamba.org/cgi-bin/distroquery"
-AUTOBUILD_MAXNUM=200
+AUTOBUILD_MAXNUM=500
 AUTOBUILD_DATEFROM=20060601
 AUTOBUILD_SKIP_DAYS=28
 AUTOBUILD_SUCCESS_DAYS=3
 AUTODIST_REPOSITORY=devel-autodist
 AUTODIST_DELAYED_REPOSITORY=devel-future
-AUTODIST_REPOSITORIES=(devel devel-games devel-makedist devel-kernel devel-xorg devel-kde4 devel-autodist)
+AUTODIST_REPOSITORIES=(base devel-makedist devel-autodist devel-misc)
+AUTOPORT_UNSTAGE_ARCHS="i586"
 AUTOPORT_STAGEVARS="--define stage1=1"
 AUTOPORT_MAX_STEPS=10
+AUTOPORT_IGNORE_LIST=""
 #RPMDIR=/usr/src/RPM
 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_REPOSITORIES=(devel devel-games devel-kernel devel-kde4 devel-xorg devel-gnome devel-makedist \
-             devel-java devel-misc devel-autodist devel-future devel-past \
+WEBBUILD_REPOSITORIES=(base devel-kernel devel-makedist devel-misc devel-autodist devel-future devel-past \
              milestone1 milestone1-updates milestone1-games milestone1-1.1 milestone1-makedist \
              milestone2 milestone2-games milestone2-updates milestone2-kernel milestone2-kde4 \
              milestone2-xorg milestone2-makedist milestone2-java \
-             devel-contrib devel-silvan devel-stefano devel-aleph0 devel-skiver devel-fabiog devel-gil \
-             devel-distservers devel-the_packagizers devel-ercolinux \
-             devel-contrib-java devel-michiamophil milestone1-java milestone1-contrib)
+             milestone1-java milestone1-contrib)
 #
 # Set to enable autodist-repository (you also need to disable WEBBUILD_REPOSITORIES above)
 #
-#AUTODIST_REPOSITORIES_LOCAL_REPS=(devel devel-games devel-kernel devel-kde4 devel-xorg devel-gnome devel-makedist \
-#            devel-java devel-misc devel-autodist devel-future devel-past devel-embedded devel-silvan \
+#AUTODIST_REPOSITORIES_LOCAL_REPS=(base devel-kernel devel-makedist devel-misc devel-autodist \
+#            devel-future devel-past \
 #            milestone3 milestone3-games milestone3-updates milestone3-makedist \
 #            milestone2 milestone2-games milestone2-updates milestone2-kernel milestone2-kde4 \
 #            milestone2-xorg milestone2-makedist milestone2-java milestone2-kernel-next \
 #            milestone1 milestone1-updates milestone1-games milestone1-1.1 milestone1-makedist)
-#AUTODIST_REPOSITORIES_REMOTE_REPS=(devel-contrib devel-stefano devel-aleph0 devel-skiver devel-fabiog devel-gil \
-#             devel-distservers devel-the_packagizers devel-ercolinux \
-#             devel-contrib-java devel-michiamophil milestone1-java milestone1-contrib)
+#AUTODIST_REPOSITORIES_REMOTE_REPS=(devel-contrib \
+#             milestone1-java milestone1-contrib)
 #AUTODIST_REPOSITORIES_TRANSITIONAL_REP=devel-makedist
 #AUTODIST_REPOSITORIES_REMOTE_FTPUSER=
 #AUTODIST_REPOSITORIES_REMOTE_FTPPASS=

etc/autodist/config-git

@@ -0,0 +1,12 @@
+REPO_DIR = "/var/ftp/pub/openmamba/base"
+ARCHIVE_DIR = "%(REPO_DIR)s/archive"
+OLD_DIR = "%(REPO_DIR)s/old"
+SRPMS_DIR = "%(REPO_DIR)s/SRPMS.base"
+
+GITEA_URL = "https://src.openmamba.org"
+GITEA_SSH_URL = "ssh://gitea@src.openmamba.org:3326/rpms/"
+GITEA_TOKEN = "<replace with a valid token>"
+GITEA_ORGANIZATION = "rpms"
+
+COMMITTER_USER = "autodist"
+COMMITTER_EMAIL = "autodist@openmamba.org"

etc/autodist/distdb

@@ -1,289 +0,0 @@
-# openmamba autodist build jobs database - architecture independent
-# 
-# Copyright (c) 2006-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
-# Released under the terms of the GNU GPL version 3 license 
-#
-
-xorg_drv_video_all=(
-xorg-drv-video-apm,xorg-drv-video-ark,xorg-drv-video-ast,xorg-drv-video-ati,\
-xorg-drv-video-chips,xorg-drv-video-cirrus,xorg-drv-video-dummy,xorg-drv-video-fbdev,\
-xorg-drv-video-geode,xorg-drv-video-glint,xorg-drv-video-i128,xorg-drv-video-i740,\
-xorg-drv-video-intel,xorg-drv-video-mach64,xorg-drv-video-mga,xorg-drv-video-neomagic,\
-xorg-drv-video-newport,xorg-drv-video-nouveau,xorg-drv-video-nv,xorg-drv-video-openchrome,\
-xorg-drv-video-r128,xorg-drv-video-radeonhd,xorg-drv-video-rendition,xorg-drv-video-s3,\
-xorg-drv-video-s3virge,xorg-drv-video-savage,xorg-drv-video-siliconmotion,xorg-drv-video-sis,\
-xorg-drv-video-trident,xorg-drv-video-tseng,xorg-drv-video-v4l,\
-xorg-drv-video-vesa,xorg-drv-video-vmware,xorg-drv-video-voodoo,xorg-drv-video-xgixp,\
-xorg-drv-video
-%continue_on_error
-1
-)
-#xorg-drv-video-sisusb,
-
-xorg_drv_input=(
-xorg-drv-input-acecad,xorg-drv-input-aiptek,xorg-drv-input-elographics,\
-xorg-drv-input-evdev,xorg-drv-input-fpit,xorg-drv-input-hyperpen,xorg-drv-input-joystick,\
-xorg-drv-input-keyboard,xorg-drv-input-mouse,xorg-drv-input-mutouch,xorg-drv-input-penmount,\
-xorg-drv-input-synaptics,xorg-drv-input-tslib,xorg-drv-input-vmmouse,xorg-drv-input-void,\
-xorg-drv-input
-%continue_on_error
-1
-)
-
-abiword=(
-abiword,abiword-docs
-%build_and_install
-1
-)
-
-compiz=(
-compiz,compiz-bcop,compiz-plugins-extra,compiz-plugins-main,libcompizconfig,compizconfig-backend-kconfig4,\
-compizconfig-simple-settings-manager,emerald
-%build_and_install
-1
-)
-# compiz-bcop,compizconfig-backend-kconfig,compizconfig-settings-manager,compizconfig-backend-gconf
-
-compiz09=(
-compiz-core,libcompizconfig,python-compizconfig,compizconfig-backend-kconfig4,compiz-fusion-plugins-main,compiz-fusion-plugins-extra
-%build_and_install
-1
-)
-
-#curl=(
-#curl
-#%build_and_install
-#1
-#)
-
-evolution=(
-libevolution-data-server,evolution
-%build_and_install
-1
-)
-#,evolution-exchange
-
-#ekiga=(
-#libpt,libopal,ekiga
-#%build_and_install
-#1
-#)
-
-#gobby=(
-#obby,gobby
-#%build_and_install
-#1
-#)
-
-kde3=(
-kdelibs,kdebase,kdeadmin,kdeutils,kdenetwork,kdeaccessibility,kdepim,kdegames,kdegraphics,kdemultimedia,kdeaddons,kdenetwork,\
-kdesdk,kdetoys,kdebindings,kdewebdev,kdeedu,kdeartwork,kde-i18n
-%build_and_install
-1
-)
-
-kde4=(
-kdelibs,kdepimlibs,oxygen-icons,nepomuk-core,kde-runtime,kactivities,kde-wallpapers,kde-baseapps,\
-nepomuk-widgets,kdepim,kdepim-runtime,libkdcraw,libkexiv2,kdeartwork,marble,\
-kdeplasma-addons,kde-l10n,blinken,libkipi,gwenview,libkdeedu,analitza,cantor,kalgebra,kalzium,kamera,\
-kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\
-klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libksane,\
-okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\
-kross-interpreters,PyKDE4,perl-Qt4,perl-KDE,kdegraphics-thumbnailers,ksaneplugin,parley,step,\
-ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,sweeper,\
-jovie,kmousetool,kmouth,qyoto,kimono,kaccessible,kdegraphics-mobipocket,\
-libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk,print-manager,kdewebdev,\
-kde-base-artwork,ffmpegthumbs,kmag,mplayerthumbs,superkaramba,\
-libkdegames,bomber,bovo,granatier,kajongg,kapman,knavalbattle,katomic,kblackbox,kblocks,\
-ksnakeduel,kbounce,kbreakout,kdiamond,kfourinline,kgoldrunner,kigo,killbots,kiriki,kjumpingcube,\
-klickety,klines,libkmahjongg,kmahjongg,kmines,knetwalk,kolf,kollision,konquest,kpat,kshisen,\
-kreversi,kspaceduel,ksquares,ksirk,ktuberling,kubrick,lskat,palapeli,ksudoku,pairs,picmi,\
-amor,kteatime,ktux,kcron,ksystemlog,kuser,kdenetwork-filesharing,zeroconf-ioslave,kget,kopete,kppp,\
-krdc,krfb,kdenetwork-strigi-analyzers,kdesdk-thumbnailers,cervisia,kcachegrind,kdesdk-kioslaves,\
-libkomparediff2,kompare,lokalize,okteta,dolphin-plugins,umbrello,kapptemplate,kde-dev-scripts,\
-kde-dev-utils,poxml,kdesdk-strigi-analyzers,kwalletmanager,baloo,kfilemetadata
-%build_and_install,%continue_on_error
-1,1
-)
-
-kde4123=(
-kdelibs,kdepimlibs,oxygen-icons,nepomuk-core,kde-runtime,kactivities,kde-wallpapers,kde-baseapps,\
-nepomuk-widgets,kdepim,kdepim-runtime,libkdcraw,libkexiv2,kdeartwork,marble,\
-kdeplasma-addons,kde-l10n,blinken,libkipi,gwenview,libkdeedu,analitza,cantor,kalgebra,kalzium,kamera,\
-kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\
-klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libksane,\
-okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\
-kross-interpreters,PyKDE4,perl-Qt4,perl-KDE,kdegraphics-thumbnailers,ksaneplugin,parley,step,\
-ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,sweeper,\
-jovie,kmousetool,kmouth,qyoto,kimono,kaccessible,kdegraphics-mobipocket,\
-libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk,print-manager,kdewebdev,\
-kde-base-artwork,ffmpegthumbs,kmag,mplayerthumbs,superkaramba,\
-libkdegames,bomber,bovo,granatier,kajongg,kapman,knavalbattle,katomic,kblackbox,kblocks,\
-ksnakeduel,kbounce,kbreakout,kdiamond,kfourinline,kgoldrunner,kigo,killbots,kiriki,kjumpingcube,\
-klickety,klines,libkmahjongg,kmahjongg,kmines,knetwalk,kolf,kollision,konquest,kpat,kshisen,\
-kreversi,kspaceduel,ksquares,ksirk,ktuberling,kubrick,lskat,palapeli,ksudoku,pairs,picmi,\
-amor,kteatime,ktux,kcron,ksystemlog,kuser,kdenetwork-filesharing,kdnssd,kget,kopete,kppp,\
-krdc,krfb,kdenetwork-strigi-analyzers,kdesdk-thumbnailers,cervisia,kcachegrind,kdesdk-kioslaves,\
-libkomparediff2,kompare,lokalize,okteta,dolphin-plugins,umbrello,kapptemplate,kde-dev-scripts,\
-kde-dev-utils,poxml,kdesdk-strigi-analyzers
-%build_and_install,%continue_on_error
-1,1
-)
-# kwalletmanager
-
-kde4122=(
-kdelibs,kdepimlibs,oxygen-icons,nepomuk-core,kde-runtime,kactivities,kde-wallpapers,kde-baseapps,\
-nepomuk-widgets,kdepim,kdepim-runtime,libkdcraw,libkexiv2,kdeartwork,marble,\
-kdeplasma-addons,kde-l10n,blinken,libkipi,gwenview,libkdeedu,analitza,cantor,kalgebra,kalzium,kamera,\
-kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\
-klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libksane,\
-okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\
-kross-interpreters,PyKDE4,perl-Qt4,perl-KDE,kdegraphics-thumbnailers,ksaneplugin,parley,step,\
-ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,kwallet,sweeper,\
-jovie,kmousetool,kmouth,qyoto,kimono,kaccessible,kdegraphics-mobipocket,\
-libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk,print-manager,kdewebdev,\
-kde-base-artwork,ffmpegthumbs,kmag,mplayerthumbs,superkaramba,\
-libkdegames,bomber,bovo,granatier,kajongg,kapman,knavalbattle,katomic,kblackbox,kblocks,\
-ksnakeduel,kbounce,kbreakout,kdiamond,kfourinline,kgoldrunner,kigo,killbots,kiriki,kjumpingcube,\
-klickety,klines,libkmahjongg,kmahjongg,kmines,knetwalk,kolf,kollision,konquest,kpat,kshisen,\
-kreversi,kspaceduel,ksquares,ksirk,ktuberling,kubrick,lskat,palapeli,ksudoku,pairs,picmi,\
-amor,kteatime,ktux,kcron,ksystemlog,kuser,kdenetwork-filesharing,kdnssd,kget,kopete,kppp,\
-krdc,krfb,kdenetwork-strigi-analyzers,kdesdk-thumbnailers,cervisia,kcachegrind,kdesdk-kioslaves,\
-libkomparediff2,kompare,lokalize,okteta,dolphin-plugins,umbrello,kapptemplate,kde-dev-scripts,\
-kde-dev-utils,poxml,kdesdk-strigi-analyzers
-%build_and_install,%continue_on_error
-1,1
-)
-
-kde411=(
-kdelibs,kdepimlibs,oxygen-icons,nepomuk-core,kde-runtime,kactivities,kde-workspace,kde-wallpapers,kde-baseapps,\
-nepomuk-widgets,kdepim,kdepim-runtime,libkdcraw,libkexiv2,kdeartwork,marble,\
-kdeplasma-addons,kde-l10n,blinken,libkipi,gwenview,libkdeedu,analitza,cantor,kalgebra,kalzium,kamera,\
-kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\
-klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libksane,\
-okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\
-kross-interpreters,PyKDE4,perl-Qt4,perl-KDE,kdegraphics-thumbnailers,ksaneplugin,parley,step,\
-ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,kwallet,sweeper,\
-jovie,kmousetool,kmouth,qyoto,kimono,kaccessible,kdegraphics-mobipocket,\
-libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk,print-manager,kdewebdev,\
-kde-base-artwork,ffmpegthumbs,kmag,mplayerthumbs,superkaramba,\
-libkdegames,bomber,bovo,granatier,kajongg,kapman,knavalbattle,katomic,kblackbox,kblocks,\
-ksnakeduel,kbounce,kbreakout,kdiamond,kfourinline,kgoldrunner,kigo,killbots,kiriki,kjumpingcube,\
-klickety,klines,libkmahjongg,kmahjongg,kmines,knetwalk,kolf,kollision,konquest,kpat,kshisen,\
-kreversi,kspaceduel,ksquares,ksirk,ktuberling,kubrick,lskat,palapeli,ksudoku,pairs,picmi,\
-amor,kteatime,ktux,kcron,ksystemlog,kuser,kdenetwork-filesharing,kdnssd,kget,kopete,kppp,\
-krdc,krfb,kdenetwork-strigi-analyzers,kdesdk-thumbnailers,cervisia,kcachegrind,kdesdk-kioslaves,\
-kompare,lokalize,okteta,dolphin-plugins,umbrello,kapptemplate,kde-dev-scripts,kde-dev-utils,poxml
-%build_and_install,%continue_on_error
-1,1
-)
-
-kde410=(
-kdelibs,kdepimlibs,oxygen-icons,nepomuk-core,kde-runtime,kactivities,kde-workspace,kde-wallpapers,kde-baseapps,\
-nepomuk-widgets,kdepim4,kdepim-runtime,kdeadmin,kdenetwork,kdetoys,kdesdk,libkdcraw,libkexiv2,kdeartwork,marble,\
-kdeplasma-addons,kde-l10n,blinken,libkipi,gwenview,libkdeedu,analitza,cantor,kalgebra,kalzium,kamera,\
-kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\
-klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libksane,\
-okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\
-kross-interpreters,PyKDE4,perl-Qt4,perl-KDE,kdegraphics-thumbnailers,ksaneplugin,parley,step,\
-ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,kwallet,sweeper,\
-jovie,kmousetool,kmouth,qyoto,kimono,kaccessible,kdegraphics-mobipocket,\
-libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk,print-manager,kdewebdev,\
-kde-base-artwork,ffmpegthumbs,kmag,mplayerthumbs,superkaramba,\
-libkdegames,bomber,bovo,granatier,kajongg,kapman,knavalbattle,katomic,kblackbox,kblocks,\
-ksnakeduel,kbounce,kbreakout,kdiamond,kfourinline,kgoldrunner,kigo,killbots,kiriki,kjumpingcube,\
-klickety,klines,libkmahjongg,kmahjongg,kmines,knetwalk,kolf,kollision,konquest,kpat,kshisen,\
-kreversi,kspaceduel,ksquares,ksirk,ktuberling,kubrick,lskat,palapeli,ksudoku,pairs,picmi
-%build_and_install,%continue_on_error
-1,1
-)
-
-xfce4=(
-libxfce4util,libxfce4ui,xfce4-appfinder,xfce4-dev-tools,xfce4-panel,xfce4-session,xfce4-settings,xfconf,xfdesktop,xfwm4
-%build_and_install,%continue_on_error
-1,1
-)
-
-alsa=(
-libalsa,libalsa-plugins,alsa-utils,alsa-tools,python-alsa
-%build_and_install,%continue_on_error
-1,1
-)
-#,alsa-driver
-
-apache_tomcat=(
-apache-tomcat-dbcp,apache-tomcat
-%build_and_install
-1
-)
-
-netbeans=(
-netbeans-platform,netbeans
-%build_and_install
-1
-)
-
-#firefox=(
-#xulrunner,firefox
-#%build_and_install
-#1
-#)
-
-xfce=(
-libxfce4util,xfconf,libxfcegui4,libxfce4ui,xfce-utils,xfce4-appfinder,xfce4-panel,xfce4-session,xfdesktop,xfwm4
-%build_and_install
-1
-)
-#xfce4-mixer,xfprint,orage,xfwm4-themes,libxfce4menu
-
-FlightGear=(
-libSimGear,FlightGear
-%build_and_install
-1
-)
-
-mythtv=(
-mythtv,mythplugins
-%build_and_install
-1
-)
-
-valknut=(
-libdc,valknut
-%build_and_install
-1
-)
-
-# use for major release update (e.g. 2.24 -> 2.26)
-gnome=(
-libgnome,libsoup,libgweather,librsvg,libwnck,libgdl,gnome-desktop,python-gnome-desktop,libeel,gnome-icon-theme,gnome-menus,\
-libgnome-panel,anjuta,zenity,metacity,nautilus,brasero,cheese,evince,gconf-editor,gedit,gedit-plugins
-%build_and_install,%continue_on_error
-1,1
-)
-
-#fwbuilder=(
-#libfwbuilder,fwbuilder
-#%build_and_install
-#1
-#)
-
-koffice=(
-koffice
-%build_and_install
-1
-)
-#,koffice-i18n
-
-python_numpy=(
-python-numpy
-with_pyver
--
-3
-)
-
-shorewall=(
-shorewall-core,shorewall
-%build_and_install
-1
-)

etc/autodist/distdb.arm

@@ -1,81 +0,0 @@
-# openmamba autodist build jobs database
-# 
-# Copyright (c) 2006-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
-# Released under the terms of the GNU GPL version 3 license 
-#
-
-#
-# XTC 1 (Cross Toolchain)
-#
-# build native binutils (gcc needed, so it's not a stage1 build) 
-# and cross platform binutils 
-#
-binutils=(
-binutils
-cross_target_cpu,_target_platform
-arm,arm-openmamba-linux-gnueabi
-avr,avr
-)
-
-glibc=(
-glibc
-cross_target_cpu,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER,build_doc,build_profile,build_selinux
-arm,-,-,mamba-arm,3.2,0,0,0
-)
-
-kernel=(
-kernel
-target,KERNEL_TARGET
-arm,mamba-arm
-)
-
-linux_firmware=(
-linux-firmware
-target,KERNEL_TARGET,KERNEL_VER
-arm,mamba-arm,3.4
-)
-
-pam=(
-pam
-bootstrap
-1
-)
-
-rpm=(
-rpm
-bootstrap
-1
-)
-
-klibc=(
-klibc
-KERNEL_VER
-2.6.33mamba-arm
-)
-
-gcc=(
-gcc
-cross_target_cpu,_target_platform,disable_java,disable_gjdoc
-arm,arm-openmamba-linux-gnueabi,-,1
-avr,avr,1,-
-)
-
-udev=(
-udev
-%build_and_install
-0
-)
-
-libcec=(
-libcec
-_with_raspberrypi
--
-1
-)
-
-xbmc=(
-xbmc
-_with_raspberrypi
--
-1
-)

etc/autodist/distdb.i586

@@ -1,430 +0,0 @@
-# openmamba autodist build jobs database for i586 platform
-# 
-# Copyright (c) 2006-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
-# Released under the terms of the GNU GPL version 3 license 
-#
-
-#
-# XTC 1 (Cross Toolchain)
-#
-# build native binutils (gcc needed, so it's not a stage1 build) 
-# and cross platform binutils 
-#
-binutils=(
-binutils
-cross_target_cpu,_target_platform
-i586,i586-openmamba-linux-gnu
-arm,arm-openmamba-linux-gnueabi
-arm,arm-openmamba-linux-gnueabihf
-avr,avr
-x86_64,x86_64-openmamba-linux-gnu
-ppc,ppc-openmamba-linux-gnu
-)
-
-#
-# XTC 2
-#
-# glibc stage1: build headers only
-glibc_stage1=(
-glibc
-cross_target_cpu,stage1,_target_platform,KERNEL_TARGET,KERNEL_VER
-i586,1,i586-openmamba-linux-gnu,mamba,-
-arm,1,arm-openmamba-linux-gnueabi,mamba-arm,2.6.33
-ppc,1,ppc-openmamba-linux-gnu,mamba-ppc,2.6.33
-x86_64,1,x86_64-openmamba-linux-gnu,mamba-x86_64,-
-)
-
-#
-# XTC 3
-#
-gcc_stage1=(
-gcc
-cross_target_cpu,stage1,_target_platform
-arm,1,arm-openmamba-linux-gnueabi
-i586,1,i586-openmamba-linux-gnu
-ppc,1,ppc-openmamba-linux-gnu
-x86_64,1,x86_64-openmamba-linux-gnu
-)
-
-#
-# XTC 4
-#
-glibc_stage2=(
-glibc
-cross_target_cpu,stage2,bigendian,softfloat,_target_platform,KERNEL_TARGET,KERNEL_VER
-arm,1,-,-,arm-openmamba-linux-gnueabi,mamba-arm,2.6.33
-i586,1,-,-,i586-openmamba-linux-gnu,mamba,-
-ppc,1,-,-,ppc-openmamba-linux-gnu,mamba,-
-x86_64,1,-,-,x86_64-openmamba-linux-gnu,mamba-x86_64,-
-)
-
-#
-# XTC 5
-#
-gcc=(
-gcc
-cross_target_cpu,_target_platform,disable_java
-i586,i586-openmamba-linux-gnu,-
-arm,arm-openmamba-linux-gnueabi,1
-x86_64,x86_64-openmamba-linux-gnu,1
-avr,avr,1
-)
-#ppc,ppc-openmamba-linux-gnu,1
-
-#
-# XTC 6
-#
-glibc=(
-glibc
-target,cross_target_cpu,multilib,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
--,i586,-,i586-openmamba-linux-gnu,-,-,mamba,-
--,x86_64,-,x86_64-openmamba-linux-gnu,-,-,mamba-x86_64,-
--,arm,-,arm-openmamba-linux-gnueabi,-,-,mamba-arm,-
--,ppc,-,ppc-openmamba-linux-gnu,-,-,mamba-ppc,2.6.33
-x86_64,i586,1,i586-openmamba-linux-gnu,-,-,mamba-x86_64,-
-)
-
-# XTC 7
-cross_environment=(
-cross-environment
-cross_target_cpu,autodist_crossonly,_target_platform
-i586,1,i586-openmamba-linux-gnu
-arm,1,arm-openmamba-linux-gnueabi
-ppc,1,ppc-openmamba-linux-gnu
-x86_64,1,x86_64-openmamba-linux-gnu
-)
-
-gcc_arm=(
-gcc
-cross_target_cpu,_target_platform,disable_java
-arm,arm-openmamba-linux-gnueabi,1
-)
-
-glibc_arm=(
-glibc
-cross_target_cpu,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
-arm,-,-,mamba-arm,-
-)
-
-glibc_multilib=(
-glibc
-target,cross_target_cpu,multilib,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
-x86_64,i586,1,x86_64-openmamba-linux-gnu,-,-,mamba-x86_64,-
-)
-
-glibc_cross_multilib=(
-glibc
-target,cross_target_cpu,multilib,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
--,i586,1,x86_64-openmamba-linux-gnu,-,-,mamba-x86_64,-
-)
-
-gcc_cross=(
-gcc
-cross_target_cpu,_target_platform,disable_java
-x86_64,x86_64-openmamba-linux-gnu,1
-arm,arm-openmamba-linux-gnueabi,1
-ppc,ppc-openmamba-linux-gnu,1
-avr,avr,1
-)
-
-glibc_cross=(
-glibc
-target,cross_target_cpu,multilib,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
--,x86_64,-,x86_64-openmamba-linux-gnu,-,-,mamba-x86_64,-
--,arm,-,arm-openmamba-linux-gnueabi,-,-,mamba-arm,-
--,ppc,-,ppc-openmamba-linux-gnu,-,-,mamba-ppc,2.6.33
-x86_64,i586,1,i586-openmamba-linux-gnu,-,-,mamba-x86_64,-
-)
-
-pkg_config=(
-pkg-config
-cross_target_cpu,_target_platform
-i586,i586-openmamba-linux-gnu
-x86_64,x86_64-openmamba-linux-gnu
-arm,arm-openmamba-linux-gnueabi
-ppc,ppc-openmamba-linux-gnu
-)
-
-gcc_uclibc=(
-gcc
-cross_target_cpu,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
-arm,arm-linux-uclibc,-,-,mamba-arm,2.6.33
-)
-
-dietlibc=(
-dietlibc
-cross_target_cpu
-i586
-arm
-)
-
-gcc34=(
-gcc34
-cross_target_cpu
-i586
-ppc
-)
-
-klibc=(
-klibc
-cross_target_cpu,_target_platform,KERNEL_TARGET,KERNEL_VER
--,-,-
-ppc,ppc-openmamba-linux-gnu,mamba-ppc,-
-x86_64,x86_64-openmamba-linux-gnu,3mamba-x86_64,-
-arm,arm-openmamba-linux-gnueabi,mamba-arm,-
-)
-
-#
-# arm cross toolchain
-#
-binutils_arm=(
-binutils
-cross_target_cpu,_target_platform
-arm,arm-openmamba-linux-gnueabi
-)
-
-glibc_stage2_armhf=(
-glibc
-cross_target_cpu,stage2,bigendian,hardfloat,_target_platform,KERNEL_TARGET,KERNEL_VER
-arm,1,-,1,arm-openmamba-linux-gnueabi,mamba-arm,3.4
-)
-
-#
-# armhf cross toolchain
-#
-binutils_armhf=(
-binutils
-cross_target_cpu,_target_platform
-)
-
-glibc_stage1_armhf=(
-glibc
-cross_target_cpu,stage1,_target_platform,KERNEL_TARGET,KERNEL_VER
-armhf,1,arm-openmamba-linux-gnueabihf,mamba-arm,3.4
-)
-
-#
-# ppc cross toolchain
-#
-binutils_ppc=(
-binutils
-cross_target_cpu,_target_platform
-ppc,ppc-openmamba-linux-gnu
-)
-
-glibc_ppc_stage1=(
-glibc
-cross_target_cpu,stage1,_target_platform,KERNEL_TARGET,KERNEL_VER
-ppc,1,ppc-openmamba-linux-gnu,mamba,-
-)
-
-gcc_ppc_stage1=(
-gcc
-cross_target_cpu,stage1,_target_platform
-ppc,1,ppc-openmamba-linux-gnu
-)
-
-glibc_ppc_stage2=(
-glibc
-cross_target_cpu,stage2,bigendian,softfloat,_target_platform,KERNEL_TARGET,KERNEL_VER
-ppc,1,-,-,ppc-openmamba-linux-gnu,mamba-ppc,2.6.33
-)
-
-gcc_ppc=(
-gcc
-cross_target_cpu,_target_platform
-ppc,ppc-openmamba-linux-gnu
-)
-
-glibc_ppc=(
-glibc
-cross_target_cpu,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
-ppc,ppc-openmamba-linux-gnu,-,-,mamba-ppc,2.6.33
-)
-
-#
-# KERNEL
-#
-kernel=(
-kernel
-target,KERNEL_TARGET
-i586,mamba-64GB
-i586,mamba
-arm,mamba-arm
-arm,mamba-arm-dove
-)
-#i586,mamba-rt
-#i586,mamba-64GB-rt
-#arm,mamba-arm-kirkwood
-#x86_64,mamba-x86_64
-
-kernel_310=(
-kernel
-target,KERNEL_TARGET
-i586,mamba-64GB
-i586,mamba
-arm,mamba-arm
-)
-
-kernel_37=(
-kernel
-target,KERNEL_TARGET
-i586,mamba
-i586,mamba-64GB
-arm,mamba-arm
-arm,mamba-arm-kirkwood
-x86_64,mamba-x86_64
-)
-
-kernel_34=(
-kernel
-target,KERNEL_TARGET
-i586,mamba-64GB
-i586,mamba
-x86_64,mamba-x86_64
-i586,mamba-rt
-i586,mamba-64GB-rt
-arm,mamba-arm
-arm,mamba-arm-kirkwood
-)
-
-kernel_34_64GB=(
-kernel
-target,KERNEL_TARGET
-i586,mamba-64GB
-)
-
-kernel_arm_kirkwood=(
-kernel
-target,KERNEL_TARGET
-arm,mamba-arm-kirkwood
-)
-
-kernel_milestone2=(
-kernel
-target,KERNEL_TARGET
-i586,mamba
-i586,mamba-64GB
-arm,mamba-arm
-)
-
-kernel_rt=(
-kernel
-target,KERNEL_TARGET
-i586,mamba-rt
-)
-
-kernel_64GB=(
-kernel
-target,KERNEL_TARGET
-i586,mamba-64GB
-)
-
-kernel_64GB_rt=(
-kernel
-target,KERNEL_TARGET
-i586,mamba-64GB-rt
-)
-
-kernel_x86_64=(
-kernel
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-
-kernel_packages=(
-slmodem,stk11xx,cm2020
-target,KERNEL_TARGET,KERNEL_VER
-i586,mamba,-
-i586,mamba-64GB,-
-)
-#i586,mamba-rt,-
-#i586,mamba-64GB-rt,-
-
-#Removed:
-#hsfmodem: dropped support
-#r8101, broadcom-sta, ndiswrapper: dkms
-#alsa-driver: abandoned upstream
-#compat-wireless: changed upstream to backport, stopping maintaining it for now
-#lirc
-
-kernel_packages_37=(
-hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,ndiswrapper,NVIDIA,VirtualBox-kernel,\
-broadcom-sta,stk11xx,cm2020,r8101
-target,KERNEL_TARGET,KERNEL_VER
-i586,mamba,3.7
-i586,mamba-64GB,3.7
-)
-#i586,mamba-rt,3.7
-#i586,mamba-64GB-rt,3.7
-
-kernel_packages_36=(
-hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,ndiswrapper,NVIDIA,VirtualBox-kernel,\
-broadcom-sta,stk11xx,cm2020,r8101
-target,KERNEL_TARGET,KERNEL_VER
-i586,mamba,3.6
-i586,mamba-64GB,3.6
-i586,mamba-rt,3.6
-i586,mamba-64GB-rt,3.6
-)
-#lirc
-
-kernel_packages_34=(
-hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,ndiswrapper,NVIDIA,VirtualBox-kernel,\
-broadcom-sta,stk11xx,cm2020,r8101
-target,KERNEL_TARGET,KERNEL_VER
-i586,mamba,3.4
-i586,mamba-64GB,3.4
-i586,mamba-rt,3.4
-i586,mamba-64GB-rt,3.4
-)
-#lirc
-
-kernel_packages_32=(
-hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox-kernel,\
-broadcom-sta,stk11xx,cm2020,r8101
-target,KERNEL_TARGET,KERNEL_VER
-i586,mamba,3.2
-i586,mamba-64GB,3.2
-)
-
-kernel_packages_30=(
-hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,\
-broadcom-sta,atheros-81,drbd,rtl8192se
-target,KERNEL_TARGET,KERNEL_VER
-i586,mamba,3.0
-i586,mamba-64GB,3.0
-)
-
-kernel_hannspad=(
-kernel-hannspad
-target
-arm
-)
-
-kernel_iconia=(
-kernel-iconia
-target
-arm
-)
-
-kernel_iconia_altgcc=(
-kernel-iconia
-target,_target_platform
-arm,arm-none-linux-gnueabi
-)
-
-linux_firmware=(
-linux-firmware
-target,KERNEL_TARGET,KERNEL_VER
-i586,mamba,3.10
-)
-
-NVIDIA=(
-NVIDIA
-target,KERNEL_TARGET,KERNEL_VER
-i586,mamba,-
-i586,mamba-64GB,-
-i586,mamba-rt
-i586,mamba-64GB-rt
-)

etc/autodist/distdb.ppc

@@ -1,267 +0,0 @@
-# openmamba autodist build jobs database
-# 
-# Copyright (c) 2006-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
-# Released under the terms of the GNU GPL version 3 license 
-#
-
-# XTC 1 (Cross Toolchain)
-cross_environment=(
-cross-environment
-cross_target_cpu,autodist_crossonly,_target_platform
-x86_64,1,x86_64-openmamba-linux-gnu
-i586,1,i586-openmamba-linux-gnu
-arm,1,arm-openmamba-linux-gnueabi
-ppc,1,ppc-openmamba-linux-gnu
-)
-
-#
-# XTC 2
-#
-# build native binutils (gcc needed, so it's not a stage1 build) 
-# and cross platform binutils 
-#
-binutils=(
-binutils
-cross_target_cpu,_target_platform
-x86_64,x86_64-openmamba-linux-gnu
-i586,i586-openmamba-linux-gnu
-arm,arm-openmamba-linux-gnueabi
-ppc,ppc-openmamba-linux-gnu
-)
-
-#
-# XTC 3
-#
-# glibc stage1: build headers only
-glibc_stage1=(
-glibc
-cross_target_cpu,stage1,_target_platform,KERNEL_TARGET,KERNEL_VER
-x86_64,1,x86_64-openmamba-linux-gnu,mamba-x86_64,-
-arm,1,arm-openmamba-linux-gnueabi,mamba-arm,2.6.33
-i586,1,i586-openmamba-linux-gnu,mamba,-
-ppc,1,ppc-openmamba-linux-gnu,mamba,-
-)
-
-#
-# XTC 4
-#
-gcc_stage1=(
-gcc
-cross_target_cpu,stage1,_target_platform
-x86_64,1,x86_64-openmamba-linux-gnu
-arm,1,arm-openmamba-linux-gnueabi
-i586,1,i586-openmamba-linux-gnu
-ppc,1,ppc-openmamba-linux-gnu
-)
-
-#
-# XTC 5
-#
-glibc_stage2=(
-glibc
-cross_target_cpu,stage2,bigendian,softfloat,_target_platform,KERNEL_TARGET,KERNEL_VER
-x86_64,1,-,-,x86_64-openmamba-linux-gnu,mamba-x86_64,-
-arm,1,-,-,arm-openmamba-linux-gnueabi,mamba-arm,2.6.33
-i586,1,-,-,i586-openmamba-linux-gnu,mamba,-
-ppc,1,-,-,ppc-openmamba-linux-gnu,mamba,-
-)
-
-#
-# XTC 6
-#
-gcc=(
-gcc
-cross_target_cpu,_target_platform
-x86_64,x86_64-openmamba-linux-gnu
-arm,arm-openmamba-linux-gnueabi
-i586,i586-openmamba-linux-gnu
-ppc,ppc-openmamba-linux-gnu
-)
-
-#
-# XTC 7
-#
-glibc=(
-glibc
-cross_target_cpu,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
-ppc,ppc-openmamba-linux-gnu,-,-,mamba-ppc,2.6.33
-x86_64,x86_64-openmamba-linux-gnu,-,-,mamba-x86_64,-
-i586,i586-openmamba-linux-gnu,-,-,mamba,-
-arm,arm-openmamba-linux-gnueabi,-,-,mamba-arm,2.6.33
-)
-
-gcc_uclibc=(
-gcc
-cross_target_cpu,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
-arm,arm-linux-uclibc,-,-,mamba-arm,2.6.33
-)
-
-dietlibc=(
-dietlibc
-cross_target_cpu
-ppc
-x86_64
-i586
-arm
-)
-
-gcc34=(
-gcc34
-cross_target_cpu
-ppc
-x86_64
-i586
-ppc
-)
-
-#klibc=(
-#klibc
-#cross_target_cpu,_target_platform,KERNEL_VER
-#-,-,-
-#ppc,ppc-openmamba-linux-gnueabi,2.6.33mamba-ppc
-#)
-
-kernel=(
-kernel
-target,KERNEL_TARGET
-ppc,mamba-ppc
-)
-
-kernel_new=(
-kernel
-target,KERNEL_TARGET,KERNEL_VER
-ppc,mamba-ppc,2.6.33
-)
-
-kernel_extra=(
-kernel-extramodules
-target,KERNEL_TARGET
-ppc,mamba-ppc
-)
-
-kernel_packages=(
-hsfmodem,compat-wireless,ati-driver,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,broadcom-sta
-target,KERNEL_TARGET,KERNEL_VER
-ppc,mamba-ppc,-
-)
-# slmodem, alsa-driver, lirc,VirtualBox, ndiswrapper, alsa-driver
-
-kernel_packages_new=(
-hsfmodem,compat-wireless,ati-driver,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,broadcom-sta
-target,KERNEL_TARGET,KERNEL_VER
-ppc,mamba-ppc,2.6.33
-)
-
-NVIDIA_all=(
-NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx
-target,KERNEL_TARGET,KERNEL_VER
-ppc,mamba-ppc
-)
-
-alsa_driver=(
-alsa-driver
-target,KERNEL_TARGET
-ppc,mamba-ppc
-)
-
-ati_driver=(
-ati-driver
-target,KERNEL_TARGET
-ppc,mamba-ppc
-)
-
-broadcom_sta=(
-broadcom-sta
-target,KERNEL_TARGET
-ppc,mamba-ppc
-)
-
-kernel_extramodules=(
-kernel-extramodules
-target,KERNEL_TARGET
-ppc,mamba-ppc
-)
-
-kernel_nongpl=(
-kernel-nongpl
-target,KERNEL_TARGET
-ppc,mamba-ppc
-)
-
-kernel_wireless_backport=(
-kernel-wireless-backport
-target,KERNEL_TARGET
-ppc,mamba-ppc
-)
-
-lirc=(
-lirc
-target,KERNEL_TARGET
-ppc,mamba-ppc
-)
-
-ndiswrapper=(
-ndiswrapper
-target,KERNEL_TARGET
-ppc,mamba-ppc
-)
-
-NVIDIA=(
-NVIDIA
-target,KERNEL_TARGET
-ppc,mamba-ppc
-)
-
-VirtualBox=(
-VirtualBox
-target,KERNEL_TARGET
-ppc,mamba-ppc
-)
-
-glibc=(
-glibc
-cross_target_cpu,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
-ppc,-,-,mamba-ppc,2.6.33
-)
-
-gcc=(
-gcc
-cross_target_cpu
-ppc
-)
-
-binutils=(
-binutils
-cross_target_cpu
-ppc
-)
-
-pam=(
-pam
-bootstrap
-1
-)
-
-rpm=(
-rpm
-bootstrap
-1
-)
-
-klibc=(
-klibc
-KERNEL_VER
-2.6.33mamba-ppc
-)
-
-emacs=(
-emacs
-bootstrap
-1
-)
-
-gcc=(
-gcc
-disable_jack,disable_java,disable_gjdoc
-1,1,1
-)

etc/autodist/distdb.x86_64

@@ -1,281 +0,0 @@
-# openmamba autodist build jobs database
-# 
-# Copyright (c) 2006-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
-# Released under the terms of the GNU GPL version 3 license 
-#
-
-# XTC 1 (Cross Toolchain)
-cross_environment=(
-cross-environment
-cross_target_cpu,autodist_crossonly,_target_platform
-x86_64,1,x86_64-openmamba-linux-gnu
-i586,1,i586-openmamba-linux-gnu
-arm,1,arm-openmamba-linux-gnueabi
-ppc,1,ppc-openmamba-linux-gnu
-)
-
-#
-# XTC 2
-#
-# build native binutils (gcc needed, so it's not a stage1 build) 
-# and cross platform binutils 
-#
-binutils=(
-binutils
-cross_target_cpu,_target_platform
-x86_64,x86_64-openmamba-linux-gnu
-i586,i586-openmamba-linux-gnu
-arm,arm-openmamba-linux-gnueabi
-ppc,ppc-openmamba-linux-gnu
-)
-
-#
-# XTC 3
-#
-# glibc stage1: build headers only
-glibc_stage1=(
-glibc
-cross_target_cpu,stage1,_target_platform,KERNEL_TARGET,KERNEL_VER
-x86_64,1,x86_64-openmamba-linux-gnu,mamba-x86_64,-
-arm,1,arm-openmamba-linux-gnueabi,mamba-arm,2.6.33
-i586,1,i586-openmamba-linux-gnu,mamba,-
-ppc,1,ppc-openmamba-linux-gnu,mamba,-
-)
-
-#
-# XTC 4
-#
-gcc_stage1=(
-gcc
-cross_target_cpu,stage1,_target_platform
-x86_64,1,x86_64-openmamba-linux-gnu
-arm,1,arm-openmamba-linux-gnueabi
-i586,1,i586-openmamba-linux-gnu
-ppc,1,ppc-openmamba-linux-gnu
-)
-
-#
-# XTC 5
-#
-glibc_stage2=(
-glibc
-cross_target_cpu,stage2,bigendian,softfloat,_target_platform,KERNEL_TARGET,KERNEL_VER
-x86_64,1,-,-,x86_64-openmamba-linux-gnu,mamba-x86_64,-
-arm,1,-,-,arm-openmamba-linux-gnueabi,mamba-arm,2.6.33
-i586,1,-,-,i586-openmamba-linux-gnu,mamba,-
-ppc,1,-,-,ppc-openmamba-linux-gnu,mamba,-
-)
-
-#
-# XTC 6
-#
-gcc=(
-gcc
-cross_target_cpu,_target_platform
-x86_64,x86_64-openmamba-linux-gnu
-arm,arm-openmamba-linux-gnueabi
-i586,i586-openmamba-linux-gnu
-ppc,ppc-openmamba-linux-gnu
-)
-
-#
-# XTC 7
-#
-glibc=(
-glibc
-cross_target_cpu,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
-x86_64,x86_64-openmamba-linux-gnu,-,-,mamba-x86_64,-
-i586,i586-openmamba-linux-gnu,-,-,mamba,-
-arm,arm-openmamba-linux-gnueabi,-,-,mamba-arm,2.6.33
-)
-
-gcc_uclibc=(
-gcc
-cross_target_cpu,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
-arm,arm-linux-uclibc,-,-,mamba-arm,2.6.33
-)
-
-dietlibc=(
-dietlibc
-cross_target_cpu
-x86_64
-i586
-arm
-)
-
-gcc34=(
-gcc34
-cross_target_cpu
-x86_64
-i586
-ppc
-)
-
-#
-# KERNEL
-#
-kernel=(
-kernel
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-linux_firmware=(
-linux-firmware
-target,KERNEL_TARGET,KERNEL_VER
-x86_64,mamba-x86_64,-
-)
-
-kernel_extra=(
-kernel-extramodules
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-kernel_packages=(
-VirtualBox-kernel
-target,KERNEL_TARGET,KERNEL_VER
-x86_64,mamba-x86_64,-
-)
-#hsfmodem,compat-wireless,ati-driver,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,broadcom-sta
-# slmodem, alsa-driver, lirc,VirtualBox, ndiswrapper, alsa-driver
-
-kernel_packages_36=(
-VirtualBox-kernel,NVIDIA
-target,KERNEL_TARGET,KERNEL_VER
-x86_64,mamba-x86_64,3.6
-)
-
-kernel_packages_34=(
-VirtualBox-kernel,NVIDIA
-target,KERNEL_TARGET,KERNEL_VER
-x86_64,mamba-x86_64,3.4
-)
-
-#kernelxen_packages=(
-#alsa-driver,hsfmodem,compat-wireless,ati-driver,ndiswrapper,broadcom-sta
-#target,KERNEL_TARGET,KERNEL_VER
-#x86_64,mamba-xen,-
-#)
-
-#NVIDIA_all=(
-#NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx
-#target,KERNEL_TARGET,KERNEL_VER
-#x86_64,mamba-x86_64
-#)
-##x86_64,mamba-xen
-
-alsa_driver=(
-alsa-driver
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-ati_driver=(
-ati-driver
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-broadcom_sta=(
-broadcom-sta
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-kernel_extramodules=(
-kernel-extramodules
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-kernel_nongpl=(
-kernel-nongpl
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-kernel_wireless_backport=(
-kernel-wireless-backport
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-broadcom_sta=(
-broadcom-sta
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-lirc=(
-lirc
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-ndiswrapper=(
-ndiswrapper
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-NVIDIA=(
-NVIDIA
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-VirtualBox_kernel=(
-VirtualBox-kernel
-target,KERNEL_TARGET
-x86_64,mamba-x86_64
-)
-#x86_64,mamba-xen
-
-glibc=(
-glibc
-cross_target_cpu,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER,multilib
-x86_64,-,-,mamba-x86_64,-,-
-)
-
-binutils=(
-binutils
-cross_target_cpu
-x86_64
-)
-
-pam=(
-pam
-bootstrap
-1
-)
-
-rpm=(
-rpm
-bootstrap
-1
-)
-
-gcc=(
-gcc
-cross_target_cpu,_target_platform,disable_jack,disable_gjdoc,disable_java
-x86_64,x86_64-openmamba-linux-gnu,1,0,0
-)
-
-apache_ant=(
-apache-ant
-stage2
-1
-)

etc/autodist/legacy

@@ -1,141 +0,0 @@
-kdebase
-kdewebdev
-grub
-libsqlite2
-libglade1
-openssl097
-gnupg
-kannel
-ftp
-nrg2iso
-ddrescue
-db42
-gcc34
-ftpsync
-libglib1
-gcc33
-libxml
-libtool1
-openldap22
-python24
-postgresql7
-PyQt
-libcares1
-libraw13941
-net-snmp5
-libmtp7
-gambas
-libgda2
-libmusicbrainz2
-libpng2
-libXaw8
-icu38
-mysql5
-libreadline5
-libxcb-xlib
-autoconf2.13
-python
-libflac11
-libdc1394_control
-automake1.10
-libusb0
-xorg-drv-input
-libeigen
-libgtk1
-java-junit3
-lm_sensors2
-kernel-extramodules
-kernel-nongpl-nvidia
-kernel-nongpl-fglrx
-kernel-nongpl
-automake1.6
-libjpeg6b
-kernel-nongpl-fglrx
-kernel-nongpl-nvidia
-db47
-arts
-kdegraphics
-synaptic
-libjpeg7
-kdevelop
-objectweb-asm1
-objectweb-asm2
-apache-tomcat5
-java-junit381
-jakarta-commons-lang24
-openssl098
-libpng12
-java-servletapi4
-tcltk84
-make381
-lilo
-rpm516
-ffmpeg052
-rpm5
-libpoppler6
-x264-84
-db51
-kde-i18n
-libwpg01
-libwps01
-libwpd08
-db52
-glade-3
-goocanvas
-moagg
-apache-commons-digester18
-x264-116
-libcdio12
-udev173
-libtiff3
-libpcre0
-libcdio12
-libpoppler12
-libaudiofile0
-libxcb-util1
-parted2
-libguile1
-libgnutls2
-libgdbm3
-farstream1
-gst-plugins-base010
-gst-plugins-good010
-gst-plugins-bad010
-gst-plugins-ugly010
-gstreamer010
-lua51
-libwebkit-gtk
-libgraphite2_11
-goocanvas
-libdirectfb5
-libtasn1_3
-kdelibs3
-goocanvas
-libraptor
-python
-liblcms
-libpng14
-xmlgraphics-commons14
-pygobject2
-ImageMagick5
-automake1.12
-libpcap0
-htmlunit1
-libimobiledevice3
-libilmbase1
-libgif4
-libmpc2
-ffmpeg010
-openexr1
-libnl1
-db53
-libpoppler20
-net-snmp25
-openssl100
-libglew15
-libpng15
-libmng1
-libimlib2
-antlr313
-libgmp3
-libeigen

etc/autodist/scripts/update-specfile

@@ -1,29 +1,100 @@
+#!/bin/bash
+#
 # Autodist script for updating specfiles
 # 
-# Copyright (c) 2007-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2024 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Released with the same license as autodist
 #
 
-[ "$1" ] || {
-   echo "Error: update-specfile: specfile not given; aborting."
+SPECFILE=
+NEWVERSION=
+BUILDREQNUM=0
+
+for ((i=1; i<=$#; i++)); do
+   case ${!i} in
+      --buildreq) let i+=1
+                  if [ ! "${!i}" ]; then
+                     echo "ERROR: --buildreq requires at least an argument; aborting."
+                     exit 1
+                  fi
+                  let BUILDREQNUM+=1
+                  BUILDREQ[$BUILDREQNUM]=${!i}
+                  if [ "${!i+1}" -a "${!i+1:0:1}" != "-" ]; then
+                     let i+=1
+                     BUILDREQREL[$BUILDREQNUM]=${!i}
+                     if [ ! "${!i+1}" -o "${!i+1:0:1}" = "-" ]; then
+                        echo "ERROR: update-specfile: --buildreq requires one or three arguments; aborting."
+                        exit 1
+                     fi
+                     let i+=1
+                     BUILDREQVER[$BUILDREQNUM]=${!i}
+                  fi
+                  ;;
+      *) if [ ! "$SPECFILE" ]; then
+            SPECFILE=${!i}
+         elif [ ! "$NEWVERSION" ]; then
+            NEWVERSION=${!i}
+         else
+            echo "ERROR: update-specfile: unrecognized script option: '${!i}'; aborting."
+            exit 1
+         fi
+   esac
+done
+
+[ "$SPECFILE" ] || {
+   echo "ERROR: update-specfile: specfile not given; aborting."
    exit 1
 }
 
-[ -e $1 ] || {
+[ -e $SPECFILE ] || {
    echo "Error: update-specfile: file $1 does not exist; aborting."
    exit 1
 }
 
-sed -i "s|^Vendor:.*|Vendor:        openmamba|" $1
-sed -i "s|^Distribution:.*|Distribution:  openmamba|" $1
-sed -i "s|silvan\.calarco@qilinux\.it|silvan.calarco@mambasoft.it|" $1
-sed -i "/BuildRequires:[[:space:]]*libffmpeg-devel/d" $1
-sed -i "s|\(BuildRequires:[[:space:]]*\)libmysql-devel|\1libmysql5-devel|" $1
-sed -i "s|\(BuildRequires:[[:space:]]*\)libdb42-devel|\1libdb47-devel|" $1
-sed -i "s|\(BuildRequires:[[:space:]]*\)firefox-devel|\1xulrunner-devel|" $1
-sed -i "s|^PreReq:[[:space:]]*/sbin/install-info|Requires(post):%{__install_info}|" $1
-sed -i "s|^PreReq:[[:space:]]*%{__install_info}|Requires(post):%{__install_info}|" $1
-sed -i "s|^PreReq:[[:space:]]*|Requires(pre): |" $1
-sed -i "s|http://.*.dl\.sourceforge\.net/|http://downloads.sourceforge.net/|" $1
-#sed -i "s|^\(Source.*:[[:space:]]*ftp://ftp.kde.org/pub/kde/stable/.*.tar.\)bz2|\1xz|" $1
+# Distribution global changes
+sed -i "s|^Vendor:.*|Vendor:        openmamba|;
+        s|^Distribution:.*|Distribution:  openmamba|;
+        /^%debug_package$/d;
+        /BuildRequires:[[:space:]]*libffmpeg-devel/d;
+        /^BuildRequires:[[:space:]]*libkdegames-devel/d;
+        /^BuildRequires:[[:space:]]*libkdegames5-devel/d;
+        /^BuildRequires:[[:space:]]*python3.7dist/d;
+        /^BuildRoot:[[:space:]]*.*/d;
+        \,%post.* -p /sbin/ldconfig$,d;
+        s|\(BuildRequires:[[:space:]]*\)libmysql-devel|\1libmysql5-devel|;
+        s|\(BuildRequires:[[:space:]]*\)libdb42-devel|\1libdb47-devel|;
+        s|\(BuildRequires:[[:space:]]*\)libdb51-devel|\1libdb53-devel|;
+        s|\(BuildRequires:[[:space:]]*\)firefox-devel|\1xulrunner-devel|;
+        s|^PreReq:[[:space:]]*/sbin/install-info|Requires(post):%{__install_info}|;
+        s|^PreReq:[[:space:]]*%{__install_info}|Requires(post):%{__install_info}|;
+        s|^PreReq:[[:space:]]*|Requires(pre): |;
+        s|^\(Requires:[[:space:]]*kde-workspace\)$|#\1|;
+        s|^%patch\([0-9][0-9]*\)|%patch \1|;
+        s|http://.*.dl\.sourceforge\.net/|https://downloads.sourceforge.net/|;
+        s|http://ftp.kde.org/stable/|https://download.kde.org/stable/|;
+        s|ftp://ftp.kde.org/pub/kde/|https://download.kde.org/|;
+        s|update-mime-database %{|update-mime-database -n %{|;
+        s|http://download.kde.org/stable/%{version}|https://download.kde.org/stable/applications/%{version}|;
+        s|http[s]*://pypi.python.org/packages/source/[^/]*/|https://pypi.debian.net/|;
+        s|http://ftp.gnome.org/pub/GNOME/sources/|https://download.gnome.org/sources/|;
+        s|ftp://ftp.gnome.org/pub/gnome/sources/|https://download.gnome.org/sources/|" $SPECFILE
+#        s|;s,.*/man/.*,&.gz,g||;
+#        s|http.*.cpan.org/.*/\([^/-]*\)\(-.*\)|https://cpan.metacpan.org/modules/by-module/\1/\1\2|;
+#sed -i "s|^\(Source.*:[[:space:]]*ftp://ftp.kde.org/pub/kde/stable/.*.tar.\)bz2|\1xz|" $SPECFILE
+
+if [ $BUILDREQNUM -gt 0 ]; then
+   grep "^## AUTOBUILDREQ-END" $SPECFILE > /dev/null || {
+      echo "ERROR: update-specfile: missing AUTOBUILDREQ block; aborting."
+      exit 1
+   }
+   for b in `seq 1 $BUILDREQNUM`; do
+      line=${BUILDREQ[$b]}
+      if [ "${BUILDREQREL[$b]}" ]; then
+         line="$line ${BUILDREQREL[$b]} ${BUILDREQVER[$b]}"
+      fi
+      sed -i "/^## AUTOBUILDREQ-END/,9999{/BuildRequires:[[:space:]]*${BUILDREQ[$b]}$/d}" $SPECFILE
+      sed -i "/^## AUTOBUILDREQ-END/,9999{/BuildRequires:[[:space:]]*${BUILDREQ[$b]}[[:space:]]/d}" $SPECFILE
+      sed -i "/^## AUTOBUILDREQ-END/a BuildRequires: $line" $SPECFILE
+   done
+fi
 exit 0

etc/autodist/unstage

@@ -1 +0,0 @@
-gcc

etc/autodist/unstage.arm

@@ -1,45 +0,0 @@
-libatk
-libgtk
-libpango
-tcltk
-dbus
-libgsf
-python
-glib
-libnfsidmap
-ghostscript
-liblcms
-ImageMagick4
-ImageMagick
-gcc
-libtiff
-libtiff3
-libcairo
-gtk-doc
-libpoppler
-libpoppler12
-gettext
-libXext
-gnokii
-kdegames
-soprano
-autoconf
-libidn
-libcanberra
-libxml2
-libcaca
-libproxy
-libphonon
-xmms2
-libalsa-plugins
-gutenprint
-gpm
-emacs
-groff
-graphviz
-python26
-python27
-beecrypt
-ncurses
-tcltk85
-java-openjdk

etc/autodist/unstage.x86_64

@@ -1,42 +0,0 @@
-tcltk
-libxml2
-libpango
-libatk
-gettext
-libnfsidmap
-libXext
-libidn
-libtiff
-liblcms
-python
-glib
-libcanberra
-avahi
-gpm
-emacs
-groff
-soprano
-livecd-tools
-tracker
-graphviz
-PackageKit
-apache-ant
-libpeas
-libalsa-plugins
-libproxy
-python26
-python27
-beecrypt
-gtk-doc
-tzdata
-db60
-ImageMagick
-java-openjdk
-java-gcj-compat
-apache-log4j
-java-icu4j4
-mpg123
-libgphoto
-nfs-utils
-git
-xmms2

etc/cron.daily/40-autodist-cleanold

@@ -1,33 +0,0 @@
-#!/bin/bash
-[ -e /etc/sysconfig/autoport ] && . /etc/sysconfig/autoport
-
-function clean() {
-   dir=$1
-   arch=$2
-   find $dir/RPM/RPMS/$arch/ -maxdepth 1 -ctime +21 -exec rm -rf {} \;
-   find $dir/RPM/RPMS/noarch/ -maxdepth 1 -ctime +21 -exec rm -rf {} \;
-   find $dir/RPM/BUILD/ -maxdepth 1 -ctime +21 -exec rm -rf {} \;
-   find $dir/RPM/SOURCES/ -maxdepth 1 -ctime +120 -a ! -name "*.patch" -exec rm -rf {} \;
-   find $dir/RPM/SRPMS/ -maxdepth 1 -ctime +48 -exec rm -rf {} \;
-}
-
-for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
-   if [ "${AUTOPORT_CHROOT[$i]}" ]; then
-      a=${AUTOPORT_CHROOT[$i]}
-      clean /var/autoport/$a/usr/src ${AUTOPORT_ARCH[$i]}
-      [ -e /var/autoport/$a/var/autodist/RPM/RPMS/$arch ] && \
-         clean /var/autoport/$a/var/autodist ${AUTOPORT_ARCH[$i]}
-      [ -e /var/autoport/$a/var/tmp/autodist ] && \
-         find /var/autoport/$a/var/tmp/autodist/ -maxdepth 1 -ctime +25 -exec rm -rf {} \;
-      find /var/autoport/$a/tmp/ -maxdepth 1 -ctime +25 -exec rm -rf {} \;
-   elif [ "${AUTOPORT_UPDATE[$i]}" ]; then
-      clean /var/autodist ${AUTOPORT_ARCH[$i]}
-      find /var/autodist-tmp/ -maxdepth 1 -ctime +25 -exec rm -rf {} \;
-   elif [ "${AUTOPORT_NATIVE[$i]}" -a "${AUTOPORT_CHROOT_USER[$i]}" ]; then
-      WORKINGHOME=`getent passwd ${AUTOPORT_CHROOT_USER[$i]} | cut -d: -f6`
-      if [ -e $WORKINGHOME ]; then
-         clean $WORKINGHOME ${AUTOPORT_ARCH[$i]}
-      fi
-      find /var/autodist-tmp/ -maxdepth 1 -ctime +25 -exec rm -rf {} \;
-   fi
-done

etc/cron.daily/40-autodist-upstream-updates

@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# autodist-upstream-updates daily cron script
-# (c) 2008-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
-#
-. /etc/autodist/config
-REPOSITORY=devel
-/usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
-
-REPOSITORY=milestone1-1.1
-/usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
-
-REPOSITORY=milestone2
-/usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
-
-exit 0

etc/cron.daily/45-autodist-git-sync

@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# autodist-git-sync daily cron script
+# (c) 2024 by Silvan Calarco <silvan.calarco@mambasoft.it>
+#
+. /etc/autodist/config
+
+if [ "$AUTODIST_GIT_SYNC" == "1" ]; then
+   autodist-git syncrepo
+fi
+
+exit 0

etc/cron.hourly/60-autodist-update

@@ -1,68 +1,17 @@
 #!/bin/bash
 #
 # autodist autoupdate hourly cron script
-# (c) 2008-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# (c) 2008-2021 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 . /etc/autodist/config
 . /etc/sysconfig/autoport
 
-ME=`basename $0`
-
 # FIXME: parametrize automaint call
-automaint -s devel-autodist -d devel -p devel-makedist
-
-[ "$$" == "`pidof -x $ME`" -o "$$" == "`pidof -x 60-autodist-update`" ] || {
-#   echo "Warning: $ME script already running; exiting."
-   exit 0
-}
-
-PIDFILE=/var/run/autodist/autodist.pid
-HOUR=`date +%H`
-[ "`uname -m`" = "x86_64" ] && HOST_IS_X86_64=1
-
-function pid_check() {
-
-   [ -e $PIDFILE ] && PIDCHECK=`cat $PIDFILE`
-
-   [ "$PIDCHECK" -a -e /proc/$PIDCHECK ] && {
-      echo "Error: an autodist process is already running; exiting for safety."
-      exit 0
-
-   }
-}
+if [ ! "$AUTOPORT_UPDATE_NO_AUTOMAINT" ]; then
+   automaint -s devel-autodist -d base -p devel-makedist
+fi
 
 for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
- for r in ${AUTOPORT_REPOSITORIES[$i]}; do
-   [ "${AUTOPORT_ARCH[$i]}" ] || continue
-   [ "${AUTOPORT_DISABLE[$i]}" -a "${AUTOPORT_DISABLE[$i]}" != "0" ] && continue
-
-   if [ "$HOST_IS_X86_64" -a "${AUTOPORT_ARCH[$i]}" != "x86_64" ]; then
-      CMD_PREFIX=linux32
-   else
-      CMD_PREFIX=
-   fi
-
-   # TODO: parametrize DISTROMATIC_REPOSITORY and following log files
-   DISTROMATIC_REPOSITORY=devel-future
-
-   LOGFILE=/var/autodist/log/autodist.log
-   LASTLOGFILE=/var/autodist/log/autodist-last.log
-   REPLOGFILE=$LOCAL_REPS_BASE_DIR/$r/autodist.log
-   REPLASTLOGFILE=$LOCAL_REPS_BASE_DIR/$r/autodist-last.log
-
-   if [ "${AUTOPORT_UPDATE[$i]}" ]; then
-      pid_check
-      distromatic -q -t $DISTROMATIC_REPOSITORY --gensrcpkglist > $LOCAL_REPS_BASE_DIR/$DISTROMATIC_REPOSITORY/srcpkglist 2>/dev/null
-
-      pid_check
-      autodist-upstream-updates -q -h -u -r $DISTROMATIC_REPOSITORY -o $r \
-         > $LOCAL_REPS_BASE_DIR/distromatic/$r/_popular.html
-
-      pid_check
-      [ -e $LOGFILE ] && mv $LOGFILE $LASTLOGFILE
-      su -l autodist -c "$CMD_PREFIX autodist -a --server $r" > $LOGFILE
-      [ -e $REPLOGFILE ] && mv $REPLOGFILE $REPLASTLOGFILE
-      cp $LOGFILE $REPLOGFILE
-   fi
- done
+ echo "Running autodist-launcher ${i}"
+ systemd-run -u autodist-launcher-${i} /usr/bin/autodist-launcher ${i}
 done

etc/cron.hourly/65-autoport

@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# openmamba-autobuild-autoport daily cron script
+# (c) 2008-2021 by Silvan Calarco <silvan.calarco@mambasoft.it>
+#
+#. /etc/sysconfig/openmamba-central
+. /etc/sysconfig/autoport
+
+[ "$AUTOPORT_ENABLE" = "1" -o "$AUTOPORT_ENABLE" = "true" ] || exit 0
+
+for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
+  echo "Running autoport-launcher ${i}"
+  systemd-run -u autoport-launcher-${i} /usr/bin/autoport-launcher ${i}
+done

etc/cron.hourly/65-autoport-native

@@ -1,80 +0,0 @@
-#!/bin/bash
-#
-# openmamba-autobuild-autoport daily cron script
-# (c) 2008-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
-#
-#. /etc/sysconfig/openmamba-central
-. /etc/sysconfig/autoport
-
-[ "$AUTOPORT_ENABLE" = "1" -o "$AUTOPORT_ENABLE" = "true" ] || exit 0
-
-ME=`basename $0`
-[ "$$" == "`pidof -x $ME`" ] || {
-   [[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Warning: $ME script already running; exiting."
-   exit 0
-}
-
-PIDFILE=/var/run/autodist/autoport.pid
-HOUR=`date +%H`
-[ "`uname -m`" = "x86_64" ] && HOST_IS_X86_64=1
-
-function pid_check() {
-
-   [ -e $PIDFILE ] && PIDCHECK=`cat $PIDFILE`
-
-   [ "$PIDCHECK" -a -e /proc/$PIDCHECK ] && {
-      echo "Error: an autodist process is already running; exiting for safety."
-      exit 0
-
-   }
-}
-
-pid_check
-
-for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
- for r in ${AUTOPORT_REPOSITORIES[$i]}; do
-   [ "${AUTOPORT_ARCH[$i]}" ] || continue
-   [ "${AUTOPORT_DISABLE[$i]}" -a "${AUTOPORT_DISABLE[$i]}" != "0" ] && continue
-
-   if [ "$HOST_IS_X86_64" -a "${AUTOPORT_ARCH[$i]}" != "x86_64" ]; then
-      CMD_PREFIX=linux32
-   else
-      CMD_PREFIX=
-   fi
-
-   if [ "${AUTOPORT_NATIVE[$i]}" ]; then
-      LOGFILE="/var/autodist/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}.log"
-      LASTLOGFILE="/var/autodist/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}-last.log"
-   else
-      continue
-   fi
-   [ -e $LOGFILE ] && mv $LOGFILE $LASTLOGFILE
-
-   echo "+ Autoport start at `date`" > $LOGFILE
-   echo "============================================" >> $LOGFILE
-
-   if [ "${AUTOPORT_NATIVE[$i]}" ]; then
-      a=${AUTOPORT_ARCH[$i]}
-      [[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Updating packages in $a native environment"
-      echo "= Updating packages in $a native environment..." >> $LOGFILE
-      LANG=C smart update > /dev/null
-      LANG=C smart upgrade -y >> $LOGFILE
-      echo "= Working on $r($a) in native mode" >> $LOGFILE
-      su -l ${AUTOPORT_CHROOT_USER[$i]} -c "$CMD_PREFIX autoport -b -r $r" >> $LOGFILE
-      AUTODIST_HOME=`getent passwd ${AUTOPORT_CHROOT_USER[$i]} | cut -d: -f6`
-      cat $AUTODIST_HOME/.autoport/$a/$r-current.log >> $LOGFILE
-   fi
-
-#   if [ "${AUTOPORT_CROSS[$i]}" ]; then
-#      a=${AUTOPORT_CROSS[$i]}
-#      [[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Working on $r($a) in cross-platform mode"
-#      echo "= Working on $r($a) in cross-platform mode" >> $LOGFILE
-#      su -l autodist -c "autoport -b -x $a -r $r" >> $LOGFILE
-#      cat /var/autodist/.autoport/$a/$r-current.log >> $LOGFILE
-#   fi
-
-   echo "- Autoport end at `date`" >> $LOGFILE
-   echo "============================================" >> $LOGFILE
-
- done
-done

etc/cron.hourly/66-autoport-chroot

@@ -1,109 +0,0 @@
-#!/bin/bash
-#
-# openmamba-autobuild-autoport daily cron script
-# (c) 2008-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
-#
-#. /etc/sysconfig/openmamba-central
-. /etc/sysconfig/autoport
-
-[ "$AUTOPORT_ENABLE" = "1" -o "$AUTOPORT_ENABLE" = "true" ] || exit 0
-
-ME=`basename $0`
-[ "$$" == "`pidof -x $ME`" ] || {
-   [[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Warning: $ME script already running; exiting."
-   exit 0
-}
-
-PIDFILE=/var/run/autodist/autoport.pid
-HOUR=`date +%H`
-[ "`uname -m`" = "x86_64" ] && HOST_IS_X86_64=1
-
-function pid_check() {
-
-   [ -e $PIDFILE ] && PIDCHECK=`cat $PIDFILE`
-
-   [ "$PIDCHECK" -a -e /proc/$PIDCHECK ] && {
-      echo "Error: an autodist process is already running; exiting for safety."
-      exit 0
-
-   }
-}
-
-pid_check
-
-for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
- [ "${AUTOPORT_ARCH[$i]}" ] || continue
- [ "${AUTOPORT_DISABLE[$i]}" -a "${AUTOPORT_DISABLE[$i]}" != "0" ] && continue
-
- if [ "${AUTOPORT_CHROOT[$i]}" ]; then
-    # disable service restarts
-    mv /var/autoport/${AUTOPORT_CHROOT[$i]}/sbin/service /var/autoport/${AUTOPORT_CHROOT[$i]}/sbin/service.autoport
-    ln -s /bin/true /var/autoport/${AUTOPORT_CHROOT[$i]}/sbin/service
-    # sudo mount -o bind /proc /var/autoport/${AUTOPORT_CHROOT[$i]}/proc
-    [[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Updating packages in ${AUTOPORT_CHROOT[$i]} chroot environment"
-    #echo "= Updating packages in ${AUTOPORT_CHROOT[$i]} chroot environment..." >> $LOGFILE
-    LANG=C /usr/sbin/chroot /var/autoport/${AUTOPORT_CHROOT[$i]} smart update --quiet > /dev/null
-    LANG=C /usr/sbin/chroot /var/autoport/${AUTOPORT_CHROOT[$i]} smart upgrade -y > /dev/null
-    [ "${AUTOPORT_CHROOT_ICECREAM[$i]}" ] && LANG=C /usr/sbin/chroot /etc/init.d/icecream start
- fi
-
- for r in ${AUTOPORT_REPOSITORIES[$i]}; do
-
-   if [ "$HOST_IS_X86_64" -a "${AUTOPORT_ARCH[$i]}" != "x86_64" ]; then
-      CMD_PREFIX=linux32
-   else
-      CMD_PREFIX=
-   fi
-
-   if [ "${AUTOPORT_CHROOT[$i]}" ]; then
-      LOGFILE="/var/autodist/log/autoport-chroot-$r-${AUTOPORT_CHROOT[$i]}.log"
-      LASTLOGFILE="/var/autodist/log/autoport-chroot-$r-${AUTOPORT_CHROOT[$i]}-last.log"
-   elif [ "${AUTOPORT_CROSS[$i]}" ]; then
-      LOGFILE="/var/autodist/log/autoport-cross-$r-${AUTOPORT_CROSS[$i]}.log"
-      LASTLOGFILE="/var/autodist/log/autoport-cross-$r-${AUTOPORT_CROSS[$i]}-last.log"
-   else
-      continue
-   fi
-   [ -e $LOGFILE ] && mv $LOGFILE $LASTLOGFILE
-
-   echo "+ Autoport start at `date`" > $LOGFILE
-   echo "============================================" >> $LOGFILE
-
-   if [ "${AUTOPORT_CHROOT[$i]}" ]; then
-      echo "= Working on $r(${AUTOPORT_CHROOT[$i]}) in chroot mode..." >> $LOGFILE
-      [[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Working on $r(${AUTOPORT_CHROOT[$i]}) in chroot mode" >> $LOGFILE
-      #echo "DEBUG: $CMD_PREFIX /usr/sbin/chroot /var/autoport/${AUTOPORT_CHROOT[$i]} su -l ${AUTOPORT_CHROOT_USER[$i]} -c \"autoport -b -r $r\"" >> $LOGFILE
-      $CMD_PREFIX /usr/sbin/chroot /var/autoport/${AUTOPORT_CHROOT[$i]} su -l ${AUTOPORT_CHROOT_USER[$i]} -c "autoport -b -r $r" >> $LOGFILE
-      cat /var/autoport/${AUTOPORT_CHROOT[$i]}/home/${AUTOPORT_CHROOT_USER[$i]}/.autoport/${AUTOPORT_ARCH[$i]}/$r-current.log >> $LOGFILE
-      #echo "DEBUG: cat /var/autoport/${AUTOPORT_CHROOT[$i]}/home/${AUTOPORT_CHROOT_USER[$i]}/.autoport/${AUTOPORT_ARCH[$i]}/$r-current.log" >> $LOGFILE
-   fi
-
-#   if [ "${AUTOPORT_NATIVE[$i]}" ]; then
-#      a=${AUTOPORT_ARCH[$i]}
-#      [[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Updating packages in $a native environment"
-#      echo "= Updating packages in $a native environment..." >> $LOGFILE
-#      LANG=C smart update > /dev/null
-#      LANG=C smart upgrade -y >> $LOGFILE
-#      echo "= Working on $r($a) in native mode" >> $LOGFILE
-#      su -l autodist -c "autoport -b -r $r" >> $LOGFILE
-#      cat /var/autodist/.autoport/$a/$r-current.log >> $LOGFILE
-#   fi
-
-   if [ "${AUTOPORT_CROSS[$i]}" ]; then
-      [[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Working on $r(${AUTOPORT_CROSS[$i]}) in cross-platform mode"
-      echo "= Working on $r(${AUTOPORT_CROSS[$i]}) in cross-platform mode" >> $LOGFILE
-      su -l autodist -c "autoport -b -x ${AUTOPORT_CROSS[$i]} -r $r" >> $LOGFILE
-      cat /var/autodist/.autoport/${AUTOPORT_CROSS[$i]}/$r-current.log >> $LOGFILE
-   fi
-
-   echo "- Autoport end at `date`" >> $LOGFILE
-   echo "============================================" >> $LOGFILE
-
- done
-
- if [ "${AUTOPORT_CHROOT[$i]}" ]; then
-    mv /var/autoport/${AUTOPORT_CHROOT[$i]}/sbin/service.autoport /var/autoport/${AUTOPORT_CHROOT[$i]}/sbin/service
-    [ "${AUTOPORT_CHROOT_ICECREAM[$i]}" ] && LANG=C /usr/sbin/chroot /etc/init.d/icecream stop
- fi
-
-done

etc/sysconfig/autoport

@@ -5,12 +5,15 @@ local_ftp=/var/ftp/pub/openmamba/
 
 #AUTOBUILDS_STATUS_URL="http://www.openmamba.org/distribution/autobuilds.html"
 #AUTOPORT_ENABLE=1
+# Disabled by default because they would require local repository
+AUTOPORT_UPDATE_NO_AUTOMAINT=1
+AUTOPORT_UPDATE_NO_DISTROMATIC=1
 #AUTOPORT_CGI_HOST=(http://localhost/cgi-bin/autodist)
 #AUTOPORT_WEBBUILD_HOST=http://localhost/webbuild.html
 #ICECREAM_MONITOR_HOST=localhost
 
-AUTOPORT_DEVEL_IMPORT_REPOSITORIES="devel-makedist devel devel-games devel-autodist devel-gnome \
-devel-kde4 devel-xorg devel-kernel devel-misc devel-java devel-future devel-past devel-contrib devel-contrib-java"
+AUTOPORT_DEVEL_IMPORT_REPOSITORIES="devel-makedist base devel-autodist \
+devel-kernel devel-misc devel-future devel-past"
 
 AUTOPORT_DEVEL_RELEASE_REPOSITORIES="milestone2-makedist milestone2-kernel milestone2-kernel-next"
 

repology-openmamba.py

@@ -0,0 +1,79 @@
+#!/usr/bin/python3
+#
+# repology-openmamba.py - find upstream packages updates from repology.org
+# Copyright (c) 2021-2024 by Silvan Calarco <silvan.calarco@mambasoft.it>
+#
+
+import json
+import rpm
+import sys
+import time
+import urllib.request
+
+
+with open("/var/ftp/pub/openmamba/base/legacy") as f:
+    legacy_packages = f.read().splitlines()
+
+with open("/var/ftp/pub/openmamba/base/updates-conf.json") as f:
+    data = json.loads(f.read())
+    ignored_packages = data["repology"]["ignore"]
+
+from_package = ""
+last_from_package = "NONE"
+results = []
+
+while True:
+    if from_package == last_from_package:
+        break
+    requrl = "https://repology.org/api/v1/projects/"
+    if from_package != "":
+        requrl += from_package +"/"
+    requrl += "?inrepo=openmamba&outdated=1"
+    sys.stderr.write("Requesting: " + requrl + "\n")
+    req = urllib.request.Request(
+        requrl,
+        data=None,
+        headers={'User-Agent': 'autodist/1.5.3 (Linux; openmamba; reports@openmamba.org)'}
+    )
+    url = urllib.request.urlopen(req)
+    #print(requrl)
+    data = json.loads(url.read().decode())
+
+    if from_package != "" and len(data.keys()) <= 1:
+        break
+    for k in data.keys():
+        if k == from_package:
+            continue
+        package = k
+        openmamba_srcname = None
+        openmamba_version = None
+        openmamba_altnames = []
+        newest_version = None
+        newest_repos = []
+        for p in data[k]:
+            if p["repo"] == "openmamba":
+                if not p["srcname"] in ignored_packages and \
+                    not p["srcname"] in legacy_packages:
+                        if openmamba_srcname is None:
+                            openmamba_version = p["version"]
+                            openmamba_srcname = p["srcname"]
+                        else:
+                            openmamba_altnames.append(p["srcname"])
+            elif p["status"] == "newest":
+               # kaos_build provides unreleased kde package versions
+               if p["repo"] != "kaos_build":
+                   newest_version = p["version"]
+                   newest_repos.append(p["repo"])
+        newest_repos = list(dict.fromkeys(newest_repos))
+        if openmamba_srcname and newest_version is not None and len(newest_repos) > 0:
+            results.append(openmamba_srcname + " " + newest_version)
+            for altname in openmamba_altnames:
+                results.append(altname + " " + newest_version)
+    last_from_package = from_package
+    from_package = package
+    time.sleep(1)
+
+results_sorted = sorted(set(results), key=str.casefold)
+#results_unique = set(results_sorted)
+for result in results_sorted:
+    print(result)

telegram/openmamba_bot.py

@@ -0,0 +1,205 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# openmamba bot for Telegram
+#
+# Copyright (C) 2016-2023 by Silvan Calarco <silvan.calarco@mambasoft.it>
+#
+# GPL v3 license
+
+from telegram import (ParseMode, Update)
+
+from telegram.ext import (Updater, CommandHandler, MessageHandler, Filters, RegexHandler,
+                          ConversationHandler, Job, CallbackContext)
+
+import logging
+import subprocess
+import sqlite3
+import os
+
+# Enable logging
+logging.basicConfig(format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+                    level=logging.INFO)
+
+logger = logging.getLogger(__name__)
+timers = dict()
+social_log_last_ids = dict()
+
+reps = [ 'base', 'devel-makedist', 'devel-autodist', 'devel-kernel', 'devel-misc', 'devel-future', 'devel-past' ]
+
+def start(update: Update, context: CallbackContext):
+
+    user = update.message.from_user
+    logger.info("User %s started the conversation." % user.first_name)
+
+    update.message.reply_text(
+        'Hi! This is the openmamba GNU/Linux Bot.\n'
+        'Send any text to search for packages.\n'
+        'Send /details [name] to see details of specified source package.\n'
+        'Send /set [seconds] to enable notifications.\n'
+        'Send /unset to disable notifications.\n\n')
+
+    return
+
+
+def help(update: Update, context: CallbackContext):
+
+    update.message.reply_text(
+        'Send any text to search for packages.\n'
+        'Send /details [name] to see details of specified source package.\n'
+        'Send /set [seconds] to enable notifications.\n'
+        'Send /unset to disable notifications.\n\n')
+
+    return
+
+
+def query(update: Update, context: CallbackContext):
+    user = update.message.from_user
+    logger.info("Query of %s: %s" % (user.first_name, update.message.text))
+
+    response = ""
+    for rep in reps:
+        conn = sqlite3.connect('/var/webbuild/db/%s-sources.db' % rep, check_same_thread=False)
+        cursor = conn.cursor()
+        print(rep)
+        cursor.execute(
+            'SELECT id,name,version,release,summary,url FROM sources where name like "%%%s%%" or summary like "%%%s%%" '
+            'ORDER BY name="%s" DESC, name like "%s%%" DESC, name like "%%%s%%" DESC limit 10'
+               % (update.message.text, update.message.text, update.message.text, update.message.text, update.message.text))
+        for row in cursor:
+            response += "<b>%s</b> %s-%s (%s)\n%s\n%s\n\n" % (row[1], row[2], row[3], rep, row[4], row[5])
+
+    if response != "":
+        update.message.reply_text(response, parse_mode=ParseMode.HTML)
+    else:
+        update.message.reply_text('No results found.')
+    return
+
+
+def details(update: Update, context: CallbackContext):
+    user = update.message.from_user
+    logger.info("Details of %s: %s" % (user.first_name, update.message.text))
+
+    response = ""
+    for rep in reps:
+        conn = sqlite3.connect('/var/webbuild/db/%s-sources.db' % rep, check_same_thread=False)
+        cursor = conn.cursor()
+        cursor.execute(
+            'SELECT id,name,version,release,summary,url,description FROM sources where name="%s"' % (context.args[0]))
+        for row in cursor:
+            response += "<b>%s</b> %s-%s (devel)\n%s\n%s\n\n<i>%s</i>\n\n" % (row[1], row[2], row[3], row[4], row[5], row[6])
+            for arch in [ 'x86_64', 'aarch64', 'i586', 'arm' ]:
+                conn1 = sqlite3.connect('/var/webbuild/db/' + rep + '-' + arch + '.db', check_same_thread=False)
+                cursor1 = conn1.cursor()
+                cursor1.execute('SELECT id,name FROM packages where id_source=%s' % (row[0]))
+                for row1 in cursor1:
+                    response += "<b>%s</b>(%s) " % (row1[1], arch)
+            response += "\n\n\n"
+
+    if response != "":
+        update.message.reply_text(response[0:4096], parse_mode=ParseMode.HTML)
+    else:
+        update.message.reply_text('No results found.')
+    return
+
+
+def alarm(context):
+    social_log_conn = sqlite3.connect('/var/webbuild/webbuild.db')
+    social_log_cursor = social_log_conn.cursor()
+    social_log_cursor.execute('SELECT id,user,text,datetime(time,\'localtime\'),type FROM social_log where id>%s' % social_log_last_ids[context.job])
+    response = ""
+    for row in social_log_cursor:
+        if row[4] == "job":
+            response += "Job run by <i>%s</i> %s (%s)\n" % (row[1], row[2], row[3])
+        else:
+            response += "<i>%s</i> %s (%s)\n" % (row[1], row[2], row[3])
+    if response != "":
+        bot.sendMessage(context.job, response, parse_mode=ParseMode.HTML)
+        social_log_last_ids[context.job] = row[0]
+
+
+def set(update: Update, context: CallbackContext):
+    chat_id = update.message.chat_id
+    try:
+        due = int(context.args[0])
+        if due < 0:
+            update.message.reply_text('Sorry we can not go back to future!')
+            return
+        #job = Job(alarm, context, next_t=due, repeat=True, context=chat_id)
+        #timers[chat_id] = job
+        context.job_queue.run_repeating(alarm, due)
+        #context.jobqueue.put(job)
+
+        social_log_conn = sqlite3.connect('/var/webbuild/webbuild.db')
+        social_log_cursor = social_log_conn.cursor()
+        social_log_cursor.execute('''SELECT MAX(id) FROM social_log''')
+        social_log_last_ids[chat_id] = social_log_cursor.fetchone()[0] - 5
+
+        update.message.reply_text('Notifications enabled!')
+
+    except (IndexError, ValueError):
+        update.message.reply_text('Usage: /set <seconds>')
+
+
+def unset(update: Update, context: CallbackContext):
+    chat_id = update.message.chat_id
+
+    if chat_id not in timers:
+        update.message.reply_text('Notification were not enabled')
+        return
+
+    job = timers[chat_id]
+    job.schedule_removal()
+    del timers[chat_id]
+    update.message.reply_text('Notifications disabled')
+
+
+def cancel(update: Update, context: CallbackContext):
+    user = update.message.from_user
+    logger.info("User %s canceled the conversation." % user.first_name)
+    update.message.reply_text('Bye!')
+
+    return ConversationHandler.END
+
+
+def error(update: Update, context: CallbackContext):
+    logger.warning('Update "%s" caused error "%s"' % (update, context.error))
+
+
+def main():
+
+    # Load bot token from external configuration file
+    bot_token = ""
+    with open("/etc/autodist/secrets") as myfile:
+        for line in myfile:
+            name, var = line.rstrip().split("=")
+            if name == "TELEGRAM_BOT_TOKEN":
+                bot_token = var
+
+    # Create the EventHandler and pass it your bot's token.
+    updater = Updater(bot_token)
+
+    # Get the dispatcher to register handlers
+    dp = updater.dispatcher
+
+    dp.add_handler(CommandHandler('start', start))
+    dp.add_handler(CommandHandler('help', help))
+    dp.add_handler(CommandHandler('details', details, pass_args=True))
+    dp.add_handler(CommandHandler('set', set, pass_args=True, pass_job_queue=True))
+    dp.add_handler(CommandHandler('unset', unset))
+    dp.add_handler(MessageHandler(Filters.text, query))
+
+    # log all errors
+    dp.add_error_handler(error)
+
+    # Start the Bot
+    updater.start_polling()
+
+    # Run the bot until the you presses Ctrl-C or the process receives SIGINT,
+    # SIGTERM or SIGABRT. This should be used most of the time, since
+    # start_polling() is non-blocking and will stop the bot gracefully.
+    updater.idle()
+
+
+if __name__ == '__main__':
+    main()

telegram/openmambabot.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=openmamba bot for Telegram
+After=syslog.target
+
+[Service]
+Type=simple
+ExecStart=/var/autodist/env/bin/python3 /usr/share/autodist/openmamba_bot.py
+
+[Install]
+WantedBy=multi-user.target

telegram/requirements.txt

@@ -0,0 +1 @@
+python-telegram-bot~=13.14

webbuild/html/autobuilds.html

@@ -2,6 +2,7 @@
 <html><head>
 <meta content="text/html; charset=utf-8" http-equiv="content-type">
 
+<link rel="shortcut icon" type="image/x-icon" href="/images/webbuild.ico" />
 <!-- styles needed by jScrollPane -->
 <link type="text/css" href="/scripts/jquery.jscrollpane.css" rel="stylesheet" media="all" >
 <!-- latest jQuery direct from google's CDN -->
@@ -20,6 +21,7 @@ var reloadtime = 0;
 
 function ajax_getvalues() {
   var url = window.location.protocol+"//"+window.location.hostname+"/cgi-bin/autodist?FORMAT=xml&"+window.location.href.replace(/.*\?/,"");
+  var xmlhttp;
   if (window.XMLHttpRequest)
     xmlhttp = new XMLHttpRequest();
   else if (window.ActiveXObject)
@@ -42,16 +44,7 @@ function ajax_getvalues() {
 //-->
 </script>
 </head><body>
-<div id=container style="position:relative;width:894px;height:auto;top:0;left:0;margin-left:auto;margin-right:auto;">
-<table width="100%"><tr><td>
-<tr><td valign="middle">
- <table align="center"><tr>
-  <td colspan=2><img src="/images/webbuild.png" alt="build automatici">
-  &nbsp;&nbsp;&nbsp;<b>- Autodist - Build automatici</b>
-  </td>
- </tr></table>
-</td></tr>
-<tr><td>
+<div id=container style="margin-left:auto;margin-right:auto;width:95%;">
 <div id="noajax_msg"><p>Il supporto per AJAX non è abilitato nel tuo browser. L'aggiornamento live non sarà disponibile, premi Ricarica per aggiornare la pagina.</p></div>
 <span id="output">Caricamento in corso, attendere...</span>
 <script>
@@ -62,7 +55,6 @@ $("#output").mousemove(function(event) {
   if (lastupdatetime > reloadtime) { lastupdate = lastupdatetime; ajax_getvalues(); }
 });
 </script>
-</td></tr>
-</table>
+
 </div>
 </body></html>

webbuild/html/scripts/codemirror/.editorconfig

@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8

webbuild/html/scripts/codemirror/.gitattributes

@@ -0,0 +1,8 @@
+*.txt   text eol=lf
+*.js    text eol=lf
+*.html  text eol=lf
+*.md    text eol=lf
+*.json  text eol=lf
+*.yml   text eol=lf
+*.css   text eol=lf
+*.svg   text eol=lf

webbuild/html/scripts/codemirror/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,5 @@
+<!--
+Do not use this bug tracker for questions. We have a forum (https://discuss.codemirror.net) for those.
+
+In order to get us to look at something, you need to make it easy for us to understand what you are doing and what went wrong. When possible, a code example that demonstrates the problem helps a lot. If there's any chance at all that a problem is related to the browser, include information about which browser(s) you tested with.
+-->

webbuild/html/scripts/codemirror/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+<!--
+NOTE: We are not accepting pull requests for new modes or addons. Please put such code in a separate repository, and release them as stand-alone npm packages. See for example the [Elixir mode](https://github.com/ianwalter/codemirror-mode-elixir).
+
+Also pull requests that rewrite big chunks of code or adjust code style to your own taste are generally not welcome. Make your changes in focused steps that fix or improve a specific thing.
+-->

webbuild/html/scripts/codemirror/.gitignore

@@ -1,2 +0,0 @@
-/node_modules
-/npm-debug.log

webbuild/html/scripts/codemirror/.npmignore

@@ -0,0 +1,14 @@
+/node_modules
+/demo
+/doc
+/test
+/test*.html
+/index.html
+/mode/*/*test.js
+/mode/*/*.html
+/mode/index.html
+.*
+/bin/authors.sh
+/bin/lint
+/bin/release
+/bin/upload-release.js

webbuild/html/scripts/codemirror/.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - 0.8
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  - stable
+sudo: false
+cache: npm

webbuild/html/scripts/codemirror/AUTHORS

@@ -0,0 +1,893 @@
+List of CodeMirror contributors. Updated before every release.
+
+4oo4
+4r2r
+Aaron Brooks
+Abdelouahab
+Abdussalam Abdurrahman
+Abe Fettig
+Abhishek Gahlot
+Adam Ahmed
+Adam King
+Adam Particka
+adanlobato
+Adán Lobato
+Aditya Toshniwal
+Adrian Aichner
+Adrian Heine
+Adrian Kunz
+Adrien Bertrand
+aeroson
+Ahmad Amireh
+Ahmad M. Zawawi
+ahoward
+Ajin Abraham
+Akeksandr Motsjonov
+Alasdair Smith
+AlbertHilb
+Alberto González Palomo
+Alberto Pose
+Albert Xing
+Alexander Pavlov
+Alexander Schepanovski
+Alexander Shvets
+Alexander Solovyov
+Alexandre Bique
+Alex Churchill
+alexey-k
+Alex Piggott
+Aliaksei Chapyzhenka
+Allen Sarkisyan
+Ami Fischman
+Amin Shali
+Amin Ullah Khan
+amshali@google.com
+Amsul
+amuntean
+Amy
+Ananya Sen
+anaran
+AndersMad
+Anders Nawroth
+Anderson Mesquita
+Anders Wåglund
+Andrea G
+Andreas Reischuck
+Andres Taylor
+Andre von Houck
+Andrew Cheng
+Andrew Dassonville
+Andrey Fedorov
+Andrey Klyuchnikov
+Andrey Lushnikov
+Andrey Shchekin
+Andy Joslin
+Andy Kimball
+Andy Li
+Angelo
+angelozerr
+angelo.zerr@gmail.com
+Ankit
+Ankit Ahuja
+Ansel Santosa
+Anthony Dugois
+anthonygego
+Anthony Gégo
+Anthony Grimes
+Anton Kovalyov
+antosarho
+Apollo Zhu
+AQNOUCH Mohammed
+Aram Shatakhtsyan
+areos
+Arnab Bose
+Arnoud Buzing
+Arsène von Wyss
+Arthur Müller
+Arun Narasani
+as3boyan
+asolove
+atelierbram
+AtomicPages LLC
+Atul Bhouraskar
+Aurelian Oancea
+Axel Lewenhaupt
+Baptiste Augrain
+Barret Rennie
+Bartosz Dziewoński
+Basarat Ali Syed
+Bastian Müller
+belhaj
+Bem Jones-Bey
+benbro
+Benedikt Meurer
+benhormann
+Ben Hormann
+Beni Cherniavsky-Paskin
+Benjamin DeCoste
+Benjamin Young
+Ben Keen
+Ben Miller
+Ben Mosher
+Bernhard Sirlinger
+Bert Chang
+Bharad
+BigBlueHat
+Billy Moon
+Bin Ni
+binny
+Bjorn Hansen
+B Krishna Chaitanya
+Blaine G
+blukat29
+Bo
+boomyjee
+Bo Peng
+borawjm
+Boris K
+Brad Metcalf
+Brandon Frohs
+Brandon Wamboldt
+Bret Little
+Brett Zamir
+Brian Grinstead
+BrianHung
+Brian Sletten
+brrd
+Bruce Mitchener
+Bruno Logerfo
+Bryan Gin-ge Chen
+Bryan Massoth
+Caitlin Potter
+Calin Barbat
+callodacity
+Camilo Roca
+Casey Klebba
+cBiscuit87
+César González Íñiguez
+Chad Jolly
+Chandra Sekhar Pydi
+Charles Skelton
+Cheah Chu Yeow
+Chhekur
+Chris Colborne
+Chris Coyier
+Chris Ford
+Chris Granger
+Chris Houseknecht
+Chris Lohfink
+Chris Morgan
+Chris Reeves
+Chris Smith
+Christian Gruen
+Christian Oyarzun
+Christian Petrov
+christopherblaser
+Christopher Brown
+Christopher Kramer
+Christopher Mitchell
+Christopher Pfohl
+Christopher Wallis
+Chunliang Lyu
+ciaranj
+clone-it
+clso
+CodeAnimal
+CodeBitt
+coderaiser
+Cole R Lawrence
+ComFreek
+Cristian Prieto
+Curran Kelleher
+Curtis Gagliardi
+d8888
+dagsta
+daines
+Dale Jung
+Dan Bentley
+Dan Heberden
+Daniel, Dao Quang Minh
+Daniele Di Sarli
+Daniel Faust
+Daniel Hanggi
+Daniel Huigens
+Daniel Kesler
+Daniel KJ
+Daniel Neel
+Daniel Parnell
+Daniel Thwaites
+Danila Malyutin
+Danny Yoo
+darealshinji
+Darius Roberts
+databricks-david-lewis
+Dave Brondsema
+Dave MacLachlan
+Dave Myers
+David Barnett
+David H. Bronke
+David Mignot
+David Pathakjee
+David Rodrigues
+David Santana
+David Vázquez
+David Whittington
+deebugger
+Deep Thought
+Denis Ovsienko
+Devin Abbott
+Devon Carew
+Dick Choi
+Diego Fernandez
+dignifiedquire
+Dimage Sapelkin
+Dinindu D. Wanniarachchi
+dmaclach
+Dmitry Kiselyov
+domagoj412
+Dominator008
+Domizio Demichelis
+Doug Blank
+Doug Wikle
+Drew Bratcher
+Drew Hintz
+Drew Khoury
+Drini Cami
+Dror BG
+Duncan Lilley
+duralog
+dwelle
+Ealton
+eborden
+edoroshenko
+edsharp
+ekhaled
+Elisée
+elpnt
+Emmanuel Schanzer
+Enam Mijbah Noor
+Eric Allam
+Eric Bogard
+Erik Demaine
+Erik Welander
+eustas
+Evan Minsk
+Fabien Dubosson
+Fabien O'Carroll
+Fabio Zendhi Nagao
+Faiza Alsaied
+Fauntleroy
+fbuchinger
+feizhang365
+Felipe Lalanne
+Felix Raab
+ficristo
+Filip Noetzel
+Filip Stollár
+Filype Pereira
+finalfantasia
+flack
+Florian Felten
+Fons van der Plas
+Forbes Lindesay
+ForbesLindesay
+Ford_Lawnmower
+Forrest Oliphant
+Franco Catena
+Frank Seifferth
+Frank Wiegand
+fraxx001
+Fredrik Borg
+FUJI Goro (gfx)
+Gabriel Gheorghian
+Gabriel Horner
+Gabriel Nahmias
+galambalazs
+Gary Sheng
+Gautam Mehta
+Gavin Douglas
+gekkoe
+Geordie Hall
+George Stephanis
+geowarin
+Gerard Braad
+Gergely Hegykozi
+Germain Chazot
+Giovanni Calò
+Glebov Boris
+Glenn Jorde
+Glenn Ruehle
+goldsmcb
+Golevka
+Google LLC
+Gordon Smith
+Grant Skinner
+greengiant
+Gregory Koberger
+Grzegorz Mazur
+Guang Li
+Guan Gui
+Guillaume Massé
+Guillaume Massé
+guraga
+Gustavo Rodrigues
+Hakan Tunc
+Hanno Fellmann
+Hans Engel
+Hanzhao Deng
+Haoran Yu
+Harald Schilly
+Hardest
+Harshvardhan Gupta
+Hasan Delibaş
+Hasan Karahan
+Heanes
+Hector Oswaldo Caballero
+Hein Htat
+Hélio
+Hendrik Wallbaum
+Henrik Haugbølle
+Herculano Campos
+hidaiy
+Hiroyuki Makino
+hitsthings
+Hocdoc
+Howard
+Howard Jing
+Hugues Malphettes
+Ian Beck
+Ian Davies
+Ian Dickinson
+ianhi
+Ian Rose
+Ian Wehrman
+Ian Wetherbee
+Ice White
+ICHIKAWA, Yuji
+idleberg
+Igor Petruk
+ilvalle
+Ilya Kharlamov
+Ilya Zverev
+Ingo Richter
+Intervue
+Irakli Gozalishvili
+Ivan Kurnosov
+Ivoah
+Jack Douglas
+Jacob Lee
+Jaimin
+Jake Peyser
+Jakob Miland
+Jakub Vrana
+Jakub Vrána
+James Campos
+James Cockshull
+James Howard
+James Thorne
+Jamie Hill
+Jamie Morris
+Janice Leung
+Jan Jongboom
+jankeromnes
+Jan Keromnes
+Jan Odvarko
+Jan Schär
+Jan T. Sott
+Jared Dean
+Jared Forsyth
+Jared Jacobs
+Jason
+Jason Barnabe
+Jason Grout
+Jason Heeris
+Jason Johnston
+Jason San Jose
+Jason Siefken
+Jayaprabhakar
+Jay Contonio
+Jaydeep Solanki
+Jean Boussier
+Jeff Blaisdell
+Jeff Hanke
+Jeff Jenkins
+jeffkenton
+Jeff Pickhardt
+jem (graphite)
+Jeremy Parmenter
+Jim
+Jim Avery
+jkaplon
+JobJob
+jochenberger
+Jochen Berger
+Joel Einbinder
+joelpinheiro
+joewalsh
+Johan Ask
+Johannes
+John Chen
+John Connor
+John-David Dalton
+John Engler
+John Lees-Miller
+John Ryan
+John Snelson
+John Van Der Loo
+Jon Ander Peñalba
+Jonas Döbertin
+Jonas Helfer
+Jonathan Dierksen
+Jonathan Hart
+Jonathan Malmaud
+Jon Gacnik
+jongalloway
+Jon Malmaud
+Jon Sangster
+Joo
+Joost-Wim Boekesteijn
+Joseph Pecoraro
+Josh Barnes
+Josh Cohen
+Josh Soref
+Joshua Newman
+Josh Watzman
+jots
+Joy Zhong
+jsoojeon
+ju1ius
+Juan Benavides Romero
+Jucovschi Constantin
+Juho Vuori
+Julien CROUZET
+Julien Rebetez
+Justin Andresen
+Justin Hileman
+jwallers@gmail.com
+kaniga
+karevn
+Karol
+Kaushik Kulkarni
+Kayur Patel
+Kazuhito Hokamura
+kcwiakala
+Kees de Kooter
+Kenan Christian Dimas
+Ken Newman
+ken restivo
+Ken Rockot
+Kevin Earls
+Kevin Kwok
+Kevin Muret
+Kevin Sawicki
+Kevin Ushey
+Kier Darby
+Klaus Silveira
+Koh Zi Han, Cliff
+komakino
+Konstantin Lopuhin
+koops
+Kris Ciccarello
+ks-ifware
+kubelsmieci
+kvncp
+KwanEsq
+Kyle Kelley
+KyleMcNutt
+LaKing
+Lanfei
+Lanny
+laobubu
+Laszlo Vidacs
+leaf
+leaf corcoran
+Lemmon
+Leo Baschy
+Leonid Khachaturov
+Leon Sorokin
+Leonya Khachaturov
+Liam Newman
+Libo Cannici
+Lior Goldberg
+Lior Shub
+LloydMilligan
+LM
+lochel
+Lonnie Abelbeck
+Lorenzo Simionato
+Lorenzo Stoakes
+Louis Mauchet
+Luca Fabbri
+Lucas Buchala
+Luciano Longo
+Luciano Santana
+Lu Fangjian
+Luke Browning
+Luke Granger-Brown
+Luke Stagner
+lynschinzer
+M1cha
+Madhura Jayaratne
+Maksim Lin
+Maksym Taran
+Malay Majithia
+Manideep
+Manuel Rego Casasnovas
+Marat Dreizin
+Marcel Gerber
+Marcelo Camargo
+Marco Aurélio
+Marco Munizaga
+Marcus Bointon
+Marek Rudnicki
+Marijn Haverbeke
+Mário Gonçalves
+Mario Pietsch
+Mark Anderson
+Mark Dalgleish
+Mark Hamstra
+Mark Lentczner
+Marko Bonaci
+Mark Peace
+Markus Bordihn
+Markus Olsson
+Martin Balek
+Martín Gaitán
+Martin Hasoň
+Martin Hunt
+Martin Laine
+Martin Zagora
+Mason Malone
+Mateusz Paprocki
+Mathias Bynens
+mats cronqvist
+Matt Gaide
+Matthew Bauer
+Matthew Beale
+Matthew Casperson
+matthewhayes
+Matthew Rathbone
+Matthew Suozzo
+Matthias Bussonnier
+Matthias BUSSONNIER
+Mattia Astorino
+Matt MacPherson
+Matt McDonald
+Matt Pass
+Matt Sacks
+mauricio
+Maximilian Hils
+Maxim Kraev
+Max Kirsch
+Max Schaefer
+Max Wu
+Max Xiantu
+mbarkhau
+McBrainy
+mce2
+Mélanie Chauvel
+melpon
+meshuamam
+Metatheos
+Micah Dubinko
+Michael
+Michael Goderbauer
+Michael Grey
+Michael Kaminsky
+Michael Lehenbauer
+Michael Wadman
+Michael Walker
+Michael Zhou
+Michal Čihař
+Michal Dorner
+Michal Kapiczynski
+Mighty Guava
+Miguel Castillo
+mihailik
+Mika Andrianarijaona
+Mike
+Mike Bostock
+Mike Brevoort
+Mike Diaz
+Mike Ivanov
+Mike Kadin
+Mike Kobit
+Milan Szekely
+MinRK
+Miraculix87
+misfo
+mkaminsky11
+mloginov
+Moritz Schubotz (physikerwelt)
+Moritz Schwörer
+Moshe Wajnberg
+mps
+ms
+mtaran-google
+Mu-An ✌️ Chiou
+Mu-An Chiou
+mzabuawala
+Narciso Jaramillo
+Nathan Williams
+ndr
+Neil Anderson
+neon-dev
+nerbert
+NetworkNode
+nextrevision
+ngn
+nguillaumin
+Ng Zhi An
+Nicholas Bollweg
+Nicholas Bollweg (Nick)
+NickKolok
+Nick Kreeger
+Nick Small
+Nicolas Chevobbe
+Nicolas Kick
+Nicolò Ribaudo
+Niels van Groningen
+nightwing
+Nikita Beloglazov
+Nikita Vasilyev
+Nikolaj Kappler
+Nikolay Kostov
+nilp0inter
+Nils Knappmeier
+Nisarg Jhaveri
+nlwillia
+noragrossman
+Norman Rzepka
+Nouzbe
+Oleksandr Yakovenko
+Olivia Ytterbrink
+Opender Singh
+opl-
+Oreoluwa Onatemowo
+orionlee
+oscar.lofwenhamn
+Oskar Segersvärd
+ossdev
+overdodactyl
+pablo
+pabloferz
+Pablo Zubieta
+paddya
+Page
+paladox
+Panupong Pasupat
+paris
+Paris
+Paris Kasidiaris
+Patil Arpith
+Patrick Kettner
+Patrick Stoica
+Patrick Strawderman
+Paul Garvin
+Paul Ivanov
+Paul Masson
+Paul Schmidt
+Pavel
+Pavel Feldman
+Pavel Petržela
+Pavel Strashkin
+Paweł Bartkiewicz
+peteguhl
+peter
+Peter Flynn
+peterkroon
+Peter Kroon
+Peter László
+Philipp A
+Philipp Markovics
+Philip Stadermann
+Pi Delport
+Pierre Gerold
+Pieter Ouwerkerk
+Pontus Melke
+prasanthj
+Prasanth J
+Prayag Verma
+prendota
+Prendota
+Qiang Li
+Radek Piórkowski
+Rahul
+Rahul Anand
+ramwin1
+Randall Mason
+Randy Burden
+Randy Edmunds
+Randy Luecke
+Raphael Amorim
+Rasmus Erik Voel Jensen
+Rasmus Schultz
+raymondf
+Raymond Hill
+ray ratchup
+Ray Ratchup
+Remi Nyborg
+Renaud Durlin
+Reynold Xin
+Richard Denton
+Richard van der Meer
+Richard Z.H. Wang
+Rishi Goomar
+Robert Brignull
+Robert Crossfield
+Robert Martin
+Roberto Abdelkader Martínez Pérez
+robertop23
+Roberto Vidal
+Robert Plummer
+Roman Janusz
+Rrandom
+Rrrandom
+Ruslan Osmanov
+rvalavicius
+Ryan Pangrle
+Ryan Petrello
+Ryan Prior
+ryu-sato
+sabaca
+Sam Lee
+Sam Rawlins
+Samuel Ainsworth
+Sam Wilson
+sandeepshetty
+Sander AKA Redsandro
+Sander Verweij
+santec
+Sarah McAlear and Wenlin Zhang
+Sascha Peilicke
+Sasha Varlamov
+satamas
+satchmorun
+sathyamoorthi
+Saul Costa
+S. Chris Colbert
+SCLINIC\jdecker
+Scott Aikin
+Scott Feeney
+Scott Goodhew
+Seb35
+Sebastian Wilzbach
+Sebastian Zaha
+Seren D
+Sergey Goder
+Sergey Tselovalnikov
+Se-Won Kim
+Shane Liesegang
+shaund
+shaun gilchrist
+Shawn A
+Shea Bunge
+sheopory
+Shil S
+Shiv Deepak
+Shmuel Englard
+Shubham Jain
+Siamak Mokhtari
+Siddhartha Gunti
+silverwind
+Simon Edwards
+sinkuu
+snasa
+soliton4
+sonson
+Sorab Bisht
+spastorelli
+srajanpaliwal
+Stanislav Oaserele
+stan-z
+Stas Kobzar
+Stefan Borsje
+Steffen Beyer
+Steffen Bruchmann
+Steffen Kowalski
+Stephane Moore
+Stephen Lavelle
+Steve Champagne
+Steve Hoover
+Steve O'Hara
+stockiNail
+stoskov
+Stryder Crown
+Stu Kennedy
+Sungho Kim
+sverweij
+Taha Jahangir
+takamori
+Tako Schotanus
+Takuji Shimokawa
+Takuya Matsuyama
+Tarmil
+T. Brandon Ashley
+TDaglis
+Teja
+tel
+Tentone
+tfjgeorge
+Thaddee Tyl
+thanasis
+TheHowl
+themrmax
+think
+Thomas Brouard
+Thomas Dvornik
+Thomas Kluyver
+thomasmaclean
+Thomas Schmid
+Tim Alby
+Tim Baumann
+Tim Gates
+Timothy Farrell
+Timothy Gu
+Timothy Hatcher
+Tim van der Lippe
+Tobias Bertelsen
+TobiasBg
+Todd Berman
+Todd Kennedy
+tokafew420
+Tomas-A
+Tomas Varaneckas
+Tom Erik Støwer
+Tom Klancer
+Tom MacWright
+Tom McLaughlin
+Tony Jian
+tophf
+Torgeir Thoresen
+totalamd
+Travis Heppe
+Triangle717
+Tristan Tarrant
+TSUYUSATO Kitsune
+Tugrul Elmas
+twifkak
+Tyler Long
+Tyler Makaro
+Vadim Dyachenko
+Vadzim Ramanenka
+Vaibhav Sagar
+vamshi.revu
+VapidWorx
+Vestimir Markov
+vf
+Victor Bocharsky
+Vincent Woo
+Volker Mische
+vtripolitakis
+wdouglashall
+Weiyan Shao
+wenli
+Wes Cossick
+Wesley Wiser
+Weston Ruter
+Will Binns-Smith
+Will Dean
+William Desportes
+William Jamieson
+William Stein
+Willy
+Wojtek Ptak
+wonderboyjon
+Wu Cheng-Han
+Xavier Mendez
+Yang Guo
+Yassin N. Hassan
+YNH Webdev
+yoongu
+Yunchi Luo
+Yuvi Panda
+Yvonnick Esnault
+Zac Anger
+Zachary Dremann
+ZeeshanNoor
+Zeno Rocha
+Zhang Hao
+Ziv
+zoobestik
+zziuni
+魏鹏刚

webbuild/html/scripts/codemirror/CONTRIBUTING.md

@@ -0,0 +1,92 @@
+# How to contribute
+
+- [Getting help](#getting-help)
+- [Submitting bug reports](#submitting-bug-reports)
+- [Contributing code](#contributing-code)
+
+## Getting help
+
+Community discussion, questions, and informal bug reporting is done on the
+[discuss.CodeMirror forum](http://discuss.codemirror.net).
+
+## Submitting bug reports
+
+The preferred way to report bugs is to use the
+[GitHub issue tracker](http://github.com/codemirror/CodeMirror/issues). Before
+reporting a bug, read these pointers.
+
+**Note:** The issue tracker is for *bugs*, not requests for help. Questions
+should be asked on the
+[discuss.CodeMirror forum](http://discuss.codemirror.net) instead.
+
+### Reporting bugs effectively
+
+- CodeMirror is maintained by volunteers. They don't owe you anything, so be
+  polite. Reports with an indignant or belligerent tone tend to be moved to the
+  bottom of the pile.
+
+- Include information about **the browser in which the problem occurred**. Even
+  if you tested several browsers, and the problem occurred in all of them,
+  mention this fact in the bug report. Also include browser version numbers and
+  the operating system that you're on.
+
+- Mention which release of CodeMirror you're using. Preferably, try also with
+  the current development snapshot, to ensure the problem has not already been
+  fixed.
+
+- Mention very precisely what went wrong. "X is broken" is not a good bug
+  report. What did you expect to happen? What happened instead? Describe the
+  exact steps a maintainer has to take to make the problem occur. We can not
+  fix something that we can not observe.
+
+- If the problem can not be reproduced in any of the demos included in the
+  CodeMirror distribution, please provide an HTML document that demonstrates
+  the problem. The best way to do this is to go to
+  [jsbin.com](http://jsbin.com/ihunin/edit), enter it there, press save, and
+  include the resulting link in your bug report.
+
+## Contributing code
+
+Note that we are not accepting any new addons or modes into the main
+distribution. If you've written such a module, please distribute it as
+a separate NPM package.
+
+- Make sure you have a [GitHub Account](https://github.com/signup/free)
+- Fork [CodeMirror](https://github.com/codemirror/CodeMirror/)
+  ([how to fork a repo](https://help.github.com/articles/fork-a-repo))
+- Make your changes
+- If your changes are easy to test or likely to regress, add tests.
+  Tests for the core go into `test/test.js`, some modes have their own
+  test suite under `mode/XXX/test.js`. Feel free to add new test
+  suites to modes that don't have one yet (be sure to link the new
+  tests into `test/index.html`).
+- Follow the general code style of the rest of the project (see
+  below). Run `bin/lint` to verify that the linter is happy.
+- Make sure all tests pass. Visit `test/index.html` in your browser to
+  run them.
+- Submit a pull request
+([how to create a pull request](https://help.github.com/articles/fork-a-repo)).
+  Don't put more than one feature/fix in a single pull request.
+
+By contributing code to CodeMirror you
+
+ - agree to license the contributed code under CodeMirror's [MIT
+   license](https://codemirror.net/LICENSE).
+
+ - confirm that you have the right to contribute and license the code
+   in question. (Either you hold all rights on the code, or the rights
+   holder has explicitly granted the right to use it like this,
+   through a compatible open source license or through a direct
+   agreement with you.)
+
+### Coding standards
+
+- 2 spaces per indentation level, no tabs.
+
+- Note that the linter (`bin/lint`) which is run after each commit
+  complains about unused variables and functions. Prefix their names
+  with an underscore to muffle it.
+
+- CodeMirror does *not* follow JSHint or JSLint prescribed style.
+  Patches that try to 'fix' code to pass one of these linters will be
+  unceremoniously discarded.

webbuild/html/scripts/codemirror/LICENSE

@@ -1,4 +1,6 @@
-Copyright (C) 2012 by Marijn Haverbeke <marijnh@gmail.com>
+MIT License
+
+Copyright (C) 2017 by Marijn Haverbeke <marijnh@gmail.com> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -17,7 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
-Please note that some subdirectories of the CodeMirror distribution
-include their own LICENSE files, and are released under different
-licences.

webbuild/html/scripts/codemirror/README.md

@@ -0,0 +1,48 @@
+# CodeMirror
+
+[![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
+[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
+[![Join the chat at https://gitter.im/codemirror/CodeMirror](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/codemirror/CodeMirror)  
+
+CodeMirror is a versatile text editor implemented in JavaScript for
+the browser. It is specialized for editing code, and comes with over
+100 language modes and various addons that implement more advanced
+editing functionality. Every language comes with fully-featured code
+and syntax highlighting to help with reading and editing complex code.
+
+A rich programming API and a CSS theming system are available for
+customizing CodeMirror to fit your application, and extending it with
+new functionality.
+
+You can find more information (and the
+[manual](https://codemirror.net/doc/manual.html)) on the [project
+page](https://codemirror.net). For questions and discussion, use the
+[discussion forum](https://discuss.codemirror.net/).
+
+See
+[CONTRIBUTING.md](https://github.com/codemirror/CodeMirror/blob/master/CONTRIBUTING.md)
+for contributing guidelines.
+
+The CodeMirror community aims to be welcoming to everybody. We use the
+[Contributor Covenant
+(1.1)](http://contributor-covenant.org/version/1/1/0/) as our code of
+conduct.
+
+### Installation
+
+Either get the [zip file](https://codemirror.net/codemirror.zip) with
+the latest version, or make sure you have [Node](https://nodejs.org/)
+installed and run:
+
+    npm install codemirror
+
+**NOTE**: This is the source repository for the library, and not the
+distribution channel. Cloning it is not the recommended way to install
+the library, and will in fact not work unless you also run the build
+step.
+
+### Quickstart
+
+To build the project, make sure you have Node.js installed (at least version 6)
+and then `npm install`. To run, just open `index.html` in your
+browser (you don't need to run a webserver). Run the tests with `npm test`.

webbuild/html/scripts/codemirror/addon/comment/comment.js

@@ -0,0 +1,211 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var noOptions = {};
+  var nonWS = /[^\s\u00a0]/;
+  var Pos = CodeMirror.Pos, cmp = CodeMirror.cmpPos;
+
+  function firstNonWS(str) {
+    var found = str.search(nonWS);
+    return found == -1 ? 0 : found;
+  }
+
+  CodeMirror.commands.toggleComment = function(cm) {
+    cm.toggleComment();
+  };
+
+  CodeMirror.defineExtension("toggleComment", function(options) {
+    if (!options) options = noOptions;
+    var cm = this;
+    var minLine = Infinity, ranges = this.listSelections(), mode = null;
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var from = ranges[i].from(), to = ranges[i].to();
+      if (from.line >= minLine) continue;
+      if (to.line >= minLine) to = Pos(minLine, 0);
+      minLine = from.line;
+      if (mode == null) {
+        if (cm.uncomment(from, to, options)) mode = "un";
+        else { cm.lineComment(from, to, options); mode = "line"; }
+      } else if (mode == "un") {
+        cm.uncomment(from, to, options);
+      } else {
+        cm.lineComment(from, to, options);
+      }
+    }
+  });
+
+  // Rough heuristic to try and detect lines that are part of multi-line string
+  function probablyInsideString(cm, pos, line) {
+    return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"\`]/.test(line)
+  }
+
+  function getMode(cm, pos) {
+    var mode = cm.getMode()
+    return mode.useInnerComments === false || !mode.innerMode ? mode : cm.getModeAt(pos)
+  }
+
+  CodeMirror.defineExtension("lineComment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = getMode(self, from);
+    var firstLine = self.getLine(from.line);
+    if (firstLine == null || probablyInsideString(self, from, firstLine)) return;
+
+    var commentString = options.lineComment || mode.lineComment;
+    if (!commentString) {
+      if (options.blockCommentStart || mode.blockCommentStart) {
+        options.fullLines = true;
+        self.blockComment(from, to, options);
+      }
+      return;
+    }
+
+    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
+    var pad = options.padding == null ? " " : options.padding;
+    var blankLines = options.commentBlankLines || from.line == to.line;
+
+    self.operation(function() {
+      if (options.indent) {
+        var baseString = null;
+        for (var i = from.line; i < end; ++i) {
+          var line = self.getLine(i);
+          var whitespace = line.slice(0, firstNonWS(line));
+          if (baseString == null || baseString.length > whitespace.length) {
+            baseString = whitespace;
+          }
+        }
+        for (var i = from.line; i < end; ++i) {
+          var line = self.getLine(i), cut = baseString.length;
+          if (!blankLines && !nonWS.test(line)) continue;
+          if (line.slice(0, cut) != baseString) cut = firstNonWS(line);
+          self.replaceRange(baseString + commentString + pad, Pos(i, 0), Pos(i, cut));
+        }
+      } else {
+        for (var i = from.line; i < end; ++i) {
+          if (blankLines || nonWS.test(self.getLine(i)))
+            self.replaceRange(commentString + pad, Pos(i, 0));
+        }
+      }
+    });
+  });
+
+  CodeMirror.defineExtension("blockComment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = getMode(self, from);
+    var startString = options.blockCommentStart || mode.blockCommentStart;
+    var endString = options.blockCommentEnd || mode.blockCommentEnd;
+    if (!startString || !endString) {
+      if ((options.lineComment || mode.lineComment) && options.fullLines != false)
+        self.lineComment(from, to, options);
+      return;
+    }
+    if (/\bcomment\b/.test(self.getTokenTypeAt(Pos(from.line, 0)))) return
+
+    var end = Math.min(to.line, self.lastLine());
+    if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end;
+
+    var pad = options.padding == null ? " " : options.padding;
+    if (from.line > end) return;
+
+    self.operation(function() {
+      if (options.fullLines != false) {
+        var lastLineHasText = nonWS.test(self.getLine(end));
+        self.replaceRange(pad + endString, Pos(end));
+        self.replaceRange(startString + pad, Pos(from.line, 0));
+        var lead = options.blockCommentLead || mode.blockCommentLead;
+        if (lead != null) for (var i = from.line + 1; i <= end; ++i)
+          if (i != end || lastLineHasText)
+            self.replaceRange(lead + pad, Pos(i, 0));
+      } else {
+        var atCursor = cmp(self.getCursor("to"), to) == 0, empty = !self.somethingSelected()
+        self.replaceRange(endString, to);
+        if (atCursor) self.setSelection(empty ? to : self.getCursor("from"), to)
+        self.replaceRange(startString, from);
+      }
+    });
+  });
+
+  CodeMirror.defineExtension("uncomment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = getMode(self, from);
+    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
+
+    // Try finding line comments
+    var lineString = options.lineComment || mode.lineComment, lines = [];
+    var pad = options.padding == null ? " " : options.padding, didSomething;
+    lineComment: {
+      if (!lineString) break lineComment;
+      for (var i = start; i <= end; ++i) {
+        var line = self.getLine(i);
+        var found = line.indexOf(lineString);
+        if (found > -1 && !/comment/.test(self.getTokenTypeAt(Pos(i, found + 1)))) found = -1;
+        if (found == -1 && nonWS.test(line)) break lineComment;
+        if (found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
+        lines.push(line);
+      }
+      self.operation(function() {
+        for (var i = start; i <= end; ++i) {
+          var line = lines[i - start];
+          var pos = line.indexOf(lineString), endPos = pos + lineString.length;
+          if (pos < 0) continue;
+          if (line.slice(endPos, endPos + pad.length) == pad) endPos += pad.length;
+          didSomething = true;
+          self.replaceRange("", Pos(i, pos), Pos(i, endPos));
+        }
+      });
+      if (didSomething) return true;
+    }
+
+    // Try block comments
+    var startString = options.blockCommentStart || mode.blockCommentStart;
+    var endString = options.blockCommentEnd || mode.blockCommentEnd;
+    if (!startString || !endString) return false;
+    var lead = options.blockCommentLead || mode.blockCommentLead;
+    var startLine = self.getLine(start), open = startLine.indexOf(startString)
+    if (open == -1) return false
+    var endLine = end == start ? startLine : self.getLine(end)
+    var close = endLine.indexOf(endString, end == start ? open + startString.length : 0);
+    var insideStart = Pos(start, open + 1), insideEnd = Pos(end, close + 1)
+    if (close == -1 ||
+        !/comment/.test(self.getTokenTypeAt(insideStart)) ||
+        !/comment/.test(self.getTokenTypeAt(insideEnd)) ||
+        self.getRange(insideStart, insideEnd, "\n").indexOf(endString) > -1)
+      return false;
+
+    // Avoid killing block comments completely outside the selection.
+    // Positions of the last startString before the start of the selection, and the first endString after it.
+    var lastStart = startLine.lastIndexOf(startString, from.ch);
+    var firstEnd = lastStart == -1 ? -1 : startLine.slice(0, from.ch).indexOf(endString, lastStart + startString.length);
+    if (lastStart != -1 && firstEnd != -1 && firstEnd + endString.length != from.ch) return false;
+    // Positions of the first endString after the end of the selection, and the last startString before it.
+    firstEnd = endLine.indexOf(endString, to.ch);
+    var almostLastStart = endLine.slice(to.ch).lastIndexOf(startString, firstEnd - to.ch);
+    lastStart = (firstEnd == -1 || almostLastStart == -1) ? -1 : to.ch + almostLastStart;
+    if (firstEnd != -1 && lastStart != -1 && lastStart != to.ch) return false;
+
+    self.operation(function() {
+      self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
+                        Pos(end, close + endString.length));
+      var openEnd = open + startString.length;
+      if (pad && startLine.slice(openEnd, openEnd + pad.length) == pad) openEnd += pad.length;
+      self.replaceRange("", Pos(start, open), Pos(start, openEnd));
+      if (lead) for (var i = start + 1; i <= end; ++i) {
+        var line = self.getLine(i), found = line.indexOf(lead);
+        if (found == -1 || nonWS.test(line.slice(0, found))) continue;
+        var foundEnd = found + lead.length;
+        if (pad && line.slice(foundEnd, foundEnd + pad.length) == pad) foundEnd += pad.length;
+        self.replaceRange("", Pos(i, found), Pos(i, foundEnd));
+      }
+    });
+    return true;
+  });
+});

webbuild/html/scripts/codemirror/addon/comment/continuecomment.js

@@ -0,0 +1,114 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  var nonspace = /\S/g;
+  var repeat = String.prototype.repeat || function (n) { return Array(n + 1).join(this); };
+  function continueComment(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), mode, inserts = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var pos = ranges[i].head
+      if (!/\bcomment\b/.test(cm.getTokenTypeAt(pos))) return CodeMirror.Pass;
+      var modeHere = cm.getModeAt(pos)
+      if (!mode) mode = modeHere;
+      else if (mode != modeHere) return CodeMirror.Pass;
+
+      var insert = null, line, found;
+      var blockStart = mode.blockCommentStart, lineCmt = mode.lineComment;
+      if (blockStart && mode.blockCommentContinue) {
+        line = cm.getLine(pos.line);
+        var end = line.lastIndexOf(mode.blockCommentEnd, pos.ch - mode.blockCommentEnd.length);
+        // 1. if this block comment ended
+        // 2. if this is actually inside a line comment
+        if (end != -1 && end == pos.ch - mode.blockCommentEnd.length ||
+            lineCmt && (found = line.lastIndexOf(lineCmt, pos.ch - 1)) > -1 &&
+            /\bcomment\b/.test(cm.getTokenTypeAt({line: pos.line, ch: found + 1}))) {
+          // ...then don't continue it
+        } else if (pos.ch >= blockStart.length &&
+                   (found = line.lastIndexOf(blockStart, pos.ch - blockStart.length)) > -1 &&
+                   found > end) {
+          // reuse the existing leading spaces/tabs/mixed
+          // or build the correct indent using CM's tab/indent options
+          if (nonspaceAfter(0, line) >= found) {
+            insert = line.slice(0, found);
+          } else {
+            var tabSize = cm.options.tabSize, numTabs;
+            found = CodeMirror.countColumn(line, found, tabSize);
+            insert = !cm.options.indentWithTabs ? repeat.call(" ", found) :
+              repeat.call("\t", (numTabs = Math.floor(found / tabSize))) +
+              repeat.call(" ", found - tabSize * numTabs);
+          }
+        } else if ((found = line.indexOf(mode.blockCommentContinue)) > -1 &&
+                   found <= pos.ch &&
+                   found <= nonspaceAfter(0, line)) {
+          insert = line.slice(0, found);
+        }
+        if (insert != null) insert += mode.blockCommentContinue
+      }
+      if (insert == null && lineCmt && continueLineCommentEnabled(cm)) {
+        if (line == null) line = cm.getLine(pos.line);
+        found = line.indexOf(lineCmt);
+        // cursor at pos 0, line comment also at pos 0 => shift it down, don't continue
+        if (!pos.ch && !found) insert = "";
+        // continue only if the line starts with an optional space + line comment
+        else if (found > -1 && nonspaceAfter(0, line) >= found) {
+          // don't continue if there's only space(s) after cursor or the end of the line
+          insert = nonspaceAfter(pos.ch, line) > -1;
+          // but always continue if the next line starts with a line comment too
+          if (!insert) {
+            var next = cm.getLine(pos.line + 1) || '',
+                nextFound = next.indexOf(lineCmt);
+            insert = nextFound > -1 && nonspaceAfter(0, next) >= nextFound || null;
+          }
+          if (insert) {
+            insert = line.slice(0, found) + lineCmt +
+                     line.slice(found + lineCmt.length).match(/^\s*/)[0];
+          }
+        }
+      }
+      if (insert == null) return CodeMirror.Pass;
+      inserts[i] = "\n" + insert;
+    }
+
+    cm.operation(function() {
+      for (var i = ranges.length - 1; i >= 0; i--)
+        cm.replaceRange(inserts[i], ranges[i].from(), ranges[i].to(), "+insert");
+    });
+  }
+
+  function nonspaceAfter(ch, str) {
+    nonspace.lastIndex = ch;
+    var m = nonspace.exec(str);
+    return m ? m.index : -1;
+  }
+
+  function continueLineCommentEnabled(cm) {
+    var opt = cm.getOption("continueComments");
+    if (opt && typeof opt == "object")
+      return opt.continueLineComment !== false;
+    return true;
+  }
+
+  CodeMirror.defineOption("continueComments", null, function(cm, val, prev) {
+    if (prev && prev != CodeMirror.Init)
+      cm.removeKeyMap("continueComment");
+    if (val) {
+      var key = "Enter";
+      if (typeof val == "string")
+        key = val;
+      else if (typeof val == "object" && val.key)
+        key = val.key;
+      var map = {name: "continueComment"};
+      map[key] = continueComment;
+      cm.addKeyMap(map);
+    }
+  });
+});

webbuild/html/scripts/codemirror/addon/dialog/dialog.css

@@ -1,16 +1,21 @@
 .CodeMirror-dialog {
-  position: relative;
-}
-
-.CodeMirror-dialog > div {
   position: absolute;
-  top: 0; left: 0; right: 0;
-  background: white;
-  border-bottom: 1px solid #eee;
+  left: 0; right: 0;
+  background: inherit;
   z-index: 15;
   padding: .1em .8em;
   overflow: hidden;
-  color: #333;
+  color: inherit;
+}
+
+.CodeMirror-dialog-top {
+  border-bottom: 1px solid #eee;
+  top: 0;
+}
+
+.CodeMirror-dialog-bottom {
+  border-top: 1px solid #eee;
+  bottom: 0;
 }
 
 .CodeMirror-dialog input {

webbuild/html/scripts/codemirror/addon/dialog/dialog.js

@@ -0,0 +1,163 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+// Open simple dialogs on top of an editor. Relies on dialog.css.
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  function dialogDiv(cm, template, bottom) {
+    var wrap = cm.getWrapperElement();
+    var dialog;
+    dialog = wrap.appendChild(document.createElement("div"));
+    if (bottom)
+      dialog.className = "CodeMirror-dialog CodeMirror-dialog-bottom";
+    else
+      dialog.className = "CodeMirror-dialog CodeMirror-dialog-top";
+
+    if (typeof template == "string") {
+      dialog.innerHTML = template;
+    } else { // Assuming it's a detached DOM element.
+      dialog.appendChild(template);
+    }
+    CodeMirror.addClass(wrap, 'dialog-opened');
+    return dialog;
+  }
+
+  function closeNotification(cm, newVal) {
+    if (cm.state.currentNotificationClose)
+      cm.state.currentNotificationClose();
+    cm.state.currentNotificationClose = newVal;
+  }
+
+  CodeMirror.defineExtension("openDialog", function(template, callback, options) {
+    if (!options) options = {};
+
+    closeNotification(this, null);
+
+    var dialog = dialogDiv(this, template, options.bottom);
+    var closed = false, me = this;
+    function close(newVal) {
+      if (typeof newVal == 'string') {
+        inp.value = newVal;
+      } else {
+        if (closed) return;
+        closed = true;
+        CodeMirror.rmClass(dialog.parentNode, 'dialog-opened');
+        dialog.parentNode.removeChild(dialog);
+        me.focus();
+
+        if (options.onClose) options.onClose(dialog);
+      }
+    }
+
+    var inp = dialog.getElementsByTagName("input")[0], button;
+    if (inp) {
+      inp.focus();
+
+      if (options.value) {
+        inp.value = options.value;
+        if (options.selectValueOnOpen !== false) {
+          inp.select();
+        }
+      }
+
+      if (options.onInput)
+        CodeMirror.on(inp, "input", function(e) { options.onInput(e, inp.value, close);});
+      if (options.onKeyUp)
+        CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
+
+      CodeMirror.on(inp, "keydown", function(e) {
+        if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
+        if (e.keyCode == 27 || (options.closeOnEnter !== false && e.keyCode == 13)) {
+          inp.blur();
+          CodeMirror.e_stop(e);
+          close();
+        }
+        if (e.keyCode == 13) callback(inp.value, e);
+      });
+
+      if (options.closeOnBlur !== false) CodeMirror.on(dialog, "focusout", function (evt) {
+        if (evt.relatedTarget !== null) close();
+      });
+    } else if (button = dialog.getElementsByTagName("button")[0]) {
+      CodeMirror.on(button, "click", function() {
+        close();
+        me.focus();
+      });
+
+      if (options.closeOnBlur !== false) CodeMirror.on(button, "blur", close);
+
+      button.focus();
+    }
+    return close;
+  });
+
+  CodeMirror.defineExtension("openConfirm", function(template, callbacks, options) {
+    closeNotification(this, null);
+    var dialog = dialogDiv(this, template, options && options.bottom);
+    var buttons = dialog.getElementsByTagName("button");
+    var closed = false, me = this, blurring = 1;
+    function close() {
+      if (closed) return;
+      closed = true;
+      CodeMirror.rmClass(dialog.parentNode, 'dialog-opened');
+      dialog.parentNode.removeChild(dialog);
+      me.focus();
+    }
+    buttons[0].focus();
+    for (var i = 0; i < buttons.length; ++i) {
+      var b = buttons[i];
+      (function(callback) {
+        CodeMirror.on(b, "click", function(e) {
+          CodeMirror.e_preventDefault(e);
+          close();
+          if (callback) callback(me);
+        });
+      })(callbacks[i]);
+      CodeMirror.on(b, "blur", function() {
+        --blurring;
+        setTimeout(function() { if (blurring <= 0) close(); }, 200);
+      });
+      CodeMirror.on(b, "focus", function() { ++blurring; });
+    }
+  });
+
+  /*
+   * openNotification
+   * Opens a notification, that can be closed with an optional timer
+   * (default 5000ms timer) and always closes on click.
+   *
+   * If a notification is opened while another is opened, it will close the
+   * currently opened one and open the new one immediately.
+   */
+  CodeMirror.defineExtension("openNotification", function(template, options) {
+    closeNotification(this, close);
+    var dialog = dialogDiv(this, template, options && options.bottom);
+    var closed = false, doneTimer;
+    var duration = options && typeof options.duration !== "undefined" ? options.duration : 5000;
+
+    function close() {
+      if (closed) return;
+      closed = true;
+      clearTimeout(doneTimer);
+      CodeMirror.rmClass(dialog.parentNode, 'dialog-opened');
+      dialog.parentNode.removeChild(dialog);
+    }
+
+    CodeMirror.on(dialog, 'click', function(e) {
+      CodeMirror.e_preventDefault(e);
+      close();
+    });
+
+    if (duration)
+      doneTimer = setTimeout(close, duration);
+
+    return close;
+  });
+});

webbuild/html/scripts/codemirror/addon/display/autorefresh.js

@@ -0,0 +1,47 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+
+  CodeMirror.defineOption("autoRefresh", false, function(cm, val) {
+    if (cm.state.autoRefresh) {
+      stopListening(cm, cm.state.autoRefresh)
+      cm.state.autoRefresh = null
+    }
+    if (val && cm.display.wrapper.offsetHeight == 0)
+      startListening(cm, cm.state.autoRefresh = {delay: val.delay || 250})
+  })
+
+  function startListening(cm, state) {
+    function check() {
+      if (cm.display.wrapper.offsetHeight) {
+        stopListening(cm, state)
+        if (cm.display.lastWrapHeight != cm.display.wrapper.clientHeight)
+          cm.refresh()
+      } else {
+        state.timeout = setTimeout(check, state.delay)
+      }
+    }
+    state.timeout = setTimeout(check, state.delay)
+    state.hurry = function() {
+      clearTimeout(state.timeout)
+      state.timeout = setTimeout(check, 50)
+    }
+    CodeMirror.on(window, "mouseup", state.hurry)
+    CodeMirror.on(window, "keyup", state.hurry)
+  }
+
+  function stopListening(_cm, state) {
+    clearTimeout(state.timeout)
+    CodeMirror.off(window, "mouseup", state.hurry)
+    CodeMirror.off(window, "keyup", state.hurry)
+  }
+});

webbuild/html/scripts/codemirror/addon/display/fullscreen.css

@@ -0,0 +1,6 @@
+.CodeMirror-fullscreen {
+  position: fixed;
+  top: 0; left: 0; right: 0; bottom: 0;
+  height: auto;
+  z-index: 9;
+}

webbuild/html/scripts/codemirror/addon/display/fullscreen.js

@@ -0,0 +1,41 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("fullScreen", false, function(cm, val, old) {
+    if (old == CodeMirror.Init) old = false;
+    if (!old == !val) return;
+    if (val) setFullscreen(cm);
+    else setNormal(cm);
+  });
+
+  function setFullscreen(cm) {
+    var wrap = cm.getWrapperElement();
+    cm.state.fullScreenRestore = {scrollTop: window.pageYOffset, scrollLeft: window.pageXOffset,
+                                  width: wrap.style.width, height: wrap.style.height};
+    wrap.style.width = "";
+    wrap.style.height = "auto";
+    wrap.className += " CodeMirror-fullscreen";
+    document.documentElement.style.overflow = "hidden";
+    cm.refresh();
+  }
+
+  function setNormal(cm) {
+    var wrap = cm.getWrapperElement();
+    wrap.className = wrap.className.replace(/\s*CodeMirror-fullscreen\b/, "");
+    document.documentElement.style.overflow = "";
+    var info = cm.state.fullScreenRestore;
+    wrap.style.width = info.width; wrap.style.height = info.height;
+    window.scrollTo(info.scrollLeft, info.scrollTop);
+    cm.refresh();
+  }
+});

webbuild/html/scripts/codemirror/addon/display/panel.js

@@ -0,0 +1,129 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function (mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function (CodeMirror) {
+  CodeMirror.defineExtension("addPanel", function (node, options) {
+    options = options || {};
+
+    if (!this.state.panels) initPanels(this);
+
+    var info = this.state.panels;
+    var wrapper = info.wrapper;
+    var cmWrapper = this.getWrapperElement();
+    var replace = options.replace instanceof Panel && !options.replace.cleared;
+
+    if (options.after instanceof Panel && !options.after.cleared) {
+      wrapper.insertBefore(node, options.before.node.nextSibling);
+    } else if (options.before instanceof Panel && !options.before.cleared) {
+      wrapper.insertBefore(node, options.before.node);
+    } else if (replace) {
+      wrapper.insertBefore(node, options.replace.node);
+      options.replace.clear(true);
+    } else if (options.position == "bottom") {
+      wrapper.appendChild(node);
+    } else if (options.position == "before-bottom") {
+      wrapper.insertBefore(node, cmWrapper.nextSibling);
+    } else if (options.position == "after-top") {
+      wrapper.insertBefore(node, cmWrapper);
+    } else {
+      wrapper.insertBefore(node, wrapper.firstChild);
+    }
+
+    var height = (options && options.height) || node.offsetHeight;
+
+    var panel = new Panel(this, node, options, height);
+    info.panels.push(panel);
+
+    this.setSize();
+    if (options.stable && isAtTop(this, node))
+      this.scrollTo(null, this.getScrollInfo().top + height);
+
+    return panel;
+  });
+
+  function Panel(cm, node, options, height) {
+    this.cm = cm;
+    this.node = node;
+    this.options = options;
+    this.height = height;
+    this.cleared = false;
+  }
+
+  /* when skipRemove is true, clear() was called from addPanel().
+   * Thus removePanels() should not be called (issue 5518) */
+  Panel.prototype.clear = function (skipRemove) {
+    if (this.cleared) return;
+    this.cleared = true;
+    var info = this.cm.state.panels;
+    info.panels.splice(info.panels.indexOf(this), 1);
+    this.cm.setSize();
+    if (this.options.stable && isAtTop(this.cm, this.node))
+      this.cm.scrollTo(null, this.cm.getScrollInfo().top - this.height)
+    info.wrapper.removeChild(this.node);
+    if (info.panels.length == 0 && !skipRemove) removePanels(this.cm);
+  };
+
+  Panel.prototype.changed = function () {
+    this.height = this.node.getBoundingClientRect().height;
+    this.cm.setSize();
+  };
+
+  function initPanels(cm) {
+    var wrap = cm.getWrapperElement();
+    var style = window.getComputedStyle ? window.getComputedStyle(wrap) : wrap.currentStyle;
+    var height = parseInt(style.height);
+    var info = cm.state.panels = {
+      setHeight: wrap.style.height,
+      panels: [],
+      wrapper: document.createElement("div")
+    };
+    wrap.parentNode.insertBefore(info.wrapper, wrap);
+    var hasFocus = cm.hasFocus();
+    info.wrapper.appendChild(wrap);
+    if (hasFocus) cm.focus();
+
+    cm._setSize = cm.setSize;
+    if (height != null) cm.setSize = function (width, newHeight) {
+      if (!newHeight) newHeight = info.wrapper.offsetHeight;
+      info.setHeight = newHeight;
+      if (typeof newHeight != "number") {
+        var px = /^(\d+\.?\d*)px$/.exec(newHeight);
+        if (px) {
+          newHeight = Number(px[1]);
+        } else {
+          info.wrapper.style.height = newHeight;
+          newHeight = info.wrapper.offsetHeight;
+        }
+      }
+      var editorheight = newHeight - info.panels
+        .map(function (p) { return p.node.getBoundingClientRect().height; })
+        .reduce(function (a, b) { return a + b; }, 0);
+      cm._setSize(width, editorheight);
+      height = newHeight;
+    };
+  }
+
+  function removePanels(cm) {
+    var info = cm.state.panels;
+    cm.state.panels = null;
+
+    var wrap = cm.getWrapperElement();
+    info.wrapper.parentNode.replaceChild(wrap, info.wrapper);
+    wrap.style.height = info.setHeight;
+    cm.setSize = cm._setSize;
+    cm.setSize();
+  }
+
+  function isAtTop(cm, dom) {
+    for (var sibling = dom.nextSibling; sibling; sibling = sibling.nextSibling)
+      if (sibling == cm.getWrapperElement()) return true
+    return false
+  }
+});

webbuild/html/scripts/codemirror/addon/display/placeholder.js

@@ -0,0 +1,77 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineOption("placeholder", "", function(cm, val, old) {
+    var prev = old && old != CodeMirror.Init;
+    if (val && !prev) {
+      cm.on("blur", onBlur);
+      cm.on("change", onChange);
+      cm.on("swapDoc", onChange);
+      CodeMirror.on(cm.getInputField(), "compositionupdate", cm.state.placeholderCompose = function() { onComposition(cm) })
+      onChange(cm);
+    } else if (!val && prev) {
+      cm.off("blur", onBlur);
+      cm.off("change", onChange);
+      cm.off("swapDoc", onChange);
+      CodeMirror.off(cm.getInputField(), "compositionupdate", cm.state.placeholderCompose)
+      clearPlaceholder(cm);
+      var wrapper = cm.getWrapperElement();
+      wrapper.className = wrapper.className.replace(" CodeMirror-empty", "");
+    }
+
+    if (val && !cm.hasFocus()) onBlur(cm);
+  });
+
+  function clearPlaceholder(cm) {
+    if (cm.state.placeholder) {
+      cm.state.placeholder.parentNode.removeChild(cm.state.placeholder);
+      cm.state.placeholder = null;
+    }
+  }
+  function setPlaceholder(cm) {
+    clearPlaceholder(cm);
+    var elt = cm.state.placeholder = document.createElement("pre");
+    elt.style.cssText = "height: 0; overflow: visible";
+    elt.style.direction = cm.getOption("direction");
+    elt.className = "CodeMirror-placeholder CodeMirror-line-like";
+    var placeHolder = cm.getOption("placeholder")
+    if (typeof placeHolder == "string") placeHolder = document.createTextNode(placeHolder)
+    elt.appendChild(placeHolder)
+    cm.display.lineSpace.insertBefore(elt, cm.display.lineSpace.firstChild);
+  }
+
+  function onComposition(cm) {
+    setTimeout(function() {
+      var empty = false, input = cm.getInputField()
+      if (input.nodeName == "TEXTAREA")
+        empty = !input.value
+      else if (cm.lineCount() == 1)
+        empty = !/[^\u200b]/.test(input.querySelector(".CodeMirror-line").textContent)
+      if (empty) setPlaceholder(cm)
+      else clearPlaceholder(cm)
+    }, 20)
+  }
+
+  function onBlur(cm) {
+    if (isEmpty(cm)) setPlaceholder(cm);
+  }
+  function onChange(cm) {
+    var wrapper = cm.getWrapperElement(), empty = isEmpty(cm);
+    wrapper.className = wrapper.className.replace(" CodeMirror-empty", "") + (empty ? " CodeMirror-empty" : "");
+
+    if (empty) setPlaceholder(cm);
+    else clearPlaceholder(cm);
+  }
+
+  function isEmpty(cm) {
+    return (cm.lineCount() === 1) && (cm.getLine(0) === "");
+  }
+});

webbuild/html/scripts/codemirror/addon/display/rulers.js

@@ -0,0 +1,51 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("rulers", false, function(cm, val) {
+    if (cm.state.rulerDiv) {
+      cm.state.rulerDiv.parentElement.removeChild(cm.state.rulerDiv)
+      cm.state.rulerDiv = null
+      cm.off("refresh", drawRulers)
+    }
+    if (val && val.length) {
+      cm.state.rulerDiv = cm.display.lineSpace.parentElement.insertBefore(document.createElement("div"), cm.display.lineSpace)
+      cm.state.rulerDiv.className = "CodeMirror-rulers"
+      drawRulers(cm)
+      cm.on("refresh", drawRulers)
+    }
+  });
+
+  function drawRulers(cm) {
+    cm.state.rulerDiv.textContent = ""
+    var val = cm.getOption("rulers");
+    var cw = cm.defaultCharWidth();
+    var left = cm.charCoords(CodeMirror.Pos(cm.firstLine(), 0), "div").left;
+    cm.state.rulerDiv.style.minHeight = (cm.display.scroller.offsetHeight + 30) + "px";
+    for (var i = 0; i < val.length; i++) {
+      var elt = document.createElement("div");
+      elt.className = "CodeMirror-ruler";
+      var col, conf = val[i];
+      if (typeof conf == "number") {
+        col = conf;
+      } else {
+        col = conf.column;
+        if (conf.className) elt.className += " " + conf.className;
+        if (conf.color) elt.style.borderColor = conf.color;
+        if (conf.lineStyle) elt.style.borderLeftStyle = conf.lineStyle;
+        if (conf.width) elt.style.borderLeftWidth = conf.width;
+      }
+      elt.style.left = (left + col * cw) + "px";
+      cm.state.rulerDiv.appendChild(elt)
+    }
+  }
+});

webbuild/html/scripts/codemirror/addon/edit/closebrackets.js

@@ -0,0 +1,191 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  var defaults = {
+    pairs: "()[]{}''\"\"",
+    closeBefore: ")]}'\":;>",
+    triples: "",
+    explode: "[]{}"
+  };
+
+  var Pos = CodeMirror.Pos;
+
+  CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.removeKeyMap(keyMap);
+      cm.state.closeBrackets = null;
+    }
+    if (val) {
+      ensureBound(getOption(val, "pairs"))
+      cm.state.closeBrackets = val;
+      cm.addKeyMap(keyMap);
+    }
+  });
+
+  function getOption(conf, name) {
+    if (name == "pairs" && typeof conf == "string") return conf;
+    if (typeof conf == "object" && conf[name] != null) return conf[name];
+    return defaults[name];
+  }
+
+  var keyMap = {Backspace: handleBackspace, Enter: handleEnter};
+  function ensureBound(chars) {
+    for (var i = 0; i < chars.length; i++) {
+      var ch = chars.charAt(i), key = "'" + ch + "'"
+      if (!keyMap[key]) keyMap[key] = handler(ch)
+    }
+  }
+  ensureBound(defaults.pairs + "`")
+
+  function handler(ch) {
+    return function(cm) { return handleChar(cm, ch); };
+  }
+
+  function getConfig(cm) {
+    var deflt = cm.state.closeBrackets;
+    if (!deflt || deflt.override) return deflt;
+    var mode = cm.getModeAt(cm.getCursor());
+    return mode.closeBrackets || deflt;
+  }
+
+  function handleBackspace(cm) {
+    var conf = getConfig(cm);
+    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var pairs = getOption(conf, "pairs");
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var around = charsAround(cm, ranges[i].head);
+      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+    }
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var cur = ranges[i].head;
+      cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1), "+delete");
+    }
+  }
+
+  function handleEnter(cm) {
+    var conf = getConfig(cm);
+    var explode = conf && getOption(conf, "explode");
+    if (!explode || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var around = charsAround(cm, ranges[i].head);
+      if (!around || explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+    }
+    cm.operation(function() {
+      var linesep = cm.lineSeparator() || "\n";
+      cm.replaceSelection(linesep + linesep, null);
+      cm.execCommand("goCharLeft");
+      ranges = cm.listSelections();
+      for (var i = 0; i < ranges.length; i++) {
+        var line = ranges[i].head.line;
+        cm.indentLine(line, null, true);
+        cm.indentLine(line + 1, null, true);
+      }
+    });
+  }
+
+  function contractSelection(sel) {
+    var inverted = CodeMirror.cmpPos(sel.anchor, sel.head) > 0;
+    return {anchor: new Pos(sel.anchor.line, sel.anchor.ch + (inverted ? -1 : 1)),
+            head: new Pos(sel.head.line, sel.head.ch + (inverted ? 1 : -1))};
+  }
+
+  function handleChar(cm, ch) {
+    var conf = getConfig(cm);
+    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var pairs = getOption(conf, "pairs");
+    var pos = pairs.indexOf(ch);
+    if (pos == -1) return CodeMirror.Pass;
+
+    var closeBefore = getOption(conf,"closeBefore");
+
+    var triples = getOption(conf, "triples");
+
+    var identical = pairs.charAt(pos + 1) == ch;
+    var ranges = cm.listSelections();
+    var opening = pos % 2 == 0;
+
+    var type;
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], cur = range.head, curType;
+      var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
+      if (opening && !range.empty()) {
+        curType = "surround";
+      } else if ((identical || !opening) && next == ch) {
+        if (identical && stringStartsAfter(cm, cur))
+          curType = "both";
+        else if (triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
+          curType = "skipThree";
+        else
+          curType = "skip";
+      } else if (identical && cur.ch > 1 && triples.indexOf(ch) >= 0 &&
+                 cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch) {
+        if (cur.ch > 2 && /\bstring/.test(cm.getTokenTypeAt(Pos(cur.line, cur.ch - 2)))) return CodeMirror.Pass;
+        curType = "addFour";
+      } else if (identical) {
+        var prev = cur.ch == 0 ? " " : cm.getRange(Pos(cur.line, cur.ch - 1), cur)
+        if (!CodeMirror.isWordChar(next) && prev != ch && !CodeMirror.isWordChar(prev)) curType = "both";
+        else return CodeMirror.Pass;
+      } else if (opening && (next.length === 0 || /\s/.test(next) || closeBefore.indexOf(next) > -1)) {
+        curType = "both";
+      } else {
+        return CodeMirror.Pass;
+      }
+      if (!type) type = curType;
+      else if (type != curType) return CodeMirror.Pass;
+    }
+
+    var left = pos % 2 ? pairs.charAt(pos - 1) : ch;
+    var right = pos % 2 ? ch : pairs.charAt(pos + 1);
+    cm.operation(function() {
+      if (type == "skip") {
+        cm.execCommand("goCharRight");
+      } else if (type == "skipThree") {
+        for (var i = 0; i < 3; i++)
+          cm.execCommand("goCharRight");
+      } else if (type == "surround") {
+        var sels = cm.getSelections();
+        for (var i = 0; i < sels.length; i++)
+          sels[i] = left + sels[i] + right;
+        cm.replaceSelections(sels, "around");
+        sels = cm.listSelections().slice();
+        for (var i = 0; i < sels.length; i++)
+          sels[i] = contractSelection(sels[i]);
+        cm.setSelections(sels);
+      } else if (type == "both") {
+        cm.replaceSelection(left + right, null);
+        cm.triggerElectric(left + right);
+        cm.execCommand("goCharLeft");
+      } else if (type == "addFour") {
+        cm.replaceSelection(left + left + left + left, "before");
+        cm.execCommand("goCharRight");
+      }
+    });
+  }
+
+  function charsAround(cm, pos) {
+    var str = cm.getRange(Pos(pos.line, pos.ch - 1),
+                          Pos(pos.line, pos.ch + 1));
+    return str.length == 2 ? str : null;
+  }
+
+  function stringStartsAfter(cm, pos) {
+    var token = cm.getTokenAt(Pos(pos.line, pos.ch + 1))
+    return /\bstring/.test(token.type) && token.start == pos.ch &&
+      (pos.ch == 0 || !/\bstring/.test(cm.getTokenTypeAt(pos)))
+  }
+});

webbuild/html/scripts/codemirror/addon/edit/closetag.js

@@ -0,0 +1,184 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+/**
+ * Tag-closer extension for CodeMirror.
+ *
+ * This extension adds an "autoCloseTags" option that can be set to
+ * either true to get the default behavior, or an object to further
+ * configure its behavior.
+ *
+ * These are supported options:
+ *
+ * `whenClosing` (default true)
+ *   Whether to autoclose when the '/' of a closing tag is typed.
+ * `whenOpening` (default true)
+ *   Whether to autoclose the tag when the final '>' of an opening
+ *   tag is typed.
+ * `dontCloseTags` (default is empty tags for HTML, none for XML)
+ *   An array of tag names that should not be autoclosed.
+ * `indentTags` (default is block tags for HTML, none for XML)
+ *   An array of tag names that should, when opened, cause a
+ *   blank line to be added inside the tag, and the blank line and
+ *   closing line to be indented.
+ * `emptyTags` (default is none)
+ *   An array of XML tag names that should be autoclosed with '/>'.
+ *
+ * See demos/closetag.html for a usage example.
+ */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineOption("autoCloseTags", false, function(cm, val, old) {
+    if (old != CodeMirror.Init && old)
+      cm.removeKeyMap("autoCloseTags");
+    if (!val) return;
+    var map = {name: "autoCloseTags"};
+    if (typeof val != "object" || val.whenClosing !== false)
+      map["'/'"] = function(cm) { return autoCloseSlash(cm); };
+    if (typeof val != "object" || val.whenOpening !== false)
+      map["'>'"] = function(cm) { return autoCloseGT(cm); };
+    cm.addKeyMap(map);
+  });
+
+  var htmlDontClose = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param",
+                       "source", "track", "wbr"];
+  var htmlIndent = ["applet", "blockquote", "body", "button", "div", "dl", "fieldset", "form", "frameset", "h1", "h2", "h3", "h4",
+                    "h5", "h6", "head", "html", "iframe", "layer", "legend", "object", "ol", "p", "select", "table", "ul"];
+
+  function autoCloseGT(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), replacements = [];
+    var opt = cm.getOption("autoCloseTags");
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      var tagInfo = inner.mode.xmlCurrentTag && inner.mode.xmlCurrentTag(state)
+      var tagName = tagInfo && tagInfo.name
+      if (!tagName) return CodeMirror.Pass
+
+      var html = inner.mode.configuration == "html";
+      var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
+      var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
+
+      if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
+      var lowerTagName = tagName.toLowerCase();
+      // Don't process the '>' at the end of an end-tag or self-closing tag
+      if (!tagName ||
+          tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
+          tok.type == "tag" && tagInfo.close ||
+          tok.string.indexOf("/") == (pos.ch - tok.start - 1) || // match something like <someTagName />
+          dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
+          closingTagExists(cm, inner.mode.xmlCurrentContext && inner.mode.xmlCurrentContext(state) || [], tagName, pos, true))
+        return CodeMirror.Pass;
+
+      var emptyTags = typeof opt == "object" && opt.emptyTags;
+      if (emptyTags && indexOf(emptyTags, tagName) > -1) {
+        replacements[i] = { text: "/>", newPos: CodeMirror.Pos(pos.line, pos.ch + 2) };
+        continue;
+      }
+
+      var indent = indentTags && indexOf(indentTags, lowerTagName) > -1;
+      replacements[i] = {indent: indent,
+                         text: ">" + (indent ? "\n\n" : "") + "</" + tagName + ">",
+                         newPos: indent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1)};
+    }
+
+    var dontIndentOnAutoClose = (typeof opt == "object" && opt.dontIndentOnAutoClose);
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var info = replacements[i];
+      cm.replaceRange(info.text, ranges[i].head, ranges[i].anchor, "+insert");
+      var sel = cm.listSelections().slice(0);
+      sel[i] = {head: info.newPos, anchor: info.newPos};
+      cm.setSelections(sel);
+      if (!dontIndentOnAutoClose && info.indent) {
+        cm.indentLine(info.newPos.line, null, true);
+        cm.indentLine(info.newPos.line + 1, null, true);
+      }
+    }
+  }
+
+  function autoCloseCurrent(cm, typingSlash) {
+    var ranges = cm.listSelections(), replacements = [];
+    var head = typingSlash ? "/" : "</";
+    var opt = cm.getOption("autoCloseTags");
+    var dontIndentOnAutoClose = (typeof opt == "object" && opt.dontIndentOnSlash);
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      if (typingSlash && (tok.type == "string" || tok.string.charAt(0) != "<" ||
+                          tok.start != pos.ch - 1))
+        return CodeMirror.Pass;
+      // Kludge to get around the fact that we are not in XML mode
+      // when completing in JS/CSS snippet in htmlmixed mode. Does not
+      // work for other XML embedded languages (there is no general
+      // way to go from a mixed mode to its current XML state).
+      var replacement, mixed = inner.mode.name != "xml" && cm.getMode().name == "htmlmixed"
+      if (mixed && inner.mode.name == "javascript") {
+        replacement = head + "script";
+      } else if (mixed && inner.mode.name == "css") {
+        replacement = head + "style";
+      } else {
+        var context = inner.mode.xmlCurrentContext && inner.mode.xmlCurrentContext(state)
+        if (!context || (context.length && closingTagExists(cm, context, context[context.length - 1], pos)))
+          return CodeMirror.Pass;
+        replacement = head + context[context.length - 1]
+      }
+      if (cm.getLine(pos.line).charAt(tok.end) != ">") replacement += ">";
+      replacements[i] = replacement;
+    }
+    cm.replaceSelections(replacements);
+    ranges = cm.listSelections();
+    if (!dontIndentOnAutoClose) {
+        for (var i = 0; i < ranges.length; i++)
+            if (i == ranges.length - 1 || ranges[i].head.line < ranges[i + 1].head.line)
+                cm.indentLine(ranges[i].head.line);
+    }
+  }
+
+  function autoCloseSlash(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    return autoCloseCurrent(cm, true);
+  }
+
+  CodeMirror.commands.closeTag = function(cm) { return autoCloseCurrent(cm); };
+
+  function indexOf(collection, elt) {
+    if (collection.indexOf) return collection.indexOf(elt);
+    for (var i = 0, e = collection.length; i < e; ++i)
+      if (collection[i] == elt) return i;
+    return -1;
+  }
+
+  // If xml-fold is loaded, we use its functionality to try and verify
+  // whether a given tag is actually unclosed.
+  function closingTagExists(cm, context, tagName, pos, newTag) {
+    if (!CodeMirror.scanForClosingTag) return false;
+    var end = Math.min(cm.lastLine() + 1, pos.line + 500);
+    var nextClose = CodeMirror.scanForClosingTag(cm, pos, null, end);
+    if (!nextClose || nextClose.tag != tagName) return false;
+    // If the immediate wrapping context contains onCx instances of
+    // the same tag, a closing tag only exists if there are at least
+    // that many closing tags of that type following.
+    var onCx = newTag ? 1 : 0
+    for (var i = context.length - 1; i >= 0; i--) {
+      if (context[i] == tagName) ++onCx
+      else break
+    }
+    pos = nextClose.to;
+    for (var i = 1; i < onCx; i++) {
+      var next = CodeMirror.scanForClosingTag(cm, pos, null, end);
+      if (!next || next.tag != tagName) return false;
+      pos = next.to;
+    }
+    return true;
+  }
+});

webbuild/html/scripts/codemirror/addon/edit/continuelist.js

@@ -0,0 +1,101 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var listRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]\s|[*+-]\s|(\d+)([.)]))(\s*)/,
+      emptyListRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/,
+      unorderedListRE = /[*+-]\s/;
+
+  CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), replacements = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var pos = ranges[i].head;
+
+      // If we're not in Markdown mode, fall back to normal newlineAndIndent
+      var eolState = cm.getStateAfter(pos.line);
+      var inner = CodeMirror.innerMode(cm.getMode(), eolState);
+      if (inner.mode.name !== "markdown") {
+        cm.execCommand("newlineAndIndent");
+        return;
+      } else {
+        eolState = inner.state;
+      }
+
+      var inList = eolState.list !== false;
+      var inQuote = eolState.quote !== 0;
+
+      var line = cm.getLine(pos.line), match = listRE.exec(line);
+      var cursorBeforeBullet = /^\s*$/.test(line.slice(0, pos.ch));
+      if (!ranges[i].empty() || (!inList && !inQuote) || !match || cursorBeforeBullet) {
+        cm.execCommand("newlineAndIndent");
+        return;
+      }
+      if (emptyListRE.test(line)) {
+        var endOfQuote = inQuote && />\s*$/.test(line)
+        var endOfList = !/>\s*$/.test(line)
+        if (endOfQuote || endOfList) cm.replaceRange("", {
+          line: pos.line, ch: 0
+        }, {
+          line: pos.line, ch: pos.ch + 1
+        });
+        replacements[i] = "\n";
+      } else {
+        var indent = match[1], after = match[5];
+        var numbered = !(unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0);
+        var bullet = numbered ? (parseInt(match[3], 10) + 1) + match[4] : match[2].replace("x", " ");
+        replacements[i] = "\n" + indent + bullet + after;
+
+        if (numbered) incrementRemainingMarkdownListNumbers(cm, pos);
+      }
+    }
+
+    cm.replaceSelections(replacements);
+  };
+
+  // Auto-updating Markdown list numbers when a new item is added to the
+  // middle of a list
+  function incrementRemainingMarkdownListNumbers(cm, pos) {
+    var startLine = pos.line, lookAhead = 0, skipCount = 0;
+    var startItem = listRE.exec(cm.getLine(startLine)), startIndent = startItem[1];
+
+    do {
+      lookAhead += 1;
+      var nextLineNumber = startLine + lookAhead;
+      var nextLine = cm.getLine(nextLineNumber), nextItem = listRE.exec(nextLine);
+
+      if (nextItem) {
+        var nextIndent = nextItem[1];
+        var newNumber = (parseInt(startItem[3], 10) + lookAhead - skipCount);
+        var nextNumber = (parseInt(nextItem[3], 10)), itemNumber = nextNumber;
+
+        if (startIndent === nextIndent && !isNaN(nextNumber)) {
+          if (newNumber === nextNumber) itemNumber = nextNumber + 1;
+          if (newNumber > nextNumber) itemNumber = newNumber + 1;
+          cm.replaceRange(
+            nextLine.replace(listRE, nextIndent + itemNumber + nextItem[4] + nextItem[5]),
+          {
+            line: nextLineNumber, ch: 0
+          }, {
+            line: nextLineNumber, ch: nextLine.length
+          });
+        } else {
+          if (startIndent.length > nextIndent.length) return;
+          // This doesn't run if the next line immediatley indents, as it is
+          // not clear of the users intention (new indented item or same level)
+          if ((startIndent.length < nextIndent.length) && (lookAhead === 1)) return;
+          skipCount += 1;
+        }
+      }
+    } while (nextItem);
+  }
+});

webbuild/html/scripts/codemirror/addon/edit/matchbrackets.js

@@ -0,0 +1,158 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  var ie_lt8 = /MSIE \d/.test(navigator.userAgent) &&
+    (document.documentMode == null || document.documentMode < 8);
+
+  var Pos = CodeMirror.Pos;
+
+  var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<", "<": ">>", ">": "<<"};
+
+  function bracketRegex(config) {
+    return config && config.bracketRegex || /[(){}[\]]/
+  }
+
+  function findMatchingBracket(cm, where, config) {
+    var line = cm.getLineHandle(where.line), pos = where.ch - 1;
+    var afterCursor = config && config.afterCursor
+    if (afterCursor == null)
+      afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className)
+    var re = bracketRegex(config)
+
+    // A cursor is defined as between two characters, but in in vim command mode
+    // (i.e. not insert mode), the cursor is visually represented as a
+    // highlighted box on top of the 2nd character. Otherwise, we allow matches
+    // from before or after the cursor.
+    var match = (!afterCursor && pos >= 0 && re.test(line.text.charAt(pos)) && matching[line.text.charAt(pos)]) ||
+        re.test(line.text.charAt(pos + 1)) && matching[line.text.charAt(++pos)];
+    if (!match) return null;
+    var dir = match.charAt(1) == ">" ? 1 : -1;
+    if (config && config.strict && (dir > 0) != (pos == where.ch)) return null;
+    var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
+
+    var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
+    if (found == null) return null;
+    return {from: Pos(where.line, pos), to: found && found.pos,
+            match: found && found.ch == match.charAt(0), forward: dir > 0};
+  }
+
+  // bracketRegex is used to specify which type of bracket to scan
+  // should be a regexp, e.g. /[[\]]/
+  //
+  // Note: If "where" is on an open bracket, then this bracket is ignored.
+  //
+  // Returns false when no bracket was found, null when it reached
+  // maxScanLines and gave up
+  function scanForBracket(cm, where, dir, style, config) {
+    var maxScanLen = (config && config.maxScanLineLength) || 10000;
+    var maxScanLines = (config && config.maxScanLines) || 1000;
+
+    var stack = [];
+    var re = bracketRegex(config)
+    var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1)
+                          : Math.max(cm.firstLine() - 1, where.line - maxScanLines);
+    for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) {
+      var line = cm.getLine(lineNo);
+      if (!line) continue;
+      var pos = dir > 0 ? 0 : line.length - 1, end = dir > 0 ? line.length : -1;
+      if (line.length > maxScanLen) continue;
+      if (lineNo == where.line) pos = where.ch - (dir < 0 ? 1 : 0);
+      for (; pos != end; pos += dir) {
+        var ch = line.charAt(pos);
+        if (re.test(ch) && (style === undefined || cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style)) {
+          var match = matching[ch];
+          if (match && (match.charAt(1) == ">") == (dir > 0)) stack.push(ch);
+          else if (!stack.length) return {pos: Pos(lineNo, pos), ch: ch};
+          else stack.pop();
+        }
+      }
+    }
+    return lineNo - dir == (dir > 0 ? cm.lastLine() : cm.firstLine()) ? false : null;
+  }
+
+  function matchBrackets(cm, autoclear, config) {
+    // Disable brace matching in long lines, since it'll cause hugely slow updates
+    var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
+    var marks = [], ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config);
+      if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
+        var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
+        marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
+        if (match.to && cm.getLine(match.to.line).length <= maxHighlightLen)
+          marks.push(cm.markText(match.to, Pos(match.to.line, match.to.ch + 1), {className: style}));
+      }
+    }
+
+    if (marks.length) {
+      // Kludge to work around the IE bug from issue #1193, where text
+      // input stops going to the textare whever this fires.
+      if (ie_lt8 && cm.state.focused) cm.focus();
+
+      var clear = function() {
+        cm.operation(function() {
+          for (var i = 0; i < marks.length; i++) marks[i].clear();
+        });
+      };
+      if (autoclear) setTimeout(clear, 800);
+      else return clear;
+    }
+  }
+
+  function doMatchBrackets(cm) {
+    cm.operation(function() {
+      if (cm.state.matchBrackets.currentlyHighlighted) {
+        cm.state.matchBrackets.currentlyHighlighted();
+        cm.state.matchBrackets.currentlyHighlighted = null;
+      }
+      cm.state.matchBrackets.currentlyHighlighted = matchBrackets(cm, false, cm.state.matchBrackets);
+    });
+  }
+
+  CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
+    function clear(cm) {
+      if (cm.state.matchBrackets && cm.state.matchBrackets.currentlyHighlighted) {
+        cm.state.matchBrackets.currentlyHighlighted();
+        cm.state.matchBrackets.currentlyHighlighted = null;
+      }
+    }
+
+    if (old && old != CodeMirror.Init) {
+      cm.off("cursorActivity", doMatchBrackets);
+      cm.off("focus", doMatchBrackets)
+      cm.off("blur", clear)
+      clear(cm);
+    }
+    if (val) {
+      cm.state.matchBrackets = typeof val == "object" ? val : {};
+      cm.on("cursorActivity", doMatchBrackets);
+      cm.on("focus", doMatchBrackets)
+      cm.on("blur", clear)
+    }
+  });
+
+  CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
+  CodeMirror.defineExtension("findMatchingBracket", function(pos, config, oldConfig){
+    // Backwards-compatibility kludge
+    if (oldConfig || typeof config == "boolean") {
+      if (!oldConfig) {
+        config = config ? {strict: true} : null
+      } else {
+        oldConfig.strict = config
+        config = oldConfig
+      }
+    }
+    return findMatchingBracket(this, pos, config)
+  });
+  CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, config){
+    return scanForBracket(this, pos, dir, style, config);
+  });
+});

webbuild/html/scripts/codemirror/addon/edit/matchtags.js

@@ -0,0 +1,66 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("matchTags", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.off("cursorActivity", doMatchTags);
+      cm.off("viewportChange", maybeUpdateMatch);
+      clear(cm);
+    }
+    if (val) {
+      cm.state.matchBothTags = typeof val == "object" && val.bothTags;
+      cm.on("cursorActivity", doMatchTags);
+      cm.on("viewportChange", maybeUpdateMatch);
+      doMatchTags(cm);
+    }
+  });
+
+  function clear(cm) {
+    if (cm.state.tagHit) cm.state.tagHit.clear();
+    if (cm.state.tagOther) cm.state.tagOther.clear();
+    cm.state.tagHit = cm.state.tagOther = null;
+  }
+
+  function doMatchTags(cm) {
+    cm.state.failedTagMatch = false;
+    cm.operation(function() {
+      clear(cm);
+      if (cm.somethingSelected()) return;
+      var cur = cm.getCursor(), range = cm.getViewport();
+      range.from = Math.min(range.from, cur.line); range.to = Math.max(cur.line + 1, range.to);
+      var match = CodeMirror.findMatchingTag(cm, cur, range);
+      if (!match) return;
+      if (cm.state.matchBothTags) {
+        var hit = match.at == "open" ? match.open : match.close;
+        if (hit) cm.state.tagHit = cm.markText(hit.from, hit.to, {className: "CodeMirror-matchingtag"});
+      }
+      var other = match.at == "close" ? match.open : match.close;
+      if (other)
+        cm.state.tagOther = cm.markText(other.from, other.to, {className: "CodeMirror-matchingtag"});
+      else
+        cm.state.failedTagMatch = true;
+    });
+  }
+
+  function maybeUpdateMatch(cm) {
+    if (cm.state.failedTagMatch) doMatchTags(cm);
+  }
+
+  CodeMirror.commands.toMatchingTag = function(cm) {
+    var found = CodeMirror.findMatchingTag(cm, cm.getCursor());
+    if (found) {
+      var other = found.at == "close" ? found.open : found.close;
+      if (other) cm.extendSelection(other.to, other.from);
+    }
+  };
+});

webbuild/html/scripts/codemirror/addon/edit/trailingspace.js

@@ -0,0 +1,27 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineOption("showTrailingSpace", false, function(cm, val, prev) {
+    if (prev == CodeMirror.Init) prev = false;
+    if (prev && !val)
+      cm.removeOverlay("trailingspace");
+    else if (!prev && val)
+      cm.addOverlay({
+        token: function(stream) {
+          for (var l = stream.string.length, i = l; i && /\s/.test(stream.string.charAt(i - 1)); --i) {}
+          if (i > stream.pos) { stream.pos = i; return null; }
+          stream.pos = l;
+          return "trailingspace";
+        },
+        name: "trailingspace"
+      });
+  });
+});

webbuild/html/scripts/codemirror/addon/fold/brace-fold.js

@@ -0,0 +1,105 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("fold", "brace", function(cm, start) {
+  var line = start.line, lineText = cm.getLine(line);
+  var tokenType;
+
+  function findOpening(openCh) {
+    for (var at = start.ch, pass = 0;;) {
+      var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
+      if (found == -1) {
+        if (pass == 1) break;
+        pass = 1;
+        at = lineText.length;
+        continue;
+      }
+      if (pass == 1 && found < start.ch) break;
+      tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
+      if (!/^(comment|string)/.test(tokenType)) return found + 1;
+      at = found - 1;
+    }
+  }
+
+  var startToken = "{", endToken = "}", startCh = findOpening("{");
+  if (startCh == null) {
+    startToken = "[", endToken = "]";
+    startCh = findOpening("[");
+  }
+
+  if (startCh == null) return;
+  var count = 1, lastLine = cm.lastLine(), end, endCh;
+  outer: for (var i = line; i <= lastLine; ++i) {
+    var text = cm.getLine(i), pos = i == line ? startCh : 0;
+    for (;;) {
+      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
+      if (nextOpen < 0) nextOpen = text.length;
+      if (nextClose < 0) nextClose = text.length;
+      pos = Math.min(nextOpen, nextClose);
+      if (pos == text.length) break;
+      if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
+        if (pos == nextOpen) ++count;
+        else if (!--count) { end = i; endCh = pos; break outer; }
+      }
+      ++pos;
+    }
+  }
+  if (end == null || line == end) return;
+  return {from: CodeMirror.Pos(line, startCh),
+          to: CodeMirror.Pos(end, endCh)};
+});
+
+CodeMirror.registerHelper("fold", "import", function(cm, start) {
+  function hasImport(line) {
+    if (line < cm.firstLine() || line > cm.lastLine()) return null;
+    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
+    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
+    if (start.type != "keyword" || start.string != "import") return null;
+    // Now find closing semicolon, return its position
+    for (var i = line, e = Math.min(cm.lastLine(), line + 10); i <= e; ++i) {
+      var text = cm.getLine(i), semi = text.indexOf(";");
+      if (semi != -1) return {startCh: start.end, end: CodeMirror.Pos(i, semi)};
+    }
+  }
+
+  var startLine = start.line, has = hasImport(startLine), prev;
+  if (!has || hasImport(startLine - 1) || ((prev = hasImport(startLine - 2)) && prev.end.line == startLine - 1))
+    return null;
+  for (var end = has.end;;) {
+    var next = hasImport(end.line + 1);
+    if (next == null) break;
+    end = next.end;
+  }
+  return {from: cm.clipPos(CodeMirror.Pos(startLine, has.startCh + 1)), to: end};
+});
+
+CodeMirror.registerHelper("fold", "include", function(cm, start) {
+  function hasInclude(line) {
+    if (line < cm.firstLine() || line > cm.lastLine()) return null;
+    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
+    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
+    if (start.type == "meta" && start.string.slice(0, 8) == "#include") return start.start + 8;
+  }
+
+  var startLine = start.line, has = hasInclude(startLine);
+  if (has == null || hasInclude(startLine - 1) != null) return null;
+  for (var end = startLine;;) {
+    var next = hasInclude(end + 1);
+    if (next == null) break;
+    ++end;
+  }
+  return {from: CodeMirror.Pos(startLine, has + 1),
+          to: cm.clipPos(CodeMirror.Pos(end))};
+});
+
+});

webbuild/html/scripts/codemirror/addon/fold/comment-fold.js

@@ -0,0 +1,59 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
+  return mode.blockCommentStart && mode.blockCommentEnd;
+}, function(cm, start) {
+  var mode = cm.getModeAt(start), startToken = mode.blockCommentStart, endToken = mode.blockCommentEnd;
+  if (!startToken || !endToken) return;
+  var line = start.line, lineText = cm.getLine(line);
+
+  var startCh;
+  for (var at = start.ch, pass = 0;;) {
+    var found = at <= 0 ? -1 : lineText.lastIndexOf(startToken, at - 1);
+    if (found == -1) {
+      if (pass == 1) return;
+      pass = 1;
+      at = lineText.length;
+      continue;
+    }
+    if (pass == 1 && found < start.ch) return;
+    if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1))) &&
+        (found == 0 || lineText.slice(found - endToken.length, found) == endToken ||
+         !/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found))))) {
+      startCh = found + startToken.length;
+      break;
+    }
+    at = found - 1;
+  }
+
+  var depth = 1, lastLine = cm.lastLine(), end, endCh;
+  outer: for (var i = line; i <= lastLine; ++i) {
+    var text = cm.getLine(i), pos = i == line ? startCh : 0;
+    for (;;) {
+      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
+      if (nextOpen < 0) nextOpen = text.length;
+      if (nextClose < 0) nextClose = text.length;
+      pos = Math.min(nextOpen, nextClose);
+      if (pos == text.length) break;
+      if (pos == nextOpen) ++depth;
+      else if (!--depth) { end = i; endCh = pos; break outer; }
+      ++pos;
+    }
+  }
+  if (end == null || line == end && endCh == startCh) return;
+  return {from: CodeMirror.Pos(line, startCh),
+          to: CodeMirror.Pos(end, endCh)};
+});
+
+});

webbuild/html/scripts/codemirror/addon/fold/foldcode.js

@@ -0,0 +1,157 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function doFold(cm, pos, options, force) {
+    if (options && options.call) {
+      var finder = options;
+      options = null;
+    } else {
+      var finder = getOption(cm, options, "rangeFinder");
+    }
+    if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
+    var minSize = getOption(cm, options, "minFoldSize");
+
+    function getRange(allowFolded) {
+      var range = finder(cm, pos);
+      if (!range || range.to.line - range.from.line < minSize) return null;
+      var marks = cm.findMarksAt(range.from);
+      for (var i = 0; i < marks.length; ++i) {
+        if (marks[i].__isFold && force !== "fold") {
+          if (!allowFolded) return null;
+          range.cleared = true;
+          marks[i].clear();
+        }
+      }
+      return range;
+    }
+
+    var range = getRange(true);
+    if (getOption(cm, options, "scanUp")) while (!range && pos.line > cm.firstLine()) {
+      pos = CodeMirror.Pos(pos.line - 1, 0);
+      range = getRange(false);
+    }
+    if (!range || range.cleared || force === "unfold") return;
+
+    var myWidget = makeWidget(cm, options, range);
+    CodeMirror.on(myWidget, "mousedown", function(e) {
+      myRange.clear();
+      CodeMirror.e_preventDefault(e);
+    });
+    var myRange = cm.markText(range.from, range.to, {
+      replacedWith: myWidget,
+      clearOnEnter: getOption(cm, options, "clearOnEnter"),
+      __isFold: true
+    });
+    myRange.on("clear", function(from, to) {
+      CodeMirror.signal(cm, "unfold", cm, from, to);
+    });
+    CodeMirror.signal(cm, "fold", cm, range.from, range.to);
+  }
+
+  function makeWidget(cm, options, range) {
+    var widget = getOption(cm, options, "widget");
+
+    if (typeof widget == "function") {
+      widget = widget(range.from, range.to);
+    }
+
+    if (typeof widget == "string") {
+      var text = document.createTextNode(widget);
+      widget = document.createElement("span");
+      widget.appendChild(text);
+      widget.className = "CodeMirror-foldmarker";
+    } else if (widget) {
+      widget = widget.cloneNode(true)
+    }
+    return widget;
+  }
+
+  // Clumsy backwards-compatible interface
+  CodeMirror.newFoldFunction = function(rangeFinder, widget) {
+    return function(cm, pos) { doFold(cm, pos, {rangeFinder: rangeFinder, widget: widget}); };
+  };
+
+  // New-style interface
+  CodeMirror.defineExtension("foldCode", function(pos, options, force) {
+    doFold(this, pos, options, force);
+  });
+
+  CodeMirror.defineExtension("isFolded", function(pos) {
+    var marks = this.findMarksAt(pos);
+    for (var i = 0; i < marks.length; ++i)
+      if (marks[i].__isFold) return true;
+  });
+
+  CodeMirror.commands.toggleFold = function(cm) {
+    cm.foldCode(cm.getCursor());
+  };
+  CodeMirror.commands.fold = function(cm) {
+    cm.foldCode(cm.getCursor(), null, "fold");
+  };
+  CodeMirror.commands.unfold = function(cm) {
+    cm.foldCode(cm.getCursor(), null, "unfold");
+  };
+  CodeMirror.commands.foldAll = function(cm) {
+    cm.operation(function() {
+      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
+        cm.foldCode(CodeMirror.Pos(i, 0), null, "fold");
+    });
+  };
+  CodeMirror.commands.unfoldAll = function(cm) {
+    cm.operation(function() {
+      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
+        cm.foldCode(CodeMirror.Pos(i, 0), null, "unfold");
+    });
+  };
+
+  CodeMirror.registerHelper("fold", "combine", function() {
+    var funcs = Array.prototype.slice.call(arguments, 0);
+    return function(cm, start) {
+      for (var i = 0; i < funcs.length; ++i) {
+        var found = funcs[i](cm, start);
+        if (found) return found;
+      }
+    };
+  });
+
+  CodeMirror.registerHelper("fold", "auto", function(cm, start) {
+    var helpers = cm.getHelpers(start, "fold");
+    for (var i = 0; i < helpers.length; i++) {
+      var cur = helpers[i](cm, start);
+      if (cur) return cur;
+    }
+  });
+
+  var defaultOptions = {
+    rangeFinder: CodeMirror.fold.auto,
+    widget: "\u2194",
+    minFoldSize: 0,
+    scanUp: false,
+    clearOnEnter: true
+  };
+
+  CodeMirror.defineOption("foldOptions", null);
+
+  function getOption(cm, options, name) {
+    if (options && options[name] !== undefined)
+      return options[name];
+    var editorOptions = cm.options.foldOptions;
+    if (editorOptions && editorOptions[name] !== undefined)
+      return editorOptions[name];
+    return defaultOptions[name];
+  }
+
+  CodeMirror.defineExtension("foldOption", function(options, name) {
+    return getOption(this, options, name);
+  });
+});

webbuild/html/scripts/codemirror/addon/fold/foldgutter.css

@@ -0,0 +1,20 @@
+.CodeMirror-foldmarker {
+  color: blue;
+  text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
+  font-family: arial;
+  line-height: .3;
+  cursor: pointer;
+}
+.CodeMirror-foldgutter {
+  width: .7em;
+}
+.CodeMirror-foldgutter-open,
+.CodeMirror-foldgutter-folded {
+  cursor: pointer;
+}
+.CodeMirror-foldgutter-open:after {
+  content: "\25BE";
+}
+.CodeMirror-foldgutter-folded:after {
+  content: "\25B8";
+}

webbuild/html/scripts/codemirror/addon/fold/foldgutter.js

@@ -0,0 +1,163 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./foldcode"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./foldcode"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("foldGutter", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.clearGutter(cm.state.foldGutter.options.gutter);
+      cm.state.foldGutter = null;
+      cm.off("gutterClick", onGutterClick);
+      cm.off("changes", onChange);
+      cm.off("viewportChange", onViewportChange);
+      cm.off("fold", onFold);
+      cm.off("unfold", onFold);
+      cm.off("swapDoc", onChange);
+    }
+    if (val) {
+      cm.state.foldGutter = new State(parseOptions(val));
+      updateInViewport(cm);
+      cm.on("gutterClick", onGutterClick);
+      cm.on("changes", onChange);
+      cm.on("viewportChange", onViewportChange);
+      cm.on("fold", onFold);
+      cm.on("unfold", onFold);
+      cm.on("swapDoc", onChange);
+    }
+  });
+
+  var Pos = CodeMirror.Pos;
+
+  function State(options) {
+    this.options = options;
+    this.from = this.to = 0;
+  }
+
+  function parseOptions(opts) {
+    if (opts === true) opts = {};
+    if (opts.gutter == null) opts.gutter = "CodeMirror-foldgutter";
+    if (opts.indicatorOpen == null) opts.indicatorOpen = "CodeMirror-foldgutter-open";
+    if (opts.indicatorFolded == null) opts.indicatorFolded = "CodeMirror-foldgutter-folded";
+    return opts;
+  }
+
+  function isFolded(cm, line) {
+    var marks = cm.findMarks(Pos(line, 0), Pos(line + 1, 0));
+    for (var i = 0; i < marks.length; ++i) {
+      if (marks[i].__isFold) {
+        var fromPos = marks[i].find(-1);
+        if (fromPos && fromPos.line === line)
+          return marks[i];
+      }
+    }
+  }
+
+  function marker(spec) {
+    if (typeof spec == "string") {
+      var elt = document.createElement("div");
+      elt.className = spec + " CodeMirror-guttermarker-subtle";
+      return elt;
+    } else {
+      return spec.cloneNode(true);
+    }
+  }
+
+  function updateFoldInfo(cm, from, to) {
+    var opts = cm.state.foldGutter.options, cur = from - 1;
+    var minSize = cm.foldOption(opts, "minFoldSize");
+    var func = cm.foldOption(opts, "rangeFinder");
+    // we can reuse the built-in indicator element if its className matches the new state
+    var clsFolded = typeof opts.indicatorFolded == "string" && classTest(opts.indicatorFolded);
+    var clsOpen = typeof opts.indicatorOpen == "string" && classTest(opts.indicatorOpen);
+    cm.eachLine(from, to, function(line) {
+      ++cur;
+      var mark = null;
+      var old = line.gutterMarkers;
+      if (old) old = old[opts.gutter];
+      if (isFolded(cm, cur)) {
+        if (clsFolded && old && clsFolded.test(old.className)) return;
+        mark = marker(opts.indicatorFolded);
+      } else {
+        var pos = Pos(cur, 0);
+        var range = func && func(cm, pos);
+        if (range && range.to.line - range.from.line >= minSize) {
+          if (clsOpen && old && clsOpen.test(old.className)) return;
+          mark = marker(opts.indicatorOpen);
+        }
+      }
+      if (!mark && !old) return;
+      cm.setGutterMarker(line, opts.gutter, mark);
+    });
+  }
+
+  // copied from CodeMirror/src/util/dom.js
+  function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") }
+
+  function updateInViewport(cm) {
+    var vp = cm.getViewport(), state = cm.state.foldGutter;
+    if (!state) return;
+    cm.operation(function() {
+      updateFoldInfo(cm, vp.from, vp.to);
+    });
+    state.from = vp.from; state.to = vp.to;
+  }
+
+  function onGutterClick(cm, line, gutter) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
+    if (gutter != opts.gutter) return;
+    var folded = isFolded(cm, line);
+    if (folded) folded.clear();
+    else cm.foldCode(Pos(line, 0), opts);
+  }
+
+  function onChange(cm) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
+    state.from = state.to = 0;
+    clearTimeout(state.changeUpdate);
+    state.changeUpdate = setTimeout(function() { updateInViewport(cm); }, opts.foldOnChangeTimeSpan || 600);
+  }
+
+  function onViewportChange(cm) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
+    clearTimeout(state.changeUpdate);
+    state.changeUpdate = setTimeout(function() {
+      var vp = cm.getViewport();
+      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
+        updateInViewport(cm);
+      } else {
+        cm.operation(function() {
+          if (vp.from < state.from) {
+            updateFoldInfo(cm, vp.from, state.from);
+            state.from = vp.from;
+          }
+          if (vp.to > state.to) {
+            updateFoldInfo(cm, state.to, vp.to);
+            state.to = vp.to;
+          }
+        });
+      }
+    }, opts.updateViewportTimeSpan || 400);
+  }
+
+  function onFold(cm, from) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var line = from.line;
+    if (line >= state.from && line < state.to)
+      updateFoldInfo(cm, line, line + 1);
+  }
+});

webbuild/html/scripts/codemirror/addon/fold/indent-fold.js

@@ -0,0 +1,48 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+function lineIndent(cm, lineNo) {
+  var text = cm.getLine(lineNo)
+  var spaceTo = text.search(/\S/)
+  if (spaceTo == -1 || /\bcomment\b/.test(cm.getTokenTypeAt(CodeMirror.Pos(lineNo, spaceTo + 1))))
+    return -1
+  return CodeMirror.countColumn(text, null, cm.getOption("tabSize"))
+}
+
+CodeMirror.registerHelper("fold", "indent", function(cm, start) {
+  var myIndent = lineIndent(cm, start.line)
+  if (myIndent < 0) return
+  var lastLineInFold = null
+
+  // Go through lines until we find a line that definitely doesn't belong in
+  // the block we're folding, or to the end.
+  for (var i = start.line + 1, end = cm.lastLine(); i <= end; ++i) {
+    var indent = lineIndent(cm, i)
+    if (indent == -1) {
+    } else if (indent > myIndent) {
+      // Lines with a greater indent are considered part of the block.
+      lastLineInFold = i;
+    } else {
+      // If this line has non-space, non-comment content, and is
+      // indented less or equal to the start line, it is the start of
+      // another block.
+      break;
+    }
+  }
+  if (lastLineInFold) return {
+    from: CodeMirror.Pos(start.line, cm.getLine(start.line).length),
+    to: CodeMirror.Pos(lastLineInFold, cm.getLine(lastLineInFold).length)
+  };
+});
+
+});

webbuild/html/scripts/codemirror/addon/fold/markdown-fold.js

@@ -0,0 +1,49 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("fold", "markdown", function(cm, start) {
+  var maxDepth = 100;
+
+  function isHeader(lineNo) {
+    var tokentype = cm.getTokenTypeAt(CodeMirror.Pos(lineNo, 0));
+    return tokentype && /\bheader\b/.test(tokentype);
+  }
+
+  function headerLevel(lineNo, line, nextLine) {
+    var match = line && line.match(/^#+/);
+    if (match && isHeader(lineNo)) return match[0].length;
+    match = nextLine && nextLine.match(/^[=\-]+\s*$/);
+    if (match && isHeader(lineNo + 1)) return nextLine[0] == "=" ? 1 : 2;
+    return maxDepth;
+  }
+
+  var firstLine = cm.getLine(start.line), nextLine = cm.getLine(start.line + 1);
+  var level = headerLevel(start.line, firstLine, nextLine);
+  if (level === maxDepth) return undefined;
+
+  var lastLineNo = cm.lastLine();
+  var end = start.line, nextNextLine = cm.getLine(end + 2);
+  while (end < lastLineNo) {
+    if (headerLevel(end + 1, nextLine, nextNextLine) <= level) break;
+    ++end;
+    nextLine = nextNextLine;
+    nextNextLine = cm.getLine(end + 2);
+  }
+
+  return {
+    from: CodeMirror.Pos(start.line, firstLine.length),
+    to: CodeMirror.Pos(end, cm.getLine(end).length)
+  };
+});
+
+});

webbuild/html/scripts/codemirror/addon/fold/xml-fold.js

@@ -0,0 +1,184 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+  function cmp(a, b) { return a.line - b.line || a.ch - b.ch; }
+
+  var nameStartChar = "A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";
+  var nameChar = nameStartChar + "\-\:\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
+  var xmlTagStart = new RegExp("<(/?)([" + nameStartChar + "][" + nameChar + "]*)", "g");
+
+  function Iter(cm, line, ch, range) {
+    this.line = line; this.ch = ch;
+    this.cm = cm; this.text = cm.getLine(line);
+    this.min = range ? Math.max(range.from, cm.firstLine()) : cm.firstLine();
+    this.max = range ? Math.min(range.to - 1, cm.lastLine()) : cm.lastLine();
+  }
+
+  function tagAt(iter, ch) {
+    var type = iter.cm.getTokenTypeAt(Pos(iter.line, ch));
+    return type && /\btag\b/.test(type);
+  }
+
+  function nextLine(iter) {
+    if (iter.line >= iter.max) return;
+    iter.ch = 0;
+    iter.text = iter.cm.getLine(++iter.line);
+    return true;
+  }
+  function prevLine(iter) {
+    if (iter.line <= iter.min) return;
+    iter.text = iter.cm.getLine(--iter.line);
+    iter.ch = iter.text.length;
+    return true;
+  }
+
+  function toTagEnd(iter) {
+    for (;;) {
+      var gt = iter.text.indexOf(">", iter.ch);
+      if (gt == -1) { if (nextLine(iter)) continue; else return; }
+      if (!tagAt(iter, gt + 1)) { iter.ch = gt + 1; continue; }
+      var lastSlash = iter.text.lastIndexOf("/", gt);
+      var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
+      iter.ch = gt + 1;
+      return selfClose ? "selfClose" : "regular";
+    }
+  }
+  function toTagStart(iter) {
+    for (;;) {
+      var lt = iter.ch ? iter.text.lastIndexOf("<", iter.ch - 1) : -1;
+      if (lt == -1) { if (prevLine(iter)) continue; else return; }
+      if (!tagAt(iter, lt + 1)) { iter.ch = lt; continue; }
+      xmlTagStart.lastIndex = lt;
+      iter.ch = lt;
+      var match = xmlTagStart.exec(iter.text);
+      if (match && match.index == lt) return match;
+    }
+  }
+
+  function toNextTag(iter) {
+    for (;;) {
+      xmlTagStart.lastIndex = iter.ch;
+      var found = xmlTagStart.exec(iter.text);
+      if (!found) { if (nextLine(iter)) continue; else return; }
+      if (!tagAt(iter, found.index + 1)) { iter.ch = found.index + 1; continue; }
+      iter.ch = found.index + found[0].length;
+      return found;
+    }
+  }
+  function toPrevTag(iter) {
+    for (;;) {
+      var gt = iter.ch ? iter.text.lastIndexOf(">", iter.ch - 1) : -1;
+      if (gt == -1) { if (prevLine(iter)) continue; else return; }
+      if (!tagAt(iter, gt + 1)) { iter.ch = gt; continue; }
+      var lastSlash = iter.text.lastIndexOf("/", gt);
+      var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
+      iter.ch = gt + 1;
+      return selfClose ? "selfClose" : "regular";
+    }
+  }
+
+  function findMatchingClose(iter, tag) {
+    var stack = [];
+    for (;;) {
+      var next = toNextTag(iter), end, startLine = iter.line, startCh = iter.ch - (next ? next[0].length : 0);
+      if (!next || !(end = toTagEnd(iter))) return;
+      if (end == "selfClose") continue;
+      if (next[1]) { // closing tag
+        for (var i = stack.length - 1; i >= 0; --i) if (stack[i] == next[2]) {
+          stack.length = i;
+          break;
+        }
+        if (i < 0 && (!tag || tag == next[2])) return {
+          tag: next[2],
+          from: Pos(startLine, startCh),
+          to: Pos(iter.line, iter.ch)
+        };
+      } else { // opening tag
+        stack.push(next[2]);
+      }
+    }
+  }
+  function findMatchingOpen(iter, tag) {
+    var stack = [];
+    for (;;) {
+      var prev = toPrevTag(iter);
+      if (!prev) return;
+      if (prev == "selfClose") { toTagStart(iter); continue; }
+      var endLine = iter.line, endCh = iter.ch;
+      var start = toTagStart(iter);
+      if (!start) return;
+      if (start[1]) { // closing tag
+        stack.push(start[2]);
+      } else { // opening tag
+        for (var i = stack.length - 1; i >= 0; --i) if (stack[i] == start[2]) {
+          stack.length = i;
+          break;
+        }
+        if (i < 0 && (!tag || tag == start[2])) return {
+          tag: start[2],
+          from: Pos(iter.line, iter.ch),
+          to: Pos(endLine, endCh)
+        };
+      }
+    }
+  }
+
+  CodeMirror.registerHelper("fold", "xml", function(cm, start) {
+    var iter = new Iter(cm, start.line, 0);
+    for (;;) {
+      var openTag = toNextTag(iter)
+      if (!openTag || iter.line != start.line) return
+      var end = toTagEnd(iter)
+      if (!end) return
+      if (!openTag[1] && end != "selfClose") {
+        var startPos = Pos(iter.line, iter.ch);
+        var endPos = findMatchingClose(iter, openTag[2]);
+        return endPos && cmp(endPos.from, startPos) > 0 ? {from: startPos, to: endPos.from} : null
+      }
+    }
+  });
+  CodeMirror.findMatchingTag = function(cm, pos, range) {
+    var iter = new Iter(cm, pos.line, pos.ch, range);
+    if (iter.text.indexOf(">") == -1 && iter.text.indexOf("<") == -1) return;
+    var end = toTagEnd(iter), to = end && Pos(iter.line, iter.ch);
+    var start = end && toTagStart(iter);
+    if (!end || !start || cmp(iter, pos) > 0) return;
+    var here = {from: Pos(iter.line, iter.ch), to: to, tag: start[2]};
+    if (end == "selfClose") return {open: here, close: null, at: "open"};
+
+    if (start[1]) { // closing tag
+      return {open: findMatchingOpen(iter, start[2]), close: here, at: "close"};
+    } else { // opening tag
+      iter = new Iter(cm, to.line, to.ch, range);
+      return {open: here, close: findMatchingClose(iter, start[2]), at: "open"};
+    }
+  };
+
+  CodeMirror.findEnclosingTag = function(cm, pos, range, tag) {
+    var iter = new Iter(cm, pos.line, pos.ch, range);
+    for (;;) {
+      var open = findMatchingOpen(iter, tag);
+      if (!open) break;
+      var forward = new Iter(cm, pos.line, pos.ch, range);
+      var close = findMatchingClose(forward, open.tag);
+      if (close) return {open: open, close: close};
+    }
+  };
+
+  // Used by addon/edit/closetag.js
+  CodeMirror.scanForClosingTag = function(cm, pos, name, end) {
+    var iter = new Iter(cm, pos.line, pos.ch, end ? {from: 0, to: end} : null);
+    return findMatchingClose(iter, name);
+  };
+});

webbuild/html/scripts/codemirror/addon/hint/anyword-hint.js

@@ -0,0 +1,41 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var WORD = /[\w$]+/, RANGE = 500;
+
+  CodeMirror.registerHelper("hint", "anyword", function(editor, options) {
+    var word = options && options.word || WORD;
+    var range = options && options.range || RANGE;
+    var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
+    var end = cur.ch, start = end;
+    while (start && word.test(curLine.charAt(start - 1))) --start;
+    var curWord = start != end && curLine.slice(start, end);
+
+    var list = options && options.list || [], seen = {};
+    var re = new RegExp(word.source, "g");
+    for (var dir = -1; dir <= 1; dir += 2) {
+      var line = cur.line, endLine = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
+      for (; line != endLine; line += dir) {
+        var text = editor.getLine(line), m;
+        while (m = re.exec(text)) {
+          if (line == cur.line && m[0] === curWord) continue;
+          if ((!curWord || m[0].lastIndexOf(curWord, 0) == 0) && !Object.prototype.hasOwnProperty.call(seen, m[0])) {
+            seen[m[0]] = true;
+            list.push(m[0]);
+          }
+        }
+      }
+    }
+    return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
+  });
+});

webbuild/html/scripts/codemirror/addon/hint/css-hint.js

@@ -0,0 +1,66 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../mode/css/css"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../mode/css/css"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var pseudoClasses = {"active":1, "after":1, "before":1, "checked":1, "default":1,
+    "disabled":1, "empty":1, "enabled":1, "first-child":1, "first-letter":1,
+    "first-line":1, "first-of-type":1, "focus":1, "hover":1, "in-range":1,
+    "indeterminate":1, "invalid":1, "lang":1, "last-child":1, "last-of-type":1,
+    "link":1, "not":1, "nth-child":1, "nth-last-child":1, "nth-last-of-type":1,
+    "nth-of-type":1, "only-of-type":1, "only-child":1, "optional":1, "out-of-range":1,
+    "placeholder":1, "read-only":1, "read-write":1, "required":1, "root":1,
+    "selection":1, "target":1, "valid":1, "visited":1
+  };
+
+  CodeMirror.registerHelper("hint", "css", function(cm) {
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    var inner = CodeMirror.innerMode(cm.getMode(), token.state);
+    if (inner.mode.name != "css") return;
+
+    if (token.type == "keyword" && "!important".indexOf(token.string) == 0)
+      return {list: ["!important"], from: CodeMirror.Pos(cur.line, token.start),
+              to: CodeMirror.Pos(cur.line, token.end)};
+
+    var start = token.start, end = cur.ch, word = token.string.slice(0, end - start);
+    if (/[^\w$_-]/.test(word)) {
+      word = ""; start = end = cur.ch;
+    }
+
+    var spec = CodeMirror.resolveMode("text/css");
+
+    var result = [];
+    function add(keywords) {
+      for (var name in keywords)
+        if (!word || name.lastIndexOf(word, 0) == 0)
+          result.push(name);
+    }
+
+    var st = inner.state.state;
+    if (st == "pseudo" || token.type == "variable-3") {
+      add(pseudoClasses);
+    } else if (st == "block" || st == "maybeprop") {
+      add(spec.propertyKeywords);
+    } else if (st == "prop" || st == "parens" || st == "at" || st == "params") {
+      add(spec.valueKeywords);
+      add(spec.colorKeywords);
+    } else if (st == "media" || st == "media_parens") {
+      add(spec.mediaTypes);
+      add(spec.mediaFeatures);
+    }
+
+    if (result.length) return {
+      list: result,
+      from: CodeMirror.Pos(cur.line, start),
+      to: CodeMirror.Pos(cur.line, end)
+    };
+  });
+});

webbuild/html/scripts/codemirror/addon/hint/html-hint.js

@@ -0,0 +1,350 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./xml-hint"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./xml-hint"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var langs = "ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" ");
+  var targets = ["_blank", "_self", "_top", "_parent"];
+  var charsets = ["ascii", "utf-8", "utf-16", "latin1", "latin1"];
+  var methods = ["get", "post", "put", "delete"];
+  var encs = ["application/x-www-form-urlencoded", "multipart/form-data", "text/plain"];
+  var media = ["all", "screen", "print", "embossed", "braille", "handheld", "print", "projection", "screen", "tty", "tv", "speech",
+               "3d-glasses", "resolution [>][<][=] [X]", "device-aspect-ratio: X/Y", "orientation:portrait",
+               "orientation:landscape", "device-height: [X]", "device-width: [X]"];
+  var s = { attrs: {} }; // Simple tag, reused for a whole lot of tags
+
+  var data = {
+    a: {
+      attrs: {
+        href: null, ping: null, type: null,
+        media: media,
+        target: targets,
+        hreflang: langs
+      }
+    },
+    abbr: s,
+    acronym: s,
+    address: s,
+    applet: s,
+    area: {
+      attrs: {
+        alt: null, coords: null, href: null, target: null, ping: null,
+        media: media, hreflang: langs, type: null,
+        shape: ["default", "rect", "circle", "poly"]
+      }
+    },
+    article: s,
+    aside: s,
+    audio: {
+      attrs: {
+        src: null, mediagroup: null,
+        crossorigin: ["anonymous", "use-credentials"],
+        preload: ["none", "metadata", "auto"],
+        autoplay: ["", "autoplay"],
+        loop: ["", "loop"],
+        controls: ["", "controls"]
+      }
+    },
+    b: s,
+    base: { attrs: { href: null, target: targets } },
+    basefont: s,
+    bdi: s,
+    bdo: s,
+    big: s,
+    blockquote: { attrs: { cite: null } },
+    body: s,
+    br: s,
+    button: {
+      attrs: {
+        form: null, formaction: null, name: null, value: null,
+        autofocus: ["", "autofocus"],
+        disabled: ["", "autofocus"],
+        formenctype: encs,
+        formmethod: methods,
+        formnovalidate: ["", "novalidate"],
+        formtarget: targets,
+        type: ["submit", "reset", "button"]
+      }
+    },
+    canvas: { attrs: { width: null, height: null } },
+    caption: s,
+    center: s,
+    cite: s,
+    code: s,
+    col: { attrs: { span: null } },
+    colgroup: { attrs: { span: null } },
+    command: {
+      attrs: {
+        type: ["command", "checkbox", "radio"],
+        label: null, icon: null, radiogroup: null, command: null, title: null,
+        disabled: ["", "disabled"],
+        checked: ["", "checked"]
+      }
+    },
+    data: { attrs: { value: null } },
+    datagrid: { attrs: { disabled: ["", "disabled"], multiple: ["", "multiple"] } },
+    datalist: { attrs: { data: null } },
+    dd: s,
+    del: { attrs: { cite: null, datetime: null } },
+    details: { attrs: { open: ["", "open"] } },
+    dfn: s,
+    dir: s,
+    div: s,
+    dl: s,
+    dt: s,
+    em: s,
+    embed: { attrs: { src: null, type: null, width: null, height: null } },
+    eventsource: { attrs: { src: null } },
+    fieldset: { attrs: { disabled: ["", "disabled"], form: null, name: null } },
+    figcaption: s,
+    figure: s,
+    font: s,
+    footer: s,
+    form: {
+      attrs: {
+        action: null, name: null,
+        "accept-charset": charsets,
+        autocomplete: ["on", "off"],
+        enctype: encs,
+        method: methods,
+        novalidate: ["", "novalidate"],
+        target: targets
+      }
+    },
+    frame: s,
+    frameset: s,
+    h1: s, h2: s, h3: s, h4: s, h5: s, h6: s,
+    head: {
+      attrs: {},
+      children: ["title", "base", "link", "style", "meta", "script", "noscript", "command"]
+    },
+    header: s,
+    hgroup: s,
+    hr: s,
+    html: {
+      attrs: { manifest: null },
+      children: ["head", "body"]
+    },
+    i: s,
+    iframe: {
+      attrs: {
+        src: null, srcdoc: null, name: null, width: null, height: null,
+        sandbox: ["allow-top-navigation", "allow-same-origin", "allow-forms", "allow-scripts"],
+        seamless: ["", "seamless"]
+      }
+    },
+    img: {
+      attrs: {
+        alt: null, src: null, ismap: null, usemap: null, width: null, height: null,
+        crossorigin: ["anonymous", "use-credentials"]
+      }
+    },
+    input: {
+      attrs: {
+        alt: null, dirname: null, form: null, formaction: null,
+        height: null, list: null, max: null, maxlength: null, min: null,
+        name: null, pattern: null, placeholder: null, size: null, src: null,
+        step: null, value: null, width: null,
+        accept: ["audio/*", "video/*", "image/*"],
+        autocomplete: ["on", "off"],
+        autofocus: ["", "autofocus"],
+        checked: ["", "checked"],
+        disabled: ["", "disabled"],
+        formenctype: encs,
+        formmethod: methods,
+        formnovalidate: ["", "novalidate"],
+        formtarget: targets,
+        multiple: ["", "multiple"],
+        readonly: ["", "readonly"],
+        required: ["", "required"],
+        type: ["hidden", "text", "search", "tel", "url", "email", "password", "datetime", "date", "month",
+               "week", "time", "datetime-local", "number", "range", "color", "checkbox", "radio",
+               "file", "submit", "image", "reset", "button"]
+      }
+    },
+    ins: { attrs: { cite: null, datetime: null } },
+    kbd: s,
+    keygen: {
+      attrs: {
+        challenge: null, form: null, name: null,
+        autofocus: ["", "autofocus"],
+        disabled: ["", "disabled"],
+        keytype: ["RSA"]
+      }
+    },
+    label: { attrs: { "for": null, form: null } },
+    legend: s,
+    li: { attrs: { value: null } },
+    link: {
+      attrs: {
+        href: null, type: null,
+        hreflang: langs,
+        media: media,
+        sizes: ["all", "16x16", "16x16 32x32", "16x16 32x32 64x64"]
+      }
+    },
+    map: { attrs: { name: null } },
+    mark: s,
+    menu: { attrs: { label: null, type: ["list", "context", "toolbar"] } },
+    meta: {
+      attrs: {
+        content: null,
+        charset: charsets,
+        name: ["viewport", "application-name", "author", "description", "generator", "keywords"],
+        "http-equiv": ["content-language", "content-type", "default-style", "refresh"]
+      }
+    },
+    meter: { attrs: { value: null, min: null, low: null, high: null, max: null, optimum: null } },
+    nav: s,
+    noframes: s,
+    noscript: s,
+    object: {
+      attrs: {
+        data: null, type: null, name: null, usemap: null, form: null, width: null, height: null,
+        typemustmatch: ["", "typemustmatch"]
+      }
+    },
+    ol: { attrs: { reversed: ["", "reversed"], start: null, type: ["1", "a", "A", "i", "I"] } },
+    optgroup: { attrs: { disabled: ["", "disabled"], label: null } },
+    option: { attrs: { disabled: ["", "disabled"], label: null, selected: ["", "selected"], value: null } },
+    output: { attrs: { "for": null, form: null, name: null } },
+    p: s,
+    param: { attrs: { name: null, value: null } },
+    pre: s,
+    progress: { attrs: { value: null, max: null } },
+    q: { attrs: { cite: null } },
+    rp: s,
+    rt: s,
+    ruby: s,
+    s: s,
+    samp: s,
+    script: {
+      attrs: {
+        type: ["text/javascript"],
+        src: null,
+        async: ["", "async"],
+        defer: ["", "defer"],
+        charset: charsets
+      }
+    },
+    section: s,
+    select: {
+      attrs: {
+        form: null, name: null, size: null,
+        autofocus: ["", "autofocus"],
+        disabled: ["", "disabled"],
+        multiple: ["", "multiple"]
+      }
+    },
+    small: s,
+    source: { attrs: { src: null, type: null, media: null } },
+    span: s,
+    strike: s,
+    strong: s,
+    style: {
+      attrs: {
+        type: ["text/css"],
+        media: media,
+        scoped: null
+      }
+    },
+    sub: s,
+    summary: s,
+    sup: s,
+    table: s,
+    tbody: s,
+    td: { attrs: { colspan: null, rowspan: null, headers: null } },
+    textarea: {
+      attrs: {
+        dirname: null, form: null, maxlength: null, name: null, placeholder: null,
+        rows: null, cols: null,
+        autofocus: ["", "autofocus"],
+        disabled: ["", "disabled"],
+        readonly: ["", "readonly"],
+        required: ["", "required"],
+        wrap: ["soft", "hard"]
+      }
+    },
+    tfoot: s,
+    th: { attrs: { colspan: null, rowspan: null, headers: null, scope: ["row", "col", "rowgroup", "colgroup"] } },
+    thead: s,
+    time: { attrs: { datetime: null } },
+    title: s,
+    tr: s,
+    track: {
+      attrs: {
+        src: null, label: null, "default": null,
+        kind: ["subtitles", "captions", "descriptions", "chapters", "metadata"],
+        srclang: langs
+      }
+    },
+    tt: s,
+    u: s,
+    ul: s,
+    "var": s,
+    video: {
+      attrs: {
+        src: null, poster: null, width: null, height: null,
+        crossorigin: ["anonymous", "use-credentials"],
+        preload: ["auto", "metadata", "none"],
+        autoplay: ["", "autoplay"],
+        mediagroup: ["movie"],
+        muted: ["", "muted"],
+        controls: ["", "controls"]
+      }
+    },
+    wbr: s
+  };
+
+  var globalAttrs = {
+    accesskey: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
+    "class": null,
+    contenteditable: ["true", "false"],
+    contextmenu: null,
+    dir: ["ltr", "rtl", "auto"],
+    draggable: ["true", "false", "auto"],
+    dropzone: ["copy", "move", "link", "string:", "file:"],
+    hidden: ["hidden"],
+    id: null,
+    inert: ["inert"],
+    itemid: null,
+    itemprop: null,
+    itemref: null,
+    itemscope: ["itemscope"],
+    itemtype: null,
+    lang: ["en", "es"],
+    spellcheck: ["true", "false"],
+    autocorrect: ["true", "false"],
+    autocapitalize: ["true", "false"],
+    style: null,
+    tabindex: ["1", "2", "3", "4", "5", "6", "7", "8", "9"],
+    title: null,
+    translate: ["yes", "no"],
+    onclick: null,
+    rel: ["stylesheet", "alternate", "author", "bookmark", "help", "license", "next", "nofollow", "noreferrer", "prefetch", "prev", "search", "tag"]
+  };
+  function populate(obj) {
+    for (var attr in globalAttrs) if (globalAttrs.hasOwnProperty(attr))
+      obj.attrs[attr] = globalAttrs[attr];
+  }
+
+  populate(s);
+  for (var tag in data) if (data.hasOwnProperty(tag) && data[tag] != s)
+    populate(data[tag]);
+
+  CodeMirror.htmlSchema = data;
+  function htmlHint(cm, options) {
+    var local = {schemaInfo: data};
+    if (options) for (var opt in options) local[opt] = options[opt];
+    return CodeMirror.hint.xml(cm, local);
+  }
+  CodeMirror.registerHelper("hint", "html", htmlHint);
+});

webbuild/html/scripts/codemirror/addon/hint/javascript-hint.js

@@ -0,0 +1,162 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  var Pos = CodeMirror.Pos;
+
+  function forEach(arr, f) {
+    for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
+  }
+
+  function arrayContains(arr, item) {
+    if (!Array.prototype.indexOf) {
+      var i = arr.length;
+      while (i--) {
+        if (arr[i] === item) {
+          return true;
+        }
+      }
+      return false;
+    }
+    return arr.indexOf(item) != -1;
+  }
+
+  function scriptHint(editor, keywords, getToken, options) {
+    // Find the token at the cursor
+    var cur = editor.getCursor(), token = getToken(editor, cur);
+    if (/\b(?:string|comment)\b/.test(token.type)) return;
+    var innerMode = CodeMirror.innerMode(editor.getMode(), token.state);
+    if (innerMode.mode.helperType === "json") return;
+    token.state = innerMode.state;
+
+    // If it's not a 'word-style' token, ignore the token.
+    if (!/^[\w$_]*$/.test(token.string)) {
+      token = {start: cur.ch, end: cur.ch, string: "", state: token.state,
+               type: token.string == "." ? "property" : null};
+    } else if (token.end > cur.ch) {
+      token.end = cur.ch;
+      token.string = token.string.slice(0, cur.ch - token.start);
+    }
+
+    var tprop = token;
+    // If it is a property, find out what it is a property of.
+    while (tprop.type == "property") {
+      tprop = getToken(editor, Pos(cur.line, tprop.start));
+      if (tprop.string != ".") return;
+      tprop = getToken(editor, Pos(cur.line, tprop.start));
+      if (!context) var context = [];
+      context.push(tprop);
+    }
+    return {list: getCompletions(token, context, keywords, options),
+            from: Pos(cur.line, token.start),
+            to: Pos(cur.line, token.end)};
+  }
+
+  function javascriptHint(editor, options) {
+    return scriptHint(editor, javascriptKeywords,
+                      function (e, cur) {return e.getTokenAt(cur);},
+                      options);
+  };
+  CodeMirror.registerHelper("hint", "javascript", javascriptHint);
+
+  function getCoffeeScriptToken(editor, cur) {
+  // This getToken, it is for coffeescript, imitates the behavior of
+  // getTokenAt method in javascript.js, that is, returning "property"
+  // type and treat "." as indepenent token.
+    var token = editor.getTokenAt(cur);
+    if (cur.ch == token.start + 1 && token.string.charAt(0) == '.') {
+      token.end = token.start;
+      token.string = '.';
+      token.type = "property";
+    }
+    else if (/^\.[\w$_]*$/.test(token.string)) {
+      token.type = "property";
+      token.start++;
+      token.string = token.string.replace(/\./, '');
+    }
+    return token;
+  }
+
+  function coffeescriptHint(editor, options) {
+    return scriptHint(editor, coffeescriptKeywords, getCoffeeScriptToken, options);
+  }
+  CodeMirror.registerHelper("hint", "coffeescript", coffeescriptHint);
+
+  var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " +
+                     "toUpperCase toLowerCase split concat match replace search").split(" ");
+  var arrayProps = ("length concat join splice push pop shift unshift slice reverse sort indexOf " +
+                    "lastIndexOf every some filter forEach map reduce reduceRight ").split(" ");
+  var funcProps = "prototype apply call bind".split(" ");
+  var javascriptKeywords = ("break case catch class const continue debugger default delete do else export extends false finally for function " +
+                  "if in import instanceof new null return super switch this throw true try typeof var void while with yield").split(" ");
+  var coffeescriptKeywords = ("and break catch class continue delete do else extends false finally for " +
+                  "if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
+
+  function forAllProps(obj, callback) {
+    if (!Object.getOwnPropertyNames || !Object.getPrototypeOf) {
+      for (var name in obj) callback(name)
+    } else {
+      for (var o = obj; o; o = Object.getPrototypeOf(o))
+        Object.getOwnPropertyNames(o).forEach(callback)
+    }
+  }
+
+  function getCompletions(token, context, keywords, options) {
+    var found = [], start = token.string, global = options && options.globalScope || window;
+    function maybeAdd(str) {
+      if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
+    }
+    function gatherCompletions(obj) {
+      if (typeof obj == "string") forEach(stringProps, maybeAdd);
+      else if (obj instanceof Array) forEach(arrayProps, maybeAdd);
+      else if (obj instanceof Function) forEach(funcProps, maybeAdd);
+      forAllProps(obj, maybeAdd)
+    }
+
+    if (context && context.length) {
+      // If this is a property, see if it belongs to some object we can
+      // find in the current environment.
+      var obj = context.pop(), base;
+      if (obj.type && obj.type.indexOf("variable") === 0) {
+        if (options && options.additionalContext)
+          base = options.additionalContext[obj.string];
+        if (!options || options.useGlobalScope !== false)
+          base = base || global[obj.string];
+      } else if (obj.type == "string") {
+        base = "";
+      } else if (obj.type == "atom") {
+        base = 1;
+      } else if (obj.type == "function") {
+        if (global.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
+            (typeof global.jQuery == 'function'))
+          base = global.jQuery();
+        else if (global._ != null && (obj.string == '_') && (typeof global._ == 'function'))
+          base = global._();
+      }
+      while (base != null && context.length)
+        base = base[context.pop().string];
+      if (base != null) gatherCompletions(base);
+    } else {
+      // If not, just look in the global object, any local scope, and optional additional-context
+      // (reading into JS mode internals to get at the local and global variables)
+      for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
+      for (var c = token.state.context; c; c = c.prev)
+        for (var v = c.vars; v; v = v.next) maybeAdd(v.name)
+      for (var v = token.state.globalVars; v; v = v.next) maybeAdd(v.name);
+      if (options && options.additionalContext != null)
+        for (var key in options.additionalContext)
+          maybeAdd(key);
+      if (!options || options.useGlobalScope !== false)
+        gatherCompletions(global);
+      forEach(keywords, maybeAdd);
+    }
+    return found;
+  }
+});

webbuild/html/scripts/codemirror/addon/hint/show-hint.css

@@ -0,0 +1,36 @@
+.CodeMirror-hints {
+  position: absolute;
+  z-index: 10;
+  overflow: hidden;
+  list-style: none;
+
+  margin: 0;
+  padding: 2px;
+
+  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  border-radius: 3px;
+  border: 1px solid silver;
+
+  background: white;
+  font-size: 90%;
+  font-family: monospace;
+
+  max-height: 20em;
+  overflow-y: auto;
+}
+
+.CodeMirror-hint {
+  margin: 0;
+  padding: 0 4px;
+  border-radius: 2px;
+  white-space: pre;
+  color: black;
+  cursor: pointer;
+}
+
+li.CodeMirror-hint-active {
+  background: #08f;
+  color: white;
+}

webbuild/html/scripts/codemirror/addon/hint/show-hint.js

@@ -0,0 +1,479 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var HINT_ELEMENT_CLASS        = "CodeMirror-hint";
+  var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active";
+
+  // This is the old interface, kept around for now to stay
+  // backwards-compatible.
+  CodeMirror.showHint = function(cm, getHints, options) {
+    if (!getHints) return cm.showHint(options);
+    if (options && options.async) getHints.async = true;
+    var newOpts = {hint: getHints};
+    if (options) for (var prop in options) newOpts[prop] = options[prop];
+    return cm.showHint(newOpts);
+  };
+
+  CodeMirror.defineExtension("showHint", function(options) {
+    options = parseOptions(this, this.getCursor("start"), options);
+    var selections = this.listSelections()
+    if (selections.length > 1) return;
+    // By default, don't allow completion when something is selected.
+    // A hint function can have a `supportsSelection` property to
+    // indicate that it can handle selections.
+    if (this.somethingSelected()) {
+      if (!options.hint.supportsSelection) return;
+      // Don't try with cross-line selections
+      for (var i = 0; i < selections.length; i++)
+        if (selections[i].head.line != selections[i].anchor.line) return;
+    }
+
+    if (this.state.completionActive) this.state.completionActive.close();
+    var completion = this.state.completionActive = new Completion(this, options);
+    if (!completion.options.hint) return;
+
+    CodeMirror.signal(this, "startCompletion", this);
+    completion.update(true);
+  });
+
+  CodeMirror.defineExtension("closeHint", function() {
+    if (this.state.completionActive) this.state.completionActive.close()
+  })
+
+  function Completion(cm, options) {
+    this.cm = cm;
+    this.options = options;
+    this.widget = null;
+    this.debounce = 0;
+    this.tick = 0;
+    this.startPos = this.cm.getCursor("start");
+    this.startLen = this.cm.getLine(this.startPos.line).length - this.cm.getSelection().length;
+
+    var self = this;
+    cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });
+  }
+
+  var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
+    return setTimeout(fn, 1000/60);
+  };
+  var cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout;
+
+  Completion.prototype = {
+    close: function() {
+      if (!this.active()) return;
+      this.cm.state.completionActive = null;
+      this.tick = null;
+      this.cm.off("cursorActivity", this.activityFunc);
+
+      if (this.widget && this.data) CodeMirror.signal(this.data, "close");
+      if (this.widget) this.widget.close();
+      CodeMirror.signal(this.cm, "endCompletion", this.cm);
+    },
+
+    active: function() {
+      return this.cm.state.completionActive == this;
+    },
+
+    pick: function(data, i) {
+      var completion = data.list[i], self = this;
+      this.cm.operation(function() {
+        if (completion.hint)
+          completion.hint(self.cm, data, completion);
+        else
+          self.cm.replaceRange(getText(completion), completion.from || data.from,
+                               completion.to || data.to, "complete");
+        CodeMirror.signal(data, "pick", completion);
+        self.cm.scrollIntoView();
+      })
+      this.close();
+    },
+
+    cursorActivity: function() {
+      if (this.debounce) {
+        cancelAnimationFrame(this.debounce);
+        this.debounce = 0;
+      }
+
+      var identStart = this.startPos;
+      if(this.data) {
+        identStart = this.data.from;
+      }
+
+      var pos = this.cm.getCursor(), line = this.cm.getLine(pos.line);
+      if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch ||
+          pos.ch < identStart.ch || this.cm.somethingSelected() ||
+          (!pos.ch || this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
+        this.close();
+      } else {
+        var self = this;
+        this.debounce = requestAnimationFrame(function() {self.update();});
+        if (this.widget) this.widget.disable();
+      }
+    },
+
+    update: function(first) {
+      if (this.tick == null) return
+      var self = this, myTick = ++this.tick
+      fetchHints(this.options.hint, this.cm, this.options, function(data) {
+        if (self.tick == myTick) self.finishUpdate(data, first)
+      })
+    },
+
+    finishUpdate: function(data, first) {
+      if (this.data) CodeMirror.signal(this.data, "update");
+
+      var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);
+      if (this.widget) this.widget.close();
+
+      this.data = data;
+
+      if (data && data.list.length) {
+        if (picked && data.list.length == 1) {
+          this.pick(data, 0);
+        } else {
+          this.widget = new Widget(this, data);
+          CodeMirror.signal(data, "shown");
+        }
+      }
+    }
+  };
+
+  function parseOptions(cm, pos, options) {
+    var editor = cm.options.hintOptions;
+    var out = {};
+    for (var prop in defaultOptions) out[prop] = defaultOptions[prop];
+    if (editor) for (var prop in editor)
+      if (editor[prop] !== undefined) out[prop] = editor[prop];
+    if (options) for (var prop in options)
+      if (options[prop] !== undefined) out[prop] = options[prop];
+    if (out.hint.resolve) out.hint = out.hint.resolve(cm, pos)
+    return out;
+  }
+
+  function getText(completion) {
+    if (typeof completion == "string") return completion;
+    else return completion.text;
+  }
+
+  function buildKeyMap(completion, handle) {
+    var baseMap = {
+      Up: function() {handle.moveFocus(-1);},
+      Down: function() {handle.moveFocus(1);},
+      PageUp: function() {handle.moveFocus(-handle.menuSize() + 1, true);},
+      PageDown: function() {handle.moveFocus(handle.menuSize() - 1, true);},
+      Home: function() {handle.setFocus(0);},
+      End: function() {handle.setFocus(handle.length - 1);},
+      Enter: handle.pick,
+      Tab: handle.pick,
+      Esc: handle.close
+    };
+
+    var mac = /Mac/.test(navigator.platform);
+
+    if (mac) {
+      baseMap["Ctrl-P"] = function() {handle.moveFocus(-1);};
+      baseMap["Ctrl-N"] = function() {handle.moveFocus(1);};
+    }
+
+    var custom = completion.options.customKeys;
+    var ourMap = custom ? {} : baseMap;
+    function addBinding(key, val) {
+      var bound;
+      if (typeof val != "string")
+        bound = function(cm) { return val(cm, handle); };
+      // This mechanism is deprecated
+      else if (baseMap.hasOwnProperty(val))
+        bound = baseMap[val];
+      else
+        bound = val;
+      ourMap[key] = bound;
+    }
+    if (custom)
+      for (var key in custom) if (custom.hasOwnProperty(key))
+        addBinding(key, custom[key]);
+    var extra = completion.options.extraKeys;
+    if (extra)
+      for (var key in extra) if (extra.hasOwnProperty(key))
+        addBinding(key, extra[key]);
+    return ourMap;
+  }
+
+  function getHintElement(hintsElement, el) {
+    while (el && el != hintsElement) {
+      if (el.nodeName.toUpperCase() === "LI" && el.parentNode == hintsElement) return el;
+      el = el.parentNode;
+    }
+  }
+
+  function Widget(completion, data) {
+    this.completion = completion;
+    this.data = data;
+    this.picked = false;
+    var widget = this, cm = completion.cm;
+    var ownerDocument = cm.getInputField().ownerDocument;
+    var parentWindow = ownerDocument.defaultView || ownerDocument.parentWindow;
+
+    var hints = this.hints = ownerDocument.createElement("ul");
+    var theme = completion.cm.options.theme;
+    hints.className = "CodeMirror-hints " + theme;
+    this.selectedHint = data.selectedHint || 0;
+
+    var completions = data.list;
+    for (var i = 0; i < completions.length; ++i) {
+      var elt = hints.appendChild(ownerDocument.createElement("li")), cur = completions[i];
+      var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
+      if (cur.className != null) className = cur.className + " " + className;
+      elt.className = className;
+      if (cur.render) cur.render(elt, data, cur);
+      else elt.appendChild(ownerDocument.createTextNode(cur.displayText || getText(cur)));
+      elt.hintId = i;
+    }
+
+    var container = completion.options.container || ownerDocument.body;
+    var pos = cm.cursorCoords(completion.options.alignWithWord ? data.from : null);
+    var left = pos.left, top = pos.bottom, below = true;
+    var offsetLeft = 0, offsetTop = 0;
+    if (container !== ownerDocument.body) {
+      // We offset the cursor position because left and top are relative to the offsetParent's top left corner.
+      var isContainerPositioned = ['absolute', 'relative', 'fixed'].indexOf(parentWindow.getComputedStyle(container).position) !== -1;
+      var offsetParent = isContainerPositioned ? container : container.offsetParent;
+      var offsetParentPosition = offsetParent.getBoundingClientRect();
+      var bodyPosition = ownerDocument.body.getBoundingClientRect();
+      offsetLeft = (offsetParentPosition.left - bodyPosition.left - offsetParent.scrollLeft);
+      offsetTop = (offsetParentPosition.top - bodyPosition.top - offsetParent.scrollTop);
+    }
+    hints.style.left = (left - offsetLeft) + "px";
+    hints.style.top = (top - offsetTop) + "px";
+
+    // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
+    var winW = parentWindow.innerWidth || Math.max(ownerDocument.body.offsetWidth, ownerDocument.documentElement.offsetWidth);
+    var winH = parentWindow.innerHeight || Math.max(ownerDocument.body.offsetHeight, ownerDocument.documentElement.offsetHeight);
+    container.appendChild(hints);
+    var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
+    var scrolls = hints.scrollHeight > hints.clientHeight + 1
+    var startScroll = cm.getScrollInfo();
+
+    if (overlapY > 0) {
+      var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
+      if (curTop - height > 0) { // Fits above cursor
+        hints.style.top = (top = pos.top - height - offsetTop) + "px";
+        below = false;
+      } else if (height > winH) {
+        hints.style.height = (winH - 5) + "px";
+        hints.style.top = (top = pos.bottom - box.top - offsetTop) + "px";
+        var cursor = cm.getCursor();
+        if (data.from.ch != cursor.ch) {
+          pos = cm.cursorCoords(cursor);
+          hints.style.left = (left = pos.left - offsetLeft) + "px";
+          box = hints.getBoundingClientRect();
+        }
+      }
+    }
+    var overlapX = box.right - winW;
+    if (overlapX > 0) {
+      if (box.right - box.left > winW) {
+        hints.style.width = (winW - 5) + "px";
+        overlapX -= (box.right - box.left) - winW;
+      }
+      hints.style.left = (left = pos.left - overlapX - offsetLeft) + "px";
+    }
+    if (scrolls) for (var node = hints.firstChild; node; node = node.nextSibling)
+      node.style.paddingRight = cm.display.nativeBarWidth + "px"
+
+    cm.addKeyMap(this.keyMap = buildKeyMap(completion, {
+      moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },
+      setFocus: function(n) { widget.changeActive(n); },
+      menuSize: function() { return widget.screenAmount(); },
+      length: completions.length,
+      close: function() { completion.close(); },
+      pick: function() { widget.pick(); },
+      data: data
+    }));
+
+    if (completion.options.closeOnUnfocus) {
+      var closingOnBlur;
+      cm.on("blur", this.onBlur = function() { closingOnBlur = setTimeout(function() { completion.close(); }, 100); });
+      cm.on("focus", this.onFocus = function() { clearTimeout(closingOnBlur); });
+    }
+
+    cm.on("scroll", this.onScroll = function() {
+      var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
+      var newTop = top + startScroll.top - curScroll.top;
+      var point = newTop - (parentWindow.pageYOffset || (ownerDocument.documentElement || ownerDocument.body).scrollTop);
+      if (!below) point += hints.offsetHeight;
+      if (point <= editor.top || point >= editor.bottom) return completion.close();
+      hints.style.top = newTop + "px";
+      hints.style.left = (left + startScroll.left - curScroll.left) + "px";
+    });
+
+    CodeMirror.on(hints, "dblclick", function(e) {
+      var t = getHintElement(hints, e.target || e.srcElement);
+      if (t && t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
+    });
+
+    CodeMirror.on(hints, "click", function(e) {
+      var t = getHintElement(hints, e.target || e.srcElement);
+      if (t && t.hintId != null) {
+        widget.changeActive(t.hintId);
+        if (completion.options.completeOnSingleClick) widget.pick();
+      }
+    });
+
+    CodeMirror.on(hints, "mousedown", function() {
+      setTimeout(function(){cm.focus();}, 20);
+    });
+    this.scrollToActive()
+
+    CodeMirror.signal(data, "select", completions[this.selectedHint], hints.childNodes[this.selectedHint]);
+    return true;
+  }
+
+  Widget.prototype = {
+    close: function() {
+      if (this.completion.widget != this) return;
+      this.completion.widget = null;
+      this.hints.parentNode.removeChild(this.hints);
+      this.completion.cm.removeKeyMap(this.keyMap);
+
+      var cm = this.completion.cm;
+      if (this.completion.options.closeOnUnfocus) {
+        cm.off("blur", this.onBlur);
+        cm.off("focus", this.onFocus);
+      }
+      cm.off("scroll", this.onScroll);
+    },
+
+    disable: function() {
+      this.completion.cm.removeKeyMap(this.keyMap);
+      var widget = this;
+      this.keyMap = {Enter: function() { widget.picked = true; }};
+      this.completion.cm.addKeyMap(this.keyMap);
+    },
+
+    pick: function() {
+      this.completion.pick(this.data, this.selectedHint);
+    },
+
+    changeActive: function(i, avoidWrap) {
+      if (i >= this.data.list.length)
+        i = avoidWrap ? this.data.list.length - 1 : 0;
+      else if (i < 0)
+        i = avoidWrap ? 0  : this.data.list.length - 1;
+      if (this.selectedHint == i) return;
+      var node = this.hints.childNodes[this.selectedHint];
+      if (node) node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
+      node = this.hints.childNodes[this.selectedHint = i];
+      node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
+      this.scrollToActive()
+      CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);
+    },
+
+    scrollToActive: function() {
+      var margin = this.completion.options.scrollMargin || 0;
+      var node1 = this.hints.childNodes[Math.max(0, this.selectedHint - margin)];
+      var node2 = this.hints.childNodes[Math.min(this.data.list.length - 1, this.selectedHint + margin)];
+      var firstNode = this.hints.firstChild;
+      if (node1.offsetTop < this.hints.scrollTop)
+        this.hints.scrollTop = node1.offsetTop - firstNode.offsetTop;
+      else if (node2.offsetTop + node2.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
+        this.hints.scrollTop = node2.offsetTop + node2.offsetHeight - this.hints.clientHeight + firstNode.offsetTop;
+    },
+
+    screenAmount: function() {
+      return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
+    }
+  };
+
+  function applicableHelpers(cm, helpers) {
+    if (!cm.somethingSelected()) return helpers
+    var result = []
+    for (var i = 0; i < helpers.length; i++)
+      if (helpers[i].supportsSelection) result.push(helpers[i])
+    return result
+  }
+
+  function fetchHints(hint, cm, options, callback) {
+    if (hint.async) {
+      hint(cm, callback, options)
+    } else {
+      var result = hint(cm, options)
+      if (result && result.then) result.then(callback)
+      else callback(result)
+    }
+  }
+
+  function resolveAutoHints(cm, pos) {
+    var helpers = cm.getHelpers(pos, "hint"), words
+    if (helpers.length) {
+      var resolved = function(cm, callback, options) {
+        var app = applicableHelpers(cm, helpers);
+        function run(i) {
+          if (i == app.length) return callback(null)
+          fetchHints(app[i], cm, options, function(result) {
+            if (result && result.list.length > 0) callback(result)
+            else run(i + 1)
+          })
+        }
+        run(0)
+      }
+      resolved.async = true
+      resolved.supportsSelection = true
+      return resolved
+    } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) {
+      return function(cm) { return CodeMirror.hint.fromList(cm, {words: words}) }
+    } else if (CodeMirror.hint.anyword) {
+      return function(cm, options) { return CodeMirror.hint.anyword(cm, options) }
+    } else {
+      return function() {}
+    }
+  }
+
+  CodeMirror.registerHelper("hint", "auto", {
+    resolve: resolveAutoHints
+  });
+
+  CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur)
+    var term, from = CodeMirror.Pos(cur.line, token.start), to = cur
+    if (token.start < cur.ch && /\w/.test(token.string.charAt(cur.ch - token.start - 1))) {
+      term = token.string.substr(0, cur.ch - token.start)
+    } else {
+      term = ""
+      from = cur
+    }
+    var found = [];
+    for (var i = 0; i < options.words.length; i++) {
+      var word = options.words[i];
+      if (word.slice(0, term.length) == term)
+        found.push(word);
+    }
+
+    if (found.length) return {list: found, from: from, to: to};
+  });
+
+  CodeMirror.commands.autocomplete = CodeMirror.showHint;
+
+  var defaultOptions = {
+    hint: CodeMirror.hint.auto,
+    completeSingle: true,
+    alignWithWord: true,
+    closeCharacters: /[\s()\[\]{};:>,]/,
+    closeOnUnfocus: true,
+    completeOnSingleClick: true,
+    container: null,
+    customKeys: null,
+    extraKeys: null
+  };
+
+  CodeMirror.defineOption("hintOptions", null);
+});

webbuild/html/scripts/codemirror/addon/hint/sql-hint.js

@@ -0,0 +1,304 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../mode/sql/sql"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../mode/sql/sql"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var tables;
+  var defaultTable;
+  var keywords;
+  var identifierQuote;
+  var CONS = {
+    QUERY_DIV: ";",
+    ALIAS_KEYWORD: "AS"
+  };
+  var Pos = CodeMirror.Pos, cmpPos = CodeMirror.cmpPos;
+
+  function isArray(val) { return Object.prototype.toString.call(val) == "[object Array]" }
+
+  function getKeywords(editor) {
+    var mode = editor.doc.modeOption;
+    if (mode === "sql") mode = "text/x-sql";
+    return CodeMirror.resolveMode(mode).keywords;
+  }
+
+  function getIdentifierQuote(editor) {
+    var mode = editor.doc.modeOption;
+    if (mode === "sql") mode = "text/x-sql";
+    return CodeMirror.resolveMode(mode).identifierQuote || "`";
+  }
+
+  function getText(item) {
+    return typeof item == "string" ? item : item.text;
+  }
+
+  function wrapTable(name, value) {
+    if (isArray(value)) value = {columns: value}
+    if (!value.text) value.text = name
+    return value
+  }
+
+  function parseTables(input) {
+    var result = {}
+    if (isArray(input)) {
+      for (var i = input.length - 1; i >= 0; i--) {
+        var item = input[i]
+        result[getText(item).toUpperCase()] = wrapTable(getText(item), item)
+      }
+    } else if (input) {
+      for (var name in input)
+        result[name.toUpperCase()] = wrapTable(name, input[name])
+    }
+    return result
+  }
+
+  function getTable(name) {
+    return tables[name.toUpperCase()]
+  }
+
+  function shallowClone(object) {
+    var result = {};
+    for (var key in object) if (object.hasOwnProperty(key))
+      result[key] = object[key];
+    return result;
+  }
+
+  function match(string, word) {
+    var len = string.length;
+    var sub = getText(word).substr(0, len);
+    return string.toUpperCase() === sub.toUpperCase();
+  }
+
+  function addMatches(result, search, wordlist, formatter) {
+    if (isArray(wordlist)) {
+      for (var i = 0; i < wordlist.length; i++)
+        if (match(search, wordlist[i])) result.push(formatter(wordlist[i]))
+    } else {
+      for (var word in wordlist) if (wordlist.hasOwnProperty(word)) {
+        var val = wordlist[word]
+        if (!val || val === true)
+          val = word
+        else
+          val = val.displayText ? {text: val.text, displayText: val.displayText} : val.text
+        if (match(search, val)) result.push(formatter(val))
+      }
+    }
+  }
+
+  function cleanName(name) {
+    // Get rid name from identifierQuote and preceding dot(.)
+    if (name.charAt(0) == ".") {
+      name = name.substr(1);
+    }
+    // replace doublicated identifierQuotes with single identifierQuotes
+    // and remove single identifierQuotes
+    var nameParts = name.split(identifierQuote+identifierQuote);
+    for (var i = 0; i < nameParts.length; i++)
+      nameParts[i] = nameParts[i].replace(new RegExp(identifierQuote,"g"), "");
+    return nameParts.join(identifierQuote);
+  }
+
+  function insertIdentifierQuotes(name) {
+    var nameParts = getText(name).split(".");
+    for (var i = 0; i < nameParts.length; i++)
+      nameParts[i] = identifierQuote +
+        // doublicate identifierQuotes
+        nameParts[i].replace(new RegExp(identifierQuote,"g"), identifierQuote+identifierQuote) +
+        identifierQuote;
+    var escaped = nameParts.join(".");
+    if (typeof name == "string") return escaped;
+    name = shallowClone(name);
+    name.text = escaped;
+    return name;
+  }
+
+  function nameCompletion(cur, token, result, editor) {
+    // Try to complete table, column names and return start position of completion
+    var useIdentifierQuotes = false;
+    var nameParts = [];
+    var start = token.start;
+    var cont = true;
+    while (cont) {
+      cont = (token.string.charAt(0) == ".");
+      useIdentifierQuotes = useIdentifierQuotes || (token.string.charAt(0) == identifierQuote);
+
+      start = token.start;
+      nameParts.unshift(cleanName(token.string));
+
+      token = editor.getTokenAt(Pos(cur.line, token.start));
+      if (token.string == ".") {
+        cont = true;
+        token = editor.getTokenAt(Pos(cur.line, token.start));
+      }
+    }
+
+    // Try to complete table names
+    var string = nameParts.join(".");
+    addMatches(result, string, tables, function(w) {
+      return useIdentifierQuotes ? insertIdentifierQuotes(w) : w;
+    });
+
+    // Try to complete columns from defaultTable
+    addMatches(result, string, defaultTable, function(w) {
+      return useIdentifierQuotes ? insertIdentifierQuotes(w) : w;
+    });
+
+    // Try to complete columns
+    string = nameParts.pop();
+    var table = nameParts.join(".");
+
+    var alias = false;
+    var aliasTable = table;
+    // Check if table is available. If not, find table by Alias
+    if (!getTable(table)) {
+      var oldTable = table;
+      table = findTableByAlias(table, editor);
+      if (table !== oldTable) alias = true;
+    }
+
+    var columns = getTable(table);
+    if (columns && columns.columns)
+      columns = columns.columns;
+
+    if (columns) {
+      addMatches(result, string, columns, function(w) {
+        var tableInsert = table;
+        if (alias == true) tableInsert = aliasTable;
+        if (typeof w == "string") {
+          w = tableInsert + "." + w;
+        } else {
+          w = shallowClone(w);
+          w.text = tableInsert + "." + w.text;
+        }
+        return useIdentifierQuotes ? insertIdentifierQuotes(w) : w;
+      });
+    }
+
+    return start;
+  }
+
+  function eachWord(lineText, f) {
+    var words = lineText.split(/\s+/)
+    for (var i = 0; i < words.length; i++)
+      if (words[i]) f(words[i].replace(/[,;]/g, ''))
+  }
+
+  function findTableByAlias(alias, editor) {
+    var doc = editor.doc;
+    var fullQuery = doc.getValue();
+    var aliasUpperCase = alias.toUpperCase();
+    var previousWord = "";
+    var table = "";
+    var separator = [];
+    var validRange = {
+      start: Pos(0, 0),
+      end: Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).length)
+    };
+
+    //add separator
+    var indexOfSeparator = fullQuery.indexOf(CONS.QUERY_DIV);
+    while(indexOfSeparator != -1) {
+      separator.push(doc.posFromIndex(indexOfSeparator));
+      indexOfSeparator = fullQuery.indexOf(CONS.QUERY_DIV, indexOfSeparator+1);
+    }
+    separator.unshift(Pos(0, 0));
+    separator.push(Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).text.length));
+
+    //find valid range
+    var prevItem = null;
+    var current = editor.getCursor()
+    for (var i = 0; i < separator.length; i++) {
+      if ((prevItem == null || cmpPos(current, prevItem) > 0) && cmpPos(current, separator[i]) <= 0) {
+        validRange = {start: prevItem, end: separator[i]};
+        break;
+      }
+      prevItem = separator[i];
+    }
+
+    if (validRange.start) {
+      var query = doc.getRange(validRange.start, validRange.end, false);
+
+      for (var i = 0; i < query.length; i++) {
+        var lineText = query[i];
+        eachWord(lineText, function(word) {
+          var wordUpperCase = word.toUpperCase();
+          if (wordUpperCase === aliasUpperCase && getTable(previousWord))
+            table = previousWord;
+          if (wordUpperCase !== CONS.ALIAS_KEYWORD)
+            previousWord = word;
+        });
+        if (table) break;
+      }
+    }
+    return table;
+  }
+
+  CodeMirror.registerHelper("hint", "sql", function(editor, options) {
+    tables = parseTables(options && options.tables)
+    var defaultTableName = options && options.defaultTable;
+    var disableKeywords = options && options.disableKeywords;
+    defaultTable = defaultTableName && getTable(defaultTableName);
+    keywords = getKeywords(editor);
+    identifierQuote = getIdentifierQuote(editor);
+
+    if (defaultTableName && !defaultTable)
+      defaultTable = findTableByAlias(defaultTableName, editor);
+
+    defaultTable = defaultTable || [];
+
+    if (defaultTable.columns)
+      defaultTable = defaultTable.columns;
+
+    var cur = editor.getCursor();
+    var result = [];
+    var token = editor.getTokenAt(cur), start, end, search;
+    if (token.end > cur.ch) {
+      token.end = cur.ch;
+      token.string = token.string.slice(0, cur.ch - token.start);
+    }
+
+    if (token.string.match(/^[.`"'\w@][\w$#]*$/g)) {
+      search = token.string;
+      start = token.start;
+      end = token.end;
+    } else {
+      start = end = cur.ch;
+      search = "";
+    }
+    if (search.charAt(0) == "." || search.charAt(0) == identifierQuote) {
+      start = nameCompletion(cur, token, result, editor);
+    } else {
+      var objectOrClass = function(w, className) {
+        if (typeof w === "object") {
+          w.className = className;
+        } else {
+          w = { text: w, className: className };
+        }
+        return w;
+      };
+    addMatches(result, search, defaultTable, function(w) {
+        return objectOrClass(w, "CodeMirror-hint-table CodeMirror-hint-default-table");
+    });
+    addMatches(
+        result,
+        search,
+        tables, function(w) {
+          return objectOrClass(w, "CodeMirror-hint-table");
+        }
+    );
+    if (!disableKeywords)
+      addMatches(result, search, keywords, function(w) {
+          return objectOrClass(w.toUpperCase(), "CodeMirror-hint-keyword");
+      });
+  }
+
+    return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};
+  });
+});

webbuild/html/scripts/codemirror/addon/hint/xml-hint.js

@@ -0,0 +1,132 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+
+  function matches(hint, typed, matchInMiddle) {
+    if (matchInMiddle) return hint.indexOf(typed) >= 0;
+    else return hint.lastIndexOf(typed, 0) == 0;
+  }
+
+  function getHints(cm, options) {
+    var tags = options && options.schemaInfo;
+    var quote = (options && options.quoteChar) || '"';
+    var matchInMiddle = options && options.matchInMiddle;
+    if (!tags) return;
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    if (token.end > cur.ch) {
+      token.end = cur.ch;
+      token.string = token.string.slice(0, cur.ch - token.start);
+    }
+    var inner = CodeMirror.innerMode(cm.getMode(), token.state);
+    if (!inner.mode.xmlCurrentTag) return
+    var result = [], replaceToken = false, prefix;
+    var tag = /\btag\b/.test(token.type) && !/>$/.test(token.string);
+    var tagName = tag && /^\w/.test(token.string), tagStart;
+
+    if (tagName) {
+      var before = cm.getLine(cur.line).slice(Math.max(0, token.start - 2), token.start);
+      var tagType = /<\/$/.test(before) ? "close" : /<$/.test(before) ? "open" : null;
+      if (tagType) tagStart = token.start - (tagType == "close" ? 2 : 1);
+    } else if (tag && token.string == "<") {
+      tagType = "open";
+    } else if (tag && token.string == "</") {
+      tagType = "close";
+    }
+
+    var tagInfo = inner.mode.xmlCurrentTag(inner.state)
+    if (!tag && !tagInfo || tagType) {
+      if (tagName)
+        prefix = token.string;
+      replaceToken = tagType;
+      var context = inner.mode.xmlCurrentContext ? inner.mode.xmlCurrentContext(inner.state) : []
+      var inner = context.length && context[context.length - 1]
+      var curTag = inner && tags[inner]
+      var childList = inner ? curTag && curTag.children : tags["!top"];
+      if (childList && tagType != "close") {
+        for (var i = 0; i < childList.length; ++i) if (!prefix || matches(childList[i], prefix, matchInMiddle))
+          result.push("<" + childList[i]);
+      } else if (tagType != "close") {
+        for (var name in tags)
+          if (tags.hasOwnProperty(name) && name != "!top" && name != "!attrs" && (!prefix || matches(name, prefix, matchInMiddle)))
+            result.push("<" + name);
+      }
+      if (inner && (!prefix || tagType == "close" && matches(inner, prefix, matchInMiddle)))
+        result.push("</" + inner + ">");
+    } else {
+      // Attribute completion
+      var curTag = tagInfo && tags[tagInfo.name], attrs = curTag && curTag.attrs;
+      var globalAttrs = tags["!attrs"];
+      if (!attrs && !globalAttrs) return;
+      if (!attrs) {
+        attrs = globalAttrs;
+      } else if (globalAttrs) { // Combine tag-local and global attributes
+        var set = {};
+        for (var nm in globalAttrs) if (globalAttrs.hasOwnProperty(nm)) set[nm] = globalAttrs[nm];
+        for (var nm in attrs) if (attrs.hasOwnProperty(nm)) set[nm] = attrs[nm];
+        attrs = set;
+      }
+      if (token.type == "string" || token.string == "=") { // A value
+        var before = cm.getRange(Pos(cur.line, Math.max(0, cur.ch - 60)),
+                                 Pos(cur.line, token.type == "string" ? token.start : token.end));
+        var atName = before.match(/([^\s\u00a0=<>\"\']+)=$/), atValues;
+        if (!atName || !attrs.hasOwnProperty(atName[1]) || !(atValues = attrs[atName[1]])) return;
+        if (typeof atValues == 'function') atValues = atValues.call(this, cm); // Functions can be used to supply values for autocomplete widget
+        if (token.type == "string") {
+          prefix = token.string;
+          var n = 0;
+          if (/['"]/.test(token.string.charAt(0))) {
+            quote = token.string.charAt(0);
+            prefix = token.string.slice(1);
+            n++;
+          }
+          var len = token.string.length;
+          if (/['"]/.test(token.string.charAt(len - 1))) {
+            quote = token.string.charAt(len - 1);
+            prefix = token.string.substr(n, len - 2);
+          }
+          if (n) { // an opening quote
+            var line = cm.getLine(cur.line);
+            if (line.length > token.end && line.charAt(token.end) == quote) token.end++; // include a closing quote
+          }
+          replaceToken = true;
+        }
+        function returnHintsFromAtValues(atValues) {
+          if (atValues)
+            for (var i = 0; i < atValues.length; ++i) if (!prefix || matches(atValues[i], prefix, matchInMiddle))
+              result.push(quote + atValues[i] + quote);
+          return returnHints();
+        }
+        if (atValues && atValues.then) return atValues.then(returnHintsFromAtValues);
+        return returnHintsFromAtValues(atValues);
+      } else { // An attribute name
+        if (token.type == "attribute") {
+          prefix = token.string;
+          replaceToken = true;
+        }
+        for (var attr in attrs) if (attrs.hasOwnProperty(attr) && (!prefix || matches(attr, prefix, matchInMiddle)))
+          result.push(attr);
+      }
+    }
+    function returnHints() {
+      return {
+        list: result,
+        from: replaceToken ? Pos(cur.line, tagStart == null ? token.start : tagStart) : cur,
+        to: replaceToken ? Pos(cur.line, token.end) : cur
+      };
+    }
+    return returnHints();
+  }
+
+  CodeMirror.registerHelper("hint", "xml", getHints);
+});

webbuild/html/scripts/codemirror/addon/lint/coffeescript-lint.js

@@ -0,0 +1,47 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+// Depends on coffeelint.js from http://www.coffeelint.org/js/coffeelint.js
+
+// declare global: coffeelint
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("lint", "coffeescript", function(text) {
+  var found = [];
+  if (!window.coffeelint) {
+    if (window.console) {
+      window.console.error("Error: window.coffeelint not defined, CodeMirror CoffeeScript linting cannot run.");
+    }
+    return found;
+  }
+  var parseError = function(err) {
+    var loc = err.lineNumber;
+    found.push({from: CodeMirror.Pos(loc-1, 0),
+                to: CodeMirror.Pos(loc, 0),
+                severity: err.level,
+                message: err.message});
+  };
+  try {
+    var res = coffeelint.lint(text);
+    for(var i = 0; i < res.length; i++) {
+      parseError(res[i]);
+    }
+  } catch(e) {
+    found.push({from: CodeMirror.Pos(e.location.first_line, 0),
+                to: CodeMirror.Pos(e.location.last_line, e.location.last_column),
+                severity: 'error',
+                message: e.message});
+  }
+  return found;
+});
+
+});

webbuild/html/scripts/codemirror/addon/lint/css-lint.js

@@ -0,0 +1,40 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+// Depends on csslint.js from https://github.com/stubbornella/csslint
+
+// declare global: CSSLint
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("lint", "css", function(text, options) {
+  var found = [];
+  if (!window.CSSLint) {
+    if (window.console) {
+        window.console.error("Error: window.CSSLint not defined, CodeMirror CSS linting cannot run.");
+    }
+    return found;
+  }
+  var results = CSSLint.verify(text, options), messages = results.messages, message = null;
+  for ( var i = 0; i < messages.length; i++) {
+    message = messages[i];
+    var startLine = message.line -1, endLine = message.line -1, startCol = message.col -1, endCol = message.col;
+    found.push({
+      from: CodeMirror.Pos(startLine, startCol),
+      to: CodeMirror.Pos(endLine, endCol),
+      message: message.message,
+      severity : message.type
+    });
+  }
+  return found;
+});
+
+});

webbuild/html/scripts/codemirror/addon/lint/html-lint.js

@@ -0,0 +1,59 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+// Depends on htmlhint.js from http://htmlhint.com/js/htmlhint.js
+
+// declare global: HTMLHint
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("htmlhint"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "htmlhint"], mod);
+  else // Plain browser env
+    mod(CodeMirror, window.HTMLHint);
+})(function(CodeMirror, HTMLHint) {
+  "use strict";
+
+  var defaultRules = {
+    "tagname-lowercase": true,
+    "attr-lowercase": true,
+    "attr-value-double-quotes": true,
+    "doctype-first": false,
+    "tag-pair": true,
+    "spec-char-escape": true,
+    "id-unique": true,
+    "src-not-empty": true,
+    "attr-no-duplication": true
+  };
+
+  CodeMirror.registerHelper("lint", "html", function(text, options) {
+    var found = [];
+    if (HTMLHint && !HTMLHint.verify) {
+      if(typeof HTMLHint.default !== 'undefined') {
+        HTMLHint = HTMLHint.default;
+      } else {
+        HTMLHint = HTMLHint.HTMLHint;
+      }
+    }
+    if (!HTMLHint) HTMLHint = window.HTMLHint;
+    if (!HTMLHint) {
+      if (window.console) {
+          window.console.error("Error: HTMLHint not found, not defined on window, or not available through define/require, CodeMirror HTML linting cannot run.");
+      }
+      return found;
+    }
+    var messages = HTMLHint.verify(text, options && options.rules || defaultRules);
+    for (var i = 0; i < messages.length; i++) {
+      var message = messages[i];
+      var startLine = message.line - 1, endLine = message.line - 1, startCol = message.col - 1, endCol = message.col;
+      found.push({
+        from: CodeMirror.Pos(startLine, startCol),
+        to: CodeMirror.Pos(endLine, endCol),
+        message: message.message,
+        severity : message.type
+      });
+    }
+    return found;
+  });
+});

webbuild/html/scripts/codemirror/addon/lint/javascript-lint.js

@@ -0,0 +1,63 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+  // declare global: JSHINT
+
+  function validator(text, options) {
+    if (!window.JSHINT) {
+      if (window.console) {
+        window.console.error("Error: window.JSHINT not defined, CodeMirror JavaScript linting cannot run.");
+      }
+      return [];
+    }
+    if (!options.indent) // JSHint error.character actually is a column index, this fixes underlining on lines using tabs for indentation
+      options.indent = 1; // JSHint default value is 4
+    JSHINT(text, options, options.globals);
+    var errors = JSHINT.data().errors, result = [];
+    if (errors) parseErrors(errors, result);
+    return result;
+  }
+
+  CodeMirror.registerHelper("lint", "javascript", validator);
+
+  function parseErrors(errors, output) {
+    for ( var i = 0; i < errors.length; i++) {
+      var error = errors[i];
+      if (error) {
+        if (error.line <= 0) {
+          if (window.console) {
+            window.console.warn("Cannot display JSHint error (invalid line " + error.line + ")", error);
+          }
+          continue;
+        }
+
+        var start = error.character - 1, end = start + 1;
+        if (error.evidence) {
+          var index = error.evidence.substring(start).search(/.\b/);
+          if (index > -1) {
+            end += index;
+          }
+        }
+
+        // Convert to format expected by validation service
+        var hint = {
+          message: error.reason,
+          severity: error.code ? (error.code.startsWith('W') ? "warning" : "error") : "error",
+          from: CodeMirror.Pos(error.line - 1, start),
+          to: CodeMirror.Pos(error.line - 1, end)
+        };
+
+        output.push(hint);
+      }
+    }
+  }
+});

webbuild/html/scripts/codemirror/addon/lint/json-lint.js

@@ -0,0 +1,40 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+// Depends on jsonlint.js from https://github.com/zaach/jsonlint
+
+// declare global: jsonlint
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("lint", "json", function(text) {
+  var found = [];
+  if (!window.jsonlint) {
+    if (window.console) {
+      window.console.error("Error: window.jsonlint not defined, CodeMirror JSON linting cannot run.");
+    }
+    return found;
+  }
+  // for jsonlint's web dist jsonlint is exported as an object with a single property parser, of which parseError
+  // is a subproperty
+  var jsonlint = window.jsonlint.parser || window.jsonlint
+  jsonlint.parseError = function(str, hash) {
+    var loc = hash.loc;
+    found.push({from: CodeMirror.Pos(loc.first_line - 1, loc.first_column),
+                to: CodeMirror.Pos(loc.last_line - 1, loc.last_column),
+                message: str});
+  };
+  try { jsonlint.parse(text); }
+  catch(e) {}
+  return found;
+});
+
+});

webbuild/html/scripts/codemirror/addon/lint/lint.css

@@ -0,0 +1,71 @@
+/* The lint marker gutter */
+.CodeMirror-lint-markers {
+  width: 16px;
+}
+
+.CodeMirror-lint-tooltip {
+  background-color: #ffd;
+  border: 1px solid black;
+  border-radius: 4px 4px 4px 4px;
+  color: black;
+  font-family: monospace;
+  font-size: 10pt;
+  overflow: hidden;
+  padding: 2px 5px;
+  position: fixed;
+  white-space: pre;
+  white-space: pre-wrap;
+  z-index: 100;
+  max-width: 600px;
+  opacity: 0;
+  transition: opacity .4s;
+  -moz-transition: opacity .4s;
+  -webkit-transition: opacity .4s;
+  -o-transition: opacity .4s;
+  -ms-transition: opacity .4s;
+}
+
+.CodeMirror-lint-mark {
+  background-position: left bottom;
+  background-repeat: repeat-x;
+}
+
+.CodeMirror-lint-mark-warning {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
+}
+
+.CodeMirror-lint-mark-error {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==");
+}
+
+.CodeMirror-lint-marker {
+  background-position: center center;
+  background-repeat: no-repeat;
+  cursor: pointer;
+  display: inline-block;
+  height: 16px;
+  width: 16px;
+  vertical-align: middle;
+  position: relative;
+}
+
+.CodeMirror-lint-message {
+  padding-left: 18px;
+  background-position: top left;
+  background-repeat: no-repeat;
+}
+
+.CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=");
+}
+
+.CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=");
+}
+
+.CodeMirror-lint-marker-multiple {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC");
+  background-repeat: no-repeat;
+  background-position: right bottom;
+  width: 100%; height: 100%;
+}

webbuild/html/scripts/codemirror/addon/lint/lint.js

@@ -0,0 +1,255 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+  var GUTTER_ID = "CodeMirror-lint-markers";
+
+  function showTooltip(cm, e, content) {
+    var tt = document.createElement("div");
+    tt.className = "CodeMirror-lint-tooltip cm-s-" + cm.options.theme;
+    tt.appendChild(content.cloneNode(true));
+    if (cm.state.lint.options.selfContain)
+      cm.getWrapperElement().appendChild(tt);
+    else
+      document.body.appendChild(tt);
+
+    function position(e) {
+      if (!tt.parentNode) return CodeMirror.off(document, "mousemove", position);
+      tt.style.top = Math.max(0, e.clientY - tt.offsetHeight - 5) + "px";
+      tt.style.left = (e.clientX + 5) + "px";
+    }
+    CodeMirror.on(document, "mousemove", position);
+    position(e);
+    if (tt.style.opacity != null) tt.style.opacity = 1;
+    return tt;
+  }
+  function rm(elt) {
+    if (elt.parentNode) elt.parentNode.removeChild(elt);
+  }
+  function hideTooltip(tt) {
+    if (!tt.parentNode) return;
+    if (tt.style.opacity == null) rm(tt);
+    tt.style.opacity = 0;
+    setTimeout(function() { rm(tt); }, 600);
+  }
+
+  function showTooltipFor(cm, e, content, node) {
+    var tooltip = showTooltip(cm, e, content);
+    function hide() {
+      CodeMirror.off(node, "mouseout", hide);
+      if (tooltip) { hideTooltip(tooltip); tooltip = null; }
+    }
+    var poll = setInterval(function() {
+      if (tooltip) for (var n = node;; n = n.parentNode) {
+        if (n && n.nodeType == 11) n = n.host;
+        if (n == document.body) return;
+        if (!n) { hide(); break; }
+      }
+      if (!tooltip) return clearInterval(poll);
+    }, 400);
+    CodeMirror.on(node, "mouseout", hide);
+  }
+
+  function LintState(cm, options, hasGutter) {
+    this.marked = [];
+    this.options = options;
+    this.timeout = null;
+    this.hasGutter = hasGutter;
+    this.onMouseOver = function(e) { onMouseOver(cm, e); };
+    this.waitingFor = 0
+  }
+
+  function parseOptions(_cm, options) {
+    if (options instanceof Function) return {getAnnotations: options};
+    if (!options || options === true) options = {};
+    return options;
+  }
+
+  function clearMarks(cm) {
+    var state = cm.state.lint;
+    if (state.hasGutter) cm.clearGutter(GUTTER_ID);
+    for (var i = 0; i < state.marked.length; ++i)
+      state.marked[i].clear();
+    state.marked.length = 0;
+  }
+
+  function makeMarker(cm, labels, severity, multiple, tooltips) {
+    var marker = document.createElement("div"), inner = marker;
+    marker.className = "CodeMirror-lint-marker CodeMirror-lint-marker-" + severity;
+    if (multiple) {
+      inner = marker.appendChild(document.createElement("div"));
+      inner.className = "CodeMirror-lint-marker CodeMirror-lint-marker-multiple";
+    }
+
+    if (tooltips != false) CodeMirror.on(inner, "mouseover", function(e) {
+      showTooltipFor(cm, e, labels, inner);
+    });
+
+    return marker;
+  }
+
+  function getMaxSeverity(a, b) {
+    if (a == "error") return a;
+    else return b;
+  }
+
+  function groupByLine(annotations) {
+    var lines = [];
+    for (var i = 0; i < annotations.length; ++i) {
+      var ann = annotations[i], line = ann.from.line;
+      (lines[line] || (lines[line] = [])).push(ann);
+    }
+    return lines;
+  }
+
+  function annotationTooltip(ann) {
+    var severity = ann.severity;
+    if (!severity) severity = "error";
+    var tip = document.createElement("div");
+    tip.className = "CodeMirror-lint-message CodeMirror-lint-message-" + severity;
+    if (typeof ann.messageHTML != 'undefined') {
+      tip.innerHTML = ann.messageHTML;
+    } else {
+      tip.appendChild(document.createTextNode(ann.message));
+    }
+    return tip;
+  }
+
+  function lintAsync(cm, getAnnotations, passOptions) {
+    var state = cm.state.lint
+    var id = ++state.waitingFor
+    function abort() {
+      id = -1
+      cm.off("change", abort)
+    }
+    cm.on("change", abort)
+    getAnnotations(cm.getValue(), function(annotations, arg2) {
+      cm.off("change", abort)
+      if (state.waitingFor != id) return
+      if (arg2 && annotations instanceof CodeMirror) annotations = arg2
+      cm.operation(function() {updateLinting(cm, annotations)})
+    }, passOptions, cm);
+  }
+
+  function startLinting(cm) {
+    var state = cm.state.lint, options = state.options;
+    /*
+     * Passing rules in `options` property prevents JSHint (and other linters) from complaining
+     * about unrecognized rules like `onUpdateLinting`, `delay`, `lintOnChange`, etc.
+     */
+    var passOptions = options.options || options;
+    var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint");
+    if (!getAnnotations) return;
+    if (options.async || getAnnotations.async) {
+      lintAsync(cm, getAnnotations, passOptions)
+    } else {
+      var annotations = getAnnotations(cm.getValue(), passOptions, cm);
+      if (!annotations) return;
+      if (annotations.then) annotations.then(function(issues) {
+        cm.operation(function() {updateLinting(cm, issues)})
+      });
+      else cm.operation(function() {updateLinting(cm, annotations)})
+    }
+  }
+
+  function updateLinting(cm, annotationsNotSorted) {
+    clearMarks(cm);
+    var state = cm.state.lint, options = state.options;
+
+    var annotations = groupByLine(annotationsNotSorted);
+
+    for (var line = 0; line < annotations.length; ++line) {
+      var anns = annotations[line];
+      if (!anns) continue;
+
+      var maxSeverity = null;
+      var tipLabel = state.hasGutter && document.createDocumentFragment();
+
+      for (var i = 0; i < anns.length; ++i) {
+        var ann = anns[i];
+        var severity = ann.severity;
+        if (!severity) severity = "error";
+        maxSeverity = getMaxSeverity(maxSeverity, severity);
+
+        if (options.formatAnnotation) ann = options.formatAnnotation(ann);
+        if (state.hasGutter) tipLabel.appendChild(annotationTooltip(ann));
+
+        if (ann.to) state.marked.push(cm.markText(ann.from, ann.to, {
+          className: "CodeMirror-lint-mark CodeMirror-lint-mark-" + severity,
+          __annotation: ann
+        }));
+      }
+
+      if (state.hasGutter)
+        cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, anns.length > 1,
+                                                       state.options.tooltips));
+    }
+    if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
+  }
+
+  function onChange(cm) {
+    var state = cm.state.lint;
+    if (!state) return;
+    clearTimeout(state.timeout);
+    state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
+  }
+
+  function popupTooltips(cm, annotations, e) {
+    var target = e.target || e.srcElement;
+    var tooltip = document.createDocumentFragment();
+    for (var i = 0; i < annotations.length; i++) {
+      var ann = annotations[i];
+      tooltip.appendChild(annotationTooltip(ann));
+    }
+    showTooltipFor(cm, e, tooltip, target);
+  }
+
+  function onMouseOver(cm, e) {
+    var target = e.target || e.srcElement;
+    if (!/\bCodeMirror-lint-mark-/.test(target.className)) return;
+    var box = target.getBoundingClientRect(), x = (box.left + box.right) / 2, y = (box.top + box.bottom) / 2;
+    var spans = cm.findMarksAt(cm.coordsChar({left: x, top: y}, "client"));
+
+    var annotations = [];
+    for (var i = 0; i < spans.length; ++i) {
+      var ann = spans[i].__annotation;
+      if (ann) annotations.push(ann);
+    }
+    if (annotations.length) popupTooltips(cm, annotations, e);
+  }
+
+  CodeMirror.defineOption("lint", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      clearMarks(cm);
+      if (cm.state.lint.options.lintOnChange !== false)
+        cm.off("change", onChange);
+      CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver);
+      clearTimeout(cm.state.lint.timeout);
+      delete cm.state.lint;
+    }
+
+    if (val) {
+      var gutters = cm.getOption("gutters"), hasLintGutter = false;
+      for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
+      var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
+      if (state.options.lintOnChange !== false)
+        cm.on("change", onChange);
+      if (state.options.tooltips != false && state.options.tooltips != "gutter")
+        CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
+
+      startLinting(cm);
+    }
+  });
+
+  CodeMirror.defineExtension("performLint", function() {
+    if (this.state.lint) startLinting(this);
+  });
+});

webbuild/html/scripts/codemirror/addon/lint/yaml-lint.js

@@ -0,0 +1,41 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+// Depends on js-yaml.js from https://github.com/nodeca/js-yaml
+
+// declare global: jsyaml
+
+CodeMirror.registerHelper("lint", "yaml", function(text) {
+  var found = [];
+  if (!window.jsyaml) {
+    if (window.console) {
+      window.console.error("Error: window.jsyaml not defined, CodeMirror YAML linting cannot run.");
+    }
+    return found;
+  }
+  try { jsyaml.loadAll(text); }
+  catch(e) {
+      var loc = e.mark,
+          // js-yaml YAMLException doesn't always provide an accurate lineno
+          // e.g., when there are multiple yaml docs
+          // ---
+          // ---
+          // foo:bar
+          from = loc ? CodeMirror.Pos(loc.line, loc.column) : CodeMirror.Pos(0, 0),
+          to = from;
+      found.push({ from: from, to: to, message: e.message });
+  }
+  return found;
+});
+
+});

webbuild/html/scripts/codemirror/addon/merge/merge.css

@@ -0,0 +1,119 @@
+.CodeMirror-merge {
+  position: relative;
+  border: 1px solid #ddd;
+  white-space: pre;
+}
+
+.CodeMirror-merge, .CodeMirror-merge .CodeMirror {
+  height: 350px;
+}
+
+.CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 47%; }
+.CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 6%; }
+.CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
+.CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
+
+.CodeMirror-merge-pane {
+  display: inline-block;
+  white-space: normal;
+  vertical-align: top;
+}
+.CodeMirror-merge-pane-rightmost {
+  position: absolute;
+  right: 0px;
+  z-index: 1;
+}
+
+.CodeMirror-merge-gap {
+  z-index: 2;
+  display: inline-block;
+  height: 100%;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  overflow: hidden;
+  border-left: 1px solid #ddd;
+  border-right: 1px solid #ddd;
+  position: relative;
+  background: #f8f8f8;
+}
+
+.CodeMirror-merge-scrolllock-wrap {
+  position: absolute;
+  bottom: 0; left: 50%;
+}
+.CodeMirror-merge-scrolllock {
+  position: relative;
+  left: -50%;
+  cursor: pointer;
+  color: #555;
+  line-height: 1;
+}
+.CodeMirror-merge-scrolllock:after {
+  content: "\21db\00a0\00a0\21da";
+}
+.CodeMirror-merge-scrolllock.CodeMirror-merge-scrolllock-enabled:after {
+  content: "\21db\21da";
+}
+
+.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
+  position: absolute;
+  left: 0; top: 0;
+  right: 0; bottom: 0;
+  line-height: 1;
+}
+
+.CodeMirror-merge-copy {
+  position: absolute;
+  cursor: pointer;
+  color: #44c;
+  z-index: 3;
+}
+
+.CodeMirror-merge-copy-reverse {
+  position: absolute;
+  cursor: pointer;
+  color: #44c;
+}
+
+.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
+.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
+
+.CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
+  background-position: bottom left;
+  background-repeat: repeat-x;
+}
+
+.CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
+  background-position: bottom left;
+  background-repeat: repeat-x;
+}
+
+.CodeMirror-merge-r-chunk { background: #ffffe0; }
+.CodeMirror-merge-r-chunk-start { border-top: 1px solid #ee8; }
+.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #ee8; }
+.CodeMirror-merge-r-connect { fill: #ffffe0; stroke: #ee8; stroke-width: 1px; }
+
+.CodeMirror-merge-l-chunk { background: #eef; }
+.CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
+.CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
+.CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
+
+.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
+.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
+.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
+
+.CodeMirror-merge-collapsed-widget:before {
+  content: "(...)";
+}
+.CodeMirror-merge-collapsed-widget {
+  cursor: pointer;
+  color: #88b;
+  background: #eef;
+  border: 1px solid #ddf;
+  font-size: 90%;
+  padding: 0 3px;
+  border-radius: 4px;
+}
+.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { display: none; }