webbuild-cgi: other adjustements using binary calls to webbuild-sudo

webbuild-cgi: need to pass binary to some SUDO_WRAPPER calls after previous change
webbuild-sudo: pipe send output to parse_generic_output
2014-07-10 13:31:20 +02:00 · 2014-07-08 18:55:58 +02:00 · 2014-07-08 17:56:49 +02:00 · 2014-07-08 02:08:53 +02:00 · 2014-07-06 23:23:55 +02:00 · 2014-07-06 22:18:49 +02:00
32 changed files with 468 additions and 1822 deletions
--- a/12
+++ b/12
@ -86,18 +86,6 @@ install-programs:

 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/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
--- a/2
+++ b/2
@ -1 +1 @@
-VERSION = 0.9.10
+VERSION = 0.9.16
--- a/135
+++ b/135
@ -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-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=0.9.10
+VERSION=0.9.16
 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.""

 "$"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)""
@ -53,25 +53,22 @@ ${me[0]} ${me[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,6 +92,7 @@ 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"

@ -194,23 +192,37 @@ for ((i=1; i<=$#; i++)); do
                ;;
      -*) 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
@ -498,7 +510,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 +560,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 $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 $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 ] && {
@ -608,7 +643,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 +653,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
@ -789,6 +829,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)
@ -846,11 +891,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 +899,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 +974,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`"

--- a/152
+++ b/152
@ -40,8 +40,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 +61,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 +93,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 +120,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

@ -153,7 +153,7 @@ function get_pkg_buildinfo() {
 }

 function import_file() {
- [ $1 ] || exit 1
+ [ $1 ] || exit 200

 local f import_mode
 f=$1
@ -168,7 +168,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 +177,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 +186,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 +194,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 +226,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 +250,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 +273,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 +284,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 +301,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 +320,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 +340,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 +414,7 @@ function restore_package() {
 }

 function import_package() {
- [ $1 ] || exit 1
+ [ $1 ] || exit 200
 
 local import_pkg import_mode

@ -439,14 +439,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 +472,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 +495,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 +539,14 @@ 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

    #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 +554,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 +571,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,13 +603,13 @@ 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
@ -643,13 +645,13 @@ while [ "$1" ]; do
 		      ;;
 		  "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
@ -667,7 +669,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 +690,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 +698,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 +709,11 @@ done
   exit 0
 }

-[ "$origrepository" ] || { usage; exit 1; }
+[ "$origrepository" ] || { usage; exit 200; }
 SRCPKGLIST="${LOCAL_REPS_BASE_DIR}/$origrepository/srcpkglist"

-[ "$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 +756,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 +765,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 +789,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 +819,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 +860,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 +875,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"
@ -896,7 +898,7 @@ SRCPKGLIST="${LOCAL_REPS_BASE_DIR}/$origrepository/srcpkglist"

 [ "$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 +971,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 +987,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 +1001,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 +1013,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
--- a/7
+++ b/7
@ -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
--- a/19
+++ b/19
@ -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"
@ -168,6 +158,15 @@ UPDATES_DB=$CACHE_DIR/upstream-updates
 ALIASES_DB=$CACHE_DIR/aliases
 MANUALVER_DB=$CACHE_DIR/manualver

+[ -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
--- a/123
+++ b/123
@ -1,10 +1,10 @@
 #!/bin/bash
 # autoport -- batch cross-build tool based on autodist
-# Copyright (C) 2011-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2011-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=0.9.10
+VERSION=0.9.16

 BASE_ARCH=i586
 BASE_REPOSITORY=devel
@ -17,13 +17,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-2014 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 +33,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""
@ -232,12 +234,22 @@ function find_requirements() {
 }

 fetch_repfiles() {
-   curl -s ${REPS_BASE_URL}/$PORT_REPOSITORY/srcpkglist -o $DATADIR/$PORT_REPOSITORY/srcpkglist ||
+   local u
+
+   curl -f -L -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 ||
+   curl -f -L -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"
+   curl -f -L -s $PORT_REPOSITORY_DISTROMATIC_URL/builds-$TARGET_ARCH.sh -o $DATADIR/$PORT_REPOSITORY/builds-$TARGET_ARCH.sh ||
+      echo "Warning: unable to fetch $PORT_REPOSITORY_DISTROMATIC_URL/builds-$TARGET_ARCH.sh"
+   for u in ${AUTOPORT_UNSTAGE_ARCHS}; do
+      [ "$u" = "$TARGET_ARCH" ] && {
+         rm -f $DATADIR/$PORT_REPOSITORY/unstage.$TARGET_ARCH
+         return
+      }
+   done
+   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; }
@ -267,6 +279,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 +290,9 @@ for ((i=1; i<=$#; i++)); do
      -r) shift
          PORT_REPOSITORY="${!i}"
          ;;
+      -s) shift
+          SCRIPT_ARGS="${!i}"
+          ;;
      -d) shift
          DEST_REPOSITORY="${!i}"
          ;;
@ -321,10 +339,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,14 +365,46 @@ 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_version=$pkg_version
+         port_pkg_release=$pkg_release
+         currrebuild=
+         currjobsscriptargs=
+         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
+               JOB=(${JOB[*]} $currrebuild)
+               let JOBNUM+=1
+            fi
+            currprovider=${p/*@}
+            if [ "$port_pkgbuilds/ $currprovider-devel }"  != "$port_pkgbuilds" ]; then
+               currprovider=${currprovider}-devel
+            fi
+            currjobscriptargs="$currjobscriptargs --buildreq ${currprovider} >= $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."
@ -438,8 +484,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,6 +524,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
         fi

         DONT_PREPARE_THIS=
+         RELEASE_UPDATED=
         for p in ${JOB_CMDLINE[*]}; do
            [ "$p" = "${JOB_CURRENT}" -o "$DONT_PREPARE_ANY" ] || continue
            [ -e ${SPECDIR}/${JOB_CURRENT}.spec ] && DONT_PREPARE_THIS="$DONT_PREPARE"
@ -506,11 +554,16 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
               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"
+               if [ "$REBUILD_DEPENDANT_MODE" ]; then
+                  SCRIPT_ARGS="${JOB_SCRIPTARGS[$JOB_NUM-1]}"
+                  changelogadd="`echo ${SCRIPT_ARGS} | sed "s|--buildreq|,|;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\""
-               LANG=C LC_ALL=C autodist -u --rebuild -r ${JOB_CURRENT} --severity 2 -- $STAGEOPTS --changelog \"$REBUILD_CHANGELOG\" &>$tmpfile
+%% 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 +571,13 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
               } || {
                  autoport_log ${JOB_CURRENT} update ok $tmpfile
                  echo -n "(OK) "
+                  RELEASE_UPDATED=1
               }
            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
+               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 +586,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"
@ -563,6 +618,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 +628,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"
+         [ ! "$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 $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
+%% 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
@ -607,10 +662,10 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
            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
+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
+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 +709,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 +773,4 @@ 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
+exit ${#JOB_FAILED[*]}
--- a/etc/autodist/config
+++ b/etc/autodist/config
@ -17,6 +17,7 @@ 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)
+AUTOPORT_UNSTAGE_ARCHS="i586"
 AUTOPORT_STAGEVARS="--define stage1=1"
 AUTOPORT_MAX_STEPS=10
 #RPMDIR=/usr/src/RPM
--- a/etc/autodist/distdb
+++ b/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
-)
--- a/etc/autodist/distdb.arm
+++ b/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
-)
--- a/etc/autodist/distdb.i586
+++ b/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
-)
--- a/etc/autodist/distdb.ppc
+++ b/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
-)
--- a/etc/autodist/distdb.x86_64
+++ b/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
-)
--- a/etc/autodist/legacy
+++ b/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
--- a/etc/autodist/scripts/update-specfile
+++ b/etc/autodist/scripts/update-specfile
@ -1,29 +1,79 @@
+#!/bin/bash
+#
 # Autodist script for updating specfiles
 # 
