Release 0.9.22

Added forgotten autodist-tmpfilesd new file

Makefile

@@ -17,7 +17,7 @@ mandir = ${prefix}/usr/share/man
 sysconfigdir= ${sysconfdir}/sysconfig
 configdir = ${sysconfdir}/autodist
 localstatedir= /var
-piddir= ${localstatedir}/run/autodist
+piddir= /run/autodist
 cgidir = ${localstatedir}/www/cgi-bin
 htmldir = ${localstatedir}/www/html
 
@@ -62,9 +62,9 @@ install-dirs:
 	@$(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)$(libexecdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(localstatedir)/webbuild/{cache,home,notes,tmp,users}
+	@$(INSTALL_DIR) $(DESTDIR)$(prefix)/lib/tmpfiles.d/
 
 install-programs:
 	@$(INSTALL_SCRIPT) autodist $(DESTDIR)$(bindir)/autodist
@@ -101,6 +101,7 @@ install-data:
 	@$(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
 	@touch $(DESTDIR)$(pck_statedir)/template/autoupdate/auto.success
 	@touch $(DESTDIR)$(pck_statedir)/template/autoupdate/auto.skip
 

VERSION

@@ -1 +1 @@
-VERSION = 0.9.19
+VERSION = 0.9.22

autodist

@@ -5,7 +5,7 @@
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=0.9.19
+VERSION=0.9.21
 me=(${0##*/} $VERSION "Sat Aug 20 2010")
 exec 3>`readlink /proc/self/fd/0`
 
@@ -94,7 +94,7 @@ 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

autodist-cgi

@@ -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>"
@@ -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
@@ -218,7 +218,7 @@ _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;">
 _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

autodist-tmpfilesd

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

autoport

@@ -4,7 +4,7 @@
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=0.9.19
+VERSION=0.9.21
 
 BASE_ARCH=i586
 BASE_REPOSITORY=devel

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
+SITE_BASE_URL=http://www.openmamba.org
+REPS_BASE_URL=${SITE_BASE_URL}/pub/openmamba
 LOCAL_REPS_BASE_DIR=/var/ftp/pub/openmamba
 SEND_SERVER=devel-autodist
 #WEBBUILD_URL=http://localhost/cgi-bin/webbuild

etc/cron.daily/40-autodist-cleanold

@@ -1,14 +1,23 @@
 #!/bin/bash
 [ -e /etc/sysconfig/autoport ] && . /etc/sysconfig/autoport
 
+RPMS_CTIME_OLD="+14"
+BUILD_CTIME_OLD="+14"
+SOURCES_CTIME_OLD="+60"
+SRPMS_CTIME_OLD="+30"
+TMP_CTIME_OLD="+2"
+
 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 {} \;
+   [ "$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 {} \;
+   [ -e $dir/RPM/RPMS/$arch/ ] && find $dir/RPM/RPMS/$arch/ -mindepth 1 -maxdepth 1 -ctime ${RPMS_CTIME_OLD} -exec rm -f {} \;
+   [ -e $dir/RPM/RPMS/noarch/ ] && find $dir/RPM/RPMS/noarch/ -mindepth 1 -maxdepth 1 -ctime ${RPMS_CTIME_OLD} -exec rm -f {} \;
+   [ -e $dir/RPM/BUILD/ ] && find $dir/RPM/BUILD/ -mindepth 1 -maxdepth 1 -ctime ${BUILD_CTIME_OLD} -exec rm -rf {} \;
+   [ -e $dir/RPM/SOURCES/ ] && find $dir/RPM/SOURCES/ -mindepth 1 -maxdepth 1 -ctime ${SOURCES_CTIME_OLD} -a ! -name "*.patch" -exec rm -rf {} \;
+   [ -e $dir/RPM/SRPMS/ ] && find $dir/RPM/SRPMS/ -mindepth 1 -maxdepth 1 -ctime ${SRPMS_CTIME_OLD} -exec rm -f {} \;
 }
 
 for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
@@ -18,16 +27,16 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
       [ -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 {} \;
+         find /var/autoport/$a/var/tmp/autodist/ -mindepth 1 -maxdepth 1 -ctime ${TMP_CTIME_OLD} -exec rm -rf {} \;
+      find /var/autoport/$a/tmp/ -mindepth 1 -maxdepth 1 -ctime ${TMP_CTIME_OLD} -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 {} \;
+      find /var/autodist-tmp/ -mindepth 1 -maxdepth 1 -ctime ${TMP_CTIME_OLD} -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 {} \;
+      find /var/autodist-tmp/ -mindepth 1 -maxdepth 1 -ctime ${TMP_CTIME_OLD} -exec rm -rf {} \;
    fi
 done

etc/cron.hourly/60-autodist-update

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # autodist autoupdate hourly cron script
-# (c) 2008-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# (c) 2008-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 . /etc/autodist/config
 . /etc/sysconfig/autoport
@@ -18,7 +18,7 @@ fi
    exit 0
 }
 
-PIDFILE=/var/run/autodist/autodist.pid
+PIDFILE=/run/autodist/autodist.pid
 HOUR=`date +%H`
 [ "`uname -m`" = "x86_64" ] && HOST_IS_X86_64=1
 

etc/cron.hourly/65-autoport-native

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # openmamba-autobuild-autoport daily cron script
-# (c) 2008-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# (c) 2008-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 #. /etc/sysconfig/openmamba-central
 . /etc/sysconfig/autoport
@@ -14,7 +14,7 @@ ME=`basename $0`
    exit 0
 }
 
-PIDFILE=/var/run/autodist/autoport.pid
+PIDFILE=/run/autodist/autoport.pid
 HOUR=`date +%H`
 [ "`uname -m`" = "x86_64" ] && HOST_IS_X86_64=1
 

etc/cron.hourly/66-autoport-chroot

@@ -14,7 +14,7 @@ ME=`basename $0`
    exit 0
 }
 
-PIDFILE=/var/run/autodist/autoport.pid
+PIDFILE=/run/autodist/autoport.pid
 HOUR=`date +%H`
 [ "`uname -m`" = "x86_64" ] && HOST_IS_X86_64=1
 

webbuild/html/autobuilds.html

@@ -21,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)

webbuild/html/webbuild.html

@@ -92,6 +92,7 @@ function editorChanged() {
 
 function ajax_getvalues(request,confirm) {
   var url = "/cgi-bin/webbuild"
+  var xmlhttp;
 
   if (!user) {
      user=getCookie("webbuild-user");

webbuild/webbuild-cgi

@@ -466,8 +466,10 @@ if [ "$REQUEST" = "repsearch" ]; then
    echo -n "<output><![CDATA["
    echo -n "<hr><b>Search results for \"$REPSEARCHTEXT\":</b><div align=left class=output id=outputtop style=\"font-family:serif;color:black;background-color:#E0F2D0;\">"
 #   echo -n "<pre><!-- SCROLL -->"
-   curl -s "${WEBBUILD_DISTROQUERY_URL}?query=$REPSEARCHTEXT&search_milestone2=true&search_devel=true\
-&search_i586=true&search_x86_64=true&search_arm=true&search_sources=true&query_compact=true&replyplain=true"
+   REPSEARCHTEXT_FMT=`echo "${REPSEARCHTEXT}" | sed "s|[[:space:]]|+|g"`
+   curl -s "${WEBBUILD_DISTROQUERY_URL}?query=${REPSEARCHTEXT_FMT}&search_milestone2=true&search_milestone3=true&search_devel=true\
+&search_i586=true&search_x86_64=true&search_arm=true&search_sources=true&query_compact=true&replyplain=true" | \
+   sed "s| \(href=.\)/| \1${SITE_BASE_URL}/|g"
 #   $SUDO_WRAPPER 0 local "$USER" "" "autodist-repository search -i ${REPSEARCHTEXT/-/\-}" | \
 #      parse_search_output ${AUTOPORT_ARCH[$ENVIRONMENT]}
 #      sed "s|\(.*(source).*\)|<font color=white><b>\1</b></font>|;
@@ -650,6 +652,10 @@ echo -n "<topcontrols><![CDATA["
 # new session button
 echo -n "<input type=button id=newsessionbutton value=\"New session\" onclick="
 echo -n "window.open(document.URL);>"
+# rpm manager
+echo -n "<input type=button id=rpmmanager value=\"RPM manager\" onclick="
+echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
+echo -n "REQUEST=rpmmanager\");>"
 # expert mode checkbox
 [ "$STATE_ADVANCEDCONTROLS" ] && CHECKED="checked=checked" || CHECKED=
 echo -n " <span style=\"white-space:nowrap\">Autodist:<input type=checkbox id=\"advancedcontrols\" "
@@ -889,12 +895,12 @@ if [ "$MAINTAINERMODE" = "true" -o ! "${AUTOPORT_UPDATE[$ENVIRONMENT]}" ]; then
       #(getElementById('package').selectedIndex);>"
       echo "<option value=\"\">-- Select a SRPM package --</option>"
       SRPMBUTTONDISABLED="disabled=disabled"
-      if [ -e $local_ftp/$REPOSITORY ]; then
+      if [ "$local_ftp" -a -e $local_ftp/$REPOSITORY ]; then
          if [ $local_ftp/$REPOSITORY/SRPMS.base -nt $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY ]; then
             ls --color=none $local_ftp/$REPOSITORY/SRPMS.base/ | grep ".src.rpm$" | sort -f > $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
          fi
       else
-         curl $REPS_BASE_URL/$REPOSITORY/SRPMS.base/ | grep .src.rpm | \
+         curl -s $REPS_BASE_URL/$REPOSITORY/SRPMS.base/ | grep .src.rpm | \
             sed "s|.*\.src\.rpm\">\(.*\)</a>.*|\1|" | sort -f > $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
       fi
       while read f; do
@@ -1005,7 +1011,12 @@ fi
 if [ "$REQUEST" = "prepare" -o "$REQUEST" = "updatespec" -o "$REQUEST" = "speccreate" -o \
      "$REQUEST" = "rebuildspec" -o "$REQUEST" = "renamespec" -o "$REQUEST" = "deletespec" -o \
      "$REQUEST" = "autodistprepare" -o "$REQUEST" = "autodistupdate" -o "$REQUEST" = "addpkgnote" ]; then
-   echo -n "<output><![CDATA[<hr><b>Console output:</b><div align=left class=output id=outputbottom>"
+   if [ "$REQUEST" = "speccreate" ]; then
+      OUTPUTMODE="outputtop"
+   else
+      OUTPUTMODE="outputbottom"
+   fi
+   echo -n "<output><![CDATA[<hr><b>Console output:</b><div align=left class=output id=$OUTPUTMODE>"
    echo -n "<pre>"
    RET=255
    case $REQUEST in
@@ -1028,30 +1039,40 @@ if [ "$REQUEST" = "prepare" -o "$REQUEST" = "updatespec" -o "$REQUEST" = "speccr
                     RET=$?
                     ;;
       "speccreate") if [ "$SPECCREATEURL" -a "$PACKAGE" ]; then
-                       if [ "${SPECCREATEURL/\/}" = "$SPECCREATEURL" ]; then
-                          # local source in /SOURCES
-                          SPECCREATEURL="../SOURCES/$SPECCREATEURL"
-                       fi
-                       AUTOSPEC_CMDLINE="-n $PACKAGE -o $PACKAGE.spec"
-                       #DECODEDURL=`cgi_decodevar $SPECCREATEURL`
-                       [ "$SPECCREATETYPE" ] && AUTOSPEC_CMDLINE="$AUTOSPEC_CMDLINE -t $SPECCREATETYPE"
-                       [ "$SPECCREATEVERSION" ] && AUTOSPEC_CMDLINE="$AUTOSPEC_CMDLINE -v $SPECCREATEVERSION"
-                       [ "$SPECCREATEGITBRANCH" ] && AUTOSPEC_CMDLINE="$AUTOSPEC_CMDLINE --git-branch $SPECCREATEGITBRANCH"
-                       [ "$USER_FULLNAME" -a "$USER_EMAIL" ] && AUTOSPEC_CMDLINE="$AUTOSPEC_CMDLINE --packager-fullname=\"$USER_FULLNAME\" --packager-email=\"$USER_EMAIL\""
-                       $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "$AUTOSPEC_CMD -s \"$SPECCREATEURL\" $AUTOSPEC_CMDLINE \
-                          --changelog \"package created using the webbuild interface\""
-                       RET=$?
-                       [ $RET -eq 0 ] && {
-                          eval `$SUDO_WRAPPER specinfo $ENVIRONMENT "$USER" $PACKAGE ""`
-                          social_log "SUSER=$USER SEMAIL=$USER_EMAIL STARGET=developers STEXT=\"is working on <b>$PACKAGE</b> new package in <b>`print_environment_descr $ENVIRONMENT`</b> environment\" STIME=`date +%s`"
-                          # prepare
-                          $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bp $PACKAGE.spec --nodeps --define=\"_topdir $SPECVAR_WORKINGHOME/RPM\""
-                          RET=$?
-                          if [ $RET -eq 0 ]; then
-                             REQUEST_NEXT="showbuilddocs"
+                       FOUND_EXISTING=`curl -s "${WEBBUILD_DISTROQUERY_URL}?package=$PACKAGE&search_milestone2=true&search_milestone3=true&search_devel=true&search_sources=true&query_compact=true&replyplain=true&searchbox=false"`
+                       if [ "$FOUND_EXISTING" != "" ]; then
+                          echo -n "<div align=left class=output id=outputtop style=\"font-family:serif;color:black;background-color:#E0F2D0;\">"
+                          echo "<b><font color=red>ERROR: package already exists, please update from appropriate version:</font><b>"
+                          echo -n "<hr><b>Search results for \"$PACKAGE\":</b>$FOUND_EXISTING"
+                          echo -n "</div>"
+                          RET=1
+                          continue
+                       else
+                          if [ "${SPECCREATEURL/\/}" = "$SPECCREATEURL" ]; then
+                             # local source in /SOURCES
+                             SPECCREATEURL="../SOURCES/$SPECCREATEURL"
                           fi
-                          #echo "<br><font color=gold>HINT: don't forget to add build requirements after successful build! Edit specfile and check <i>recreate SRPM</i> before sending the package.</font>"
-                       }
+                          AUTOSPEC_CMDLINE="-n $PACKAGE -o $PACKAGE.spec"
+                          #DECODEDURL=`cgi_decodevar $SPECCREATEURL`
+                          [ "$SPECCREATETYPE" ] && AUTOSPEC_CMDLINE="$AUTOSPEC_CMDLINE -t $SPECCREATETYPE"
+                          [ "$SPECCREATEVERSION" ] && AUTOSPEC_CMDLINE="$AUTOSPEC_CMDLINE -v $SPECCREATEVERSION"
+                          [ "$SPECCREATEGITBRANCH" ] && AUTOSPEC_CMDLINE="$AUTOSPEC_CMDLINE --git-branch $SPECCREATEGITBRANCH"
+                          [ "$USER_FULLNAME" -a "$USER_EMAIL" ] && AUTOSPEC_CMDLINE="$AUTOSPEC_CMDLINE --packager-fullname=\"$USER_FULLNAME\" --packager-email=\"$USER_EMAIL\""
+                          $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "$AUTOSPEC_CMD -s \"$SPECCREATEURL\" $AUTOSPEC_CMDLINE \
+                             --changelog \"package created using the webbuild interface\""
+                          RET=$?
+                          [ $RET -eq 0 ] && {
+                             eval `$SUDO_WRAPPER specinfo $ENVIRONMENT "$USER" $PACKAGE ""`
+                             social_log "SUSER=$USER SEMAIL=$USER_EMAIL STARGET=developers STEXT=\"is working on <b>$PACKAGE</b> new package in <b>`print_environment_descr $ENVIRONMENT`</b> environment\" STIME=`date +%s`"
+                             # prepare
+                             $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bp $PACKAGE.spec --nodeps --define=\"_topdir $SPECVAR_WORKINGHOME/RPM\""
+                             RET=$?
+                             if [ $RET -eq 0 ]; then
+                             :
+                                REQUEST_NEXT="showbuilddocs"
+                             fi
+                          }
+                       fi
                     else
                        echo "ERROR: both source archive URL and name are needed."
                        RET=1
@@ -1078,7 +1099,7 @@ if [ "$REQUEST" = "prepare" -o "$REQUEST" = "updatespec" -o "$REQUEST" = "speccr
                        autodistjobs="$AUTODISTJOB"
                     fi
                     [ "$REPOSITORY" ] && REPOSITORYADD="--repository $REPOSITORY" || REPOSITORYADD="--repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]}"
-                    $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist -v -p $autodistjobs $REPOSITORYADD --arch $AUTODISTARCH --user $USER $AUTODISTADD"
+                    $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist -v -p $autodistjobs $REPOSITORYADD --arch $AUTODISTARCH --user $USER $AUTODISTADD -- --colors web"
                     RET=$?
                     ;;
       "autodistupdate") [ "$AUTODISTFORCE" = "true" ] && AUTODISTADD="--force" || AUTODISTADD=
@@ -1087,15 +1108,18 @@ if [ "$REQUEST" = "prepare" -o "$REQUEST" = "updatespec" -o "$REQUEST" = "speccr
                            AUTODISTADD="$AUTODISTADD --rebuild -- --changelog \"${AUTODISTUPDATECHANGELOG}\""
                         fi
                     autodistjobs=
+                    if [ "$AUTODISTVERSION" ]; then
+                       AUTODISTVER="\#$AUTODISTVERSION"
+                    fi
                     if [ "$AUTODISTPKGS" ]; then
                        for p in $AUTODISTPKGS; do
-                          autodistjobs="$autodistjobs $AUTODISTJOB/$p"
+                          autodistjobs="$autodistjobs $AUTODISTJOB/$p${AUTODISTVER}"
                        done
                     else
-                       autodistjobs="$AUTODISTJOB"
+                       autodistjobs="$AUTODISTJOB${AUTODISTVER}"
                     fi
                     [ "$REPOSITORY" ] && REPOSITORYADD="--repository $REPOSITORY" || REPOSITORYADD="--repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]}"
-                    $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist -v -u $autodistjobs $REPOSITORYADD --arch $AUTODISTARCH --user $USER $AUTODISTADD"
+                    $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist -v -u $autodistjobs $REPOSITORYADD --arch $AUTODISTARCH --user $USER $AUTODISTADD -- --colors web"
                     RET=$?
                     ;;
       "addpkgnote") echo "`date +%s` $USER $ENVIRONMENT $PKGNOTE" >> $WEBBUILD_STATEDIR/notes/$PACKAGE.notes; RET=$? ;;
@@ -1140,9 +1164,19 @@ if [ "$MAINTAINERMODE" = "true" ]; then
          echo -n "<editor><![CDATA["
          echo -n "<div class=maintainer>"
          echo -n "<b>Recent packages in $REPOSITORY:</b><br>"
-         cat $local_ftp/distromatic/$REPOSITORY/_recent.inc | sed "s|a href=|a target=new href=|g"
+         if [ "$local_ftp" -a -e $local_ftp/distromatic/$REPOSITORY ]; then
+            if [ $local_ftp/distromatic/$REPOSITORY/_recent.inc -nt $WEBBUILD_STATEDIR/cache/repository-recent-$REPOSITORY ]; then
+               cat $local_ftp/distromatic/$REPOSITORY/_recent.inc > $WEBBUILD_STATEDIR/cache/repository-recent-$REPOSITORY
+               cat $local_ftp/$REPOSITORY/distromatic.log > $WEBBUILD_STATEDIR/cache/repository-distromaticlog-$REPOSITORY
+            fi
+         else
+            curl -s $REPS_BASE_URL/distromatic/$REPOSITORY/_recent.inc > $WEBBUILD_STATEDIR/cache/repository-recent-$REPOSITORY
+            curl -s $REPS_BASE_URL/$REPOSITORY/distromatic.log > $WEBBUILD_STATEDIR/cache/repository-distromaticlog-$REPOSITORY
+         fi
+         cat $WEBBUILD_STATEDIR/cache/repository-recent-$REPOSITORY | sed "s|a \(href=.\)/|a target=new \1${SITE_BASE_URL}/|g"
+
          echo -n "<br><b>Log:</b><br><pre>"
-         cat $local_ftp/$REPOSITORY/distromatic.log
+         cat $WEBBUILD_STATEDIR/cache/repository-distromaticlog-$REPOSITORY
          echo -n "</pre></div>"
          echo -n "<input type=button id=updatespecbutton value=\"refresh\" onclick="
          echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
@@ -1207,14 +1241,15 @@ fi
 # operation panel
 if [ "$MAINTAINERMODE" != "true" ]; then
    echo -n "<operationpanel><![CDATA["
+   echo -n "<div style=\"margin-top:140px;background-color:#E0F2D0;border:1px;\">"
+   if [ "$PACKAGE" ]; then
+      echo -n "Package: <b>$PACKAGE</b><br>Version: "
+      [ "${SPECVAR_Epoch[0]}" ] && echo -n "${SPECVAR_Epoch[0]}:"
+      echo -n "<b>${SPECVAR_Version[0]}-${SPECVAR_Release[0]}</b><br>"
+   fi
    showEnvironmentPanel
-   echo -n "<hr>"
-   [ "$PACKAGE" ] && {
-      echo -n "Package: <b>$PACKAGE</b><br>Version: <b>"
-      [ "${SPECVAR_Epoch[0]}" ] && echo -n "${SPECVAR_Epoch[0]}:" || echo -n "0:"
-      echo -n "${SPECVAR_Version[0]}-${SPECVAR_Release[0]}</b><br>"
-   }
-   echo -n "Target arch:<select id=rpmbuildarch>"
+   echo -n "</div>"
+   echo -n "<br><b>Build/Send options:</b><br>Arch:<select id=rpmbuildarch>"
    for f in i586 arm x86_64 ppc; do
       SELECTED=
       if [ "$f" = "$RPMBUILDARCH" ]; then
@@ -1225,8 +1260,8 @@ if [ "$MAINTAINERMODE" != "true" ]; then
       echo -n "<option value=\"$f\" $SELECTED>$f</option>"
    done
    echo -n "</select>"
-   echo -n "<label style=\"background-color:red;padding:1px;\"><input type=checkbox id=\"rpmforce\" value=\"force\">force&nbsp;</label>"
-   echo -n "<label style=\"padding:1px;\"><input type=checkbox id=\"debug\" value=\"debug\">debug&nbsp;</label>"
+   echo -n "&nbsp;<label style=\"background-color:red;padding:1px;\"><input type=checkbox id=\"rpmforce\" value=\"force\">force&nbsp;</label>"
+   echo -n "&nbsp;<label style=\"padding:1px;\"><input type=checkbox id=\"debug\" value=\"debug\">debug&nbsp;</label>"
    # destination repository select
    echo -n "<br>Send to:"
    echo -n "<select id=sendrepository>"
@@ -1252,7 +1287,7 @@ if [ "$MAINTAINERMODE" != "true" ]; then
       echo -n "<option value=\"$repname\" $SELECTED>$repname</option>"
    done
    echo -n "</select><br>"
-   [ "${AUTOPORT_UPDATE[$ENVIRONMENT]}" -o "$STATE_ADVANCEDCONTROLS" ] && echo -n "<hr><div style=\"background-color:#FFFFDE\"><b>Autodist batch builds:</b><br>"
+   [ "${AUTOPORT_UPDATE[$ENVIRONMENT]}" -o "$STATE_ADVANCEDCONTROLS" ] && echo -n "<br><div style=\"background-color:#FFFFDE\"><b>Autodist batch builds:</b><br>"
    if [ "$PACKAGE" ]; then
       if [ "${AUTOPORT_UPDATE[$ENVIRONMENT]}" ]; then
          echo -n "Patch for $PACKAGE:<br>"
@@ -1316,6 +1351,9 @@ if [ "$MAINTAINERMODE" != "true" ]; then
          echo -n "<option value=\"$PACKAGEENCODED\" $SELECTED>$PACKAGE (defaults)</option>"
       fi
       echo -n "</select>"
+      if [ "$AUTODISTJOBSELECTED" -a "$AUTODISTJOB" = "$PACKAGE" ]; then
+         echo -n "<br><font color=red>You should use autodist for this package!</font>"
+      fi
       if [ "$AUTODISTJOB" ]; then
          echo -n "<br>Job packages:"
          echo -n "<label><input type=checkbox name=autodistpkgsselectallcheckbox value=\"\" onclick=checkAllBoxes('autodistpkgscheckbox',this.checked);>select/unselect all</label>"
@@ -1348,6 +1386,7 @@ if [ "$MAINTAINERMODE" != "true" ]; then
          echo -n "AUTODISTJOB=\"+getSelectedValueById('autodistjobs')+\"&"
          echo -n "AUTODISTPKGS=\"+encodeURIComponent(p)+\"&"
          echo -n "AUTODISTUPDATECHANGELOG=\"+encodeURIComponent(getElementById('autodistupdatechangelog').value)+\"&"
+         echo -n "AUTODISTVERSION=\"+getElementById('autodistversion').value+\"&"
          echo -n "ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=autodistupdate\");>"
          # autodist build
          echo -n "<input type=button value=\"build\" onclick="
@@ -1382,16 +1421,16 @@ if [ "$MAINTAINERMODE" != "true" ]; then
          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>"
-         # autodist update changelog
-         echo -n "Rebuild changelog:<br>"
-         echo -n "<input type=text id=autodistupdatechangelog style=\"width:95%\">"
          # autodist schedule
-         echo -n "<br><input type=button value=\"schedule job\" onclick="
+         echo -n "<br>New version:<input type=text id=autodistversion value=\"\" style=\"width:20%\"> "
+         echo -n "<input type=button value=\"schedule job\" onclick="
          echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
          echo -n "AUTODISTJOB=\"+getSelectedValueById('autodistjobs')+\"&"
-         echo -n "REQUEST=schedule&SCHEDULEVERSION=\"+getElementById('scheduleversion').value"
+         echo -n "REQUEST=schedule&AUTODISTVERSION=\"+getElementById('autodistversion').value"
          echo -n ",\"`cgi_encodevar "Schedule <b>"`\"+getSelectedValueById('autodistjobs')+\"`cgi_encodevar "</b> autodist job for automatic update?"`\"); class=boldbutton>"
-         echo -n "(version:<input type=text id=scheduleversion value=\"\" size=\"6\">)"
+         # autodist update changelog
+         echo -n "<br>Rebuild changelog:<br>"
+         echo -n "<input type=text id=autodistupdatechangelog style=\"width:95%\">"
          # autodist show schedule
          echo -n "<input type=button value=\"show schedule\" onclick=ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
          echo -n "REQUEST=showscheduled\");>"
@@ -1424,86 +1463,26 @@ if [ "$MAINTAINERMODE" != "true" ]; then
       fi
    fi
    if [ "$PACKAGE" ]; then
-      echo -n "<hr><div style=\"background-color:#E0F2D0\"><b>RPM packaging commands:</b><br>"
-      # check for updates
-      echo -n "<input type=button value=\"check for updates\" onclick="
-      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=autospecupdatescheck&"
-      echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue()));>"
-      # unpack
-      echo -n "<input type=button value=\"prepare\" onclick="
-      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=rpmprepare&"
-      echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue()));>"
-      # build
-      echo -n "<input type=button value=\"build\" onclick="
-      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=rpmbuild&"
-      echo -n "RPMBUILDARCH=\"+getSelectedValueById('rpmbuildarch')+\"&"
-      echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&RPMFORCE=\"+getElementById('rpmforce').checked); class=boldbutton>"
-      # unpackaged files
-      echo -n "<input type=button value=\"unpackaged files\" onclick="
-      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=autospeclistcheck&"
-      echo -n "RPMBUILDARCH=\"+getSelectedValueById('rpmbuildarch')+\"&"
-      echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue()));>"
-      # build requirements
-      echo -n "<input type=button value=\"build requirements\" onclick="
-      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=autospecbuildreq\");>"
+      echo -n "<hr><div style=\"background-color:#E0F2D0\">"
+      ## check for updates
+      #echo -n "<input type=button value=\"check for updates\" onclick="
+      #echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=autospecupdatescheck&"
+      #echo -n "RPMBUILDARCH=\"+getSelectedValueById('rpmbuildarch')+\"&"
+      #echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue()));>"
       ## recreate SRPM
       #echo -n "<input type=button value=\"recreate SRPM\" onclick="
       #echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=srpmbuild&"
       #echo -n "RPMFORCE=\"+getElementById('rpmforce').checked+\"&"
       #echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&RPMFORCE=\"+getElementById('rpmforce').checked);>"
