Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package obs-service-source_validator for
openSUSE:Factory checked in at 2022-07-09 16:58:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-source_validator (Old)
and /work/SRC/openSUSE:Factory/.obs-service-source_validator.new.1523
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-source_validator"
Sat Jul 9 16:58:58 2022 rev:55 rq:987566 version:0.24
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-source_validator/obs-service-source_validator.changes
2022-03-28 16:59:00.448842732 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-source_validator.new.1523/obs-service-source_validator.changes
2022-07-09 16:58:59.656432212 +0200
@@ -1,0 +2,7 @@
+Thu Jul 07 16:30:51 UTC 2022 - [email protected]
+
+- Update to version 0.24:
+ * Use ERROR for prefixing errors
+ * Split out GPG validation into own check and improve it
+
+-------------------------------------------------------------------
Old:
----
obs-service-source_validator-0.23.tar.bz2
New:
----
obs-service-source_validator-0.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-source_validator.spec ++++++
--- /var/tmp/diff_new_pack.WQD0B2/_old 2022-07-09 16:59:00.168432982 +0200
+++ /var/tmp/diff_new_pack.WQD0B2/_new 2022-07-09 16:59:00.172432988 +0200
@@ -21,7 +21,7 @@
License: GPL-2.0-or-later
Group: Development/Tools/Building
URL: https://github.com/openSUSE/obs-service-source_validator
-Version: 0.23
+Version: 0.24
Release: 0
# use osc service dr to update
Source: %{name}-%{version}.tar.bz2
@@ -31,7 +31,6 @@
# Fedora
Requires: gnupg2
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: build
Requires: /usr/bin/xmllint
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.WQD0B2/_old 2022-07-09 16:59:00.216433054 +0200
+++ /var/tmp/diff_new_pack.WQD0B2/_new 2022-07-09 16:59:00.220433060 +0200
@@ -3,6 +3,6 @@
<param
name="url">git://github.com/openSUSE/obs-service-source_validator.git</param>
<param
name="changesrevision">c68d7a28c4ecd88b179359b030098503e75adc0b</param></service><service
name="tar_scm">
<param
name="url">https://github.com/openSUSE/obs-service-source_validator.git</param>
- <param
name="changesrevision">4665aeff78e5c3540300135f6ef9be785648ac3f</param></service></servicedata>
+ <param
name="changesrevision">7f3e827602e97916d8bfe713da64579d0f67cfbd</param></service></servicedata>
(No newline at EOF)
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.WQD0B2/_old 2022-07-09 16:59:00.236433084 +0200
+++ /var/tmp/diff_new_pack.WQD0B2/_new 2022-07-09 16:59:00.240433090 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-source-validator
-Version: 0.23-0
+Version: 0.24-0
Binary: obs-service-source-validator
Maintainer: Hib Eris <[email protected]>
Architecture: all
++++++ obs-service-source_validator-0.23.tar.bz2 ->
obs-service-source_validator-0.24.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.23/20-files-present-and-referenced
new/obs-service-source_validator-0.24/20-files-present-and-referenced
--- old/obs-service-source_validator-0.23/20-files-present-and-referenced
2022-03-22 09:09:32.000000000 +0100
+++ new/obs-service-source_validator-0.24/20-files-present-and-referenced
2022-07-07 18:04:48.000000000 +0200
@@ -106,7 +106,7 @@
BASE="${i##*/}"
xmllint --format "$i" >/dev/null || {
- echo "(E) $(basename $i) is not valid XML"
+ echo "ERROR: $(basename -- $i) is not valid XML"
RETURN=2
continue
}
@@ -140,7 +140,7 @@
if grep -qsFx "$file" "$DESTINATIONDIR/_to_be_added"; then
return 0
fi
- echo "(E) $file mentioned in spec file is not tracked."
+ echo "ERROR: $file mentioned in spec file is not tracked."
return 1
fi
if ! test -f "$DIR_TO_CHECK/$file"; then
@@ -148,7 +148,7 @@
# assume it will generated on builtime based of the
archive
return 0
fi
- echo "(E) $file mentioned in spec file does not exist."
+ echo "ERROR: $file mentioned in spec file does not exist."
return 1
fi
}
@@ -160,57 +160,6 @@
fi
#
-# Verify GPG keys
-#
-
-if [ -f "$DIR_TO_CHECK"/*.keyring 2>/dev/null ]; then
- GPG_OPTIONS="--homedir $TMPDIR -q --no-default-keyring --keyring
$TMPDIR/.checkifvalidsourcedir-gpg-keyring --trust-model always"
- gpg $GPG_OPTIONS --import "$DIR_TO_CHECK"/*.keyring
- for i in "$DIR_TO_CHECK"/*.sig "$DIR_TO_CHECK"/*.sign
"$DIR_TO_CHECK"/*.asc; do
- if [ -f "$i" ]; then
- validatefn=${i%.asc}
- validatefn=${validatefn%.sig}
- validatefn=${validatefn%.sign}
- if [ -f "$validatefn" ]; then
- gpg $GPG_OPTIONS --verify "$i" || {
- echo "(E) signature $i does not validate"
- RETURN=2
- }
- else
- if [ -f "$validatefn.gz" ]; then
- TMPFILE=`mktemp`
- zcat "$validatefn.gz" > $TMPFILE
- gpg $GPG_OPTIONS --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 $GPG_OPTIONS --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 $GPG_OPTIONS --verify "$i" "$TMPFILE" || {
- echo "(E) signature $i does not validate"
- RETURN=2
- }
- rm $TMPFILE
- fi
- fi
- fi
- done
- rm $TMPDIR/.checkifvalidsourcedir-gpg-keyring
-fi
-
-#
# now check if everything is marked in spec files.
#
for i in "$DIR_TO_CHECK"/* "$DIR_TO_CHECK"/.* ; do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.23/25-keyring-validate
new/obs-service-source_validator-0.24/25-keyring-validate
--- old/obs-service-source_validator-0.23/25-keyring-validate 1970-01-01
01:00:00.000000000 +0100
+++ new/obs-service-source_validator-0.24/25-keyring-validate 2022-07-07
18:04:48.000000000 +0200
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+test "$1" = "--verbose" && { VERBOSE=true ; shift ; }
+test "$1" = "--batchmode" && { BATCHMODE=true ; shift ; }
+DIR_TO_CHECK="$1"
+test -n "$DIR_TO_CHECK" || DIR_TO_CHECK=$PWD
+RETURN=0
+
+keyrings=()
+for i in "$DIR_TO_CHECK"/*.keyring ; do
+ test -f "$i" || continue
+ : Found keyring "$i"
+ keyrings+=("$i")
+done
+
+# check for stale .keyring files
+if test ${#keyrings[@]} -gt 1; then
+ echo "ERROR: expecting one keyring named '$(basename --
"$DIR_TO_CHECK").keyring'"
+ RETURN=1
+elif test ${#keyrings[@]} -lt 1; then
+ # check for missing .keyring files
+ for i in "$DIR_TO_CHECK"/*.sig "$DIR_TO_CHECK"/*.sign
"$DIR_TO_CHECK"/*.asc; do
+ test -f "$i" || continue
+ if test ! -f "${keyrings[0]}"; then
+ echo "Warning: Need a $(basename -- "$DIR_TO_CHECK").keyring file
for validating '$(basename -- $i)'"
+ fi
+ done
+else
+ # verify GPG signatures
+ GPGTMP=$(mktemp -d)
+ GPG="gpg --homedir $GPGTMP -q --no-default-keyring --keyring
$GPGTMP/.gpg-keyring --trust-model always"
+ $GPG --import "${keyrings[0]}"
+ for i in "$DIR_TO_CHECK"/*.sig "$DIR_TO_CHECK"/*.sign
"$DIR_TO_CHECK"/*.asc; do
+ test -f "$i" || continue
+ validatefn=${i%.asc}
+ validatefn=${validatefn%.sig}
+ validatefn=${validatefn%.sign}
+ if [ -f "$validatefn" ]; then
+ if ! $GPG -q --verify -- "$i" "$validatefn"; then
+ echo "ERROR: signature $i does not validate"
+ RETURN=2
+ fi
+ else
+ if [ -f "$validatefn.gz" -o -f "$validatefn.bz2" -o -f
"$validatefn.xz" -o -f "$validatefn.zst" ]; then
+ TMPFILE=$(mktemp)
+ [ -f "$validatefn.gz" ] && zcat "$validatefn.gz" > "$TMPFILE"
+ [ -f "$validatefn.bz2" ] && bzcat "$validatefn.bz2" >
"$TMPFILE"
+ [ -f "$validatefn.xz" ] && xzcat "$validatefn.xz" > "$TMPFILE"
+ [ -f "$validatefn.zst" ] && zstdcat "$validatefn.zst" >
"$TMPFILE"
+ if ! $GPG -q --verify -- "$i" "$TMPFILE" ; then
+ echo "ERROR: signature $i does not validate"
+ RETURN=2
+ fi
+ rm -f "$TMPFILE"
+ fi
+ fi
+ done
+ rm -rf "$GPGTMP"
+fi
+
+test "$VERBOSE" = true && echo ".. completed $0"
+exit $RETURN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-source_validator-0.23/60-spec-filelist
new/obs-service-source_validator-0.24/60-spec-filelist
--- old/obs-service-source_validator-0.23/60-spec-filelist 2022-03-22
09:09:32.000000000 +0100
+++ new/obs-service-source_validator-0.24/60-spec-filelist 2022-07-07
18:04:48.000000000 +0200
@@ -33,7 +33,7 @@
case $LINE in
*/usr/man/*|*/usr/info/*|*/usr/bin/X11/*)
RETURN=1
- echo "(E)" `basename "$SPECFILE"` uses forbidden file
path \"$LINE\".
+ echo "ERROR: " `basename "$SPECFILE"` uses forbidden
file path \"$LINE\".
;;
esac
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.23/helpers/check_dates_in_changes
new/obs-service-source_validator-0.24/helpers/check_dates_in_changes
--- old/obs-service-source_validator-0.23/helpers/check_dates_in_changes
2022-03-22 09:09:32.000000000 +0100
+++ new/obs-service-source_validator-0.24/helpers/check_dates_in_changes
2022-07-07 18:04:48.000000000 +0200
@@ -49,14 +49,14 @@
break
;;
*)
- echo "(E) $DATESTR is no date"
+ echo "ERROR: '$DATESTR' is not a date"
TROUBLE_FOUND=true
;;
esac
DATE=`date +%s --date "$DATESTR" 2> /dev/null`
test $? -gt 0 -o -z "$DATE" -o "$LAST_IS_YEAR" != true && {
echo "$CHANGES"
- echo "(E) INVALID \"$DATESTR\" "
+ echo "ERROR: INVALID \"$DATESTR\" "
TROUBLE_FOUND=true
}
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.23/helpers/check_patches_applied
new/obs-service-source_validator-0.24/helpers/check_patches_applied
--- old/obs-service-source_validator-0.23/helpers/check_patches_applied
2022-03-22 09:09:32.000000000 +0100
+++ new/obs-service-source_validator-0.24/helpers/check_patches_applied
2022-07-07 18:04:48.000000000 +0200
@@ -56,7 +56,7 @@
if ($arg =~ /^[0-9]/) {
$APPLIED[$arg] = $applied;
} else {
- print STDERR "$col_red(E) %patch -P without
following numeric argument$col_norm\n";
+ print STDERR "${col_red}ERROR: %patch -P
without following numeric argument$col_norm\n";
print STDERR "line was $_\n" if $debug;
$errors++;
}
@@ -65,7 +65,7 @@
if ($arg =~ /^[0-9]/) {
$APPLIED[$arg] = $applied unless $APPLIED[$arg];
} else {
- print STDERR "$col_red(E) %patch -P without
following numeric argument$col_norm\n";
+ print STDERR "${col_red}ERROR: %patch -P
without following numeric argument$col_norm\n";
print STDERR "line was $_\n" if $debug;
$errors++;
}
@@ -80,7 +80,7 @@
if ($arg =~ /^[0-9]/) {
$APPLIED[$arg] = $applied unless $APPLIED[$arg];
} else {
- print STDERR "$col_red(E) %patchZZZ without
following numeric argument$col_norm\n";
+ print STDERR "${col_red}ERROR: %patchZZZ
without following numeric argument$col_norm\n";
print STDERR "line was $_\n" if $debug;
$errors++;
}
@@ -111,14 +111,14 @@
print STDERR "$col_yel(W) $filename: patch $i $PATCHES[$i]: is
commented out$col_norm\n";
next;
}
- print STDERR "$col_red(E) $filename: patch $i $PATCHES[$i] apparently
not applied (or not applied via %patch)$col_norm\n";
+ print STDERR "${col_red}ERROR: $filename: patch $i $PATCHES[$i]
apparently not applied (or not applied via %patch)$col_norm\n";
$errors++;
}
for my $j (1...$#APPLIED) {
next unless $APPLIED[$j];
next if $APPLIED[$j];
next if $PATCHES[$j] == 2;
- print STDERR "$col_red(E) $filename: patch number $j referenced but not
defined$col_norm\n";
+ print STDERR "${col_red}ERROR: $filename: patch number $j referenced
but not defined$col_norm\n";
$errors++;
}