-# Copyright (c) 2007-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Released with the same license as autodist
 #

-[ "$1" ] || {
-   echo "Error: update-specfile: specfile not given; aborting."
+SPECFILE=
+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}
+         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|;
+        /BuildRequires:[[:space:]]*libffmpeg-devel/d;
+        s|\(BuildRequires:[[:space:]]*\)libmysql-devel|\1libmysql5-devel|;
+        s|\(BuildRequires:[[:space:]]*\)libdb42-devel|\1libdb47-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|http://.*.dl\.sourceforge\.net/|http://downloads.sourceforge.net/|" $SPECFILE
+#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
--- a/etc/autodist/unstage
+++ b/etc/autodist/unstage
@ -1 +0,0 @@
-gcc
--- a/etc/autodist/unstage.arm
+++ b/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
--- a/etc/autodist/unstage.i586
+++ b/etc/autodist/unstage.i586
--- a/etc/autodist/unstage.ppc
+++ b/etc/autodist/unstage.ppc
--- a/etc/autodist/unstage.x86_64
+++ b/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
--- a/etc/cron.daily/40-autodist-upstream-updates
+++ b/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
--- a/etc/cron.hourly/60-autodist-update
+++ b/etc/cron.hourly/60-autodist-update
@ -9,7 +9,9 @@
 ME=`basename $0`

 # FIXME: parametrize automaint call