-      # rpm checks
-      echo -n "<input type=button id=rpmchecks value=\"checks\" onclick="
-      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=rpmchecks\");>"
-      echo -n "<input type=button id=rpmsimulateinstallbutton value=\"simulate install\" onclick="
-      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=rpmsimulateinstall\");>"
-      # rpm install
-      [ ! "$USER_CANINSTALL" ] && DISABLED="disabled=disabled"
-      echo -n "<input type=button id=rpminstallbutton value=\"install\" onclick="
-      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=rpminstall&"
-      echo -n "RPMFORCE=\"+getElementById('rpmforce').checked"
-      echo -n ",\"`cgi_encodevar "Install <b>$PACKAGE</b> in current environment?"`\""
-      echo -n "); class=redbutton $DISABLED>"
-      # rpm send
-      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 id=sendpackagebutton value=\"send\" onclick="
-      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=sendpackage&"
-      echo -n "SENDRECREATESRPM=\"+getElementById('sendrecreatesrpm').checked+\"&"
-      echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&"
-      echo -n "AUTODISTARCH=\"+getSelectedValueById('rpmbuildarch')+\"&"
-      echo -n "SENDREPOSITORY=\"+getSelectedValueById('sendrepository')"
-      echo -n ",\"`cgi_encodevar "Send <b>$PACKAGE</b> built packages to <b>"`\"+getSelectedValueById('sendrepository')+"
-      echo -n "\"`cgi_encodevar "</b>?<br><br><font color=goldenrod>HINT: does summary look short and good?</font><br><b>${SPECVAR_Name[0]} - ${SPECVAR_Summary[0]}.</b>"`\""
-      echo -n "); class=redbutton $HREFADD>"
-      # recreate and send SRPM
-      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 id=sendsourcebutton value=\"send SRPM\" onclick="
-      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=sendsource&"
-      echo -n "RPMFORCE=\"+getElementById('rpmforce').checked+\"&"
-      echo -n "SENDRECREATESRPM=\"+getElementById('sendrecreatesrpm').checked+\"&"
-      echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&"
-      echo -n "SENDREPOSITORY=\"+getSelectedValueById('sendrepository')"
-      echo -n ",\"`cgi_encodevar "Send <b>$PACKAGE</b> source package only to <b>"`\"+getSelectedValueById('sendrepository')+"
-      echo -n "\"`cgi_encodevar "</b>?<br><br>WARNING: use this to refresh the SRPM of a package which already exists with same release in repository"`\""
-      echo -n "); class=redbutton $HREFADD>"
-      # recreate SRPM before sending checkbox
-      echo -n "<label style=\"color:red;padding:0;\"><input type=checkbox id=\"sendrecreatesrpm\" value=\"force\">recreate SRPM</label>"
       # add patches
