diff -Nru os-autoinst-4.5.1527308405.8b586d5/debian/changelog os-autoinst-4.5.1527308405.8b586d5/debian/changelog --- os-autoinst-4.5.1527308405.8b586d5/debian/changelog 2018-10-02 12:19:30.000000000 +0000 +++ os-autoinst-4.5.1527308405.8b586d5/debian/changelog 2019-02-25 19:01:55.000000000 +0000 @@ -1,3 +1,39 @@ +os-autoinst (4.5.1527308405.8b586d5-4.1) unstable; urgency=medium + + * Non-maintainer upload + * Add patch to avoid race condition in osutils::runcmd (Cloese: #921757) + + -- Hilko Bengen Mon, 25 Feb 2019 20:01:55 +0100 + +os-autoinst (4.5.1527308405.8b586d5-4) unstable; urgency=medium + + * debian/control + - just build for i386 and amd64 for now... + + -- Hideki Yamane Sun, 06 Jan 2019 15:22:32 +0900 + +os-autoinst (4.5.1527308405.8b586d5-3) unstable; urgency=medium + + * debian/control + - set Standards-Version: 4.3.0 + - use dh12, set "Build-Depends: debhelper (>= 12), debhelper-compat (= 12)" + - replace from qemu-kvm (oldlibs) to qemu-system-x86 and just target + x86 systems for now + - set "Rules-Requires-Root: no" and "Build-Depends: dpkg-dev (>= 1.19.0)" + * debian/compat + - drop it + * debian/watch + - update to version 4 + * debian/rules + - adjust path in override_dh_fixperms with installation to /usr/libexec + + [ Ondřej Nový ] + * d/copyright: Use https protocol in Format field + * d/changelog: Remove trailing whitespaces + * d/control: Remove trailing whitespaces + + -- Hideki Yamane Sat, 05 Jan 2019 17:13:53 +0900 + os-autoinst (4.5.1527308405.8b586d5-2) unstable; urgency=medium * debian/control @@ -36,7 +72,7 @@ os-autoinst (4.4.1508936943.39adc5eb-1) unstable; urgency=medium - * New upstream release + * New upstream release * debian/patches 0003-avoid-clean-.orig-file.patch: drop, merged upstream * debian/control @@ -47,7 +83,7 @@ os-autoinst (4.3+git20171005-2) unstable; urgency=medium * debian/control - - fix tesseract dependency to use tesseract-all + - fix tesseract dependency to use tesseract-all - adjust Build-Depends: qemu-system, not qemu -- Hideki Yamane Fri, 27 Oct 2017 05:30:22 +0900 @@ -69,7 +105,7 @@ os-autoinst (4.3+git20160919-3) unstable; urgency=medium * debian/control - - set libtest-compile-perl (>= 1.1.0) from fedora spec file. + - set libtest-compile-perl (>= 1.1.0) from fedora spec file. - drop unnecessary Build-Depends - add libnet-ssh2-perl and libexception-class-perl for Depends @@ -79,9 +115,9 @@ * taken from git repo * debian/control - - fix Vcs-Browser + - fix Vcs-Browser - change "Depends: qemu-kvm | qemu" to satisfy dependency in some arch. - - add Build-Depends: libdevel-cover-perl,libtest-output-perl, + - add Build-Depends: libdevel-cover-perl,libtest-output-perl, libtest-pod-perl, libtry-tiny-perl, libpod-coverage-perl, libtest-mockmodule-perl and libtest-fatal-perl to enable tests - set Debhelper (>= 10) diff -Nru os-autoinst-4.5.1527308405.8b586d5/debian/compat os-autoinst-4.5.1527308405.8b586d5/debian/compat --- os-autoinst-4.5.1527308405.8b586d5/debian/compat 2018-10-02 12:19:30.000000000 +0000 +++ os-autoinst-4.5.1527308405.8b586d5/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru os-autoinst-4.5.1527308405.8b586d5/debian/control os-autoinst-4.5.1527308405.8b586d5/debian/control --- os-autoinst-4.5.1527308405.8b586d5/debian/control 2018-10-02 12:19:30.000000000 +0000 +++ os-autoinst-4.5.1527308405.8b586d5/debian/control 2019-02-24 14:46:32.000000000 +0000 @@ -2,19 +2,23 @@ Section: devel Priority: optional Maintainer: Hideki Yamane -Build-Depends: debhelper (>= 11), pkg-config, perltidy, +Build-Depends: debhelper (>= 12), debhelper-compat (= 12), pkg-config, perltidy, + dpkg-dev (>= 1.19.0~), libtheora-dev, libpng-dev, libopencv-dev, tesseract-ocr, libfftw3-dev, libsndfile1-dev, -# In Debian, we should NOT get modules from cpan... +# In Debian, we should NOT get modules from cpan... libmodule-cpanfile-perl, # Build-Depends doesn't specify version libmojolicious-perl, # same as Depends: - qemu-kvm (>= 2.0.0) [amd64 i386], qemu-system (>= 2.0.0) [!amd64 !i386], qemu-utils, + qemu-system-x86 (>= 2.0.0) [amd64 i386], +# First, we'll put this package to x86 archs... +# qemu-system (>= 2.0.0) [!amd64 !i386], + qemu-utils, libcarp-always-perl, libdata-dump-perl, libcrypt-des-perl, @@ -48,19 +52,20 @@ spell, git, wget, -Standards-Version: 4.1.2 +Rules-Requires-Root: no +Standards-Version: 4.3.0 Homepage: http://open.qa Vcs-Git: https://salsa.debian.org/debian/os-autoinst.git Vcs-Browser: https://salsa.debian.org/debian/os-autoinst Package: os-autoinst -Architecture: any +Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, - qemu-kvm (>= 2.0.0) | qemu (>= 2.0.0), qemu-utils, + qemu-system-x86 (>= 2.0.0), qemu-utils, optipng, git, tesseract-ocr-all, python, # specify version - libmojolicious-perl (>= 5.60), + libmojolicious-perl (>= 5.60), # same as B-D libcarp-always-perl, libdata-dump-perl, @@ -87,7 +92,7 @@ libnet-snmp-perl, libjson-xs-perl, Enhances: openqa -Recommends: x11-xkb-utils, +Recommends: x11-xkb-utils, # Upstream recommends: /usr/bin/Xvnc tigervnc-standalone-server, # Upstream recommends: dumponlyconsole diff -Nru os-autoinst-4.5.1527308405.8b586d5/debian/copyright os-autoinst-4.5.1527308405.8b586d5/debian/copyright --- os-autoinst-4.5.1527308405.8b586d5/debian/copyright 2018-10-02 12:19:30.000000000 +0000 +++ os-autoinst-4.5.1527308405.8b586d5/debian/copyright 2019-02-24 14:46:32.000000000 +0000 @@ -8,7 +8,7 @@ License: GPL-2+ Files: debian/* -Copyright: 2015-2018 Hideki Yamane +Copyright: 2015-2019 Hideki Yamane License: GPL-2+ License: GPL-2+ diff -Nru os-autoinst-4.5.1527308405.8b586d5/debian/patches/0006-Eliminate-race-condition-in-runcmd.patch os-autoinst-4.5.1527308405.8b586d5/debian/patches/0006-Eliminate-race-condition-in-runcmd.patch --- os-autoinst-4.5.1527308405.8b586d5/debian/patches/0006-Eliminate-race-condition-in-runcmd.patch 1970-01-01 00:00:00.000000000 +0000 +++ os-autoinst-4.5.1527308405.8b586d5/debian/patches/0006-Eliminate-race-condition-in-runcmd.patch 2019-02-25 19:01:55.000000000 +0000 @@ -0,0 +1,45 @@ +From: Hilko Bengen +Date: Mon, 25 Feb 2019 09:47:35 +0100 +Subject: Eliminate race condition in runcmd + +--- + osutils.pm | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +diff --git a/osutils.pm b/osutils.pm +index b06a042..05423c3 100644 +--- a/osutils.pm ++++ b/osutils.pm +@@ -93,19 +93,10 @@ sub quote { + # Open a process to run external program and check its return status + sub runcmd { + diag "running " . join(' ', @_); +- my ($pid, $status); +- +- local $SIG{CHLD} = sub { +- local ($!, $?); +- while ((my $child = waitpid(-1, WNOHANG)) > 0) { +- diag "runcmd pid $pid returned $child"; +- $status = $?; +- } +- }; + + my ($wtr, $rdr, $err); + $err = gensym; +- $pid = open3($wtr, $rdr, $err, @_); ++ my $pid = open3($wtr, $rdr, $err, @_); + die "couldn't open: $!" unless defined $pid; + close($wtr) or die "couldn't close fh: $!"; + +@@ -125,6 +116,11 @@ sub runcmd { + close($rdr) or die "couldn't close fh: $!"; + close($err) or die "couldn't close fh: $!"; + ++ my $status; ++ waitpid $pid, 0; ++ $status = $?; ++ diag "runcmd pid $pid returned $status"; ++ + my $exit_code = $status >> 8; + die "runcmd failed with exit code $exit_code" unless ($exit_code == 0); + return $exit_code; diff -Nru os-autoinst-4.5.1527308405.8b586d5/debian/patches/0007-Do-not-syntax-check-module-files-that-start-with-a-d.patch os-autoinst-4.5.1527308405.8b586d5/debian/patches/0007-Do-not-syntax-check-module-files-that-start-with-a-d.patch --- os-autoinst-4.5.1527308405.8b586d5/debian/patches/0007-Do-not-syntax-check-module-files-that-start-with-a-d.patch 1970-01-01 00:00:00.000000000 +0000 +++ os-autoinst-4.5.1527308405.8b586d5/debian/patches/0007-Do-not-syntax-check-module-files-that-start-with-a-d.patch 2019-02-25 19:01:55.000000000 +0000 @@ -0,0 +1,28 @@ +From: Hilko Bengen +Date: Mon, 25 Feb 2019 20:21:55 +0100 +Subject: Do not syntax-check module files that start with a dot (such as .pc) + +--- + t/00-compile-check-all.t | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/t/00-compile-check-all.t b/t/00-compile-check-all.t +index 41896f7..f344853 100755 +--- a/t/00-compile-check-all.t ++++ b/t/00-compile-check-all.t +@@ -36,6 +36,7 @@ my $test = Test::Compile->new(); + my @files = $test->all_pm_files("."); + + for my $file (@files) { ++ next if ($file =~ /^[.]/); + next if ($file =~ /main.pm/); + $file =~ s,^\./,,; + $test->ok($test->pm_file_compiles($file), "Compile test for $file"); +@@ -43,6 +44,7 @@ for my $file (@files) { + + @files = ('isotovideo', $test->all_pl_files(".")); + for my $file (@files) { ++ next if ($file =~ /^[.]/); + $test->ok($test->pl_file_compiles($file), "Compile test for $file"); + } + $test->done_testing(); diff -Nru os-autoinst-4.5.1527308405.8b586d5/debian/patches/series os-autoinst-4.5.1527308405.8b586d5/debian/patches/series --- os-autoinst-4.5.1527308405.8b586d5/debian/patches/series 2018-10-02 12:19:30.000000000 +0000 +++ os-autoinst-4.5.1527308405.8b586d5/debian/patches/series 2019-02-25 19:01:55.000000000 +0000 @@ -3,3 +3,5 @@ 0003-adjust-to-avoid-ocr-test-failure.patch 0004-avoid-make-check-doc-failure.patch 0005-set-perl-path.patch +0006-Eliminate-race-condition-in-runcmd.patch +0007-Do-not-syntax-check-module-files-that-start-with-a-d.patch diff -Nru os-autoinst-4.5.1527308405.8b586d5/debian/rules os-autoinst-4.5.1527308405.8b586d5/debian/rules --- os-autoinst-4.5.1527308405.8b586d5/debian/rules 2018-10-02 12:19:30.000000000 +0000 +++ os-autoinst-4.5.1527308405.8b586d5/debian/rules 2019-02-24 14:46:32.000000000 +0000 @@ -31,7 +31,7 @@ override_dh_fixperms: dh_fixperms - find $(CURDIR)/debian/os-autoinst/usr/lib/*/os-autoinst/ \ + find $(CURDIR)/debian/os-autoinst/usr/libexec/os-autoinst/ \ -name "*.pm" -exec chmod -x {} \; override_dh_auto_test: diff -Nru os-autoinst-4.5.1527308405.8b586d5/debian/watch os-autoinst-4.5.1527308405.8b586d5/debian/watch --- os-autoinst-4.5.1527308405.8b586d5/debian/watch 2018-10-02 12:19:30.000000000 +0000 +++ os-autoinst-4.5.1527308405.8b586d5/debian/watch 2019-02-24 14:46:32.000000000 +0000 @@ -1,5 +1,4 @@ -# Compulsory line, this is a version 3 file -version=3 +version=4 -https://github.com/os-autoinst/os-autoinst/releases \ - /os-autoinst/os-autoinst/archive/([\d\.]*).tar.gz +https://github.com/os-autoinst/@PACKAGE@/releases \ + /os-autoinst/@PACKAGE@/archive/@ANY_VERSION@@ARCHIVE_EXT@