[libvirt] [tck PATCH 00/12] Misc fixes to the TCK
Some final misc fixes before doing a new release Daniel P. Berrangé (12): rpm: use standard perl variables rpm: fix license tag to include option of Artistic license rpm: add some missing dependencies rpm: remove obsolete clean section rpm: remove obsolete build root setting rpm: remove obsolete group setting rpm: cleanup docs file list rpm: delete redundant changelog build: misc updates the Module::Build config conf: update URLs for Fedora 28 images build: ignore more auto generated files Disable known hosts file .gitignore | 3 ++ Build.PL | 12 ++++--- MANIFEST | 1 - conf/default.cfg | 12 +++---- perl-Sys-Virt-TCK.spec.PL | 43 ++++++++++--------------- scripts/nwfilter/210-no-mac-spoofing.t | 3 +- scripts/nwfilter/220-no-ip-spoofing.t | 3 +- scripts/nwfilter/230-no-mac-broadcast.t | 3 +- scripts/nwfilter/240-no-arp-spoofing.t | 3 +- 9 files changed, 41 insertions(+), 42 deletions(-) -- 2.17.0
We don't need to manually build variables for perl install locations as RPM includes that. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- perl-Sys-Virt-TCK.spec.PL | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index aac6cf6..4b1683f 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -24,13 +24,6 @@ close SPEC; __DATA__ # Automatically generated by perl-Sys-Virt-TCK.spec.PL -%define perlvendorarch %(perl -e 'use Config; print $Config{installvendorarch}') -%define perlvendorlib %(perl -e 'use Config; print $Config{installvendorlib}') -%define perlvendorprefix %(perl -e 'use Config; print $Config{vendorprefix}') -%define perlvendorman1 %{perlvendorprefix}/share/man/man1 -%define perlvendorman3 %{perlvendorprefix}/share/man/man3 -%define perlversion %(perl -e 'use Config; print $Config{version}') - %define appname Sys-Virt-TCK Summary: Sys::Virt::TCK - libvirt Technology Compatibility Kit @@ -42,7 +35,7 @@ Group: Development/Tools Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz Url: http://libvirt.org/ BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: perl >= %{perlversion} +Requires: perl >= %{perl_version} Requires: libvirt >= 0.6.2 BuildRequires: perl(accessors) BuildRequires: perl(App::Prove) @@ -118,10 +111,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/libvirt-tck %dir %{_datadir}/libvirt-tck %{_datadir}/libvirt-tck/* -%{perlvendorman1}/* -#%{perlvendorman3}/* -%{perlvendorlib}/Sys/Virt/TCK.pm -%{perlvendorlib}/Sys/Virt/TCK/ +%{_mandir}/man1/* +%{perl_vendorlib}/Sys/Virt/TCK.pm +%{perl_vendorlib}/Sys/Virt/TCK/ %dir %{_localstatedir}/cache/libvirt-tck %changelog -- 2.17.0
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
We don't need to manually build variables for perl install locations as RPM includes that.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laine Stump <laine@laine.org>
--- perl-Sys-Virt-TCK.spec.PL | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index aac6cf6..4b1683f 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -24,13 +24,6 @@ close SPEC; __DATA__ # Automatically generated by perl-Sys-Virt-TCK.spec.PL
-%define perlvendorarch %(perl -e 'use Config; print $Config{installvendorarch}') -%define perlvendorlib %(perl -e 'use Config; print $Config{installvendorlib}') -%define perlvendorprefix %(perl -e 'use Config; print $Config{vendorprefix}') -%define perlvendorman1 %{perlvendorprefix}/share/man/man1 -%define perlvendorman3 %{perlvendorprefix}/share/man/man3 -%define perlversion %(perl -e 'use Config; print $Config{version}') - %define appname Sys-Virt-TCK
Summary: Sys::Virt::TCK - libvirt Technology Compatibility Kit @@ -42,7 +35,7 @@ Group: Development/Tools Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz Url: http://libvirt.org/ BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: perl >= %{perlversion} +Requires: perl >= %{perl_version} Requires: libvirt >= 0.6.2 BuildRequires: perl(accessors) BuildRequires: perl(App::Prove) @@ -118,10 +111,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/libvirt-tck %dir %{_datadir}/libvirt-tck %{_datadir}/libvirt-tck/* -%{perlvendorman1}/* -#%{perlvendorman3}/* -%{perlvendorlib}/Sys/Virt/TCK.pm -%{perlvendorlib}/Sys/Virt/TCK/ +%{_mandir}/man1/* +%{perl_vendorlib}/Sys/Virt/TCK.pm +%{perl_vendorlib}/Sys/Virt/TCK/ %dir %{_localstatedir}/cache/libvirt-tck
%changelog
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- perl-Sys-Virt-TCK.spec.PL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index 4b1683f..39cc72f 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -30,7 +30,7 @@ Summary: Sys::Virt::TCK - libvirt Technology Compatibility Kit Name: perl-%{appname} Version: @VERSION@ Release: 1 -License: GPLv2 +License: GPLv2 or Artistic Group: Development/Tools Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz Url: http://libvirt.org/ -- 2.17.0
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laine Stump <laine@laine.org>
--- perl-Sys-Virt-TCK.spec.PL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index 4b1683f..39cc72f 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -30,7 +30,7 @@ Summary: Sys::Virt::TCK - libvirt Technology Compatibility Kit Name: perl-%{appname} Version: @VERSION@ Release: 1 -License: GPLv2 +License: GPLv2 or Artistic Group: Development/Tools Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz Url: http://libvirt.org/
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- perl-Sys-Virt-TCK.spec.PL | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index 39cc72f..c92fa34 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -35,8 +35,12 @@ Group: Development/Tools Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz Url: http://libvirt.org/ BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: perl >= %{perl_version} -Requires: libvirt >= 0.6.2 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: libvirt >= 4.4.0 +%if 0%{?fedora} || 0%{?rhel} > 7 +BuildRequires: perl-interpreter +BuildRequires: perl-generators +%endif BuildRequires: perl(accessors) BuildRequires: perl(App::Prove) BuildRequires: perl(Config::Record) @@ -57,9 +61,12 @@ BuildRequires: perl(TAP::Harness::Archive) BuildRequires: perl(Test::Builder) BuildRequires: perl(Test::More) BuildRequires: perl(Sub::Uplevel) -BuildRequires: perl(Sys::Virt) >= 0.2.0 +BuildRequires: perl(Sys::Virt) >= 0.2.1 BuildRequires: perl(XML::Twig) BuildRequires: perl(XML::Writer) +BuildRequires: perl(XML::XPath) +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Pod::Coverage) # RPM autoprovides misses these 3 Requires: perl(Test::Exception) Requires: perl(TAP::Formatter::HTML) @@ -69,6 +76,8 @@ Requires: perl(Net::OpenSSH) Requires: perl(IO::Pty) Requires: libguestfs-tools Requires: /usr/bin/mkisofs +# Want to force this minimal version, so don't rely on RPM autoprov +Requires: perl(Sys::Virt) >= 0.2.1 BuildArchitectures: noarch %description -- 2.17.0
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- perl-Sys-Virt-TCK.spec.PL | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index 39cc72f..c92fa34 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -35,8 +35,12 @@ Group: Development/Tools Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz Url: http://libvirt.org/ BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: perl >= %{perl_version} -Requires: libvirt >= 0.6.2 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: libvirt >= 4.4.0
Are you sure it requires such a high libvirt version? This will make it more cumbersome for downstream maintainers to test their builds of older libvirt versions. Of course if there really is stuff that reliably fails with older libvirt versions, then they would need to make a downstream version of the tck that disables the failing tests anyway, but this makes that mandatory from the get-go. Still something I can live with though. Reviewed-by: Laine Stump <laine@laine.org>
+%if 0%{?fedora} || 0%{?rhel} > 7 +BuildRequires: perl-interpreter +BuildRequires: perl-generators +%endif BuildRequires: perl(accessors) BuildRequires: perl(App::Prove) BuildRequires: perl(Config::Record) @@ -57,9 +61,12 @@ BuildRequires: perl(TAP::Harness::Archive) BuildRequires: perl(Test::Builder) BuildRequires: perl(Test::More) BuildRequires: perl(Sub::Uplevel) -BuildRequires: perl(Sys::Virt) >= 0.2.0 +BuildRequires: perl(Sys::Virt) >= 0.2.1
What was this you were saying on IRC about 0.x version numbers? :-)
BuildRequires: perl(XML::Twig) BuildRequires: perl(XML::Writer) +BuildRequires: perl(XML::XPath) +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Pod::Coverage) # RPM autoprovides misses these 3 Requires: perl(Test::Exception) Requires: perl(TAP::Formatter::HTML) @@ -69,6 +76,8 @@ Requires: perl(Net::OpenSSH) Requires: perl(IO::Pty) Requires: libguestfs-tools Requires: /usr/bin/mkisofs +# Want to force this minimal version, so don't rely on RPM autoprov +Requires: perl(Sys::Virt) >= 0.2.1 BuildArchitectures: noarch
%description
On Fri, Jun 08, 2018 at 11:07:13AM -0400, Laine Stump wrote:
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- perl-Sys-Virt-TCK.spec.PL | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index 39cc72f..c92fa34 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -35,8 +35,12 @@ Group: Development/Tools Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz Url: http://libvirt.org/ BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: perl >= %{perl_version} -Requires: libvirt >= 0.6.2 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: libvirt >= 4.4.0
Are you sure it requires such a high libvirt version? This will make it more cumbersome for downstream maintainers to test their builds of older libvirt versions. Of course if there really is stuff that reliably fails with older libvirt versions, then they would need to make a downstream version of the tck that disables the failing tests anyway, but this makes that mandatory from the get-go.
To be honest I didn't check how broken older libvirt's are, but given the fun with had with nwfilter, I suspect most are broken to some degree or other. In fact even 4.4.0 is broken with nwfilter as my two patches missed the release.
Still something I can live with though.
Reviewed-by: Laine Stump <laine@laine.org>
@@ -57,9 +61,12 @@ BuildRequires: perl(TAP::Harness::Archive) BuildRequires: perl(Test::Builder) BuildRequires: perl(Test::More) BuildRequires: perl(Sub::Uplevel) -BuildRequires: perl(Sys::Virt) >= 0.2.0 +BuildRequires: perl(Sys::Virt) >= 0.2.1
What was this you were saying on IRC about 0.x version numbers? :-)
This was just syned from further down. I do still need to figure out just which APIs from newer libvirt we require.
BuildRequires: perl(XML::Twig) BuildRequires: perl(XML::Writer) +BuildRequires: perl(XML::XPath) +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Pod::Coverage) # RPM autoprovides misses these 3 Requires: perl(Test::Exception) Requires: perl(TAP::Formatter::HTML) @@ -69,6 +76,8 @@ Requires: perl(Net::OpenSSH) Requires: perl(IO::Pty) Requires: libguestfs-tools Requires: /usr/bin/mkisofs +# Want to force this minimal version, so don't rely on RPM autoprov +Requires: perl(Sys::Virt) >= 0.2.1 BuildArchitectures: noarch
%description
Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 06/08/2018 11:10 AM, Daniel P. Berrangé wrote:
I do still need to figure out just which APIs from newer libvirt we require.
I had added a function that uses the (relatively new I guess) API to get guest IP addresses, but wrote the code so that it would fall back to the older method of parsing the dnsmasq lease files if the API wasn't available...
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- perl-Sys-Virt-TCK.spec.PL | 4 ---- 1 file changed, 4 deletions(-) diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index c92fa34..b4cb4a9 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -105,10 +105,6 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %__install -m 0755 -d $RPM_BUILD_ROOT%{_localstatedir}/cache/libvirt-tck -%clean -rm -rf $RPM_BUILD_ROOT - - %files %defattr(-,root,root) #%doc AUTHORS -- 2.17.0
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laine Stump <laine@laine.org>
--- perl-Sys-Virt-TCK.spec.PL | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index c92fa34..b4cb4a9 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -105,10 +105,6 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
%__install -m 0755 -d $RPM_BUILD_ROOT%{_localstatedir}/cache/libvirt-tck
-%clean -rm -rf $RPM_BUILD_ROOT - - %files %defattr(-,root,root) #%doc AUTHORS
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- perl-Sys-Virt-TCK.spec.PL | 1 - 1 file changed, 1 deletion(-) diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index b4cb4a9..2d5c38b 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -34,7 +34,6 @@ License: GPLv2 or Artistic Group: Development/Tools Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz Url: http://libvirt.org/ -BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: libvirt >= 4.4.0 %if 0%{?fedora} || 0%{?rhel} > 7 -- 2.17.0
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laine Stump <laine@laine.org>
--- perl-Sys-Virt-TCK.spec.PL | 1 - 1 file changed, 1 deletion(-)
diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index b4cb4a9..2d5c38b 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -34,7 +34,6 @@ License: GPLv2 or Artistic Group: Development/Tools Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz Url: http://libvirt.org/ -BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: libvirt >= 4.4.0 %if 0%{?fedora} || 0%{?rhel} > 7
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- perl-Sys-Virt-TCK.spec.PL | 1 - 1 file changed, 1 deletion(-) diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index 2d5c38b..d3544b6 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -31,7 +31,6 @@ Name: perl-%{appname} Version: @VERSION@ Release: 1 License: GPLv2 or Artistic -Group: Development/Tools Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz Url: http://libvirt.org/ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -- 2.17.0
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laine Stump <laine@laine.org>
--- perl-Sys-Virt-TCK.spec.PL | 1 - 1 file changed, 1 deletion(-)
diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index 2d5c38b..d3544b6 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -31,7 +31,6 @@ Name: perl-%{appname} Version: @VERSION@ Release: 1 License: GPLv2 or Artistic -Group: Development/Tools Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz Url: http://libvirt.org/ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- perl-Sys-Virt-TCK.spec.PL | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index d3544b6..49f4a3c 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -105,10 +105,8 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %files %defattr(-,root,root) -#%doc AUTHORS -%doc LICENSE +%license LICENSE %doc README -#%doc INSTALL %dir %{_sysconfdir}/libvirt-tck %config(noreplace) %{_sysconfdir}/libvirt-tck/default.cfg %{_bindir}/libvirt-tck -- 2.17.0
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laine Stump <laine@laine.org>
--- perl-Sys-Virt-TCK.spec.PL | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index d3544b6..49f4a3c 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -105,10 +105,8 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
%files %defattr(-,root,root) -#%doc AUTHORS -%doc LICENSE +%license LICENSE %doc README -#%doc INSTALL %dir %{_sysconfdir}/libvirt-tck %config(noreplace) %{_sysconfdir}/libvirt-tck/default.cfg %{_bindir}/libvirt-tck
The changelog entries only make sense in the context of a distro, not upstream. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- perl-Sys-Virt-TCK.spec.PL | 2 -- 1 file changed, 2 deletions(-) diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index 49f4a3c..42d2cef 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -118,5 +118,3 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %dir %{_localstatedir}/cache/libvirt-tck %changelog -* Fri Mar 24 2006 <berrange@redhat.com> - 0.0.1-1 -- Initial build -- 2.17.0
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
The changelog entries only make sense in the context of a distro, not upstream.
If even that. I don't recall *ever* getting any useful info from the changelog (and wouldn't trust it anyway, since it's just manually written from the POV of one person).
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laine Stump <laine@laine.org>
--- perl-Sys-Virt-TCK.spec.PL | 2 -- 1 file changed, 2 deletions(-)
diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index 49f4a3c..42d2cef 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -118,5 +118,3 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %dir %{_localstatedir}/cache/libvirt-tck
%changelog -* Fri Mar 24 2006 <berrange@redhat.com> - 0.0.1-1 -- Initial build
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- Build.PL | 12 +++++++----- MANIFEST | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Build.PL b/Build.PL index bf2d7a9..75a1436 100644 --- a/Build.PL +++ b/Build.PL @@ -61,6 +61,9 @@ EOF my $b = $class->new( module_name => "Sys::Virt::TCK", license => 'gpl', + configure_requires => { + 'Module::Build' => 0, + }, dist_author => 'Daniel Berrange <dan@berrange.com>', dist_abstract => 'libvirt Technology Compatability Kit', requires => { @@ -100,13 +103,12 @@ my $b = $class->new( script_files => [ "bin/libvirt-tck", ], - create_makefile_pl => 'passthrough', meta_add => { resources => { - license => "http://www.gnu.org/licenses/gpl.html", - homepage => "http://libvirt.org/", - repository => "http://libvirt.org/hg/libvirt-tck", - MailingList => "http://www.redhat.com/mailman/listinfo/libvir-list", + license => "https://www.gnu.org/licenses/gpl.html", + homepage => "https://libvirt.org/", + repository => "https://libvirt.org/git/?p=libvirt-tck.git;a=summary", + MailingList => "https://www.redhat.com/mailman/listinfo/libvir-list", }, }, conf_files => { diff --git a/MANIFEST b/MANIFEST index b632328..9338981 100644 --- a/MANIFEST +++ b/MANIFEST @@ -15,7 +15,6 @@ lib/Sys/Virt/TCK/StorageVolBuilder.pm lib/Sys/Virt/TCK/TAP/XMLFormatter.pm lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm LICENSE -Makefile.PL MANIFEST META.json META.yml -- 2.17.0
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laine Stump <laine@laine.org>
--- Build.PL | 12 +++++++----- MANIFEST | 1 - 2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Build.PL b/Build.PL index bf2d7a9..75a1436 100644 --- a/Build.PL +++ b/Build.PL @@ -61,6 +61,9 @@ EOF my $b = $class->new( module_name => "Sys::Virt::TCK", license => 'gpl', + configure_requires => { + 'Module::Build' => 0, + }, dist_author => 'Daniel Berrange <dan@berrange.com>', dist_abstract => 'libvirt Technology Compatability Kit', requires => { @@ -100,13 +103,12 @@ my $b = $class->new( script_files => [ "bin/libvirt-tck", ], - create_makefile_pl => 'passthrough', meta_add => { resources => { - license => "http://www.gnu.org/licenses/gpl.html", - homepage => "http://libvirt.org/", - repository => "http://libvirt.org/hg/libvirt-tck", - MailingList => "http://www.redhat.com/mailman/listinfo/libvir-list", + license => "https://www.gnu.org/licenses/gpl.html", + homepage => "https://libvirt.org/", + repository => "https://libvirt.org/git/?p=libvirt-tck.git;a=summary", + MailingList => "https://www.redhat.com/mailman/listinfo/libvir-list", }, }, conf_files => { diff --git a/MANIFEST b/MANIFEST index b632328..9338981 100644 --- a/MANIFEST +++ b/MANIFEST @@ -15,7 +15,6 @@ lib/Sys/Virt/TCK/StorageVolBuilder.pm lib/Sys/Virt/TCK/TAP/XMLFormatter.pm lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm LICENSE -Makefile.PL MANIFEST META.json META.yml
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- conf/default.cfg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/default.cfg b/conf/default.cfg index d9d858c..494c303 100644 --- a/conf/default.cfg +++ b/conf/default.cfg @@ -49,7 +49,7 @@ images = ( hvm xen ) - osname = fedora-27 + osname = fedora-28 } ) @@ -75,15 +75,15 @@ images = ( # empty sparse root FS will be created # kernels = ( - # Fedora 15 i686 PAE has pv_ops, so one kernel can do both Xen and KVM guests here + # Fedora 28 i686 PAE has pv_ops, so one kernel can do both Xen and KVM guests here { arch = i686 ostype = ( hvm xen ) - kernel = http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/i386/os/... - initrd = http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/i386/os/... + kernel = http://dl.fedoraproject.org/pub/fedora-secondary/releases/28/Everything/i386... + initrd = http://dl.fedoraproject.org/pub/fedora-secondary/releases/28/Everything/i386... } # Fedora 15 x86_64 has pv_ops, so one kernel can do both Xen and KVM guests here { @@ -92,8 +92,8 @@ kernels = ( hvm xen ) - kernel = http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/x86_64/o... - initrd = http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/x86_64/o... + kernel = http://dl.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/o... + initrd = http://dl.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/o... } # User mode linux i686 needs custom kernel + root filesystem { -- 2.17.0
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- conf/default.cfg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/conf/default.cfg b/conf/default.cfg index d9d858c..494c303 100644 --- a/conf/default.cfg +++ b/conf/default.cfg @@ -49,7 +49,7 @@ images = ( hvm xen ) - osname = fedora-27 + osname = fedora-28
Ahh, you're going to force me to download a new test image :-P
} )
@@ -75,15 +75,15 @@ images = ( # empty sparse root FS will be created # kernels = ( - # Fedora 15 i686 PAE has pv_ops, so one kernel can do both Xen and KVM guests here + # Fedora 28 i686 PAE has pv_ops, so one kernel can do both Xen and KVM guests here { arch = i686 ostype = ( hvm xen ) - kernel = http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/i386/os/... - initrd = http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/i386/os/... + kernel = http://dl.fedoraproject.org/pub/fedora-secondary/releases/28/Everything/i386... + initrd = http://dl.fedoraproject.org/pub/fedora-secondary/releases/28/Everything/i386... } # Fedora 15 x86_64 has pv_ops, so one kernel can do both Xen and KVM guests here
As long as you modified the "Fedora 15 i686" comment to Fedora 28, might as well do this one too... Reviewed-by: Laine Stump <laine@laine.org>
{ @@ -92,8 +92,8 @@ kernels = ( hvm xen ) - kernel = http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/x86_64/o... - initrd = http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/x86_64/o... + kernel = http://dl.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/o... + initrd = http://dl.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/o... } # User mode linux i686 needs custom kernel + root filesystem {
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index ca3e424..65b446f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,10 @@ *.orig *~ Build +META.json META.yml +MYMETA.json +MYMETA.yml Makefile Makefile.PL Makefile.old -- 2.17.0
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laine Stump <laine@laine.org>
--- .gitignore | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/.gitignore b/.gitignore index ca3e424..65b446f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,10 @@ *.orig *~ Build +META.json META.yml +MYMETA.json +MYMETA.yml Makefile Makefile.PL Makefile.old
Despite having StrictHostKeyChecking=no, SSH still complains about the host key mismatch and disables password auth as a result. Using /dev/null as the known_hosts file ensures the keys are never saved to the user's profile. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- scripts/nwfilter/210-no-mac-spoofing.t | 3 ++- scripts/nwfilter/220-no-ip-spoofing.t | 3 ++- scripts/nwfilter/230-no-mac-broadcast.t | 3 ++- scripts/nwfilter/240-no-arp-spoofing.t | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/nwfilter/210-no-mac-spoofing.t b/scripts/nwfilter/210-no-mac-spoofing.t index 99c5058..95b1499 100644 --- a/scripts/nwfilter/210-no-mac-spoofing.t +++ b/scripts/nwfilter/210-no-mac-spoofing.t @@ -97,7 +97,8 @@ diag "ssh'ing into $guestip"; my $ssh = Net::OpenSSH->new($guestip, user => "root", password => $tck->root_password(), - master_opts => [-o => "StrictHostKeyChecking=no"]); + master_opts => [-o => "UserKnownHostsFile=/dev/null", + -o => "StrictHostKeyChecking=off"]); # now bring eth0 down, change MAC and bring it up again diag "fiddling with mac"; diff --git a/scripts/nwfilter/220-no-ip-spoofing.t b/scripts/nwfilter/220-no-ip-spoofing.t index 85c4807..a1da6eb 100644 --- a/scripts/nwfilter/220-no-ip-spoofing.t +++ b/scripts/nwfilter/220-no-ip-spoofing.t @@ -91,7 +91,8 @@ diag "ssh'ing into $guestip"; my $ssh = Net::OpenSSH->new($guestip, user => "root", password => $tck->root_password(), - master_opts => [-o => "StrictHostKeyChecking=no"]); + master_opts => [-o => "UserKnownHostsFile=/dev/null", + -o => "StrictHostKeyChecking=no"]); # now bring eth0 down, change IP and bring it up again diag "preparing ip spoof"; diff --git a/scripts/nwfilter/230-no-mac-broadcast.t b/scripts/nwfilter/230-no-mac-broadcast.t index b65b3fc..4254e7c 100644 --- a/scripts/nwfilter/230-no-mac-broadcast.t +++ b/scripts/nwfilter/230-no-mac-broadcast.t @@ -119,7 +119,8 @@ diag "ssh'ing into $guestip"; my $ssh = Net::OpenSSH->new($guestip, user => "root", password => $tck->root_password(), - master_opts => [-o => "StrictHostKeyChecking=no"]); + master_opts => [-o => "UserKnownHostsFile=/dev/null", + -o => "StrictHostKeyChecking=no"]); # now generate a mac broadcast paket diag "generate mac broadcast"; diff --git a/scripts/nwfilter/240-no-arp-spoofing.t b/scripts/nwfilter/240-no-arp-spoofing.t index 69851b6..882a385 100644 --- a/scripts/nwfilter/240-no-arp-spoofing.t +++ b/scripts/nwfilter/240-no-arp-spoofing.t @@ -100,7 +100,8 @@ diag "ssh'ing into $guestip"; my $ssh = Net::OpenSSH->new($guestip, user => "root", password => $tck->root_password(), - master_opts => [-o => "StrictHostKeyChecking=no"]); + master_opts => [-o => "UserKnownHostsFile=/dev/null", + -o => "StrictHostKeyChecking=no"]); # now generate a arp spoofing packets diag "generate arpspoof script"; -- 2.17.0
On Fri, Jun 08, 2018 at 02:45:39PM +0100, Daniel P. Berrangé wrote:
Some final misc fixes before doing a new release
Self-NACK. Some more things need fixing and the license change patch is actually wrong.
Daniel P. Berrangé (12): rpm: use standard perl variables rpm: fix license tag to include option of Artistic license rpm: add some missing dependencies rpm: remove obsolete clean section rpm: remove obsolete build root setting rpm: remove obsolete group setting rpm: cleanup docs file list rpm: delete redundant changelog build: misc updates the Module::Build config conf: update URLs for Fedora 28 images build: ignore more auto generated files Disable known hosts file
.gitignore | 3 ++ Build.PL | 12 ++++--- MANIFEST | 1 - conf/default.cfg | 12 +++---- perl-Sys-Virt-TCK.spec.PL | 43 ++++++++++--------------- scripts/nwfilter/210-no-mac-spoofing.t | 3 +- scripts/nwfilter/220-no-ip-spoofing.t | 3 +- scripts/nwfilter/230-no-mac-broadcast.t | 3 +- scripts/nwfilter/240-no-arp-spoofing.t | 3 +- 9 files changed, 41 insertions(+), 42 deletions(-)
-- 2.17.0
Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
participants (2)
-
Daniel P. Berrangé -
Laine Stump