]> git.pld-linux.org Git - packages/rpm-build-tools.git/blobdiff - builder.sh
- updated from SPECS
[packages/rpm-build-tools.git] / builder.sh
index 894a7110f2baaa3f84cfdf90c6052110ef202072..efa39d608ea6da476c3af323c8928fd95eccad70 100644 (file)
@@ -11,7 +11,7 @@
 
 VERSION="\
 Build package utility from PLD CVS repository
-V 0.11 (C) 1999-2001 Free Penguins".
+V 0.11 (C) 1999-2003 Free Penguins".
 PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
 
 COMMAND="build"
@@ -26,7 +26,9 @@ NOCVS=""
 NOCVSSPEC=""
 NODIST=""
 UPDATE=""
-ALLWAYS_CVSUP=${ALLWAYS_CVSUP:-"yes"}
+UPDATE5=""
+ADD5=""
+ALWAYS_CVSUP=${ALWAYS_CVSUP:-"yes"}
 if [ -s CVS/Root ]; then
     CVSROOT=$(cat CVS/Root)
 else
@@ -59,7 +61,7 @@ CVSTAG=""
 RES_FILE=""
 
 CVS_SERVER="cvs.pld-linux.org"
-DISTFILES_SERVER="ftp://distfiles.pld-ppc.org"
+DISTFILES_SERVER="ftp://distfiles.pld-linux.org"
 
 DEF_NICE_LEVEL=0
 
@@ -67,6 +69,7 @@ FAIL_IF_NO_SOURCES="yes"
 
 GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES --inet"
 GETURI2="wget -c -nd -t$WGET_RETRIES --inet"
+GETLOCAL="cp -a"
 
 if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then
     RPM="rpm"
@@ -100,6 +103,9 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
        [-nu|--no-urls] [-v|--verbose] [--opts <rpm opts>]
        [--with/--without <feature>] [--define <macro> <value>] <package>[.spec]
 
+       -5, --update-md5
+                       - update md5 comments in spec, implies -nd
+       -a5, --add-md5  - add md5 comments to URL sources, implies -nc -nd
        -D, --debug     - enable script debugging mode,
        -V, --version   - output builder version
        -a, --as_anon   - get files via pserver as cvs@$CVS_SERVER,
@@ -164,9 +170,8 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
        -un, --try-upgrade-with-float-version
                        - as above, but allow float version
        -U, --update
-                       - refetch sources (makes sense with -nc -nd)
-                         (CVS updates are controlled by ALLWAYS_CVSUP environment
-                         variable, distfiles are checked against md5 sum)
+                       - refetch sources, don't use distfiles, and update md5 
+                         comments
        --with/--without <feature>
                        - conditional build package depending on
                          %_with_<feature>/%_without_<feature> macro
