BEGIN {
preamble = 1 # Is it part of preamble? Default - yes
- boc = 2 # Beggining of %changelog
+ boc = 4 # Beggining of %changelog
bod = 0 # Beggining of %description
tw = 70 # Descriptions width
}
# Define _prefix and _mandir if it is X11 application
- if (/^%description$/ && x11 == 1) {
- print "%define\t\t_prefix\t\t/usr/X11R6"
- print "%define\t\t_mandir\t\t%{_prefix}/man\n"
- prefix = "/usr/X11R6"
- x11 = 2
- }
+# if (/^%description$/ && x11 == 1) {
+# print "%define\t\t_prefix\t\t/usr/X11R6"
+# print "%define\t\t_mandir\t\t%{_prefix}/man\n"
+# prefix = "/usr/X11R6"
+# x11 = 2
+# }
# Format description
if (description == 1 && !/^%[a-z]+/ && !/^%description/) {
/^%changelog/, (/^%[a-z]+$/ && !/^%changelog/) {
preamble = 0
has_changelog = 1
+ skip = 0
# There should be some CVS keywords on the first line of %changelog.
- if (boc == 1) {
- if (!/PLD Team/) {
- print "* %{date} PLD Team <feedback@pld.org.pl>" > changelog_file
+ if (boc == 3) {
+ if (!/PLD Team/)
+ print "* %{date} PLD Team <feedback@pld-linux.org>" > changelog_file
+ else
+ skip = 1
+ boc = 2
+ }
+ if (boc == 2 && !skip) {
+ if (!/All persons listed below/) {
printf "All persons listed below can be reached at " > changelog_file
- print "<cvs_login>@pld.org.pl\n" > changelog_file
- print "$" "Log:$" > changelog_file
+ print "<cvs_login>@pld-linux.org\n" > changelog_file
+ } else
+ skip = 1
+ boc = 1
+ }
+ if (boc == 1 && !skip) {
+ if (!/^$/) {
+ if (!/\$.*Log:.*\$/)
+ print "$" "Log:$" > changelog_file
+ boc = 0
}
- boc = 0
}
-
# Define date macro.
- if (boc == 2) {
+ if (boc == 4) {
if (date == 0) {
printf "%%define date\t%%(echo `LC_ALL=\"C\"" > changelog_file
print " date +\"%a %b %d %Y\"`)" > changelog_file
date = 1
}
- boc = 1
+ boc = 3
}
sub(/[ \t]+$/, "")
if (has_changelog == 0)
print "%changelog"
- if (boc > 0) {
- print "* %{date} PLD Team <feedback@pld.org.pl>"
+ if (boc > 2)
+ print "* %{date} PLD Team <feedback@pld-linux.org>"
+ if (boc > 1) {
printf "All persons listed below can be reached at "
- print "<cvs_login>@pld.org.pl\n"
- print "$" "Log:$"
+ print "<cvs_login>@pld-linux.org\n"
}
+ if (boc > 0)
+ print "$" "Log:$"
}
function fixedsub(s1,s2,t, ind) {
function format_preamble()
{
sub(/:[ \t]*/, ":")
- if (match($0, /[A-Za-z0-9()#_ \t]+[ \t]*:[ \t]*/) == 1) {
+ if (match($0, /[A-Za-z0-9(),#_ \t]+[ \t]*:[ \t]*/) == 1) {
if (RLENGTH < 8)
sub(/:/, ":\t\t")
else
gsub("%{_prefix}/lib", "%{_libdir}")
for (c = 1; c <= NF; c++) {
- if ($c ~ sysconfdir "/{?cron.d")
+ if ($c ~ sysconfdir "/{?cron.")
continue;
if ($c ~ sysconfdir "/{?crontab.d")
continue;
gsub("%{prefix}/info", "%{_infodir}")
gsub("%{_prefix}/info", "%{_infodir}")
- gsub("%{_datadir}/aclocal", "%{_aclocaldir}")
+ if (prefix !~ "/X11R6") {
+ gsub("%{_datadir}/aclocal", "%{_aclocaldir}")
+ }
if (prefix != "/") {
for (c = 1; c <= NF; c++) {
gsub("%{PACKAGE_VERSION}", "%{version}")
gsub("%{PACKAGE_NAME}", "%{name}")
- gsub("%{_datadir}/gnome/apps", "%{_applnkdir}")
- gsub("%{_datadir}/applnk", "%{_applnkdir}")
+ # we can move files between tge dirs below
+ if ($0 !~ "%{_applnkdir}") {
+ gsub("%{_datadir}/gnome/apps", "%{_applnkdir}")
+ gsub("%{_datadir}/applnk", "%{_applnkdir}")
+ }
gsub("^make$", "%{__make}")
gsub("^make ", "%{__make} ")
VERSION="\
Build package utility from PLD CVS repository
-V 0.10 (C) 1999-2001 Tomasz K³oczko".
-
+V 0.11 (C) 1999-2003 Free Penguins".
PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
-
+
COMMAND="build"
SPECFILE=""
NOURLS=""
NOCVS=""
NOCVSSPEC=""
-ALLWAYS_CVSUP=${ALLWAYS_CVSUP:-"yes"}
+NODIST=""
+UPDATE=""
+UPDATE5=""
+ADD5=""
+ALWAYS_CVSUP=${ALWAYS_CVSUP:-"yes"}
if [ -s CVS/Root ]; then
CVSROOT=$(cat CVS/Root)
else
# Example: LOGFILE='../log.$PACKAGE_NAME'
# Yes, you can use variable name! Note _single_ quotes!
LOGFILE=''
+
+LOGDIR=""
+LOGDIROK=""
+LOGDIRFAIL=""
+LASTLOG_FILE=""
+LTAG=""
CHMOD="yes"
CHMOD_MODE="0444"
RPMOPTS=""
PACKAGE_VERSION=""
PACKAGE_NAME=""
WGET_RETRIES=${MAX_WGET_RETRIES:-0}
+CVS_RETRIES=${MAX_CVS_RETRIES:-1000}
+
+CVSTAG=""
+RES_FILE=""
+
+CVS_SERVER="cvs.pld-linux.org"
+DISTFILES_SERVER="ftp://distfiles.pld-linux.org"
DEF_NICE_LEVEL=0
FAIL_IF_NO_SOURCES="yes"
-GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES"
-GETURI2="wget -c -nd -t$WGET_RETRIES"
+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"
[-bb|--build-binary] [-bs|--build-source] [-u|--try-upgrade]
[{-B|--branch} <branch>] [{-d|--cvsroot} <cvsroot>] [-g|--get]
[-h|--help] [{-l,--logtofile} <logfile>] [-m|--mr-proper]
- [-q|--quiet] [-r <cvstag>] [{-T--tag <cvstag>]
+ [-q|--quiet] [--date <yyyy-mm-dd> [-r <cvstag>] [{-T--tag <cvstag>]
[-Tvs|--tag-version-stable] [-Tvn|--tag-version-nest]
[-Ts|--tag-stable] [-Tn|--tag-nest] [-Tv|--tag-version]
[-nu|--no-urls] [-v|--verbose] [--opts <rpm opts>]
- [--with/--without <feature>] [--define <macro> <value>] <package>.spec
+ [--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@anoncvs.pld.org.pl,
+ -a, --as_anon - get files via pserver as cvs@$CVS_SERVER,
-b, -ba,
--build - get all files from CVS repo or HTTP/FTP and build
package from <package>.spec,
given,
-ncs, --no-cvs-specs
- don't check specs in CVS
+ -nd, --no-distfiles
+ - don't download from distfiles
-nm, --no-mirrors - don't download from mirror, if source URL is given,
-nu, --no-urls - don't try to download from FTP/HTTP location,
- -ns, --no-srcs - don't downland Sources
+ -ns, --no-srcs - don't download Sources
-ns0, --no-source0
- - don't downland Source0
+ - don't download Source0
--opts <rpm opts>
- additional options for rpm
-q, --quiet - be quiet,
+ --date yyyy-mm-dd
+ - build package using resources from specified CVS
+ date,
-r <cvstag>, --cvstag <cvstag>
- build package using resources from specified CVS
tag,
-v, --verbose - be verbose,
-u, --try-upgrade
- check version, and try to upgrade package
+ -un, --try-upgrade-with-float-version
+ - as above, but allow float version
+ -U, --update
+ - refetch sources, don't use distfiles, and update md5
+ comments
--with/--without <feature>
- conditional build package depending on
%_with_<feature>/%_without_<feature> macro
parse_spec()
{
if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+ set -x;
+ set -v;
fi
cd $SPECS_DIR
-
if [ "$NOSRCS" != "yes" ]; then
- SOURCES="`$RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | awk '/SOURCEURL[0-9]+/ {print $3}'`"
+ SOURCES="`$RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | awk '/SOURCEURL[0-9]+/ {print $3}'`"
fi
if ($RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | grep -qEi ":.*nosource.*1"); then
- FAIL_IF_NO_SOURCES="no"
+ FAIL_IF_NO_SOURCES="no"
fi
PATCHES="`$RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | awk '/PATCHURL[0-9]+/ {print $3}'`"
PACKAGE_RELEASE="`$RPM -q --qf '%{RELEASE}\n' --specfile ${SPECFILE} 2> /dev/null | head -1`"
if [ -n "$BE_VERBOSE" ]; then
- echo "- Sources : `nourl $SOURCES`"
+ echo "- Sources : `nourl $SOURCES`"
if [ -n "$PATCHES" ]; then
- echo "- Patches : `nourl $PATCHES`"
+ echo "- Patches : `nourl $PATCHES`"
else
- echo "- Patches : *no patches needed*"
+ echo "- Patches : *no patches needed*"
fi
if [ -n "$ICONS" ]; then
- echo "- Icon : `nourl $ICONS`"
+ echo "- Icon : `nourl $ICONS`"
else
- echo "- Icon : *no package icon*"
+ echo "- Icon : *no package icon*"
fi
echo "- Name : $PACKAGE_NAME"
echo "- Version : $PACKAGE_VERSION"
Exit_error()
{
- if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+ if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
fi
cd $__PWD
init_builder()
{
- if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+ if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
fi
SOURCE_DIR="`$RPM --eval '%{_sourcedir}'`"
get_spec()
{
- if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+ if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
fi
if [ "$NOCVSSPEC" != "yes" ]; then
NOCVSSPEC="yes"
fi
fi
- if [ -n "$CVSTAG" ]; then
- OPTIONS="$OPTIONS -r $CVSTAG"
- else
+
+ 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
- cvs $OPTIONS $SPECFILE
- if [ "$?" -ne "0" ]; then
- Exit_error err_no_spec_in_repo;
- fi
+ result=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 $SPECFILE 2>&1)
+ result=$?
+ [ -n "$output" ] && echo "$output"
+ if [ "$result" -ne "0" ]; then
+ if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out)") && [ "$retries_counter" -le "$CVS_RETRIES" ]; then
+ echo "Trying again [$SPECFILE]... ($retries_counter)"
+ sleep 2
+ continue
+ fi
+ Exit_error err_no_spec_in_repo;
+ fi
+ done
fi
if [ ! -f "$SPECFILE" ]; then
Exit_error err_no_spec_in_repo;
fi
-
+
if [ "$CHMOD" = "yes" -a -n "$SPECFILE" ]; then
chmod $CHMOD_MODE $SPECFILE
fi
find_mirror(){
cd "$SPECS_DIR"
- url="$1"
- if [ ! -f "mirrors" ] ; then
- cvs update mirrors >&2
+ url="$1"
+ if [ ! -f "mirrors" -a "$NOCVSSPEC" != "yes" ] ; then
+ cvs update mirrors >&2
fi
IFS="|"
while read origin mirror name rest; do
- ol=`echo -n "$origin"|wc -c`
+ ol=`echo -n "$origin"|wc -c`
prefix="`echo -n "$url" | head -c $ol`"
if [ "$prefix" = "$origin" ] ; then
suffix="`echo "$url"|cut -b $ol-`"
echo "$url"
}
+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/' | \
+ head -1 | xargs
+}
+
+src_md5 ()
+{
+ no=$(src_no "$1")
+ [ -z "$no" ] && return
+ cd $SPECS_DIR
+ 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/&|')/$(basename "$1")"
+}
+
+good_md5 ()
+{
+ md5=$(src_md5 "$1")
+ [ "$md5" = "" ] || \
+ [ "$md5" = "$(md5sum $(nourl "$1") 2> /dev/null | sed -e 's/ .*//')" ]
+}
+
get_files()
{
GET_FILES="$@"
- if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+ if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
fi
if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
NOCVS="yes"
fi
fi
- if [ -n "$CVSTAG" ]; then
- OPTIONS="$OPTIONS -r $CVSTAG"
- else
+ 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 [ -z "$NOCVS" ]|| [ `echo $i | grep -vE '(ftp|http|https)://'` ]; then
- cvs $OPTIONS `nourl $i`
+
+ if [ -n "$(src_md5 "$i")" ] && [ -z "$NODIST" ]; then
+ if good_md5 "$i"; then
+ echo "$(nourl "$i") having proper md5sum already exists"
+ continue
+ fi
+ target=$(nourl "$i")
+ url=$(distfiles_url "$i")
+ if [ `echo $url | grep -E '^(\.|/)'` ] ; then
+ ${GETLOCAL} $url $target
+ else
+ if [ -z "$NOMIRRORS" ] ; then
+ url="`find_mirror "$url"`"
+ fi
+ ${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 ))
+ output=$(LC_ALL=C cvs $OPTIONS `nourl $i` 2>&1)
+ 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)"
+ sleep 2
+ continue
+ else
+ break
+ fi
+ done
fi
-
- if [ -z "$NOURLS" ]&&[ ! -f "`nourl $i`" ] && [ `echo $i | grep -E 'ftp://|http://|https://'` ]; then
- if [ -z "$NOMIRRORS" ] ; then
+
+ if [ -z "$NOURLS" ] && [ ! -f "`nourl $i`" -o -n "$UPDATE" ] && [ `echo $i | grep -E 'ftp://|http://|https://'` ]; then
+ if [ -z "$NOMIRRORS" ] ; then
i="`find_mirror "$i"`"
fi
${GETURI} "$i" || \
if [ `echo $i | grep -E 'ftp://'` ]; then ${GETURI2} "$i" ; fi
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
-
+
if [ "$CHMOD" = "yes" ]; then
CHMOD_FILES="`nourl $GET_FILES`"
if [ -n "$CHMOD_FILES" ]; then
{
TAG_FILES="$@"
- if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+ if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
fi
if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
echo $PACKAGE_VERSION
echo $PACKAGE_RELEASE
- TAGVER=$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g"`
+ TAGVER=$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
if [ "$TAG_VERSION" = "yes" ]; then
echo "CVS tag: $TAGVER"
fi
branch_files()
{
- TAG=$1
- echo "CVS branch tag: $TAG"
- shift;
+ TAG=$1
+ echo "CVS branch tag: $TAG"
+ shift;
- TAG_FILES="$@"
+ TAG_FILES="$@"
- if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
- fi
+ if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
+ fi
- if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
-
- OPTIONS="tag -b"
- if [ -n "$CVSROOT" ]; then
- OPTIONS="-d $CVSROOT $OPTIONS"
- fi
- cd $SOURCE_DIR
- for i in $TAG_FILES; do
- if [ -f `nourl $i` ]; then
- cvs $OPTIONS $TAG `nourl $i`
- else
- Exit_error err_no_source_in_repo $i
- fi
- done
- cd $SPECS_DIR
- cvs $OPTIONS $TAG $SPECFILE
+ if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
- unset OPTIONS
+ OPTIONS="tag -b"
+ if [ -n "$CVSROOT" ]; then
+ OPTIONS="-d $CVSROOT $OPTIONS"
fi
+ cd $SOURCE_DIR
+ for i in $TAG_FILES; do
+ if [ -f `nourl $i` ]; then
+ cvs $OPTIONS $TAG `nourl $i`
+ else
+ Exit_error err_no_source_in_repo $i
+ fi
+ done
+ cd $SPECS_DIR
+ cvs $OPTIONS $TAG $SPECFILE
+
+ unset OPTIONS
+ fi
}
+
+
build_package()
{
- if [ -n "$DEBUG" ]; then
+ if [ -n "$DEBUG" ]; then
set -x;
- set -v;
+ set -v;
fi
cd $SPECS_DIR
- if [ -n "$TRY_UPGRADE" ]; then
-
- TNOTIFY=`./pldnotify.awk $SPECFILE`
-
+ if [ -n "$TRY_UPGRADE" ]; then
+
+ if [ -n "FLOAT_VERSION" ]; then
+ TNOTIFY=`./pldnotify.awk $SPECFILE -n`
+ else
+ TNOTIFY=`./pldnotify.awk $SPECFILE`
+ fi
+
TNEWVER=`echo $TNOTIFY | awk '{ match($4,/\[NEW\]/); print $5 }'`
-
+
if [ -n "$TNEWVER" ]; then
-
+
TOLDVER=`echo $TNOTIFY | awk '{ print $3; }'`
-
+
echo "New version found, updating spec file to version " $TNEWVER
-
+
cp -f $SPECFILE $SPECFILE.bak
-
+
chmod +w $SPECFILE
-
+
eval "perl -pi -e 's/Version:\t"$TOLDVER"/Version:\t"$TNEWVER"/gs' $SPECFILE"
eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t1/' $SPECFILE"
-
+
parse_spec;
-
+
get_files "$SOURCES $PATCHES";
-
+
unset TOLDVER TNEWVER TNOTIFY
fi
-
+
fi
BUILD_SWITCH="-bs --nodeps" ;;
esac
if [ -n "$LOGFILE" ]; then
+ if [ -n "$CVSTAG" ]; then
+ LTAG="r_`echo $CVSTAG|sed -e 's/\./_/g'`_"
+ else
+ LTAG=""
+ fi
LOG=`eval echo $LOGFILE`
- eval nice -n ${DEF_NICE_LEVEL} time $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE 2>&1 | tee $LOG
+ if [ -n "$LASTLOG_FILE" ]; then
+ echo "LASTLOG=$LOG" > $LASTLOG_FILE
+ fi
+ RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM
+ (nice -n ${DEF_NICE_LEVEL} time $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
+ RETVAL=`cat $RES_FILE`
+ rm $RES_FILE
+ if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
+ if [ "$RETVAL" -eq "0" ]; then
+ mv $LOG $LOGDIROK
+ else
+ mv $LOG $LOGDIRFAIL
+ fi
+ fi
else
eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE
+ RETVAL=$?
fi
- if [ "$?" -ne "0" ]; then
-
- if [ -n "$TRY_UPGRADE" ]; then
+ if [ "$RETVAL" -ne "0" ]; then
+
+ if [ -n "$TRY_UPGRADE" ]; then
echo "\n!!! Package with new version cannot be build automagically\n"
mv -f $SPECFILE.bak $SPECFILE
fi
-
+
Exit_error err_build_fail;
fi
-
+
unset BUILD_SWITCH
}
nourl()
{
- echo "$@" | sed 's#\<\(ftp\|http\|https\|cvs\|svn\)://[^ ]*/##g'
+ echo "$@" | sed 's#\<\(ftp\|http\|https\|cvs\|svn\)://[^ ]*/##g'
}
#---------------------------------------------
# main()
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 )
COMMAND="version"; shift ;;
-a | --as_anon )
- CVSROOT=":pserver:cvs@anoncvs.pld.org.pl:/cvsroot"; shift ;;
+ CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot"; shift ;;
-b | -ba | --build )
COMMAND="build"; shift ;;
-bb | --build-binary )
COMMAND="mr-proper"; shift ;;
-nc | --no-cvs )
NOCVS="yes"; shift ;;
- -ncs | --no-cvs-spec )
+ -ncs | --no-cvs-specs )
NOCVSSPEC="yes"; shift ;;
+ -nd | --no-distfiles )
+ NODIST="yes"; shift ;;
-nm | --no-mirrors )
NOMIRRORS="yes"; shift ;;
-nu | --no-urls )
BCOND="$BCOND $1 $2" ; shift 2 ;;
-q | --quiet )
QUIET="--quiet"; shift ;;
+ --date )
+ CVSDATE="${2}"; shift 2 ;;
-r | --cvstag )
shift; CVSTAG="${1}"; shift ;;
-Tvs | --tag-version-stable )
TAG="$1"
TAG_VERSION="no"
shift;;
- -v | --verbose )
- BE_VERBOSE="1"; shift ;;
+ -U | --update )
+ UPDATE="yes"
+ NODIST="yes"
+ UPDATE5="yes"
+ COMMAND="get"
+ shift ;;
-u | --try-upgrade )
TRY_UPGRADE="1"; shift ;;
+ -un | --try-upgrade-with-float-version )
+ TRY_UPGRADE="1"; FLOAT_VERSION="1"; shift ;;
+ -v | --verbose )
+ BE_VERBOSE="1"; shift ;;
--define)
shift
MACRO="${1}"
RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\""
;;
* )
- SPECFILE="${1}"; shift ;;
+ SPECFILE="`basename ${1} .spec`.spec"; shift ;;
esac
done
-if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
fi
case "$COMMAND" in
parse_spec;
if [ -n "$FAIL_IF_CHANGED_BUT_NOT_BUMPED" ]; then
- TAGVER=$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g"`
+ TAGVER=$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
CURTAGREL=$(cvs status $SPECFILE | grep "Working revision:" | awk '{ print $3 }')
TAGREL=$(cvs status -v $SPECFILE | grep -E "^[[:space:]]*${TAGVER}[[[:space:]]" | sed -e 's#.*(revision: ##g' -e 's#).*##g')
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/[^ ]*//'`
fi
get_files "$SOURCES $PATCHES";
build_package;
fi
;;
"branch" )
- init_builder;
+ init_builder;
if [ -n "$SPECFILE" ]; then
get_spec;
parse_spec;
else
Exit_error err_no_spec_in_cmdl;
fi
- ;;
+ ;;
"get" )
init_builder;
if [ -n "$SPECFILE" ]; then
VERSION="\
Build package utility from PLD CVS repository
-V 0.10 (C) 1999-2001 Tomasz K³oczko".
-
+V 0.11 (C) 1999-2003 Free Penguins".
PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
-
+
COMMAND="build"
SPECFILE=""
NOURLS=""
NOCVS=""
NOCVSSPEC=""
-ALLWAYS_CVSUP=${ALLWAYS_CVSUP:-"yes"}
+NODIST=""
+UPDATE=""
+UPDATE5=""
+ADD5=""
+ALWAYS_CVSUP=${ALWAYS_CVSUP:-"yes"}
if [ -s CVS/Root ]; then
CVSROOT=$(cat CVS/Root)
else
# Example: LOGFILE='../log.$PACKAGE_NAME'
# Yes, you can use variable name! Note _single_ quotes!
LOGFILE=''
+
+LOGDIR=""
+LOGDIROK=""
+LOGDIRFAIL=""
+LASTLOG_FILE=""
+LTAG=""
CHMOD="yes"
CHMOD_MODE="0444"
RPMOPTS=""
PACKAGE_VERSION=""
PACKAGE_NAME=""
WGET_RETRIES=${MAX_WGET_RETRIES:-0}
+CVS_RETRIES=${MAX_CVS_RETRIES:-1000}
+
+CVSTAG=""
+RES_FILE=""
+
+CVS_SERVER="cvs.pld-linux.org"
+DISTFILES_SERVER="ftp://distfiles.pld-linux.org"
DEF_NICE_LEVEL=0
FAIL_IF_NO_SOURCES="yes"
-GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES"
-GETURI2="wget -c -nd -t$WGET_RETRIES"
+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"
[-bb|--build-binary] [-bs|--build-source] [-u|--try-upgrade]
[{-B|--branch} <branch>] [{-d|--cvsroot} <cvsroot>] [-g|--get]
[-h|--help] [{-l,--logtofile} <logfile>] [-m|--mr-proper]
- [-q|--quiet] [-r <cvstag>] [{-T--tag <cvstag>]
+ [-q|--quiet] [--date <yyyy-mm-dd> [-r <cvstag>] [{-T--tag <cvstag>]
[-Tvs|--tag-version-stable] [-Tvn|--tag-version-nest]
[-Ts|--tag-stable] [-Tn|--tag-nest] [-Tv|--tag-version]
[-nu|--no-urls] [-v|--verbose] [--opts <rpm opts>]
- [--with/--without <feature>] [--define <macro> <value>] <package>.spec
+ [--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@anoncvs.pld.org.pl,
+ -a, --as_anon - get files via pserver as cvs@$CVS_SERVER,
-b, -ba,
--build - get all files from CVS repo or HTTP/FTP and build
package from <package>.spec,
given,
-ncs, --no-cvs-specs
- don't check specs in CVS
+ -nd, --no-distfiles
+ - don't download from distfiles
-nm, --no-mirrors - don't download from mirror, if source URL is given,
-nu, --no-urls - don't try to download from FTP/HTTP location,
- -ns, --no-srcs - don't downland Sources
+ -ns, --no-srcs - don't download Sources
-ns0, --no-source0
- - don't downland Source0
+ - don't download Source0
--opts <rpm opts>
- additional options for rpm
-q, --quiet - be quiet,
+ --date yyyy-mm-dd
+ - build package using resources from specified CVS
+ date,
-r <cvstag>, --cvstag <cvstag>
- build package using resources from specified CVS
tag,
-v, --verbose - be verbose,
-u, --try-upgrade
- check version, and try to upgrade package
+ -un, --try-upgrade-with-float-version
+ - as above, but allow float version
+ -U, --update
+ - refetch sources, don't use distfiles, and update md5
+ comments
--with/--without <feature>
- conditional build package depending on
%_with_<feature>/%_without_<feature> macro
parse_spec()
{
if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+ set -x;
+ set -v;
fi
cd $SPECS_DIR
-
if [ "$NOSRCS" != "yes" ]; then
- SOURCES="`$RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | awk '/SOURCEURL[0-9]+/ {print $3}'`"
+ SOURCES="`$RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | awk '/SOURCEURL[0-9]+/ {print $3}'`"
fi
if ($RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | grep -qEi ":.*nosource.*1"); then
- FAIL_IF_NO_SOURCES="no"
+ FAIL_IF_NO_SOURCES="no"
fi
PATCHES="`$RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | awk '/PATCHURL[0-9]+/ {print $3}'`"
PACKAGE_RELEASE="`$RPM -q --qf '%{RELEASE}\n' --specfile ${SPECFILE} 2> /dev/null | head -1`"
if [ -n "$BE_VERBOSE" ]; then
- echo "- Sources : `nourl $SOURCES`"
+ echo "- Sources : `nourl $SOURCES`"
if [ -n "$PATCHES" ]; then
- echo "- Patches : `nourl $PATCHES`"
+ echo "- Patches : `nourl $PATCHES`"
else
- echo "- Patches : *no patches needed*"
+ echo "- Patches : *no patches needed*"
fi
if [ -n "$ICONS" ]; then
- echo "- Icon : `nourl $ICONS`"
+ echo "- Icon : `nourl $ICONS`"
else
- echo "- Icon : *no package icon*"
+ echo "- Icon : *no package icon*"
fi
echo "- Name : $PACKAGE_NAME"
echo "- Version : $PACKAGE_VERSION"
Exit_error()
{
- if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+ if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
fi
cd $__PWD
init_builder()
{
- if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+ if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
fi
SOURCE_DIR="`$RPM --eval '%{_sourcedir}'`"
get_spec()
{
- if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+ if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
fi
if [ "$NOCVSSPEC" != "yes" ]; then
NOCVSSPEC="yes"
fi
fi
- if [ -n "$CVSTAG" ]; then
- OPTIONS="$OPTIONS -r $CVSTAG"
- else
+
+ 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
- cvs $OPTIONS $SPECFILE
- if [ "$?" -ne "0" ]; then
- Exit_error err_no_spec_in_repo;
- fi
+ result=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 $SPECFILE 2>&1)
+ result=$?
+ [ -n "$output" ] && echo "$output"
+ if [ "$result" -ne "0" ]; then
+ if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out)") && [ "$retries_counter" -le "$CVS_RETRIES" ]; then
+ echo "Trying again [$SPECFILE]... ($retries_counter)"
+ sleep 2
+ continue
+ fi
+ Exit_error err_no_spec_in_repo;
+ fi
+ done
fi
if [ ! -f "$SPECFILE" ]; then
Exit_error err_no_spec_in_repo;
fi
-
+
if [ "$CHMOD" = "yes" -a -n "$SPECFILE" ]; then
chmod $CHMOD_MODE $SPECFILE
fi
find_mirror(){
cd "$SPECS_DIR"
- url="$1"
- if [ ! -f "mirrors" ] ; then
- cvs update mirrors >&2
+ url="$1"
+ if [ ! -f "mirrors" -a "$NOCVSSPEC" != "yes" ] ; then
+ cvs update mirrors >&2
fi
IFS="|"
while read origin mirror name rest; do
- ol=`echo -n "$origin"|wc -c`
+ ol=`echo -n "$origin"|wc -c`
prefix="`echo -n "$url" | head -c $ol`"
if [ "$prefix" = "$origin" ] ; then
suffix="`echo "$url"|cut -b $ol-`"
echo "$url"
}
+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/' | \
+ head -1 | xargs
+}
+
+src_md5 ()
+{
+ no=$(src_no "$1")
+ [ -z "$no" ] && return
+ cd $SPECS_DIR
+ 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/&|')/$(basename "$1")"
+}
+
+good_md5 ()
+{
+ md5=$(src_md5 "$1")
+ [ "$md5" = "" ] || \
+ [ "$md5" = "$(md5sum $(nourl "$1") 2> /dev/null | sed -e 's/ .*//')" ]
+}
+
get_files()
{
GET_FILES="$@"
- if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+ if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
fi
if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
NOCVS="yes"
fi
fi
- if [ -n "$CVSTAG" ]; then
- OPTIONS="$OPTIONS -r $CVSTAG"
- else
+ 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 [ -z "$NOCVS" ]|| [ `echo $i | grep -vE '(ftp|http|https)://'` ]; then
- cvs $OPTIONS `nourl $i`
+
+ if [ -n "$(src_md5 "$i")" ] && [ -z "$NODIST" ]; then
+ if good_md5 "$i"; then
+ echo "$(nourl "$i") having proper md5sum already exists"
+ continue
+ fi
+ target=$(nourl "$i")
+ url=$(distfiles_url "$i")
+ if [ `echo $url | grep -E '^(\.|/)'` ] ; then
+ ${GETLOCAL} $url $target
+ else
+ if [ -z "$NOMIRRORS" ] ; then
+ url="`find_mirror "$url"`"
+ fi
+ ${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 ))
+ output=$(LC_ALL=C cvs $OPTIONS `nourl $i` 2>&1)
+ 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)"
+ sleep 2
+ continue
+ else
+ break
+ fi
+ done
fi
-
- if [ -z "$NOURLS" ]&&[ ! -f "`nourl $i`" ] && [ `echo $i | grep -E 'ftp://|http://|https://'` ]; then
- if [ -z "$NOMIRRORS" ] ; then
+
+ if [ -z "$NOURLS" ] && [ ! -f "`nourl $i`" -o -n "$UPDATE" ] && [ `echo $i | grep -E 'ftp://|http://|https://'` ]; then
+ if [ -z "$NOMIRRORS" ] ; then
i="`find_mirror "$i"`"
fi
${GETURI} "$i" || \
if [ `echo $i | grep -E 'ftp://'` ]; then ${GETURI2} "$i" ; fi
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
-
+
if [ "$CHMOD" = "yes" ]; then
CHMOD_FILES="`nourl $GET_FILES`"
if [ -n "$CHMOD_FILES" ]; then
{
TAG_FILES="$@"
- if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+ if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
fi
if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
echo $PACKAGE_VERSION
echo $PACKAGE_RELEASE
- TAGVER=$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g"`
+ TAGVER=$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
if [ "$TAG_VERSION" = "yes" ]; then
echo "CVS tag: $TAGVER"
fi
branch_files()
{
- TAG=$1
- echo "CVS branch tag: $TAG"
- shift;
+ TAG=$1
+ echo "CVS branch tag: $TAG"
+ shift;
- TAG_FILES="$@"
+ TAG_FILES="$@"
- if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
- fi
+ if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
+ fi
- if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
-
- OPTIONS="tag -b"
- if [ -n "$CVSROOT" ]; then
- OPTIONS="-d $CVSROOT $OPTIONS"
- fi
- cd $SOURCE_DIR
- for i in $TAG_FILES; do
- if [ -f `nourl $i` ]; then
- cvs $OPTIONS $TAG `nourl $i`
- else
- Exit_error err_no_source_in_repo $i
- fi
- done
- cd $SPECS_DIR
- cvs $OPTIONS $TAG $SPECFILE
+ if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
- unset OPTIONS
+ OPTIONS="tag -b"
+ if [ -n "$CVSROOT" ]; then
+ OPTIONS="-d $CVSROOT $OPTIONS"
fi
+ cd $SOURCE_DIR
+ for i in $TAG_FILES; do
+ if [ -f `nourl $i` ]; then
+ cvs $OPTIONS $TAG `nourl $i`
+ else
+ Exit_error err_no_source_in_repo $i
+ fi
+ done
+ cd $SPECS_DIR
+ cvs $OPTIONS $TAG $SPECFILE
+
+ unset OPTIONS
+ fi
}
+
+
build_package()
{
- if [ -n "$DEBUG" ]; then
+ if [ -n "$DEBUG" ]; then
set -x;
- set -v;
+ set -v;
fi
cd $SPECS_DIR
- if [ -n "$TRY_UPGRADE" ]; then
-
- TNOTIFY=`./pldnotify.awk $SPECFILE`
-
+ if [ -n "$TRY_UPGRADE" ]; then
+
+ if [ -n "FLOAT_VERSION" ]; then
+ TNOTIFY=`./pldnotify.awk $SPECFILE -n`
+ else
+ TNOTIFY=`./pldnotify.awk $SPECFILE`
+ fi
+
TNEWVER=`echo $TNOTIFY | awk '{ match($4,/\[NEW\]/); print $5 }'`
-
+
if [ -n "$TNEWVER" ]; then
-
+
TOLDVER=`echo $TNOTIFY | awk '{ print $3; }'`
-
+
echo "New version found, updating spec file to version " $TNEWVER
-
+
cp -f $SPECFILE $SPECFILE.bak
-
+
chmod +w $SPECFILE
-
+
eval "perl -pi -e 's/Version:\t"$TOLDVER"/Version:\t"$TNEWVER"/gs' $SPECFILE"
eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t1/' $SPECFILE"
-
+
parse_spec;
-
+
get_files "$SOURCES $PATCHES";
-
+
unset TOLDVER TNEWVER TNOTIFY
fi
-
+
fi
BUILD_SWITCH="-bs --nodeps" ;;
esac
if [ -n "$LOGFILE" ]; then
+ if [ -n "$CVSTAG" ]; then
+ LTAG="r_`echo $CVSTAG|sed -e 's/\./_/g'`_"
+ else
+ LTAG=""
+ fi
LOG=`eval echo $LOGFILE`
- eval nice -n ${DEF_NICE_LEVEL} time $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE 2>&1 | tee $LOG
+ if [ -n "$LASTLOG_FILE" ]; then
+ echo "LASTLOG=$LOG" > $LASTLOG_FILE
+ fi
+ RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM
+ (nice -n ${DEF_NICE_LEVEL} time $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
+ RETVAL=`cat $RES_FILE`
+ rm $RES_FILE
+ if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
+ if [ "$RETVAL" -eq "0" ]; then
+ mv $LOG $LOGDIROK
+ else
+ mv $LOG $LOGDIRFAIL
+ fi
+ fi
else
eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE
+ RETVAL=$?
fi
- if [ "$?" -ne "0" ]; then
-
- if [ -n "$TRY_UPGRADE" ]; then
+ if [ "$RETVAL" -ne "0" ]; then
+
+ if [ -n "$TRY_UPGRADE" ]; then
echo "\n!!! Package with new version cannot be build automagically\n"
mv -f $SPECFILE.bak $SPECFILE
fi
-
+
Exit_error err_build_fail;
fi
-
+
unset BUILD_SWITCH
}
nourl()
{
- echo "$@" | sed 's#\<\(ftp\|http\|https\|cvs\|svn\)://[^ ]*/##g'
+ echo "$@" | sed 's#\<\(ftp\|http\|https\|cvs\|svn\)://[^ ]*/##g'
}
#---------------------------------------------
# main()
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 )
COMMAND="version"; shift ;;
-a | --as_anon )
- CVSROOT=":pserver:cvs@anoncvs.pld.org.pl:/cvsroot"; shift ;;
+ CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot"; shift ;;
-b | -ba | --build )
COMMAND="build"; shift ;;
-bb | --build-binary )
COMMAND="mr-proper"; shift ;;
-nc | --no-cvs )
NOCVS="yes"; shift ;;
- -ncs | --no-cvs-spec )
+ -ncs | --no-cvs-specs )
NOCVSSPEC="yes"; shift ;;
+ -nd | --no-distfiles )
+ NODIST="yes"; shift ;;
-nm | --no-mirrors )
NOMIRRORS="yes"; shift ;;
-nu | --no-urls )
BCOND="$BCOND $1 $2" ; shift 2 ;;
-q | --quiet )
QUIET="--quiet"; shift ;;
+ --date )
+ CVSDATE="${2}"; shift 2 ;;
-r | --cvstag )
shift; CVSTAG="${1}"; shift ;;
-Tvs | --tag-version-stable )
TAG="$1"
TAG_VERSION="no"
shift;;
- -v | --verbose )
- BE_VERBOSE="1"; shift ;;
+ -U | --update )
+ UPDATE="yes"
+ NODIST="yes"
+ UPDATE5="yes"
+ COMMAND="get"
+ shift ;;
-u | --try-upgrade )
TRY_UPGRADE="1"; shift ;;
+ -un | --try-upgrade-with-float-version )
+ TRY_UPGRADE="1"; FLOAT_VERSION="1"; shift ;;
+ -v | --verbose )
+ BE_VERBOSE="1"; shift ;;
--define)
shift
MACRO="${1}"
RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\""
;;
* )
- SPECFILE="${1}"; shift ;;
+ SPECFILE="`basename ${1} .spec`.spec"; shift ;;
esac
done
-if [ -n "$DEBUG" ]; then
- set -x;
- set -v;
+if [ -n "$DEBUG" ]; then
+ set -x;
+ set -v;
fi
case "$COMMAND" in
parse_spec;
if [ -n "$FAIL_IF_CHANGED_BUT_NOT_BUMPED" ]; then
- TAGVER=$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g"`
+ TAGVER=$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
CURTAGREL=$(cvs status $SPECFILE | grep "Working revision:" | awk '{ print $3 }')
TAGREL=$(cvs status -v $SPECFILE | grep -E "^[[:space:]]*${TAGVER}[[[:space:]]" | sed -e 's#.*(revision: ##g' -e 's#).*##g')
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/[^ ]*//'`
fi
get_files "$SOURCES $PATCHES";
build_package;
fi
;;
"branch" )
- init_builder;
+ init_builder;
if [ -n "$SPECFILE" ]; then
get_spec;
parse_spec;
else
Exit_error err_no_spec_in_cmdl;
fi
- ;;
+ ;;
"get" )
init_builder;
if [ -n "$SPECFILE" ]; then
v2=(substr(v2,1,RSTART) "." substr(v2,RSTART+RLENGTH-1))
sub("^0*","",v1)
sub("^0*","",v2)
+ gsub("\.0*",".",v1)
+ gsub("\.0*",".",v2)
if (DEBUG) print "v1 == " v1
if (DEBUG) print "v2 == " v2
count=split(v1,v1a,"\.")
return 0
}
+function compare_ver_dec(v1,v2) {
+# compares version numbers as decimal floats
+ while (match(v1,/[0-9][a-zA-Z]/))
+ v1=(substr(v1,1,RSTART) "." substr(v1,RSTART+RLENGTH-1))
+ while (match(v2,/[0-9][a-zA-Z]/))
+ v2=(substr(v2,1,RSTART) "." substr(v2,RSTART+RLENGTH-1))
+ sub("^0*","",v1)
+ sub("^0*","",v2)
+ if (DEBUG) print "v1 == " v1
+ if (DEBUG) print "v2 == " v2
+ count=split(v1,v1a,"\.")
+ count2=split(v2,v2a,"\.")
+
+ if (count<count2) mincount=count
+ else mincount=count2
+
+ for (i=1; i<=mincount; i++) {
+ if (v1a[i]=="") v1a[i]=0
+ if (v2a[i]=="") v2a[i]=0
+ if (DEBUG) print "i == " i
+ if (DEBUG) print "v1[i] == " v1a[i]
+ if (DEBUG) print "v2[i] == " v2a[i]
+ if ((v1a[i]~/[0-9]/)&&(v2a[i]~/[0-9]/)) {
+ if (i==2) {
+ if (0+("." v2a[i])>0+("." v1a[i]))
+ return 1
+ else if (0+("." v1a[i])>0+("." v2a[i]))
+ return 0
+ } else {
+ if (length(v2a[i])>length(v1a[i]))
+ return 1
+ else if (v2a[i]>v1a[i])
+ return 1
+ else if (length(v1a[i])>length(v2a[i]))
+ return 0
+ else if (v1a[i]>v2a[i])
+ return 0
+ }
+ } else if ((v1a[i]~/[A-Za-z]/)&&(v2a[i]~/[A-Za-z]/)) {
+ if (v2a[i]>v1a[i])
+ return 1
+ else if (v1a[i]>v2a[i])
+ return 0
+ } else if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha"))
+ return 1
+ else
+ return 0
+ }
+ if ((count2==mincount)&&(count!=count2)) {
+ for (i=count2+1; i<=count; i++)
+ if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha"))
+ return 1
+ return 0
+ } else if (count!=count2) {
+ for (i=count+1; i<=count2; i++)
+ if ((v2a[i]~"pre")||(v2a[i]~"beta")||(v2a[i]~"alpha"))
+ return 0
+ return 1
+ }
+ return 0
+}
+
function get_links(url, errno,link,oneline,retval,odp,tmpfile) {
# get all <A HREF=..> tags from specified URL
"mktemp /tmp/XXXXXX" | getline tmpfile
close("mktemp /tmp/XXXXXX")
if (DEBUG) print "Retrieving: " url
- errno=system("wget -O - \"" url "\" -t 1 -T 300 --passive-ftp > " tmpfile " 2>/dev/null" )
+ errno=system("wget -O - \"" url "\" -t 3 -T 300 --passive-ftp > " tmpfile " 2>/dev/null" )
if (errno==0) {
while (getline oneline < tmpfile)
odp=(odp " " oneline)
if ( DEBUG ) print "Odpowiedz: " odp
}
-
+
close(tmpfile)
system("rm -f " tmpfile)
+ urldir=url;
+ sub(/[^\/]+$/,"",urldir)
if ( errno==0) {
while ((tolower(odp) ~ /<frame[ \t]/)||(tolower(odp) ~ /href=/)) {
if (tolower(odp) ~ /<frame[ \t]/) {
match(tolower(odp),/<frame[ \t][^>]*>/)
ramka=substr(odp,RSTART,RLENGTH)
odp=substr(odp,RSTART+RLENGTH)
+ sub(/[sS][rR][cC]=[ \t]+/,"src=",ramka);
match(tolower(ramka),/src="[^"]+"/)
newurl=substr(ramka,RSTART+5,RLENGTH-6)
if (DEBUG) print "Ramka: " newurl
+ if (newurl !~ /\//) {
+ newurl=(urldir newurl)
+ if (DEBUG) print "Ramka->: " newurl
+ }
retval=(retval " " get_links(newurl))
- } else if (tolower(odp) ~ /href="[^"]+"/) {
+ } else if (tolower(odp) ~ /href=[ \t]*"[^"]+"/) {
+ sub(/[hH][rR][eE][fF]=[ \t]+/,"href=",odp)
match(tolower(odp),/href="[^"]+"/)
link=substr(odp,RSTART,RLENGTH)
odp=substr(odp,RSTART+RLENGTH)
link=substr(link,7,length(link)-7)
retval=(retval " " link)
- } else {
+ } else if (tolower(odp) ~ /href=[ \t]*[^ \t>]+/) {
+ sub(/[hH][rR][eE][fF]=[ \t]+/,"href=",odp)
match(tolower(odp),/href=[^ \t>]+/)
link=substr(odp,RSTART,RLENGTH)
odp=substr(odp,RSTART+RLENGTH)
link=substr(link,6,length(link)-5)
retval=(retval " " link)
+ } else {
+ retval=(retval " INTERNAL_ERROR")
+ break
}
}
} else {
newfilename=fixedsub(prever,"",newfilename)
newfilename=fixedsub(postver,"",newfilename)
if (DEBUG) print "Wersja: " newfilename
- if ( compare_ver(version, newfilename)==1 ) {
+ if (NUMERIC) {
+ if ( compare_ver_dec(version, newfilename)==1 ) {
+ if (DEBUG) print "Tak, jest nowa"
+ version=newfilename
+ finished=1
+ }
+ } else if ( compare_ver(version, newfilename)==1 ) {
if (DEBUG) print "Tak, jest nowa"
version=newfilename
finished=1
print "No wget installed!"
exit 1
}
+ if (ARGC>=3 && ARGV[2]=="-n") {
+ NUMERIC=1
+ for (i=3; i<ARGC; i++) ARGV[i-1]=ARGV[i]
+ ARGC=ARGC-1
+ }
}
FNR==1 {
projects / packages / rpm-build-tools.git / commitdiff