-      echo -n "<hr><b>Add patches:</b>"
+      echo -n "<b>Add patches:</b>"
       echo -n "<input type=button id=addpatchbutton value=\"submit\" onclick=ajax_getvalues(\""
       echo -n "REQUEST=addpatch&ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
       echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&"
       echo -n "ADDPATCHURL=\"+encodeURIComponent(getElementById('addpatchurl').value)+\"&"
       echo -n "ADDPATCHNAME=\"+encodeURIComponent(getElementById('addpatchname').value));>"
       echo -n "&nbsp;<a href=\"http://pastebin.com\" target=_new>pastebin</a><br>"
-      echo -n "URL:<input type=text id=addpatchurl value=\"\" style=\"size:100%\">"
+      echo -n "URL:<input type=text id=addpatchurl value=\"\" style=\"width:80%\">"
       echo -n "<br><div style=\"white-space:nowrap;font-size:9px;width:100%;overflow:hidden\"><span style=\"float:left;margin-top:6px;\">$PACKAGE-${SPECVAR_Version}-</span>"
       echo -n "<span style=\"display:block;float:right;margin-top:6px;\">.patch</span>"
       echo -n "<span style=\"display:block;overflow:hidden;padding-right:5px;\"><input type=text id=addpatchname value=\"\" style=\"width:100%\"></span></div>"
