Hello community, here is the log from the commit of package obs-service-source_validator for openSUSE:Factory checked in at 2014-06-26 10:42:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-source_validator (Old) and /work/SRC/openSUSE:Factory/.obs-service-source_validator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-source_validator" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-source_validator/obs-service-source_validator.changes 2014-06-01 18:56:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.obs-service-source_validator.new/obs-service-source_validator.changes 2014-06-26 10:42:33.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Jun 25 12:56:41 UTC 2014 - coolo@suse.com + +- update to git (0.4): + - warn about unmentioned baselibs.conf and rpmlintrc + - Handle Jan Engelhardt tarball signatures that are done before + compression + - handle %global like %define in output_versions + - Support ARM build hosts + - do not complain about temporary directories when running source services (on server esp.) + - also check for orphan files when _services are used + When _service mode is disabled or loc + +------------------------------------------------------------------- Old: ---- obs-service-source_validator-0.3.tar.bz2 New: ---- obs-service-source_validator-0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-source_validator.spec ++++++ --- /var/tmp/diff_new_pack.6UICsH/_old 2014-06-26 10:42:34.000000000 +0200 +++ /var/tmp/diff_new_pack.6UICsH/_new 2014-06-26 10:42:34.000000000 +0200 @@ -22,7 +22,7 @@ Group: Development/Tools/Building Summary: An OBS source service: defines all source-validator checks used by Factory Group: Development/Tools/Building -Version: 0.3 +Version: 0.4 Release: 0 # use osc service dr to update Source: %{name}-%{version}.tar.bz2 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.6UICsH/_old 2014-06-26 10:42:34.000000000 +0200 +++ /var/tmp/diff_new_pack.6UICsH/_new 2014-06-26 10:42:34.000000000 +0200 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="version">git-master</param> - <param name="versionformat">0.3</param> + <param name="versionformat">0.4</param> <param name="revision">master</param> </service> ++++++ obs-service-source_validator-0.3.tar.bz2 -> obs-service-source_validator-0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-source_validator-0.3/20-files-present-and-referenced new/obs-service-source_validator-0.4/20-files-present-and-referenced --- old/obs-service-source_validator-0.3/20-files-present-and-referenced 2013-08-06 14:32:22.000000000 +0200 +++ new/obs-service-source_validator-0.4/20-files-present-and-referenced 2014-06-25 14:55:01.000000000 +0200 @@ -24,6 +24,13 @@ exit $1 } +# +# display a warning if the file is not in the spec file sources +# +warn_on_unmentioned_files () { + grep -a -x $1 $TMPDIR/sources > /dev/null || echo "(W) Attention, $1 is not mentioned in spec files as source or patch." +} + test "$VERBOSE" = true && echo -n "- checking if needed files are present and none stale " # # first make my TMPDIR @@ -38,6 +45,9 @@ i386) MY_ARCH="%ix86" ;; + arm) + MY_ARCH="%arm" + ;; esac for i in $DIR_TO_CHECK/*.spec ; do test -f $i || continue @@ -186,10 +196,42 @@ gpg -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --import $DIR_TO_CHECK/*.keyring for i in $DIR_TO_CHECK/*.sig $DIR_TO_CHECK/*.asc; do if [ -f "$i" ]; then - gpg -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring "$i" || { - echo "(E) signature $i does not validate" - RETURN=2 - } + validatefn=${i/.asc} + validatefn=${validatefn/.sig} + if [ -f "$validatefn" ]; then + gpg -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" || { + echo "(E) signature $i does not validate" + RETURN=2 + } + else + if [ -f "$validatefn.gz" ]; then + TMPFILE=`mktemp` + zcat "$validatefn.gz" > $TMPFILE + gpg -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" "$TMPFILE" || { + echo "(E) signature $i does not validate" + RETURN=2 + } + rm $TMPFILE + fi + if [ -f "$validatefn.bz2" ]; then + TMPFILE=`mktemp` + bzcat "$validatefn.bz2" > $TMPFILE + gpg -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" "$TMPFILE" || { + echo "(E) signature $i does not validate" + RETURN=2 + } + rm $TMPFILE + fi + if [ -f "$validatefn.xz" ]; then + TMPFILE=`mktemp` + xzcat "$validatefn.xz" > $TMPFILE + gpg -q --no-default-keyring --keyring $TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" "$TMPFILE" || { + echo "(E) signature $i does not validate" + RETURN=2 + } + rm $TMPFILE + fi + fi fi done rm $TMPDIR/.checkifvalidsourcedir-gpg-keyring @@ -255,6 +297,11 @@ echo "###ASK $DIR_TO_CHECK/$BASE" fi fi + # we want baselibs.conf in the src.rpm + if test "$BASE" = baselibs.conf; then + warn_on_unmentioned_files $BASE + fi + ;; *rpmlintrc) if test -n "$DESTINATIONDIR" -a -f "$DESTINATIONDIR/$BASE" && cmp -s "$DIR_TO_CHECK/$BASE" "$DESTINATIONDIR/$BASE" ; then @@ -279,6 +326,8 @@ echo "###ASK $DIR_TO_CHECK/$BASE" fi fi + warn_on_unmentioned_files $BASE + LINE=$(egrep "^[^#]*setBadness" "$DIR_TO_CHECK/$BASE") if [ "$LINE" != "" ]; then @@ -357,8 +406,11 @@ test -f $DIR_TO_CHECK/_service && egrep -q 'mode=.remoterun' $DIR_TO_CHECK/_service && continue # be a bit more relaxed for osc, it won't upload directories anyway [ -d $DIR_TO_CHECK/$BASE ] && [ -d $DIR_TO_CHECK/.osc ] && continue + # and source services on server side + [ -d $DIR_TO_CHECK/$BASE ] && [ -d $DIR_TO_CHECK/.old ] && continue + + warn_on_unmentioned_files $BASE - echo "(W) Attention, $BASE is not mentioned in spec files as source or patch." if test "$RETURN" != "2" ; then if [ -d $DIR_TO_CHECK/$BASE ] ; then # be a bit more relaxed for osc, it won't upload directories anyway diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-source_validator-0.3/helpers/output_versions new/obs-service-source_validator-0.4/helpers/output_versions --- old/obs-service-source_validator-0.3/helpers/output_versions 2013-08-06 14:32:22.000000000 +0200 +++ new/obs-service-source_validator-0.4/helpers/output_versions 2014-06-25 14:55:01.000000000 +0200 @@ -75,7 +75,7 @@ close (SPEC); while ($_ = shift @SPEC) { chomp(); - if ( /^\s*%if/ || /^\s*%\{/ || /^\s*%define/ || /^\s*%el/ || /^\s*%endif/ ) { + if ( /^\s*%if/ || /^\s*%\{/ || /^\s*%define/ || /^\s*%el/ || /^\s*%endif/ || /^\s*%global/ ) { if ( /^\s*%if\s/ ) { my @args = split (/\s+/,$_); $_ =~ s/[\?\{\}\"]//g for (@args); @@ -114,7 +114,7 @@ } elsif ($ifhandler->{"disabled"} == 0 && $ifhandler->{"depth"} == 1 && $ifhandler->{"last_if_if"} == 1) { $ifhandler->{"disabled"} = 1; } - } elsif ( /^\s*%define\s/ ) { + } elsif ( /^\s*%define\s/ || /^\s*%global\s/ ) { my @args = split (/\s+/,$_); $_ =~ s/[\?\{\}\"]//g for (@args); $args[2] =~ s/\Q$_\E/$definelist->{$_}/g for (sort { length($b) <=> length($a) } keys (%{$definelist})); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org