Hello community,
here is the log from the commit of package obs-service-source_validator for
openSUSE:Factory checked in at 2016-03-07 13:37:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-07-21 13:26:17.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-source_validator.new/obs-service-source_validator.changes
2016-03-07 13:37:09.000000000 +0100
@@ -1,0 +2,17 @@
+Mon Feb 22 17:29:48 UTC 2016 - [email protected]
+
+- Update to version 0.6+git20160222.62c56d3:
+ + turned off warnings to avoid misleading messages
+ + fixes boo#967610
+ + related to bsc#967265
+
+-------------------------------------------------------------------
+Thu Feb 18 16:44:41 UTC 2016 - [email protected]
+
+- Update to version 0.6+git20160218.73d6618:
+ + Attempt to fix <CI_CNT> and <B_CNT> handling in Release in a minimal
invasive way.
+ + 20-files-present-and-referenced: also look for *.sign files
+ + various security and bug fixes (boo#967265)
+ + removed bash 4 test syntax
+
+-------------------------------------------------------------------
Old:
----
obs-service-source_validator-0.5+git20150622.3c3fa65.tar.bz2
New:
----
obs-service-source_validator-0.6+git20160222.62c56d3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-source_validator.spec ++++++
--- /var/tmp/diff_new_pack.9o9QV2/_old 2016-03-07 13:37:28.000000000 +0100
+++ /var/tmp/diff_new_pack.9o9QV2/_new 2016-03-07 13:37:28.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-source_validator
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Summary: An OBS source service: running all the osc source-validator
checks
License: GPL-2.0+
Group: Development/Tools/Building
-Version: 0.5+git20150622.3c3fa65
+Version: 0.6+git20160222.62c56d3
Release: 0
# use osc service dr to update
Source: %{name}-%{version}.tar.bz2
++++++ _service ++++++
--- /var/tmp/diff_new_pack.9o9QV2/_old 2016-03-07 13:37:28.000000000 +0100
+++ /var/tmp/diff_new_pack.9o9QV2/_new 2016-03-07 13:37:28.000000000 +0100
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="version">git-master</param>
- <param name="versionformat">0.5+git%cd.%h</param>
+ <param name="versionformat">0.6+git%cd.%h</param>
<param name="revision">master</param>
<param name="changesgenerate">enable</param>
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.9o9QV2/_old 2016-03-07 13:37:28.000000000 +0100
+++ /var/tmp/diff_new_pack.9o9QV2/_new 2016-03-07 13:37:28.000000000 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/openSUSE/obs-service-source_validator.git</param>
- <param
name="changesrevision">3c3fa650e956cedce7c1852c4bfad69b11d802c3</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">62c56d3c13eb95c40cadff4d1e036d947c800ad4</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.9o9QV2/_old 2016-03-07 13:37:28.000000000 +0100
+++ /var/tmp/diff_new_pack.9o9QV2/_new 2016-03-07 13:37:28.000000000 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-source-validator
-Version: 0.5+git20150622.3c3fa65
+Version: 0.6+git20160222.62c56d3
Binary: obs-service-source-validator
Maintainer: Hib Eris <[email protected]>
Architecture: all
++++++ obs-service-source_validator-0.5+git20150622.3c3fa65.tar.bz2 ->
obs-service-source_validator-0.6+git20160222.62c56d3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.5+git20150622.3c3fa65/20-files-present-and-referenced
new/obs-service-source_validator-0.6+git20160222.62c56d3/20-files-present-and-referenced
---
old/obs-service-source_validator-0.5+git20150622.3c3fa65/20-files-present-and-referenced
2015-06-24 17:36:19.000000000 +0200
+++
new/obs-service-source_validator-0.6+git20160222.62c56d3/20-files-present-and-referenced
2016-02-22 18:29:48.000000000 +0100
@@ -20,7 +20,9 @@
# cleanup_and_exit
#
cleanup_and_exit () {
- rm -rf $TMPDIR
+ if [ -n "$TMPDIR" ];then
+ rm -rf $TMPDIR
+ fi
exit $1
}
@@ -118,7 +120,9 @@
/^\([Ss]ource\|[Pp]atch\)[0-9]*:[ ]*/{
s/^\(\([Ss]ource\|[Pp]atch\)[0-9]*:[
]*\)\(.*\)/##seen \1\3\n%{echo:\3 }/
}
- s/^Release:.*<RELEASE.*>/Release: 0/' $i >$TMPDIR/tmp.spec
+ s/^Release:.*<RELEASE.*>/Release: 0/
+ s/^\(Release:.*\)<CI_CNT>\(.*\)/\1_\2/
+ s/^\(Release:.*\)<B_CNT>\(.*\)/\1_\2/' $i >$TMPDIR/tmp.spec
grep -a ^Icon: $i|sed -n 's/^Icon:[ ]*/%{echo:/
/^%{echo:/s/$/ }/p' >>$TMPDIR/tmp.spec
grep -a -q ^Release $i || {
@@ -232,10 +236,11 @@
if [ -f $DIR_TO_CHECK/*.keyring 2>/dev/null ]; then
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
+ 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=${i%.asc}
+ validatefn=${validatefn%.sig}
+ validatefn=${validatefn%.sign}
if [ -f "$validatefn" ]; then
gpg -q --no-default-keyring --keyring
$TMPDIR/.checkifvalidsourcedir-gpg-keyring --verify "$i" || {
echo "(E) signature $i does not validate"
@@ -302,7 +307,7 @@
read ANSWER
test "$ANSWER" = y -o "$ANSWER" = Y || {
if test "$ANSWER" = d -o "$ANSWER" = D ; then
- rm -v $DIR_TO_CHECK/$BASE
+ rm -v -- "$DIR_TO_CHECK/$BASE"
else
echo ok, please fix it...
test "$RETURN" != "2" && RETURN=1
@@ -331,7 +336,7 @@
read ANSWER
test "$ANSWER" = y -o "$ANSWER" = Y || {
if test "$ANSWER" = d -o "$ANSWER" = D ; then
- rm -v $DIR_TO_CHECK/$BASE
+ rm -v -- "$DIR_TO_CHECK/$BASE"
else
echo ok, please fix it...
test "$RETURN" != "2" && RETURN=1
@@ -361,7 +366,7 @@
fi
;;
.*.spec)
- rm -v $DIR_TO_CHECK/$BASE
+ rm -v -- "$DIR_TO_CHECK/$BASE"
;;
*.changes | \
*.lsm | \
@@ -439,7 +444,7 @@
test "$ANSWER" = y -o "$ANSWER" = Y || {
# r for remove is also accepted, to make it
compatible with osc itself
if test "$ANSWER" = d -o "$ANSWER" = D -o
"$ANSWER" = r -o "$ANSWER" = R; then
- rm -Rfv $DIR_TO_CHECK/$BASE
+ rm -Rfv -- "$DIR_TO_CHECK/$BASE"
else
echo ok, please fix it...
test "$RETURN" != "2" && RETURN=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.5+git20150622.3c3fa65/helpers/fix_changelog
new/obs-service-source_validator-0.6+git20160222.62c56d3/helpers/fix_changelog
---
old/obs-service-source_validator-0.5+git20150622.3c3fa65/helpers/fix_changelog
2015-06-24 17:36:19.000000000 +0200
+++
new/obs-service-source_validator-0.6+git20160222.62c56d3/helpers/fix_changelog
2016-02-22 18:29:48.000000000 +0100
@@ -23,12 +23,12 @@
for i in $DIR/*.changes ; do
test -f $i || continue
echo "processing $i:"
- /usr/lib/obs/service/source_validators/helpers/changelogfilter $i > $i.tmp
+ /usr/lib/obs/service/source_validators/helpers/changelogfilter "$i" >
"$i.tmp"
if test -s $i.tmp ; then
- mv $i.tmp $i
+ mv -- "$i.tmp" "$i"
else
echo "fixup failed for $i"
- rm -f $i.tmp
+ rm -f -- "$i.tmp"
fi
done
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.5+git20150622.3c3fa65/helpers/output_versions
new/obs-service-source_validator-0.6+git20160222.62c56d3/helpers/output_versions
---
old/obs-service-source_validator-0.5+git20150622.3c3fa65/helpers/output_versions
2015-06-24 17:36:19.000000000 +0200
+++
new/obs-service-source_validator-0.6+git20160222.62c56d3/helpers/output_versions
2016-02-22 18:29:48.000000000 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/perl
+use strict;
+use POSIX;
my $release = "stable";
my $quiet = 0;
@@ -9,31 +11,30 @@
my $debug = 0;
my $dir_to_check;
-for (@ARGV) {
- if ($_ eq "-q") {
+while ( my $opt = shift @ARGV) {
+ if ($opt eq "-q") {
$quiet = 1;
- } elsif ($_ eq "-m") {
+ } elsif ($opt eq "-m") {
$quiet_mainpack = 1;
- } elsif ($_ eq "-s") {
+ } elsif ($opt eq "-s") {
$quiet_specfile = 1;
- } elsif ($_ eq "-l") {
+ } elsif ($opt eq "-l") {
$add_license = 1;
- } elsif ($_ eq "-d") {
+ } elsif ($opt eq "-d") {
$debug = 1;
- } elsif ($_ eq "-r") {
+ } elsif ($opt eq "-r") {
$release = shift @ARGV;
- $release = `echo $release`;
+ $release = `echo "$release"`;
chomp ($release);
} else {
- $dir_to_check = $_;
+ $dir_to_check = $opt;
last;
}
}
sub output_package ($$) {
my ($rel,$cpack) = @_;
- my $datestr = `date "+%Y-%m-%d %H:%M:%S"`;
- chomp ($datestr);
+ my $datestr = strftime("%Y-%m-%d %H:%M:%S",localtime());
print "$datestr $rel $cpack ";
}
@@ -53,10 +54,6 @@
print "\n";
}
-my $current_package;
-my $current_package_license;
-my $package_version;
-my $main_package_name;
my @specs;
opendir (NEWD, "$dir_to_check");
@@ -66,10 +63,16 @@
closedir (NEWD);
for my $specfile (sort(@specs)) {
- my $buildroot = 0;
- $main_package_name = "";
- undef $definelist;
- undef $ifhandler;
+ my $buildroot = 0;
+ my $main_package_name = "";
+ my $definelist = {};
+ my $ifhandler = {};
+ my $package_name = undef;
+ my $main_package_version = undef;
+ my $current_package;
+ my $current_package_license;
+ my $package_version;
+
open (SPEC,"$dir_to_check/$specfile");
my @SPEC = <SPEC>;
close (SPEC);