-automaint -s devel-autodist -d devel -p devel-makedist
+if [ ! "$AUTOPORT_UPDATE_NO_AUTOMAINT" ]; then
+   automaint -s devel-autodist -d devel -p devel-makedist
+fi

 [ "$$" == "`pidof -x $ME`" -o "$$" == "`pidof -x 60-autodist-update`" ] || {
 #   echo "Warning: $ME script already running; exiting."
@ -51,8 +53,10 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
   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
+      if [ ! "$AUTOPORT_UPDATE_NO_DISTROMATIC" ]; then
+         pid_check
+         distromatic -q -t $DISTROMATIC_REPOSITORY --gensrcpkglist > $LOCAL_REPS_BASE_DIR/$DISTROMATIC_REPOSITORY/srcpkglist 2>/dev/null
+      fi

      pid_check
      autodist-upstream-updates -q -h -u -r $DISTROMATIC_REPOSITORY -o $r \
--- a/etc/cron.hourly/66-autoport-chroot
+++ b/etc/cron.hourly/66-autoport-chroot
@ -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
@ -44,7 +44,7 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
    #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
+    [ "${AUTOPORT_CHROOT_ICECREAM[$i]}" ] && LANG=C /usr/sbin/chroot /var/autoport/${AUTOPORT_CHROOT[$i]} /etc/init.d/icecream start
 fi

 for r in ${AUTOPORT_REPOSITORIES[$i]}; do
@ -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
@ -103,7 +105,7 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do

 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
+    [ "${AUTOPORT_CHROOT_ICECREAM[$i]}" ] && LANG=C /usr/sbin/chroot /var/autoport/${AUTOPORT_CHROOT[$i]} /etc/init.d/icecream stop
 fi

 done
--- a/etc/sysconfig/autoport
+++ b/etc/sysconfig/autoport
@ -5,6 +5,9 @@ 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
--- a/webbuild/html/autobuilds.html
+++ b/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 -->
--- a/webbuild/html/images/webbuild.ico
+++ b/webbuild/html/images/webbuild.ico
--- a/webbuild/html/webbuild.html
+++ b/webbuild/html/webbuild.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 -->
@ -150,13 +151,10 @@ function ajax_getvalues(request,confirm) {
       if (nodes[i].nodeName == "title") {
          document.title = nodes[i].childNodes[0].nodeValue;
       } else if (nodes[i].nodeName == "cookie-user") {
-          setCookie("webbuild-user", nodes[i].childNodes[0].nodeValue, 1);
+          setCookie("webbuild-user", nodes[i].childNodes[0].nodeValue);
       } else if (nodes[i].nodeName == "cookie-secret") {
-          setCookie("webbuild-secret", nodes[i].childNodes[0].nodeValue, 1);
+          setCookie("webbuild-secret", nodes[i].childNodes[0].nodeValue);
       } else if (document.getElementById(nodes[i].nodeName) != undefined) {
-//          var node = document.getElementById(nodes[i].nodeName)
-//alert("replace " + node.nodeValue + "with " + nodes[i].childNodes[0].nodeValue);
-//          node = replaceHTML(node, nodes[i].childNodes[0].nodeValue);
          $("#"+nodes[i].nodeName).html(nodes[i].childNodes[0].nodeValue);
          spectext = document.getElementById("spectext");
          if ((nodes[i].nodeName == "editor") && (spectext != undefined) && (spectext.parentNode != undefined))
--- a/webbuild/webbuild-cgi
+++ b/webbuild/webbuild-cgi
@ -484,7 +484,7 @@ if [ "$REQUEST" = "environmentsearch" ]; then
   echo -n "<hr><b>Environment search results for \"$ENVSEARCHTEXT\":</b><div align=left class=output id=outputtop>"
   echo -n "<pre><!-- SCROLL -->"
   echo -n "<font style=\"background-color:gray\">Installed packages providing '$ENVSEARCHTEXT':</font><br>"
-   WHAT_PROVIDES=`$SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "rpm -q --what-provides \"$ENVSEARCHTEXT\"" | sort -u`
+   WHAT_PROVIDES=`$SUDO_WRAPPER binary $ENVIRONMENT "$USER" "" "rpm -q --what-provides \"$ENVSEARCHTEXT\"" | sort -u`
   echo -n "$WHAT_PROVIDES<br>"
   if [ "${WHAT_PROVIDES:0:10}" != "no package" ]; then
      for f in $WHAT_PROVIDES; do
@ -542,7 +542,7 @@ if [ "$REQUEST" = "rpmmanager" ]; then
   rpmmanagerfiles=$rpmmanagerdir/$rpmmanagermask
   if [ "${rpmmanagermode}" = "environment" ]; then
      # local files in environment
-      $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "ls -t $rpmmanagerfiles 2>/dev/null" | \
+      $SUDO_WRAPPER binary $ENVIRONMENT "$USER" "" "ls -t $rpmmanagerfiles 2>/dev/null" | \
      while read f; do
         pkgname=`basename $f`
         echo -n "<label>"
@ -732,7 +732,7 @@ elif [ ! "$REQUEST" -o "$REQUEST" = "changeenvironment" -o "$REQUEST" = "switchm
   echo -n "onchange=ajax_getvalues(\"REQUEST=edit&ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&"
   echo -n "PACKAGE=\"+encodeURIComponent(this.value)+\"&REQUEST=changespec\");>"
   echo -n "<option value=\"\">-- Select a .spec file --</option>"
-   $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "ls *.spec 2>/dev/null| sed \"s|.spec$||\" | sort -f" | while read f; do
+   $SUDO_WRAPPER binary $ENVIRONMENT "$USER" "" "ls *.spec 2>/dev/null| sed \"s|.spec$||\" | sort -f" | while read f; do
      specname=${f/.spec}
      [ "$PACKAGE" = "$specname" ] && SELECTED="selected=\"selected\"" || SELECTED=
      echo -n "<option value=\"$specname\" $SELECTED>${specname}</option>"
@ -891,7 +891,7 @@ if [ "$MAINTAINERMODE" = "true" -o ! "${AUTOPORT_UPDATE[$ENVIRONMENT]}" ]; then
      SRPMBUTTONDISABLED="disabled=disabled"
      if [ -e $local_ftp/$REPOSITORY ]; then
         if [ $local_ftp/$REPOSITORY/SRPMS.base -nt $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY ]; then
-            ls $local_ftp/$REPOSITORY/SRPMS.base/ | grep ".src.rpm$" | sort -f > $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
+            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 | \
@ -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"
@ -1186,7 +1187,7 @@ if [ "$REQUEST" = "edit" -o "$REQUEST" = "reloadspec" -o "$REQUEST" = "switchmai
         echo -n "</div>"
      fi
      echo -n "Current <b>$PACKAGE.spec</b> in build environment:<textarea id=spectext class=editor>"
-      $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cat $PACKAGE.spec"
+      $SUDO_WRAPPER binary $ENVIRONMENT "$USER" $PACKAGE "cat $PACKAGE.spec"
      echo -n "</textarea>]]></editor>"
 #   else
 #      echo "<output><![CDATA[<div align=left class=output id=outputtop>"
@ -1382,7 +1383,7 @@ if [ "$MAINTAINERMODE" != "true" ]; then
         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:"
+         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="
@ -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');"
@ -1597,16 +1598,16 @@ fi

 echo -n "<chatpanel><![CDATA["
 # broadcast message
-echo -n "<hr><b>Write a message to all developers:</b><br>"
-echo -n "<textarea id=broadcastmessage style=\"width:98%;font-size:8pt;resize:none;\" rows=4 "
-echo -n "onkeypress=if(checkEnter()){ajax_getvalues(\""
+echo -n "<div style=\"position:absolute;width:220px;\">"
+echo -n "<textarea id=broadcastmessage style=\"font-family:sans;height:36px;width:80%;float:left;font-size:8pt;resize:none;\" "
+echo -n "onfocus=\"if(this.value==this.defaultValue)this.value='';\">Chat with online developers...</textarea>"
+echo -n "<input type=button style=\"float:right\" onclick=ajax_getvalues(\""
 echo -n "ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
 echo -n "MAINTAINERMODE=\"+getElementById('maintain').checked+\"&"
 echo -n "REQUEST=broadcastmessage&BROADCASTMESSAGE=\"+encodeURIComponent(getElementById('broadcastmessage').value));"
-echo -n "getElementById('broadcastmessage').value=\"\";}>"
-echo -n "</textarea>"
+echo -n "getElementById('broadcastmessage').value=\"\"; value=\"Send\" />"
 #echo -n "<input type=button value=\"send\" onClick="
-echo -n "]]></chatpanel>"
+echo -n "</div>]]></chatpanel>"

 if [ "$REQUEST" != "" ]; then
   echo -n "<output><![CDATA[<hr>"
@ -1637,18 +1638,18 @@ case $REQUEST in
   "runldconfig") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "/sbin/ldconfig"
                  RET=$?
                  ;;
-   "showpatch") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autodist-tool makepatch $PACKAGE"; RET=$? ;;
+   "showpatch") $SUDO_WRAPPER binary $ENVIRONMENT "$USER" $PACKAGE "autodist-tool makepatch $PACKAGE"; RET=$? ;;
   "removepatch") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autodist-tool makepatch $PACKAGE remove"
                     RET=$?
                     if [ $RET -eq 0 ]; then
                        social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"removed the autodist patch for <b>$PACKAGE</b>\" STIME=`date +%s`"
                     fi ;;
-   "autopatch") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autodist-tool makepatch $PACKAGE auto"
+   "autopatch") $SUDO_WRAPPER binary $ENVIRONMENT "$USER" $PACKAGE "autodist-tool makepatch $PACKAGE auto"
                     RET=$?
                     if [ $RET -eq 0 ]; then
                        social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"made an autodist patch for <b>$PACKAGE</b>\" STIME=`date +%s`"
                     fi ;;