@@ -1516,11 +1495,12 @@ if [ "$MAINTAINERMODE" != "true" ]; then
       echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&"
       echo -n "UPLOADFILENAME=\"+encodeURIComponent(getElementById('fileToUpload').value));>Upload</button>"
       echo -n "</form>"
-      echo -n "</div><hr>"
+      echo -n "</div>"
       # info from package sources
+      echo -n "<hr><div style=\"background-color:#A7DEDE\">"
       echo -n "<b>Info from package in the works:</b><br>"
       # show sources
-      echo -n "<select id=sourcefile onchange="
+      echo -n "<select id=sourcefile style=\"width:98%\" onchange="
       echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=showsourcefile&"
       echo -n "SOURCEFILE=\"+getSelectedValueById('sourcefile'));>"
       echo -n "<br><option value=\"\">-- select a source to display --</option>"
@@ -1530,7 +1510,7 @@ if [ "$MAINTAINERMODE" != "true" ]; then
       done
       echo -n "</select>"
       # show patches
-      echo -n "<select id=patchfile onchange="
+      echo -n "<select id=patchfile style=\"width:98%\" onchange="
       echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=showpatchfile&"
       echo -n "PATCHFILE=\"+getSelectedValueById('patchfile'));>"
       echo -n "<option value=\"\">-- select a patch to display --</option>"
