Release 0.9.13

These variables are set to 1 by default

Makefile

@@ -1,5 +1,5 @@
 # Makefile for autodist
-# Copyright (C) 2006-2009 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2006-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 PACKAGE = autodist
 
@@ -47,6 +47,7 @@ install-dirs:
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/cron.hourly
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/cron.daily
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/sysconfig
+	@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/logrotate.d
 	@$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(sbindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(cgidir)
@@ -85,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
@@ -108,7 +97,10 @@ install-data:
 	@$(INSTALL_SCRIPT) etc/cron.hourly/66-autoport-chroot $(DESTDIR)$(sysconfdir)/cron.hourly/
 	@$(INSTALL_SCRIPT) etc/cron.daily/40-autodist-cleanold $(DESTDIR)$(sysconfdir)/cron.daily/
 	@$(INSTALL_SCRIPT) etc/cron.daily/40-autodist-upstream-updates $(DESTDIR)$(sysconfdir)/cron.daily/
+	@$(INSTALL_SCRIPT) etc/logrotate.d/webbuild $(DESTDIR)$(sysconfdir)/logrotate.d/webbuild
 	@$(INSTALL_DATA) autospec-conf $(DESTDIR)$(pck_statedir)/.autospec
+	@$(INSTALL_DATA) autodist-bashrc $(DESTDIR)$(pck_statedir)/.bashrc
+	@$(INSTALL_DATA) autodist-bash_profile $(DESTDIR)$(pck_statedir)/.bash_profile
 	@touch $(DESTDIR)$(pck_statedir)/template/autoupdate/auto.success
 	@touch $(DESTDIR)$(pck_statedir)/template/autoupdate/auto.skip
 

VERSION

@@ -1 +1 @@
-VERSION = 0.9.9
+VERSION = 0.9.13

autodist

@@ -1,11 +1,11 @@
 #!/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.9
+VERSION=0.9.12
 me=(${0##*/} $VERSION "Sat Aug 20 2010")
 exec 3>`readlink /proc/self/fd/0`
 
@@ -57,21 +57,17 @@ ${me[0]} ${me[1]}
 
 }
 
-function fetch_repository_list() {
+function fetch_repository_file() {
-   local REPOLIST=$1
+   local REPOFILE=$1
-
+   if [ -r ${LOCAL_REPS_BASE_DIR}/$REPOFILE ]; then
-   if [ -r ${LOCAL_REPS_BASE_DIR}/$REPOLIST ]; then
+      echo ${LOCAL_REPS_BASE_DIR}/$REPOFILE
-      echo ${LOCAL_REPS_BASE_DIR}/$REPOLIST
       return 0
    else
-      if [ ! -r $USERCONFDIR/$REPOLIST -o "`find $USERCONFDIR/$REPOLIST -mmin +60 2>/dev/null`" ]; then
+      if [ ! -r $USERCONFDIR/$REPOFILE -o "`find $USERCONFDIR/$REPOFILE -mmin +60 2>/dev/null`" ]; then
-         mkdir -p `dirname $USERCONFDIR/$REPOLIST`
+         mkdir -p `dirname $USERCONFDIR/$REPOFILE`
-         curl -s $REPS_BASE_URL/$REPOLIST -o $USERCONFDIR/$REPOLIST || {
+         curl -f -L -s $REPS_BASE_URL/$REPOFILE -o $USERCONFDIR/$REPOFILE || return 1
-            echo "Error: unable to fetch $REPS_BASE_DIR/$REPOLIST"
-            exit 1
-         }
       fi
-      echo $USERCONFDIR/$REPOLIST
+      echo $USERCONFDIR/$REPOFILE
       return 0
    fi
 }
@@ -220,12 +216,6 @@ done
 [ "$SEND_SERVER" ] || SEND_SERVER=$AUTODIST_REPOSITORY
 
 SEND_SERVER_CMD="--server $SEND_SERVER"
-AUTOUPDATEDIR=${LOCAL_REPS_BASE_DIR}/$AUTODIST_REPOSITORY/autoupdate/
-
-[ -r $AUTOUPDATEDIR ] || {
-   AUTOUPDATEDIR=$USERCONFDIR/$AUTODIST_REPOSITORY/autoupdate
-   mkdir -p $AUTOUPDATEDIR
-}
 
 # perform arch names conversions
 case $BUILDARCH in
@@ -236,34 +226,6 @@ case $TARGETARCH in
    i386|i486|i686) TARGETARCH=i586 ;;
 esac
 
-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`
-
-BUILDSLIST=`fetch_repository_list distromatic/$AUTODIST_REPOSITORY/builds-$TARGETARCH`
-[ "$AUTODIST_DELAYED_REPOSITORY" ] && BUILDSLIST_DELAYED=`fetch_repository_list distromatic/$AUTODIST_DELAYED_REPOSITORY/builds-$TARGETARCH`
-
-[ -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}
-   mkdir -p $LOGBASEDIR/build/{ok,failed}
-   mkdir -p $LOGBASEDIR/install/{ok,failed}
-   mkdir -p $LOGBASEDIR/send/{ok,failed}
-}
-
-#[ "$PACKAGE" ] || {
-#   echo "ERROR: missing target; aborting."
-#   usage
-#   exit 1
-#}
 
 # for webbuild message
 function cgi_encodevar() {
@@ -880,10 +842,32 @@ function log_date() {
    echo -n `LANG=C date +%Y%m%d@%H%M%S`
 }
 
-DISTDBFILES="$DISTDB"
+[ -e $LOGBASEDIR ] || {
-[ -e $DISTDB.$TARGETARCH ] && DISTDBFILES="$DISTDBFILES $DISTDB.$TARGETARCH"
+   mkdir -p $LOGBASEDIR/prepare/{ok,failed}
-[ -e ~/.autodist/distdb ] && DISTDBFILES="$DISTDBFILES ~/.autodist/distdb"
+   mkdir -p $LOGBASEDIR/update/{ok,failed}
-[ -e ~/.autodist/distdb.$TARGETARCH ] && DISTDBFILES="$DISTDBFILES ~/.autodist/distdb.$TARGETARCH"
+   mkdir -p $LOGBASEDIR/build/{ok,failed}
+   mkdir -p $LOGBASEDIR/install/{ok,failed}
+   mkdir -p $LOGBASEDIR/send/{ok,failed}
+}
+
+#
+# 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
@@ -931,6 +915,30 @@ for a in $LOGBASEDIR/{,prepare/{,ok,failed},update/{,ok,failed},build/{,ok,faile
    
 done
 
+AUTOUPDATEDIR=${LOCAL_REPS_BASE_DIR}/$AUTODIST_REPOSITORY/autoupdate/
+[ -r $AUTOUPDATEDIR ] || {
+   AUTOUPDATEDIR=$USERCONFDIR/$AUTODIST_REPOSITORY/autoupdate
+   mkdir -p $AUTOUPDATEDIR
+}
+
+SOURCESDIR=$AUTOUPDATEDIR/sources/
+SUCCESSLISTDIR=$AUTOUPDATEDIR
+SKIPPEDLISTDIR=$AUTOUPDATEDIR
+
+SRCPKGLIST=`fetch_repository_file $AUTODIST_REPOSITORY/srcpkglist`
+[ $? -eq 0 ] || echo "Warning: unable to fetch $SRCPKGLIST">&2
+
+[ "$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`"
 
 # autobuild: add jobs ordered by oldest builds

autodist-bash_profile

@@ -0,0 +1,14 @@
+# .bash_profile
+
+# Get the aliases and functions
+if [ -f ~/.bashrc ]; then
+   . ~/.bashrc
+fi
+
+# User specific environment and startup programs
+if [ -d $HOME/bin ]; then
+   PATH=$PATH:$HOME/bin
+fi
+export PATH
+
+unset USERNAME

autodist-bashrc

@@ -0,0 +1,8 @@
+# .bashrc
+
+# User specific aliases and functions
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+   . /etc/bashrc
+fi

autodist-repository

@@ -3,7 +3,7 @@
 # Copyright (c) 2007-2014 by Silvan Calarco
 #
 . /etc/autodist/config
-#. /sysconfig/openmamba-central
+[ -r /etc/autodist/config-secret ] && . /etc/autodist/config-secret
 
 basearch=i586
 
@@ -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."
+      echo "ERROR: srcpkglist file missing for $origrepository repository; aborting." >&2
-      exit 1
+      exit 200
    }
    tmpfile=`mktemp`
    packages=()
@@ -61,8 +61,8 @@ get_pkg_srcinfo() {
 
    local rep pkg line
 
-   [ $1 ] && rep=$1 || exit 1
+   [ $1 ] && rep=$1 || exit 200
-   [ $2 ] && pkg=$2 || exit 1
+   [ $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
+   [ $1 ] && rep=$1 || exit 200
-   [ $2 ] && buildarch=$2 || exit 1
+   [ $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."
+	      echo "ERROR: cannot move file $ORIG_URL_LOCAL_ARCH/$f to $DEST_URL_ARCH/$f; aborting." >&2
-	      exit 1
+	      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."
+	         echo "ERROR: cannot get file $ORIG_URL_ARCH/$f; aborting." >&2
-	         exit 1
+	         exit 200
               }
         fi
      else
         # remote -> remote
-        echo "Error: remote to remote file import is not implemented yet; aborting."
+        echo "ERROR: remote to remote file import is not implemented yet; aborting." >&2
-	exit 1
+	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."
+           echo "ERROR: cannot copy file $ORIG_URL_ARCH/$f to $DEST_URL_ARCH/$f; aborting." >&2
-           exit 1
+           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."
+              echo "ERROR: cannot remove file $ORIG_URL_ARCH/$f; aborting." >&2
-              exit 1
+              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."
+              echo "ERROR: cannot send file $ORIG_URL_ARCH/$f; aborting." >&2
-              exit 1
+              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."
+          echo "ERROR: can't move $m to $LOCAL_BACKUP; aborting." >&2
-          exit 1
+          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."
+          echo "ERROR: can't copy $p to $restoredest; aborting." >&2
-          exit 1
+          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
 
@@ -426,19 +426,29 @@ function import_package() {
     # check release in dest repository
     get_pkg_buildinfo $destrepository $a $import_pkg
     [ "$pkg_name" ] && {
-#    IMPORT_ORIG_ARCHS=(${IMPORT_ORIG_ARCHS[*]} $a)
+       dest_ver=$pkg_version
+       dest_rel=$pkg_release
        get_pkg_buildinfo $origrepository $a $import_pkg
        [ "$pkg_name" ] || {
-          [ "$a" == "$basearch" ] && {
+          for b in ${AUTODIST_ARCHS[*]}; do
-             echo "Error: package $import_pkg does not exist in $origrepository($a); skipping."
+             if [ "$b" != "$a" ]; then
-             return
+                # Get upstream version in other architecture, then if same version -> merge
-          }
+                get_pkg_buildinfo $origrepository $b $import_pkg
-          if [ "$force" = "1" ]; then
+             fi
-             echo "Warning: package $import_pkg is missing in $origrepository($a) but present in $destrepository($a)."
+             [ "$pkg_name" ] && break
-             echo "Import forced. You will need to port package to the missing arch."
+          done
-          else
+          if [ "$dest_ver-$dest_rel" != "$pkg_version-$pkg_release" ]; then
-             echo "Error: package $import_pkg is missing in $origrepository($a). This would break package in $destrepository($a) repository."
+             [ "$a" == "$basearch" -a "$force" != "1" ] && {
-             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." >&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." >&2
+                return 255
+             fi
           fi
        }
     }
@@ -462,8 +472,8 @@ function import_package() {
  } || origpkgversion="none"
 
  [ $origpkgname ] || { 
-    echo "Error: package $import_pkg does not exist in $origrepository; aborting."
+    echo "ERROR: package $import_pkg does not exist in $origrepository; aborting." >&2
-    exit 1
+    exit 200
  }
 
  DEST_URL_ARCH=$DEST_URL/$destrepository/SRPMS.base/
@@ -485,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
@@ -529,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
@@ -544,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
@@ -559,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
@@ -591,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
@@ -633,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
@@ -657,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
@@ -678,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/ *}"
@@ -686,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/ *}"
@@ -697,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; }
+[ "$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."; exit 1; }
+[ "$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" ] && {
@@ -744,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
@@ -753,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
@@ -777,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
@@ -807,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
@@ -848,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
@@ -863,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"
@@ -886,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
@@ -959,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; }
@@ -975,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)"
@@ -989,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
@@ -999,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

autodist-upstream-updates

@@ -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

automaint

@@ -159,7 +159,18 @@ for a in `seq 1 ${#ARCHS[*]}`; do
    needportlist[$a-1]="${needport_list[*]}"
 done
 
-for p in ${pkglist[0]}; do
+tmpfile=`mktemp -q -t $me.XXXXXXXX` || {
+      echo "ERROR: cannot create temporary files." >&2
+      exit 1
+   }
+
+for a in `seq 1 ${#ARCHS[*]}`; do
+   echo -n "${pkglist[$a-1]} " >> $tmpfile
+done
+allpkgs="`cat $tmpfile | xargs -n 1 | sort -u | xargs`"
+rm -f $tmpfile
+
+for p in ${allpkgs}; do
    pkgcontinue=
    needsport=
    for w in ${warningslist[*]}; do
@@ -167,22 +178,39 @@ for p in ${pkglist[0]}; do
    done
    [ "$pkgcontinue" ] && continue
 
-   get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$SOURCE_REPOSITORY ${ARCHS[0]} $p
+   for a in `seq 1 ${#ARCHS[*]}`; do
+      get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$DEST_REPOSITORY ${ARCHS[$a-1]} $p
+      if [ "$pkg_name" ]; then
+         spkg_version=$pkg_version
+         spkg_release=$pkg_release
+         break
+      fi
+   done
+
+   [ "$pkg_name" ] || {
+      echo "$p: not present in $DEST_REPOSITORY; skipping."
+      continue
+   }
+
+   [ "$VERBOSE" ] && echo "$p: old release in $DEST_REPOSITORY is $spkg_version-$spkg_release"
 
    for o in ${needportlist[*]}; do
       [ "$p" = "$o" ] && { needsport=1; break; }
    done
    [ "$needsport" -a ! "$PORT_REPOSITORY" ] && continue
 
-   spkg_version=$pkg_version
+   for a in `seq 1 ${#ARCHS[*]}`; do
-   spkg_release=$pkg_release
+      get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$SOURCE_REPOSITORY ${ARCHS[$a-1]} $p
-   get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$DEST_REPOSITORY ${ARCHS[0]} $p
+      [ "$pkg_name" ] && break
+   done
 
    [ "$pkg_name" ] || {
-      echo "$p: looks like a new package; skipping."
+      echo "$p: not present in $SOURCE_REPOSITORY; skipping."
       continue
    }
 
+   [ "$VERBOSE" ] && echo "$p: new release in $SOURCE_REPOSITORY is $pkg_version-$pkg_release"
+
    if [ "$pkg_version" = "$spkg_version" ]; then
       if [ "$pkg_release" = "$spkg_release" ]; then
          echo "$p: same release as upstream; skipping."
@@ -195,22 +223,34 @@ for p in ${pkglist[0]}; do
       read -ra SVER <<< "$spkg_version"
       read -ra VER <<< "$pkg_version"
       IFS=$OIFS
+      dotdiff=`expr ${#VER[*]} - ${#SVER[*]}`
       for i in `seq 1 ${#SVER[*]}`; do
          [ "${SVER[i-1]}" != "${VER[i-1]}" ] && break
       done
-      if [ "$i" = "${#SVER[*]}" ]; then
+      if [ "$i" = "${#SVER[*]}" -a $dotdiff -eq 0 ]; then
-         if [[ 64#${SVER[i-1]} -gt 64#89 && 64#${VER[i-1]} -lt 64#80 ]]; then
+         # e.g. SVER=0.11.3 -> VER=0.11.4
-            [ "$VERBOSE" ] && echo "$p: dubious beta upgrade from ${VER[i-1]} to ${SVER[i-1]}; skipping."
+         if [[ 64#${VER[i-1]} -gt 64#89 && 64#${SVER[i-1]} -lt 64#80 ]]; then
+            [ "$VERBOSE" ] && echo "$p: dubious beta upgrade from ${SVER[i-1]} to ${VER[i-1]}; skipping."
             continue
          fi
          update_type="minor"
+      elif [ $dotdiff -lt 0 ]; then
+         [ "$VERBOSE" ] && echo "$p: newer version has less dots than older ${#VER[*]} < ${#SVER[*]}; skipping."
+         continue
+      elif [ "$i" != "${#SVER[*]}" ]; then
+         # e.g. SVER=0.11 -> VER=1.0
+         [ "$VERBOSE" ] && echo "$p: not a minor version update at position $i/${#SVER[*]}: ${SVER[i-1]} != ${VER[i-1]}; skipping."
+         continue
+      elif [ "${SVER[i-1]}" = "${VER[i-1]}" -a $dotdiff -ge 1 ]; then
+         # e.g. SVER=0.11.2 -> VER=0.11.2.3
+         update_type="minor"
       else
-         [ "$VERBOSE" ] && echo "$p: dubious not-minor version update $i/${#SVER[*]}: ${SVER[i-1]} != ${VER[i-1]}; skipping."
+         echo "$p: UNEXPECTED CASE - CHECK CODE; skipping."
          continue
       fi
    fi
    if [ "$needsport" ]; then
-      echo "$p: importing from $SOURCE_REPOSITORY to $PORT_REPOSITORY ($spkg_version-$spkg_release -> $pkg_version-$pkg_release)"
+      echo "$p: importing from $SOURCE_REPOSITORY to $PORT_REPOSITORY ($pkg_version-$pkg_release -> $spkg_version-$spkg_release)"
       if [ ! "$TESTMODE" ]; then
          autodist-repository import $SOURCE_REPOSITORY $p -d $PORT_REPOSITORY -y >/dev/null
          if [ $? -eq 0 -a "$WEBBUILD_URL" -a "$WEBBUILD_USER" ]; then
@@ -219,7 +259,7 @@ MESSAGE=`cgi_encodevar \"imported <b>$p</b> from <b>$SOURCE_REPOSITORY</b> to <b
          fi
       fi
    else
-      echo "$p: importing from $SOURCE_REPOSITORY to $DEST_REPOSITORY ($spkg_version-$spkg_release -> $pkg_version-$pkg_release; update type: $update_type)"
+      echo "$p: importing from $SOURCE_REPOSITORY to $DEST_REPOSITORY ($pkg_version-$pkg_release -> $spkg_version-$spkg_release; update type: $update_type)"
       if [ ! "$TESTMODE" ]; then
          autodist-repository import $SOURCE_REPOSITORY $p -d $DEST_REPOSITORY -y >/dev/null
          if [ $? -eq 0 -a "$WEBBUILD_URL" -a "$WEBBUILD_USER" ]; then

autoport

@@ -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.9
+VERSION=0.9.13
 
 BASE_ARCH=i586
 BASE_REPOSITORY=devel
@@ -232,12 +232,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 ||
+   curl -f -L -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"
+   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 "Error: unable to fetch ${REPS_BASE_URL}/${PORT_REPOSITORY/-*}/unstage.$TARGET_ARCH"
 }
 
 [ $# -gt 0 ] || { usage ; exit 1; }
@@ -438,8 +448,9 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
          else
             JOB_CURRENT_VERSION=
          fi
-         if [ "`grep "^${JOB_CURRENT}$" /etc/autodist/unstage 2>/dev/null`" -o \
+         if [ ! -s $DATADIR/$PORT_REPOSITORY/unstage.${TARGET_ARCH} -o \
-              "`grep "^${JOB_CURRENT}$" /etc/autodist/unstage.${TARGET_ARCH} 2>/dev/null`" ]; then
+              "`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
@@ -654,8 +665,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 \
+            if [ "`grep "^${JOB_CURRENT}$" /etc/autodist/unstage.${TARGET_ARCH} 2>/dev/null`" -o \
-                 "`grep "^${JOB_CURRENT}$" /etc/autodist/unstage.${TARGET_ARCH} 2>/dev/null`" ]; then
+                 "`grep "^${JOB_CURRENT}$" $DATADIR/$PORT_REPOSITORY/unstage.$TARGET_ARCH 2>/dev/null`" ]; then
                echo -n "$JOB_CURRENT: "
                STAGEOPTS=
             else

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

etc/autodist/distdb

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

etc/autodist/distdb.arm

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

etc/autodist/distdb.i586

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

etc/autodist/distdb.ppc

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

etc/autodist/distdb.x86_64

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

etc/autodist/legacy

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

etc/autodist/unstage

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

etc/autodist/unstage.arm

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

etc/autodist/unstage.x86_64

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

etc/cron.daily/40-autodist-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
+. /etc/sysconfig/autoport
-/usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
 
-REPOSITORY=milestone1-1.1
+if [ ! "$AUTOPORT_UPDATE_NO_DISTROMATIC" ]; then
-/usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
+   REPOSITORY=devel
+   /usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
 
-REPOSITORY=milestone2
+   REPOSITORY=milestone1-1.1
-/usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
+   /usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
+
+   REPOSITORY=milestone2
+   /usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
+fi
 
 exit 0

etc/cron.hourly/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
+      if [ ! "$AUTOPORT_UPDATE_NO_DISTROMATIC" ]; then
-      distromatic -q -t $DISTROMATIC_REPOSITORY --gensrcpkglist > $LOCAL_REPS_BASE_DIR/$DISTROMATIC_REPOSITORY/srcpkglist 2>/dev/null
+         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 \

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
+      if [ "${AUTOPORT_CHROOT[$i]}" = "autodist" ]; then
-      #echo "DEBUG: cat /var/autoport/${AUTOPORT_CHROOT[$i]}/home/${AUTOPORT_CHROOT_USER[$i]}/.autoport/${AUTOPORT_ARCH[$i]}/$r-current.log" >> $LOGFILE
+         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

etc/logrotate.d/webbuild

@@ -0,0 +1,8 @@
+/var/webbuild/access_log {
+    monthly
+    rotate 12
+    copytruncate
+    compress
+    notifempty
+    missingok
+}

etc/sysconfig/autoport

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

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 -->

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))

webbuild/webbuild-cgi

@@ -211,7 +211,7 @@ fi
 # Public requests
 #
 if [ "$REQUEST" = "refresh" -o "$REQUEST" = "refreshsocial" -o ! "$USER" ]; then
-   if [ "$WEBBUILD_URL" -a "$USER" ]; then
+   if [ "$WEBBUILD_URL" -a "${WEBBUILD_URL/\/localhost\//}" = "$WEBBUILD_URL" ]; then
       curl -s "$WEBBUILD_URL?REQUEST=refreshsocial&USER=$USER&SECRET=`cgi_encodevar \"$USER_SECRET\"`&USER_EMAIL=$USER_EMAIL&FROMID=$FROMID"
    else
       [ -e "$WEBBUILD_STATEDIR/social_log" ] || exit
@@ -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 | \
@@ -1044,7 +1044,7 @@ if [ "$REQUEST" = "prepare" -o "$REQUEST" = "updatespec" -o "$REQUEST" = "speccr
                        [ $RET -eq 0 ] && {
                           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"
@@ -1738,7 +1738,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 +1751,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 +1774,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 +1793,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`"
@@ -2112,7 +2119,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}

webbuild/webbuild-functions

@@ -37,7 +37,8 @@ function social_log() {
       set_user_state_var STATE_SOCIALLOG_ID $STATE_SOCIALLOG_ID webbuild
       echo "SID=$STATE_SOCIALLOG_ID SPRIVACY=$STATE_PRIVACYMODE $line" >> $WEBBUILD_STATEDIR/social_log
 
-      if [ "$WEBBUILD_URL" ]; then
+      # Note: checking that URL does not point here again to avoid recursive requests
+      if [ "$WEBBUILD_URL" -a "${WEBBUILD_URL/\/localhost\//}" = "$WEBBUILD_URL" ]; then
          eval $line
          USER_SECRET_FIXED=`echo $USER_SECRET | sed "s|\$|\\$|"`
          curl -s "$WEBBUILD_URL?REQUEST=message&USER=$USER&SECRET=`cgi_encodevar \"$USER_SECRET\"`&USER_EMAIL=$USER_EMAIL&\