@@ -216,7 +221,7 @@ parse_spec()
 Exit_error()
 {
     if [ -n "$DEBUG" ]; then
-       set -x;
+       set -x;
        set -v;
     fi
 
@@ -241,7 +246,7 @@ Exit_error()
 init_builder()
 {
     if [ -n "$DEBUG" ]; then
-       set -x;
+       set -x;
        set -v;
     fi
 
@@ -254,7 +259,7 @@ init_builder()
 get_spec()
 {
     if [ -n "$DEBUG" ]; then
-       set -x;
+       set -x;
        set -v;
     fi
 
@@ -276,10 +281,10 @@ get_spec()
            OPTIONS="$OPTIONS -A"
        else
            if [ -n "$CVSDATE" ]; then
-               OPTIONS="$OPTIONS -D $CVSDATE"
+               OPTIONS="$OPTIONS -D $CVSDATE"
            fi
            if [ -n "$CVSTAG" ]; then
-               OPTIONS="$OPTIONS -r $CVSTAG"
+               OPTIONS="$OPTIONS -r $CVSTAG"
            fi
        fi
 
@@ -295,8 +300,8 @@ get_spec()
                    echo "Trying again [$SPECFILE]... ($retries_counter)"
                    sleep 2
                    continue
-                fi
-               Exit_error err_no_spec_in_repo;
+               fi
+               Exit_error err_no_spec_in_repo;
            fi
        done
     fi
@@ -315,7 +320,7 @@ find_mirror(){
 
     cd "$SPECS_DIR"
     url="$1"
-    if [ ! -f "mirrors" ] ; then
+    if [ ! -f "mirrors" -a "$NOCVSSPEC" != "yes" ] ; then
        cvs update mirrors >&2
     fi
 
@@ -336,9 +341,9 @@ src_no ()
 {
     cd $SPECS_DIR
     $RPMBUILD -bp  $BCOND --define 'prep %dump' $SPECFILE 2>&1 | \
-       grep "SOURCEURL[0-9]*[  ]*$1""[         ]*$" | \
-       sed -e 's/.*SOURCEURL\([0-9][0-9]*\).*/\1/' | \
-       xargs
+       grep "SOURCEURL[0-9]*[  ]*$1""[         ]*$" | \
+       sed -e 's/.*SOURCEURL\([0-9][0-9]*\).*/\1/' | \
+       head -1 | xargs
 }
 
 src_md5 ()
@@ -346,12 +351,35 @@ src_md5 ()
     no=$(src_no "$1")
     [ -z "$no" ] && return
     cd $SPECS_DIR
-    grep -i "#[        ]*Source$no-md5[        ]*:" $SPECFILE | sed -e 's/.*://' | xargs
+    spec_rev=$(grep $SPECFILE CVS/Entries | sed -e s:/$SPECFILE/:: -e s:/.*::)
+    if [ -z "$spec_rev" ]; then
+       spec_rev="$(head -1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')"
+    fi
+    spec="$SPECFILE[0-9.,]*,$(echo $spec_rev | sed 's/\./\\./g')"
+    md5=$(grep -s -v '^#' additional-md5sums | \
+       grep -E "[      ]$(basename "$1")[      ]+${spec}([     ,]|\$)" | \
+       sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \
+       grep -E '^[0-9a-f]{32}$')
+    if [ X"$md5" = X"" ] ; then
+       grep -i "#[     ]*Source$no-md5[        ]*:" $SPECFILE | sed -e 's/.*://' | xargs
+    else
+       if [ $(echo "$md5" | wc -l) != 1 ] ; then
+           echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2
+       fi
+       echo "$md5" | tail -1
+    fi
 }
 
 distfiles_url ()
 {
-    echo "$DISTFILES_SERVER/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')"
+    echo "$DISTFILES_SERVER/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
+}
+
+good_md5 ()
+{
+    md5=$(src_md5 "$1")
+    [ "$md5" = "" ] || \
+    [ "$md5" = "$(md5sum $(nourl "$1") 2> /dev/null | sed -e 's/ .*//')" ]
 }
 
 get_files()
@@ -359,7 +387,7 @@ get_files()
     GET_FILES="$@"
 
     if [ -n "$DEBUG" ]; then
-       set -x;
+       set -x;
        set -v;
     fi
 
@@ -375,43 +403,49 @@ get_files()
                NOCVS="yes"
            fi
        fi
-       if [ -z "$CVSDATE" -a -z "$CVSTAG" ]; then
-            OPTIONS="$OPTIONS -A"
-        else
-            if [ -n "$CVSDATE" ]; then
-                OPTIONS="$OPTIONS -D $CVSDATE"
-            fi
-            if [ -n "$CVSTAG" ]; then
-                OPTIONS="$OPTIONS -r $CVSTAG"
-            fi
-        fi
+       if [ -z "$CVSDATE" -a -z "$CVSTAG" ]; then
+           OPTIONS="$OPTIONS -A"
+       else
+           if [ -n "$CVSDATE" ]; then
+               OPTIONS="$OPTIONS -D $CVSDATE"
+           fi
+           if [ -n "$CVSTAG" ]; then
+               OPTIONS="$OPTIONS -r $CVSTAG"
+           fi
+       fi
        for i in $GET_FILES; do
-           if [ ! -f `nourl $i` ] || [ $ALLWAYS_CVSUP = "yes" ]; then
+           if [ ! -f `nourl $i` ] || [ $ALWAYS_CVSUP = "yes" ]; then
                if echo $i | grep -vE '(http|ftp|https|cvs|svn)://' | grep -qE '\.(gz|bz2)$']; then
                    echo "Warning: no URL given for $i"
                fi
 
                if [ -n "$(src_md5 "$i")" ] && [ -z "$NODIST" ]; then
-                   if [ "$(src_md5 "$i")" = "$(md5sum $(nourl "$i")|sed -e 's/ .*//')" ]; then
+                   if good_md5 "$i"; then
                        echo "$(nourl "$i") having proper md5sum already exists"
                        continue
                    fi
                    target=$(nourl "$i")
                    url=$(distfiles_url "$i")
-                   if [ -z "$NOMIRRORS" ] ; then
-                       url="`find_mirror "$url"`"
-                   fi
-                   ${GETURI} -O "$target" "$url" || \
-                       if [ `echo $url | grep -E 'ftp://'` ]; then
-                           ${GETURI2} -O "$target" "$url"
+                   if [ `echo $url | grep -E '^(\.|/)'` ] ; then
+                       ${GETLOCAL} $url $target
+                   else
+                       if [ -z "$NOMIRRORS" ] ; then
+                           url="`find_mirror "$url"`"
                        fi
-               elif [ -z "$NOCVS" ]|| [ `echo $i | grep -vE '(ftp|http|https)://'` ]; then
+                       ${GETURI} -O "$target" "$url" || \
+                           if [ `echo $url | grep -E 'ftp://'` ]; then
+                               ${GETURI2} -O "$target" "$url"
+                           fi
+                       test -s "$target" || rm -f "$target"
+                   fi
+               elif [ -z "$(src_md5 "$i")" ] && \
+                    ( [ -z "$NOCVS" ] || echo $i | grep -qvE '(ftp|http|https)://' ); then
                    result=1
-                   retries_counter=0
-                   while [ "$result" != "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; do
-                       retries_counter=$(( $retries_counter + 1 ))
+                   retries_counter=0
+                   while [ "$result" != "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; do
+                       retries_counter=$(( $retries_counter + 1 ))
                        output=$(LC_ALL=C cvs $OPTIONS `nourl $i` 2>&1)
-                       result=$?
+                       result=$?
                        [ -n "$output" ] && echo "$output"
                        if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out)") && [ "$result" -ne "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; then
                                echo "Trying again [`nourl $i`]... ($retries_counter)"
@@ -429,13 +463,34 @@ get_files()
                    fi
                    ${GETURI} "$i" || \
                        if [ `echo $i | grep -E 'ftp://'` ]; then ${GETURI2} "$i" ; fi
-#                  echo -n "#Source$(src_no $i)-md5:   " >> $SPECS_DIR/$SPECFILE.md5
-#                  md5sum `echo $i | perl -ne '/.*\/(.*)/; print "$1\n"'` | cut -f1 -d' ' >> $SPECS_DIR/$SPECFILE.md5
                fi
 
-               if [ ! -f "`nourl $i`" -a "$FAIL_IF_NO_SOURCES" != "no" ]; then
-                   Exit_error err_no_source_in_repo $i;
-               fi
+
+           fi
+           srcno=$(src_no $i)
+           if [ ! -f "`nourl $i`" -a "$FAIL_IF_NO_SOURCES" != "no" ]; then
+               Exit_error err_no_source_in_repo $i;
+           elif [ -n "$UPDATE5" ] && \
+               ( ( [ -n "$ADD5" ] && echo $i | grep -q -E 'ftp://|http://|https://' && \
+                   [ -z "$(grep -E -i '^NoSource[      ]*:[    ]*'$i'([        ]|$)' $SPECS_DIR/$SPECFILE)" ] ) || \
+               grep -q -i -E '^#[      ]*source'$(src_no $i)'-md5[     ]*:' $SPECS_DIR/$SPECFILE )
+           then
+               echo "Updating source-$srcno md5."
+               md5=$(md5sum `nourl $i` | cut -f1 -d' ')
+               perl -i -ne '
+                               print unless /^\s*#\s*Source'$srcno'-md5\s*:/i;
+                               print "# Source'$srcno'-md5:\t'$md5'\n" 
+                                       if /^Source'$srcno'\s*:\s+/;
+                               ' \
+                               $SPECS_DIR/$SPECFILE
+           fi
+
+           if good_md5 "$i"; then
+               :
+           else
+               echo "MD5 sum mismatch.  Use -U to refetch sources,"
+               echo "or -5 to update md5 sums, if you're sure files are correct."
+               Exit_error err_no_source_in_repo $i
            fi
        done
 
@@ -454,7 +509,7 @@ tag_files()
     TAG_FILES="$@"
 
     if [ -n "$DEBUG" ]; then
-       set -x;
+       set -x;
        set -v;
     fi
 
@@ -603,10 +658,10 @@ build_package()
        RETVAL=`cat $RES_FILE`
        rm $RES_FILE
        if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
-           if [ "$RETVAL" -eq "0" ]; then
+           if [ "$RETVAL" -eq "0" ]; then
                mv $LOG $LOGDIROK
-           else
-               mv $LOG $LOGDIRFAIL
+           else
+               mv $LOG $LOGDIRFAIL
            fi
        fi
     else
@@ -641,6 +696,18 @@ fi
 
 while test $# -gt 0 ; do
     case "${1}" in
+       -5 | --update-md5 )
+           COMMAND="get";
+           NODIST="yes"
+           UPDATE5="yes"
+           shift ;;
+       -a5 | --add-md5 )
+           COMMAND="get";
+           NODIST="yes"
+           NOCVS="yes"
+           UPDATE5="yes"
+           ADD5="yes"
+           shift ;;
        -D | --debug )
            DEBUG="yes"; shift ;;
        -V | --version )