@@ -1563,6 +1543,15 @@ if [ "$MAINTAINERMODE" != "true" ]; then
       # show package changelog
       echo -n "<input type=button value=\"changelog(s)\" onclick="
       echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=showchangelogs\");>"
+      # add a note
+      echo -n "<label>"
+      echo -n "<input type=button id=addpkgnote value=\"add a note:\" onclick="
+      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
+      echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&"
+      echo -n "REQUEST=addpkgnote&PKGNOTE=\"+encodeURIComponent(getElementById('pkgnote').value));></label></span>"
+      echo -n "<span style=\"display:block;overflow:hidden;padding-right:5px;\">"
+      echo -n "<input type=text id=pkgnote value=\"\" style=\"width:100%\">"
+      echo -n "</span>"
 
       # generic info
       echo -n "<hr><b>Generic info:</b><br>"
@@ -1573,7 +1562,7 @@ if [ "$MAINTAINERMODE" != "true" ]; then
       echo -n "<input type=button value=\"approved licenses\" onclick="
       echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=approvedlicenses\");>"
       # templates
-      echo -n "<select id=autospectemplate onchange="
+      echo -n "<select id=autospectemplate style=\"width:98%\" onchange="
       echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=showautospectemplate&"
       echo -n "AUTOSPECTEMPLATE=\"+getSelectedValueById('autospectemplate'));>"
       echo -n "<option value=\"\">-- display a .spec template --</option>"
