From ced497545e76278fead636f59c9d3c44c38f59ff Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Mon, 17 Oct 2016 12:57:27 +0200
Subject: [PATCH] webbuild: support for different archs in downloads and some
 fixes

---
 webbuild/webbuild-cgi               | 42 ++++++++++++++++++++++-------
 webbuild/webbuild-functions-private | 20 ++++++++------
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/webbuild/webbuild-cgi b/webbuild/webbuild-cgi
index 9b6e777..01a0326 100755
--- a/webbuild/webbuild-cgi
+++ b/webbuild/webbuild-cgi
@@ -527,9 +527,17 @@ if [ "$REQUEST" = "rpmmanager" ]; then
    echo -n "<option value=\"RPMS\" $SELECTED>Local *.${AUTOPORT_ARCH[$ENVIRONMENT]}.rpm</option>"
    [ "$RPMMANAGERDIR" = "RPMSNOARCH" ] && SELECTED="selected=selected" || SELECTED=
    echo -n "<option value=\"RPMSNOARCH\" $SELECTED>Local *.noarch.rpm</option>"
+   if [ "${AUTOPORT_ARCH[$ENVIRONMENT]}" == "x86_64" ]; then
+      [ "$RPMMANAGERDIR" = "RPMS_i586" ] && SELECTED="selected=selected" || SELECTED=
+      echo -n "<option value=\"RPMS_i586\" $SELECTED>Local *.i586.rpm</option>"
+   fi
+   if [ "${AUTOPORT_ARCH[$ENVIRONMENT]}" == "x86_64" -o "${AUTOPORT_ARCH[$ENVIRONMENT]}" == "i586" ]; then
+      [ "$RPMMANAGERDIR" = "RPMS_arm" ] && SELECTED="selected=selected" || SELECTED=
+      echo -n "<option value=\"RPMS_arm\" $SELECTED>Local *.arm.rpm</option>"
+   fi
    [ "$RPMMANAGERDIR" = "SRPMS" ] && SELECTED="selected=selected" || SELECTED=
    echo -n "<option value=\"SRPMS\" $SELECTED>Local *.src.rpm</option>"
-   if [ -e $local_ftp/$REPOSITORY ]; then
+   if [ "$REPOSITORY" -a -e $local_ftp/$REPOSITORY ]; then
       [ "$RPMMANAGERDIR" = "REP_RPMS" ] && SELECTED="selected=selected" || SELECTED=
       echo -n "<option value=\"REP_RPMS\" $SELECTED>$REPOSITORY *.${AUTOPORT_ARCH[$ENVIRONMENT]}.rpm</option>"
       [ "$RPMMANAGERDIR" = "REP_RPMSNOARCH" ] && SELECTED="selected=selected" || SELECTED=
@@ -1421,17 +1429,22 @@ if [ "$MAINTAINERMODE" != "true" ]; then
          echo -n "`cgi_encodevar "</b> job in current environment?"`\""
          echo -n "); class=redbutton $DISABLED>"
          # autodist send
-         [ ! "$USER_ALLREPOSITORIES" ] && DISABLED="disabled=disabled" || DISABLED=
+         if [ "$SPECVAR_CHECK_NOAUTOBUILDREQ" ]; then
+            HREFADD="disabled=disabled title=\"WARNING: fix specfile build requirements before you can send the package\""
+        else
+            HREFADD=
+        fi
          echo -n "<input type=button value=\"send\" onclick="
          echo -n "p=getCheckedValuesByName('autodistpkgscheckbox');ajax_getvalues(\""
          echo -n "AUTODISTFORCE=\"+getElementById('rpmforce').checked+\"&"
          echo -n "AUTODISTARCH=\"+getSelectedValueById('rpmbuildarch')+\"&"
          echo -n "AUTODISTJOB=\"+getSelectedValueById('autodistjobs')+\"&"
          echo -n "AUTODISTPKGS=\"+encodeURIComponent(p)+\"&"
+         echo -n "SENDRECREATESRPM=true&"
          echo -n "SENDREPOSITORY=\"+getSelectedValueById('sendrepository')+\"&"
          echo -n "ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=autodistsend\""
          echo -n ",\"`cgi_encodevar "Send selected packages for <b>"`\"+getSelectedValueById('autodistjobs')+\"`cgi_encodevar "</b> job to <b>"`\"+"
-         echo -n "getSelectedValueById('sendrepository')+\"`cgi_encodevar "</b>?"`\"); class=redbutton $DISABLED>"
+         echo -n "getSelectedValueById('sendrepository')+\"`cgi_encodevar "</b>?"`\"); class=redbutton $HREFADD>"
          # autodist schedule
          echo -n "<br>New version:<input type=text id=autodistversion value=\"\" style=\"width:20%\"> "
          echo -n "<input type=button value=\"schedule job\" onclick="
@@ -1736,16 +1749,26 @@ case $REQUEST in
                       ;;
    "autodistsend") [ "$AUTODISTFORCE" = "true" ] && AUTODISTADD="--force" || AUTODISTADD=
                       autodistjobs=
+                      RET=0
                       if [ "$AUTODISTPKGS" ]; then
                          for p in $AUTODISTPKGS; do
                             autodistjobs="$autodistjobs $AUTODISTJOB/$p"
+                            if [ "$SENDRECREATESRPM" = "true" ]; then
+                               $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "$p" "rpmbuild -bs \
+                                   --define=\"_topdir $SPECVAR_WORKINGHOME/RPM\" \
+                                   $p.spec $RPMFORCEADD"
+                               RET=$?
+                               [ $RET -eq 0 ] || break
+                            fi
                          done
                       else
                          autodistjobs="$AUTODISTJOB"
                       fi
