Release 0.9.15

VERSION

@@ -1 +1 @@
-VERSION = 0.9.12
+VERSION = 0.9.15

autodist

@@ -5,14 +5,14 @@
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=0.9.12
+VERSION=0.9.15
 me=(${0##*/} $VERSION "Sat Aug 20 2010")
 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-2014 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.""
@@ -198,8 +198,9 @@ for ((i=1; i<=$#; i++)); do
           fi
           ;;
       *) if [ "$AUTOSPEC_ARGS_MODE" != "1" ]; then
-            JOBNAME[${#JOBNAME[@]}]="${!i/\#*}"
-	       [ "${!i/*\#}" != "${!i}" ] && JOBVER[${#JOBNAME[@]}]="+${!i/*\#}"
+            JOBIDX=${#JOBNAME[@]}
+            JOBNAME[$JOBIDX]="${!i/\#*}"
+            [ "${!i/*\#}" != "${!i}" ] && JOBVER[$JOBIDX]="+${!i/*\#}"
 	 else
             if [ "${!i/ }" != "${!i}" ]; then
                # pass multiple word arguments inside quotation marks
@@ -494,7 +495,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
@@ -604,7 +605,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/ *})."
@@ -614,6 +615,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
@@ -785,6 +791,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)

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

autoport

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

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

@@ -1,16 +1,20 @@
 #!/bin/bash
 #
 # autodist-upstream-updates daily cron script
-# (c) 2008-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# (c) 2008-2014 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
+. /etc/sysconfig/autoport
 
-REPOSITORY=milestone1-1.1
-/usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
+if [ ! "$AUTOPORT_UPDATE_NO_DISTROMATIC" ]; then
+   REPOSITORY=devel
+   /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
+   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
+fi
 
 exit 0

etc/cron.hourly/66-autoport-chroot

@@ -72,10 +72,12 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
    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
+      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
    fi
 
 #   if [ "${AUTOPORT_NATIVE[$i]}" ]; then

webbuild/webbuild-cgi

@@ -1042,9 +1042,10 @@ if [ "$REQUEST" = "prepare" -o "$REQUEST" = "updatespec" -o "$REQUEST" = "speccr
                           --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"
+                          $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"
@@ -1408,7 +1409,7 @@ if [ "$MAINTAINERMODE" != "true" ]; then
          echo -n "<br>"
       fi
       # automatic port
-      if [ ! "${AUTOPORT_DISABLE[$ENVIRONMENT]}" -a ! "${AUTOPORT_UPDATE[$ENVIRONMENT]}" ]; then
+      if [ "${AUTOPORT_PORT_REPOSITORY[$ENVIRONMENT]}" ]; then
          echo -n "Automatic port:"
          echo -n "<input type=button id=autoportnp value=\"port\" onclick="
          echo -n "p=getSelectedValueById('sendrepository');"
@@ -1738,7 +1739,7 @@ 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"; RET=$? ;;
+   "rpmprepare") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bp $PACKAGE.spec --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\""
@@ -1751,7 +1752,10 @@ case $REQUEST in
                }
                ;;
    "srpmbuild") [ "$RPMFORCE" = "true" ] && RPMFORCEADD="--nodeps"
-                $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bs --define=\"_sourcedir $SPECVAR_WORKINGHOME/RPM/SOURCES\" $RPMFORCEADD $PACKAGE.spec"
+                $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE \
+                   "rpmbuild -bs \
+--define=\"_topdir $SPECVAR_WORKINGHOME/RPM\" \
+$RPMFORCEADD $PACKAGE.spec"
                 RET=$? ;;
    "autospeclistcheck")
                    [ "$RPMBUILDARCH" -a "$RPMBUILDARCH" != "${AUTOPORT_ARCH[$ENVIRONMENT]}" ] && \
@@ -1771,7 +1775,9 @@ case $REQUEST in
                     fi ;;
    "sendpackage") if [ "$SENDREPOSITORY" ]; then
                      if [ "$SENDRECREATESRPM" = "true" ]; then
-                        $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bs --define=\"_sourcedir $SPECVAR_WORKINGHOME/RPM/SOURCES\" $PACKAGE.spec $RPMFORCEADD && $AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY"
+                        $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bs \
+--define=\"_topdir $SPECVAR_WORKINGHOME/RPM\" \
+$PACKAGE.spec $RPMFORCEADD && $AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY"
                         RET=$?
                      else
                         $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY"
@@ -1788,7 +1794,9 @@ case $REQUEST in
    "sendsource") [ "$RPMFORCE" = "true" ] && RPMFORCEADD="--nodeps"
                  if [ "$SENDREPOSITORY" ]; then
                     if [ "$SENDRECREATESRPM" = "true" ]; then
-                       $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bs --define=\"_sourcedir $SPECVAR_WORKINGHOME/RPM/SOURCES\" $PACKAGE.spec $RPMFORCEADD && $AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY --norpm"
+                       $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bs \
+--define=\"_topdir $SPECVAR_WORKINGHOME/RPM\" \
+$PACKAGE.spec $RPMFORCEADD && $AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY --norpm"
                        RET=$?
                        if [ $RET -eq 0 ]; then
                           social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"sent edited <b>$PACKAGE</b> source to <b>$SENDREPOSITORY</b>\" STIME=`date +%s`"
@@ -2246,5 +2254,5 @@ else
    echo -n ")"
 fi
 
-echo -n " :: openmamba webbuild</title>"
+echo -n " :: openmamba webbuild @`hostname`</title>"
 echo "</webbuild>"

webbuild/webbuild-functions-private

@@ -84,6 +84,7 @@ function showlog() {
 
 function showEnvironmentPanel() {
 
+   echo -n "Build host: <b>`hostname`</b><br>"
    echo -n "Environment: <b>"
    if [ "${AUTOPORT_CHROOT_USER[$ENVIRONMENT]}" ]; then
       echo -n "${AUTOPORT_CHROOT_USER[$ENVIRONMENT]} - "