@@ -1583,7 +1572,7 @@ if [ "$MAINTAINERMODE" != "true" ]; then
       done
       echo -n "</select>"
       # macros
-      echo -n "<select id=macrosfile onchange="
+      echo -n "<select id=macrosfile style=\"width:98%\" onchange="
       echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=showmacrosfile&"
       echo -n "MACROSFILE=\"+getSelectedValueById('macrosfile'));>"
       echo -n "<option value=\"\">-- display a RPM macros file --</option>"
@@ -1593,7 +1582,28 @@ if [ "$MAINTAINERMODE" != "true" ]; then
          echo -n "<option value=\"$macrosfile\">$macrosfile</option>"
       done
       echo -n "</select></div>"
+      echo -n "</div>"
+
    fi
+   echo -n "<hr><b>Host maintainance:</b><br>"
+   ## run ldconfig
+   #echo -n "<input type=button id=runldconfig value=\"run ldconfig\" onclick="
+   #echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
+   #echo -n "REQUEST=runldconfig\");>"
+
+   # environment search
+   echo -n "<div style=\"white-space:nowrap;width:100%;\">Provides:<input type=text style=\"width:75%;align:center;padding:0;margin:2px;\" id=environmentsearch value=\"Search package or provide...\" "
+   echo -n "onfocus=\"if (this.value==this.defaultValue) this.value=''\" "
+   echo -n "onkeypress=if(checkEnter(event))ajax_getvalues(\""
+   echo -n "ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
+   echo -n "REQUEST=environmentsearch&ENVSEARCHTEXT=\"+encodeURIComponent(getElementById('environmentsearch').value));></div>"
+
+   # system upgrade
+   echo -n "<input type=button id=smartupgrade value=\"system upgrade\" onclick="
+   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
+   echo -n "REQUEST=smartupgrade\""
+   echo -n ",\"`cgi_encodevar "Upgrade current environment to latest updates now?"`\"); class=redbutton>"
+
    echo -n "]]></operationpanel>"
 fi
 
@@ -1636,7 +1646,7 @@ case $REQUEST in
    "smartupgrade") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "export LANG=C;sudo smart update && sudo smart upgrade"
                    RET=$?
                    ;;
-   "runldconfig") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "/sbin/ldconfig"
+   "runldconfig") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "export LANG=C;sudo /sbin/ldconfig"
                   RET=$?
                   ;;
    "showpatch") $SUDO_WRAPPER binary $ENVIRONMENT "$USER" $PACKAGE "autodist-tool makepatch $PACKAGE"; RET=$? ;;
@@ -1661,11 +1671,11 @@ case $REQUEST in
                        social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"made an autodist <b>build</b> patch for <b>$PACKAGE</b>\" STIME=`date +%s`"
                     fi ;;
    "showscheduled") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist-tool schedule"; RET=$? ;;
-   "schedule") if [ "$SCHEDULEVERSION" ]; then
-                  $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist-tool schedule $AUTODISTJOB#$SCHEDULEVERSION"
+   "schedule") if [ "$AUTODISTVERSION" ]; then
+                  $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist-tool schedule $AUTODISTJOB#$AUTODISTVERSION"
                   RET=$?
                   if [ $RET -eq 0 ]; then
-                     social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"scheduled autodist job <b>$AUTODISTJOB</b> for update to version $SCHEDULEVERSION\" STIME=`date +%s`"
+                     social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"scheduled autodist job <b>$AUTODISTJOB</b> for update to version $AUTODISTVERSION\" STIME=`date +%s`"
                   fi
                else
                   $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist-tool schedule $AUTODISTJOB"
@@ -1689,7 +1699,7 @@ case $REQUEST in
                        else
                           autodistjobs="$AUTODISTJOB"
                        fi
