Release 0.9.16

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 23:53:15 +02:00 · 2014-07-05 17:50:53 +02:00 · 2014-06-28 18:51:12 +02:00 · 2014-06-28 18:50:15 +02:00 · 2014-06-24 11:38:48 +02:00 · 2014-06-18 13:15:44 +02:00
8 changed files with 150 additions and 41 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-VERSION = 0.9.14
+VERSION = 0.9.16
--- a/73
+++ b/73
@ -5,20 +5,20 @@
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=0.9.14
+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,6 +53,7 @@ ${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""
 "

 }
@ -91,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"

@ -190,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
@ -494,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
@ -544,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 ] && {
@ -604,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/ *})."
@ -614,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
@ -785,9 +829,10 @@ function launch_pkgs_loop() {
                             }
                        fi
                     fi
-                     if [ "$2" != "$SPEC_VERSION" -a -e $source_dir/$pkg-autoupdate ]; then
-                        echo "?= Running autoupdate script with version $SPEC_VERSION"
-                        sh $source_dir/$pkg-autoupdate $SPEC_VERSION
+                     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
                  ;;
--- a/14
+++ b/14
@ -4,7 +4,7 @@
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=0.9.14
+VERSION=0.9.16

 BASE_ARCH=i586
 BASE_REPOSITORY=devel
@ -23,7 +23,7 @@ ${me[0]} ${me[1]}
 "$"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
@ -35,6 +35,7 @@ ${me[0]} ${me[1]}
   -r                 "$"Work on given repository (default: $PORT_REPOSITORY)
   -d                 "$"Release packages to given repository (default: $PORT_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
   -v                 "$"More verbose output
   -x                 "$"Operate in cross build mode
@ -285,6 +286,9 @@ for ((i=1; i<=$#; i++)); do
      -r) shift
          PORT_REPOSITORY="${!i}"
          ;;
+      -s) shift
+          SCRIPT_ARGS="${!i}"
+          ;;
      -d) shift
          DEST_REPOSITORY="${!i}"
          ;;
@ -520,8 +524,8 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
            if [ "$REBUILD_MODE" = "1" ]; then
               echo -n "update"
               [ "$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
@ -534,7 +538,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
               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) "
--- 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/webbuild/webbuild-cgi
+++ b/webbuild/webbuild-cgi
@ -1042,6 +1042,7 @@ 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 --define=\"_topdir $SPECVAR_WORKINGHOME/RPM\""
@ -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');"
@ -2253,5 +2254,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
Author	SHA1	Message	Date
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