-                      $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist -v -s $autodistjobs --repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]} --server $SENDREPOSITORY --arch $AUTODISTARCH --user $USER $AUTODISTADD -- --colors web"
-                      RET=$?
-                      [ $RET -eq 0 ] && social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"sent <b>$AUTODISTPKGS $SPECVAR_Version-$SPECVAR_Release</b> from <i>`print_environment_descr $ENVIRONMENT`</i> to <b>$SENDREPOSITORY</b>\" STIME=`date +%s`"
+                      if [ $RET -eq 0 ]; then
+                         $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist -v -s $autodistjobs --repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]} --server $SENDREPOSITORY --arch $AUTODISTARCH --user $USER $AUTODISTADD -- --colors web"
+                         RET=$?
+                         [ $RET -eq 0 ] && social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"sent <b>$AUTODISTPKGS $SPECVAR_Version-$SPECVAR_Release</b> from <i>`print_environment_descr $ENVIRONMENT`</i> to <b>$SENDREPOSITORY</b>\" STIME=`date +%s`"
+                      fi
                       ;;
    "autoport") if [ "$AUTOPORTPACKAGE" ]; then
                   if [ "$AUTOPORTRELEASEREPOSITORY" ]; then
@@ -2060,12 +2083,11 @@ $PACKAGE.spec $RPMFORCEADD && $AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOS
    "consolecmd") if [ ! "$SPECVAR_BUILDDIR" ]; then
                        echo "ERROR: BUILDDIR is undefined"
                        RET=1
-                    else
+                 else
                        $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd $SPECVAR_RPMBUILDDIR/$SPECVAR_BUILDDIR && bash -c '$CONSOLECMD'"
                        RET=$?
-                       [ $RET -eq 0 ] && RET=-1
-                    fi
-                    ;;
+                 fi
+                 ;;
    "configurehelp") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd $SPECVAR_RPMBUILDDIR/$SPECVAR_BUILDDIR && ./configure --help || ./waf configure --help"
                     RET=$?
                     [ $RET -eq 0 ] && RET=-1 ;;
diff --git a/webbuild/webbuild-functions-private b/webbuild/webbuild-functions-private
index 50dfa40..cf77eb8 100644
--- a/webbuild/webbuild-functions-private
+++ b/webbuild/webbuild-functions-private
@@ -163,7 +163,7 @@ function print_editorcontrols() {
 
    echo -n "<editcontrols><![CDATA["
    # specfile save
-   echo -n "<div style=\"width:100%;overflow:hidden;\"><span style=\"float:left\">"
+   echo -n "<div style=\"width:100%;overflow:hidden;\"><span style=\"width:100%;display:block\">"
    echo -n "<input type=button id=savebutton value=\"save\" onclick="
    echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
    echo -n "REQUEST=savespec&SENDREPOSITORY=$SENDREPOSITORY&SPECTEXT=\"+encodeURIComponent(editor.getValue()));"
@@ -242,7 +242,7 @@ function print_editorcontrols() {
    echo -n "<label style=\"color:red;padding:0;\"><input type=checkbox id=\"sendrecreatesrpm\" value=\"force\">recreate SRPM</label>"
 
    # specfile update
-   echo -n "<div style=\"width:100%;overflow:hidden;\"><span style=\"float:left\">"
+   echo -n "<div style=\"width:100%;overflow:hidden;\"><span style=\"display:flex\">"
    echo -n "<input type=button id=updatespecbutton value=\"update\" onclick="
    echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
    echo -n "REQUEST=updatespec&UPDATESPECVERSION=\"+getElementById('updatespecversion').value+\"&"
@@ -250,12 +250,10 @@ function print_editorcontrols() {
    echo -n "DEBUG=\"+getElementById('debug').checked+\"&"
    echo -n "REBUILDSPECCHANGELOG=\"+encodeURIComponent(getElementById('rebuildspecchangelog').value)+\"&"
    echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue()));>"
-   echo -n " (automatic or specify new version:<input type=text id=updatespecversion value=\"\" size=\"10\">"
-   echo -n " or new release changelog:"
-   echo -n "</span><span style=\"display:block;float:right\">)</span>"
-   echo -n "<span style=\"display:block;overflow:hidden;padding-right:5px;\">"
-   echo -n "<input type=text id=rebuildspecchangelog value=\"$REBUILDSPECCHANGELOG\" style=\"width:100%\">"
-   echo -n "</span></div>"
+   echo -n "&nbsp;<label>to new version:</label><input type=text id=updatespecversion value=\"\" size=\"10\">"
+   echo -n "&nbsp;<label>or to new release with changelog:</label>"
+   echo -n "<input style=\"flex:1\" type=text id=rebuildspecchangelog value=\"$REBUILDSPECCHANGELOG\">"
+   echo -n "</div>"
    # close tag
    echo -n "]]></editcontrols>"
 
@@ -324,6 +322,12 @@ function resolve_rpmmanagerdir() {
       RPMSNOARCH) rpmmanagerdir=../RPMS/noarch
               rpmmanagermask="*.noarch.rpm"
               rpmmanagermode=environment ;;
+      RPMS_arm) rpmmanagerdir=../RPMS/arm
+                rpmmanagermask="*.arm.rpm"
+                rpmmanagermode=environment ;;
+      RPMS_i586) rpmmanagerdir=../RPMS/i586
+                rpmmanagermask="*.i586.rpm"
+                rpmmanagermode=environment ;;
       *) rpmmanagerdir=../RPMS/$RPMMANAGERARCH
          rpmmanagermask="*.$RPMMANAGERARCH.rpm"
          rpmmanagermode=environment ;;