-   "updatepatch") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autodist-tool makepatch $PACKAGE update"
+   "updatepatch") $SUDO_WRAPPER binary $ENVIRONMENT "$USER" $PACKAGE "autodist-tool makepatch $PACKAGE update"
                     RET=$?
                     if [ $RET -eq 0 ]; then
                        social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"made an autodist <b>update</b> patch for <b>$PACKAGE</b>\" STIME=`date +%s`"
@ -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`"
@ -1939,7 +1947,8 @@ case $REQUEST in
                         echo "ERROR: changelog was not specified."
                         RET=1
                      else
-                         $SUDO_WRAPPER background $ENVIRONMENT "$USER" "$PACKAGE" "autoport -r $SENDREPOSITORY -d $REPOSITORYIMPORTTO $PACKAGES -u \"$MASSREBUILDCHANGELOG\" --user $USER" &>/dev/null
+                         SCRIPTARGS=`echo -e $MASSREBUILDBUILDREQ | awk 'BEGIN {FS="\\\\n"} {for(i=1;i<=NF;i++) printf "--buildreq %s ", $i }'`
+                         $SUDO_WRAPPER background $ENVIRONMENT "$USER" "$PACKAGE" "autoport -r $SENDREPOSITORY -d $REPOSITORYIMPORTTO $PACKAGES -u \"$MASSREBUILDCHANGELOG\" -s \"$SCRIPTARGS\" --user $USER" &>/dev/null
                         [ $? -ne 0 ] && RET=$? || {
                            RET=-1
                            echo -n "Mass rebuild started. You may see the output in the <b>Webbuild jobs</b> box above."
@ -1949,6 +1958,18 @@ case $REQUEST in
 #                         fi
                      fi
                      ;;
+   "repositorymassrebuilddependant")
+                      if [ ! "$PACKAGES" ]; then
+                         echo "ERROR: no package(s) selected."
+                         RET=1
+                      else
+                         $SUDO_WRAPPER background $ENVIRONMENT "$USER" "$PACKAGE" "autoport -r $SENDREPOSITORY -d $REPOSITORYIMPORTTO $PACKAGES -ud --user $USER" &>/dev/null
+                         [ $? -ne 0 ] && RET=$? || {
+                            RET=-1
+                            echo -n "Mass rebuild started. You may see the output in the <b>Webbuild jobs</b> box above."
+                         }
+                      fi
+                      ;;
   "repositorysync")
                      if [ "$REPOSITORY" ]; then
                         $SUDO_WRAPPER background local "$USER" "" "/etc/cron.hourly/10-openmamba-sync-back $REPOSITORY"
@ -2020,9 +2041,9 @@ case $REQUEST in
                     [ $RET -eq 0 ] && RET=-1 ;;
   "showpatchfile") OUTPATCHFILE=${PATCHFILE/*\/}
                    case ${OUTPATCHFILE/*.} in
-                       gz|gzip) $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "gunzip -c $SPECVAR_RPMSOURCESDIR/$OUTPATCHFILE" | parse_patch_output ;;
-                       bz2) $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "bzcat $SPECVAR_RPMSOURCESDIR/$OUTPATCHFILE" | parse_patch_output ;;
-                       *) $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cat $SPECVAR_RPMSOURCESDIR/$OUTPATCHFILE" | parse_patch_output ;;
+                       gz|gzip) $SUDO_WRAPPER binary $ENVIRONMENT "$USER" $PACKAGE "gunzip -c $SPECVAR_RPMSOURCESDIR/$OUTPATCHFILE" | parse_patch_output ;;
+                       bz2) $SUDO_WRAPPER binary $ENVIRONMENT "$USER" $PACKAGE "bzcat $SPECVAR_RPMSOURCESDIR/$OUTPATCHFILE" | parse_patch_output ;;
+                       *) $SUDO_WRAPPER binary $ENVIRONMENT "$USER" $PACKAGE "cat $SPECVAR_RPMSOURCESDIR/$OUTPATCHFILE" | parse_patch_output ;;
                    esac
                    RET=$?
                    [ $RET -eq 0 ] && RET=-1
@ -2112,7 +2133,7 @@ if [ "$MAINTAINERMODE" = "true" ]; then
      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 $local_ftp/$REPOSITORY/SRPMS.base/ | grep ".src.rpm$" | sort -f > $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
+         ls --color=none $local_ftp/$REPOSITORY/SRPMS.base/ | grep ".src.rpm$" | sort -f > $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
      fi
      while read f; do
         pkgname=${f/.src.rpm}
@ -2205,8 +2226,18 @@ if [ "$MAINTAINERMODE" = "true" ]; then
      echo -n "REQUEST=repositoryarchive\""
      echo -n ",\"`cgi_encodevar "Archive <b>"`\"+p+\"`cgi_encodevar "</b> in <b>$REPOSITORY</b>?"`\""
      echo -n "); class=redbutton>"
+      # force checkbox
+      echo -n "<label><input type=checkbox id=\"repositoryforce\" value=\"force\">force</label>"
+      # simulate checkbox
+      echo -n "<label><input type=checkbox id=\"repositorysimulate\" value=\"simulate\">simulate</label>"
+      # changelog for mass rebuild
+      echo -n "<hr><b>Mass rebuild of selected packages:</b><br>Changelog:"
+      echo -n "<input type=text id=massrebuildchangelog style=\"width:100%\">"
+      # autodist update buildrequirements
+      echo -n "Add build requirement(s):<br>"
+      echo -n "<textarea id=massrebuildbuildreq style=\"width:98%;font-size:8pt;resize:none;\" rows=2></textarea>"
      # mass rebuild
-      echo -n "<input type=button value=\"mass rebuild\" onclick="
+      echo -n "<input type=button value=\"rebuild\" onclick="
      echo -n "p=getCheckedValuesByName('packagescheckbox');"
      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&"
      echo -n "PACKAGES=\"+encodeURIComponent(p)+\"&"
@ -2215,16 +2246,26 @@ if [ "$MAINTAINERMODE" = "true" ]; then
      echo -n "REPOSITORYSIMULATE=\"+getElementById('repositorysimulate').checked+\"&"
      echo -n "REPOSITORYFORCE=\"+getElementById('repositoryforce').checked+\"&"
      echo -n "MASSREBUILDCHANGELOG=\"+encodeURIComponent(getElementById('massrebuildchangelog').value)+\"&"
+      echo -n "MASSREBUILDBUILDREQ=\"+encodeURIComponent(getElementById('massrebuildbuildreq').value)+\"&"
      echo -n "SENDREPOSITORY=$REPOSITORY&REQUEST=repositorymassrebuild\""
      echo -n ",\"`cgi_encodevar "Rebuild <b>"`\"+p+\"`cgi_encodevar "</b> from <b>$REPOSITORY</b> and send to <b>"`\"+getSelectedValueById('repositoryimportto')+"
      echo -n "\"`cgi_encodevar "</b>?"`\""
      echo -n "); class=redbutton>"
-      echo -n " Changelog:"
-      echo -n "<input type=text id=massrebuildchangelog style=\"width:100%\">"
-      # force checkbox
-      echo -n "<label><input type=checkbox id=\"repositoryforce\" value=\"force\">force</label>"
-      # simulate checkbox
-      echo -n "<label><input type=checkbox id=\"repositorysimulate\" value=\"simulate\">simulate</label>"
+      # mass rebuild of dependant packages
+      echo -n "<input type=button value=\"rebuild dependant\" onclick="
+      echo -n "p=getCheckedValuesByName('packagescheckbox');"
+      echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&"
+      echo -n "PACKAGES=\"+encodeURIComponent(p)+\"&"
+      echo -n "MAINTAINERMODE=\"+getElementById('maintain').checked+\"&"
+      echo -n "REPOSITORYIMPORTTO=\"+getSelectedValueById('repositoryimportto')+\"&"
+      echo -n "REPOSITORYSIMULATE=\"+getElementById('repositorysimulate').checked+\"&"
+      echo -n "REPOSITORYFORCE=\"+getElementById('repositoryforce').checked+\"&"
+      echo -n "MASSREBUILDCHANGELOG=\"+encodeURIComponent(getElementById('massrebuildchangelog').value)+\"&"
+      echo -n "MASSREBUILDBUILDREQ=\"+encodeURIComponent(getElementById('massrebuildbuildreq').value)+\"&"
+      echo -n "SENDREPOSITORY=$REPOSITORY&REQUEST=repositorymassrebuilddependant\""
+      echo -n ",\"`cgi_encodevar "Rebuild package which depend on <b>"`\"+p+\"`cgi_encodevar "</b> in <b>$REPOSITORY</b> and send to <b>"`\"+getSelectedValueById('repositoryimportto')+"
+      echo -n "\"`cgi_encodevar "</b>?"`\""
+      echo -n "); class=redbutton>"
   fi
   echo -n "]]></operationpanel>"
 fi
@ -2246,5 +2287,5 @@ else
   echo -n ")"
 fi

-echo -n " :: openmamba webbuild</title>"
+echo -n " :: openmamba webbuild @`hostname`</title>"
 echo "</webbuild>"
--- a/webbuild/webbuild-functions
+++ b/webbuild/webbuild-functions
@ -96,9 +96,9 @@ function cgi_get_POST_vars()
        cgi_get_POST_upload "${CONTENT_TYPE/*boundary=}"
        return
    fi
-    [ "${CONTENT_TYPE:0:33}" != "application/x-www-form-urlencoded" ] && \
-       echo "Warning: you should probably use MIME type "\
-            "application/x-www-form-urlencoded instead of ${CONTENT_TYPE}!" 1>&2
+    #[ "${CONTENT_TYPE:0:33}" != "application/x-www-form-urlencoded" ] && \
+    #   echo "Warning: you should probably use MIME type "\
+    #        "application/x-www-form-urlencoded instead of ${CONTENT_TYPE}!" 1>&2
    # save POST variables (only first time this is called)
    [ -z "$QUERY_STRING_POST" \
      -a "$REQUEST_METHOD" = "POST" -a ! -z "$CONTENT_LENGTH" ] &&
--- a/webbuild/webbuild-functions-private
+++ b/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]} - "
--- a/webbuild/webbuild-httpd.conf
+++ b/webbuild/webbuild-httpd.conf
@ -0,0 +1,8 @@
+<Directory /var/www/html>
+    Options Indexes FollowSymLinks Includes ExecCGI
+    AllowOverride All
+    Require all granted
+    DirectoryIndex webbuild.html index.html index.php
+#    SSILegacyExprParser on
+</Directory>
+Timeout 600
--- a/webbuild/webbuild-sudo
+++ b/webbuild/webbuild-sudo
@ -150,7 +150,7 @@ else
      if [ "$MODE" = "binary" ]; then
         $SUCMDPREFIX ". /etc/profile;cd $WORKINGHOME/RPM/SPECS;$COMMAND;echo \$? > $rettmpfile" 2>&1
      else
-         $SUCMDPREFIX ". /etc/profile;cd $WORKINGHOME/RPM/SPECS;$COMMAND;echo \$? > $rettmpfile" 2>&1 | tr -d '\f' | tee $cmdtmpfile
+         $SUCMDPREFIX ". /etc/profile;cd $WORKINGHOME/RPM/SPECS;$COMMAND;echo \$? > $rettmpfile" 2>&1 | tr -d '\f' | tee $cmdtmpfile | parse_generic_output
      fi
      # sed "s|<|\&lt;|g" | 
   else
Author	SHA1	Message	Date
Silvan Calarco	55224a3ecb	webbuild-cgi: other adjustements using binary calls to webbuild-sudo	2014-07-10 13:31:20 +02:00
Silvan Calarco	bbcc9460b4	webbuild-cgi: need to pass binary to some SUDO_WRAPPER calls after previous change	2014-07-08 18:55:58 +02:00
Silvan Calarco	8e4e790104	webbuild-sudo: pipe send output to parse_generic_output	2014-07-08 17:56:49 +02:00
Silvan Calarco	487dbb2824	autodist: maybe fix for packages being sent to wrong repositories	2014-07-08 02:08:53 +02:00
Silvan Calarco	f05b31368f	webbuild: add support for mass rebuild of dependant packages	2014-07-06 23:23:55 +02:00
Silvan Calarco	fa602e75e0	autoport: add -ud option to rebuild dependant packages of given package(s) using new distromatic pkg_needrebuild info	2014-07-06 22:18:49 +02:00
Silvan Calarco	45b347da76	webbuild: add mass rebuilt build requirement update box; redesign and move chat box	2014-07-05 23:54:48 +02:00
Silvan Calarco	5927784c85	Release 0.9.16	2014-07-05 23:53:15 +02:00
Silvan Calarco	59a1ad0317	autodist,autoport: allow to pass arguments to update-specfile script update-specfile: accept --buildreq multiple arguments to edit build requirements with version	2014-07-05 17:50:53 +02:00
Silvan Calarco	3e0f261856	webbuild: add apache configuration file with 'Timeout 600'; not installed for now	2014-06-28 18:51:12 +02:00
Silvan Calarco	85e7950c4e	webbuild-functions: silence a warning which should be harmful and can't fix on client side	2014-06-28 18:50:15 +02:00
Silvan Calarco	58d61d51e3	Release 0.9.15	2014-06-24 11:38:48 +02:00
Silvan Calarco	b59c024914	webbuild: show build host on title and in environment panel	2014-06-18 13:15:44 +02:00
Silvan Calarco	82c5f79f27	webbuild: allow modified autodist ports is AUTOPORT_PORT_REPOSITORY is set	2014-06-18 13:09:29 +02:00
Silvan Calarco	5241fa7e82	webbuild-cgi: need to call specinfo in speccreate to set $SPECVAR_WORKINGHOME variable	2014-06-14 16:01:54 +02:00
Silvan Calarco	a89e2b9a13	autodist: fix manual version update and autoupdate script management	2014-06-13 14:35:54 +02:00
Silvan Calarco	f72d0b3663	Release 0.9.14	2014-06-13 12:53:58 +02:00
Silvan Calarco	56f41ede80	autodist-tool: use autodist --list-jobs instead of directly reading DISTDB	2014-06-13 12:47:16 +02:00
Silvan Calarco	a59ea180af	66-autoport-chroot: fix trivial mistake in previous change	2014-06-11 00:31:45 +02:00
Silvan Calarco	e3e4104f4e	autodist: add support for running <pkgname>-autoupdate script in /SOURCES after version update if found	2014-06-10 14:21:02 +02:00
Silvan Calarco	4f12cc4969	Release 0.9.13	2014-06-10 14:15:13 +02:00
Silvan Calarco	1da0a6d971	40-autodist-upstream-updates daily cron: don't run if AUTOPORT_UPDATE_NO_DISTROMATIC is set	2014-06-10 01:52:14 +02:00
Silvan Calarco	a66a8f8029	66-autoport-chroot: fix finding log path for autodist user special case	2014-06-10 01:44:26 +02:00
Silvan Calarco	2dd4d2632d	webbuild-cgi: fix rpmbuild -bs and other rpmbuild calls by passing correct %_topdir according to environment	2014-06-10 00:19:26 +02:00
Silvan Calarco	6dd2bb37bc	Release 0.9.12	2014-06-10 00:18:03 +02:00
Silvan Calarco	79c00b9f50	66-autoport-chroot: fix chroot command to start/stop icecream	2014-06-07 19:30:39 +02:00
Silvan Calarco	f4dbf4b5c2	autodist-repository, webbuild-cgi: use 'ls --color=none' to access local repository to speed up when using NFS	2014-06-07 19:20:56 +02:00
Silvan Calarco	13e52f18d5	60-autodist-update cron: add AUTOPORT_UPDATE_NO_AUTOMAINT and AUTOPORT_UPDATE_NO_DISTROMATIC configuration settings These variables are set to 1 by default	2014-06-07 19:13:48 +02:00
Silvan Calarco	1979751f33	autodist-repository: make sure to return 0 if import_package() succeeds	2014-06-05 10:51:55 +02:00
Silvan Calarco	ed2de4963a	autodist-repository: set return code as the number of import or release errors	2014-06-05 10:36:47 +02:00
Silvan Calarco	ae9e5c3be5	autodist: return error code when package to be imported does not exist any longer	2014-06-05 10:24:49 +02:00
Silvan Calarco	457d02194c	Release 0.9.11	2014-06-05 10:09:03 +02:00
Silvan Calarco	7107f7884f	autodist: don't raise error for missing $SYSCONFDIR/distdb* First use repository distdb* if available or load $SYSCONFDIR/distdb* Use $SYSCONFDIR/distdb.d/*.db for adding local custom definitions.	2014-06-04 22:39:38 +02:00
Silvan Calarco	159432b669	Remove configuration files that have been moved to repository in a previous commit	2014-06-04 18:13:33 +02:00
Silvan Calarco	c73ba35d74	autodist-upstream-updates: fix exiting with an error message if srcpkglist is bad	2014-06-04 18:03:36 +02:00
Silvan Calarco	2d950512e4	autoport: add AUTOPORT_UNSTAGE_ARCHS to globally define unstaged archs (current default: i586)	2014-06-04 15:37:41 +02:00
Silvan Calarco	30e8c88970	webbuild.html: don't set expire date for cookies	2014-05-31 15:30:20 +02:00
Silvan Calarco	eff79c5bf8	autodist, autoport: support for distdb., legacy., unstage.* from repository	2014-05-31 14:43:42 +02:00
Silvan Calarco	e6ee8dbd5b	autodist-repository: direct error and warning message to stderr	2014-05-29 15:35:40 +02:00
Silvan Calarco	9643cf4103	webbuild.html, autobuilds.html: added favicon	2014-05-29 14:35:20 +02:00