-                       $SUDO_WRAPPER background $ENVIRONMENT "$USER" "$PACKAGE" "autodist -v -b $autodistjobs --repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]} --arch $AUTODISTARCH --user $USER $AUTODISTADD" &>/dev/null
+                       $SUDO_WRAPPER background $ENVIRONMENT "$USER" "$PACKAGE" "autodist -v -b $autodistjobs --repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]} --arch $AUTODISTARCH --user $USER $AUTODISTADD -- --colors web" &>/dev/null
                        [ $? -ne 0 ] && RET=$? || {
                           RET=-1
                           echo "Autodist build start. You may see the output in the <b>Webbuild jobs</b> box above."
@@ -1705,7 +1715,7 @@ case $REQUEST in
                       else
                          autodistjobs="$AUTODISTJOB"
                       fi
-                      $SUDO_WRAPPER background $ENVIRONMENT "$USER" "$PACKAGE" "autodist -v -i $autodistjobs --repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]} --arch $AUTODISTARCH --user $USER $AUTODISTADD" &>/dev/null
+                      $SUDO_WRAPPER background $ENVIRONMENT "$USER" "$PACKAGE" "autodist -v -i $autodistjobs --repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]} --arch $AUTODISTARCH --user $USER $AUTODISTADD -- --colors web" &>/dev/null
                       [ $? -ne 0 ] && RET=$? || {
                          RET=-1
                          echo "Autodist install start. You may see the output in the <b>Webbuild jobs</b> box above."
@@ -1720,7 +1730,7 @@ case $REQUEST in
                       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"
+                      $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`"
                       ;;
@@ -1740,7 +1750,11 @@ case $REQUEST in
                fi
                ;;
    "autospecupdatescheck") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a2"; RET=$? ;;
-   "rpmprepare") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bp $PACKAGE.spec --nodeps --define=\"_topdir $SPECVAR_WORKINGHOME/RPM\""; RET=$? ;;
+   "rpmprepare") [ "$RPMBUILDARCH" -a "$RPMBUILDARCH" != "${AUTOPORT_ARCH[$ENVIRONMENT]}" ] && \
+                    RPMARCHADD="--target $RPMBUILDARCH --define=\"cross_target_cpu $RPMBUILDARCH\""
+                 $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bp $PACKAGE.spec $RPMARCHADD --nodeps --define=\"_topdir $SPECVAR_WORKINGHOME/RPM\""
+                 RET=$?
+                 ;;
    "rpmbuild") [ "$RPMFORCE" = "true" ] && RPMFORCEADD="--force-build"
                [ "$RPMBUILDARCH" -a "$RPMBUILDARCH" != "${AUTOPORT_ARCH[$ENVIRONMENT]}" ] && \
                   RPMARCHADD="-A $RPMBUILDARCH --define \"cross_target_cpu=$RPMBUILDARCH\""
@@ -1763,7 +1777,9 @@ $RPMFORCEADD $PACKAGE.spec"
                       RPMARCHADD="-A $RPMBUILDARCH --define \"cross_target_cpu=$RPMBUILDARCH\""
                    $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a5 --list-check --force $RPMARCHADD"
                    RET=$? ;;
-   "autospecbuildreq") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a6"
+   "autospecbuildreq")
+                   $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "sudo /sbin/ldconfig"
+                   $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a6"
                    RET=$? ;;
    "rpmchecks") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a8"; RET=$? ;;
    "rpmsimulateinstall") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a7"; RET=$? ;;
@@ -2133,8 +2149,13 @@ if [ "$MAINTAINERMODE" = "true" ]; then
 #      echo "<option value=\"\">-- Select a SRPM package --</option>"
       echo -n "<label><input type=checkbox name=pkgsselectallcheckbox value=\"\" onclick=checkAllBoxes('packagescheckbox',this.checked);>select/unselect all</label>"
       echo -n "<div class=multiselect>"
-      if [ $local_ftp/$REPOSITORY/SRPMS.base -nt $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY ]; then
-         ls --color=none $local_ftp/$REPOSITORY/SRPMS.base/ | grep ".src.rpm$" | sort -f > $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
+      if [ "$local_ftp" -a -e $local_ftp/$REPOSITORY ]; then
+         if [ $local_ftp/$REPOSITORY/SRPMS.base -nt $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY ]; then
+            ls --color=none $local_ftp/$REPOSITORY/SRPMS.base/ | grep ".src.rpm$" | sort -f > $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
+         fi
+      else
+         curl -s $REPS_BASE_URL/$REPOSITORY/SRPMS.base/ | grep .src.rpm | \
+            sed "s|.*\.src\.rpm\">\(.*\)</a>.*|\1|" | sort -f > $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
       fi
       while read f; do
          pkgname=${f/.src.rpm}
@@ -2164,6 +2185,8 @@ if [ "$MAINTAINERMODE" = "true" ]; then
       echo -n "<select id=repositoryimportto>"
       if [ "${REPOSITORY:0:10}" = "milestone2" ]; then
          IMPORT_REPOSITORIES=$AUTOPORT_MILESTONE2_IMPORT_REPOSITORIES
+      elif [ "${REPOSITORY:0:10}" = "milestone3" ]; then
+         IMPORT_REPOSITORIES=$AUTOPORT_MILESTONE3_IMPORT_REPOSITORIES
       else
          IMPORT_REPOSITORIES="$AUTOPORT_DEVEL_IMPORT_REPOSITORIES devel-$USER $AUTOPORT_DEVEL_RELEASE_REPOSITORIES"
       fi

webbuild/webbuild-functions

@@ -168,7 +168,7 @@ function cgi_getvars()
         p=`echo $q | sed "s|&.*||"`
         q=`echo $q | sed "s|[^&]*&||"`
 	k="${p%%=*}"  # get the key (variable name) from it
-	[ "$k" = "REMOTE_ADDR" -o "$k" = "REMOTE_HOST" -o "$k" = "REMOTE_PORT" -o "$k" = "REMOTE_USER" ] && continue
+	[ ! "$k" -o "$k" = "REMOTE_ADDR" -o "$k" = "REMOTE_HOST" -o "$k" = "REMOTE_PORT" -o "$k" = "REMOTE_USER" ] && continue
 	v="${p#*=}"   # get the value from it
         # decode and evaluate var if requested
         if [ "$k" != "SPECTEXT" ]; then

webbuild/webbuild-functions-private

@@ -56,10 +56,10 @@ function showlog() {
       echo -n "<pre>"
       if [ "$LOGTYPE" = "processtail" ]; then
          echo -n "<!-- SCROLL -->"
-         tail -n +0 -f $f --pid $PROCESSPID | stdbuf -oL sed "s|<|\&lt;|g"
+         tail -n +0 -f $f --pid $PROCESSPID | stdbuf -oL sed "s|<\([/]pre>\)|\&lt;\1|g"
          echo -n "<!-- ENDSCROLL -->"
       else
-         if [ $LOGFILESIZE -lt 524288 ]; then
+         if [ $LOGFILESIZE -lt 2097152 ]; then
             if [ -r $f ]; then
                cat $f | parse_build_output $PACKAGE
             else
@@ -67,13 +67,13 @@ function showlog() {
             fi
          else
             if [ -r $f ]; then
-               head -c 262144 $f | parse_build_output $PACKAGE
+               head -c 1048576 $f | parse_build_output $PACKAGE
                echo "<br><font style=\"background-color:yellow;color:black\">&lt;------ CUT (long file) -------&gt;</font>"
-               tail -c 262144 $f | parse_build_output $PACKAGE
+               tail -c 1048576 $f | parse_build_output $PACKAGE
             else
-               $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "head -c 262144 $f" | parse_build_output $PACKAGE
+               $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "head -c 1048576 $f" | parse_build_output $PACKAGE
                echo "<br><font style=\"background-color:yellow;color:black\">&lt;------ CUT (long file) -------&gt;</font>"
-               $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "tail -c 262144 $f" | parse_build_output $PACKAGE
+               $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "tail -c 1048576 $f" | parse_build_output $PACKAGE
             fi
          fi
       fi
@@ -84,7 +84,7 @@ function showlog() {
 
 function showEnvironmentPanel() {
 
-   echo -n "Build host: <b>`hostname`</b><br>"
+   echo -n "Host: <b>`hostname`</b><br>"
    echo -n "Environment: <b>"
    if [ "${AUTOPORT_CHROOT_USER[$ENVIRONMENT]}" ]; then
       echo -n "${AUTOPORT_CHROOT_USER[$ENVIRONMENT]} - "
@@ -108,33 +108,18 @@ function showEnvironmentPanel() {
 
    # toolchain
    echo -n "<br>"
-   local toolchain_output=`LANGUAGE=C $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "gcc --version | head -n1; LANGUAGE=C ld -v"`
-   local gcc_ver=`echo $toolchain_output | sed "s|.*(GCC) \([0-9.]*\) .*|\1|"`
-   local binutils_ver=`echo $toolchain_output | sed "s|.*GNU \(.*\) (GNU Binutils.*)\(.*\)|\1 \2|"`
-   echo "Toolchain: gcc $gcc_ver, $binutils_ver"
-
-   # system upgrade
-   echo -n "<br><input type=button id=smartupgrade value=\"system upgrade\" onclick="
-   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
-   echo -n "REQUEST=smartupgrade\""
-   echo -n ",\"`cgi_encodevar "Upgrade current environment to latest updates now?"`\"); class=redbutton>"
-
-   ## run ldconfig
-   #echo -n "<input type=button id=runldconfig value=\"run ldconfig\" onclick="
-   #echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
-   #echo -n "REQUEST=runldconfig\");>"
-
-   # rpm manager
-   echo -n "<input type=button id=rpmmanager value=\"RPM manager\" onclick="
-   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
-   echo -n "REQUEST=rpmmanager\");>"
-
-   # environment search
-   echo -n "<br><div style=\"white-space:nowrap;width:100%;\">Provides:<input type=text style=\"width:75%;align:center;padding:0;margin:2px;\" id=environmentsearch value=\"Search package or provide...\" "
-   echo -n "onfocus=\"if (this.value==this.defaultValue) this.value=''\" "
-   echo -n "onkeypress=if(checkEnter(event))ajax_getvalues(\""
-   echo -n "ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
-   echo -n "REQUEST=environmentsearch&ENVSEARCHTEXT=\"+encodeURIComponent(getElementById('environmentsearch').value));></div>"
+   if [ ! -e $WEBBUILD_STATEDIR/cache/environment-$ENVIRONMENT-data -o \
+        "`find $WEBBUILD_STATEDIR/cache/environment-$ENVIRONMENT-data -mmin +5`" ]; then
+      local toolchain_output=`LANGUAGE=C $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "gcc --version | head -n1; LANGUAGE=C clang -v | head -n1; LANGUAGE=C ld -v"`
+      local gcc_ver=`echo $toolchain_output | sed "s|.*(GCC) \([0-9.]*\) .*|\1|"`
+      local binutils_ver=`echo $toolchain_output | sed "s|.*GNU \(.*\) (GNU Binutils.*)\(.*\)|\1 \2|"`
+      local clang_ver=`echo $toolchain_output | sed "s|.*clang version \([0-9.]*\) .*|\1|"`
+      local toolchain_text="gcc $gcc_ver, clang $clang_ver, $binutils_ver"
+      echo "$toolchain_text" > $WEBBUILD_STATEDIR/cache/environment-$ENVIRONMENT-data
+   else
+      local toolchain_text=`cat $WEBBUILD_STATEDIR/cache/environment-$ENVIRONMENT-data`
+   fi
+   echo "Toolchain: $toolchain_text"
 
 }
 
@@ -178,20 +163,69 @@ function print_editorcontrols() {
    echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
    echo -n "REQUEST=deletespec\",\"`cgi_encodevar "Really delete <b>$PACKAGE.spec</b>?"`\")>"
    # specfile rename
-   echo -n "<input type=button id=updatespecbutton value=\"rename to:\" onclick="
+   echo -n "<input type=button id=updatespecbutton value=\"rename:\" onclick="
    echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&RENAMESPECFROM=$PACKAGE&"
    echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&"
    echo -n "REQUEST=renamespec&PACKAGE=\"+encodeURIComponent(getElementById('specnewname').value));>"
-   echo -n "<input type=text id=specnewname value=\"\" size=12>.spec"
-   # add a note
-   echo -n "<label>"
-   echo -n "<input type=button id=addpkgnote value=\"add a note:\" onclick="
-   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
+   echo -n "<input type=text id=specnewname value=\"\" size=6>"
+   # unpack
+   echo -n "<input type=button value=\"prepare\" onclick="
+   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=rpmprepare&"
+   echo -n "RPMBUILDARCH=\"+getSelectedValueById('rpmbuildarch')+\"&"
+   echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue()));>"
+   # build
+   echo -n "<input type=button value=\"build\" onclick="
+   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=rpmbuild&"
+   echo -n "RPMBUILDARCH=\"+getSelectedValueById('rpmbuildarch')+\"&"
+   echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&RPMFORCE=\"+getElementById('rpmforce').checked); class=boldbutton>"
+   # unpackaged files
+   echo -n "<input type=button value=\"unpackaged list\" onclick="
+   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=autospeclistcheck&"
+   echo -n "RPMBUILDARCH=\"+getSelectedValueById('rpmbuildarch')+\"&"
+   echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue()));>"
+   # build requirements
+   echo -n "<input type=button value=\"build reqs\" onclick="
+   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=autospecbuildreq\");>"
+   # rpm install
+   [ ! "$USER_CANINSTALL" ] && DISABLED="disabled=disabled"
+   echo -n "<input type=button id=rpminstallbutton value=\"install\" onclick="
+   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=rpminstall&"
+   echo -n "RPMFORCE=\"+getElementById('rpmforce').checked"
+   echo -n ",\"`cgi_encodevar "Install <b>$PACKAGE</b> in current environment?"`\""
+   echo -n "); class=redbutton $DISABLED>"
+   # rpm send
+   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 id=sendpackagebutton value=\"send\" onclick="
+   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=sendpackage&"
+   echo -n "SENDRECREATESRPM=\"+getElementById('sendrecreatesrpm').checked+\"&"
    echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&"
-   echo -n "REQUEST=addpkgnote&PKGNOTE=\"+encodeURIComponent(getElementById('pkgnote').value));></label></span>"
-   echo -n "<span style=\"display:block;overflow:hidden;padding-right:5px;\">"
-   echo -n "<input type=text id=pkgnote value=\"\" style=\"width:100%\">"
-   echo -n "</span></div>"
+   echo -n "AUTODISTARCH=\"+getSelectedValueById('rpmbuildarch')+\"&"
+   echo -n "SENDREPOSITORY=\"+getSelectedValueById('sendrepository')"
+   echo -n ",\"`cgi_encodevar "Send <b>$PACKAGE</b> built packages to <b>"`\"+getSelectedValueById('sendrepository')+"
+   echo -n "\"`cgi_encodevar "</b>?<br><br><font color=goldenrod>HINT: does summary look short and good?</font><br><b>${SPECVAR_Name[0]} - ${SPECVAR_Summary[0]}.</b>"`\""
+   echo -n "); class=redbutton $HREFADD>"
+   # recreate and send SRPM
+   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 id=sendsourcebutton value=\"send SRPM\" onclick="
+   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=sendsource&"
+   echo -n "RPMFORCE=\"+getElementById('rpmforce').checked+\"&"
+   echo -n "SENDRECREATESRPM=\"+getElementById('sendrecreatesrpm').checked+\"&"
+   echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&"
+   echo -n "SENDREPOSITORY=\"+getSelectedValueById('sendrepository')"
+   echo -n ",\"`cgi_encodevar "Send <b>$PACKAGE</b> source package only to <b>"`\"+getSelectedValueById('sendrepository')+"
+   echo -n "\"`cgi_encodevar "</b>?<br><br>WARNING: use this to refresh the SRPM of a package which already exists with same release in repository"`\""
+   echo -n "); class=redbutton $HREFADD>"
+   # recreate SRPM before sending checkbox
+   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 "<input type=button id=updatespecbutton value=\"update\" onclick="