@@ -725,7 +792,11 @@ while test $# -gt 0 ; do
            TAG_VERSION="no"
            shift;;
        -U | --update )
-           UPDATE="yes"; shift ;;
+           UPDATE="yes"
+           NODIST="yes"
+           UPDATE5="yes"
+           COMMAND="get"
+           shift ;;
        -u | --try-upgrade )
            TRY_UPGRADE="1"; shift ;;
        -un | --try-upgrade-with-float-version )
@@ -767,8 +838,8 @@ case "$COMMAND" in
            fi
 
            if [ -n "$ICONS" ]; then
-               get_files $ICONS;
-               parse_spec;
+               get_files $ICONS;
+               parse_spec;
            fi
            if [ -n "$NOSOURCE0" ] ; then
                SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'`
@@ -780,7 +851,7 @@ case "$COMMAND" in
        fi
        ;;
     "branch" )
-       init_builder;
+       init_builder;
        if [ -n "$SPECFILE" ]; then
                get_spec;
                parse_spec;
@@ -793,7 +864,7 @@ case "$COMMAND" in
        else
                Exit_error err_no_spec_in_cmdl;
        fi
-       ;;
+       ;;
     "get" )
        init_builder;
        if [ -n "$SPECFILE" ]; then
This page took 0.40794 seconds and 4 git commands to generate.