diff -Nru ruby-serverspec-2.41.5/appveyor.yml ruby-serverspec-2.41.8/appveyor.yml --- ruby-serverspec-2.41.5/appveyor.yml 2019-08-20 09:09:09.000000000 +0000 +++ ruby-serverspec-2.41.8/appveyor.yml 2021-07-09 07:28:36.000000000 +0000 @@ -59,6 +59,7 @@ - ps: $PSVersionTable build_script: + - set SSL_CERT_FILE=C:/ruby24-x64/ssl/cert.pem - ruby -rfileutils -e 'FileUtils.rm_r(File.join(Gem.dir, "cache", "bundler")) if Dir.exists?(File.join(Gem.dir, "cache", "bundler"))' - bundle install --jobs 3 --retry 3 - net user diff -Nru ruby-serverspec-2.41.5/debian/changelog ruby-serverspec-2.41.8/debian/changelog --- ruby-serverspec-2.41.5/debian/changelog 2019-08-20 09:12:23.000000000 +0000 +++ ruby-serverspec-2.41.8/debian/changelog 2021-10-09 06:35:57.000000000 +0000 @@ -1,3 +1,34 @@ +ruby-serverspec (2.41.8-2) unstable; urgency=medium + + [ Debian Janitor ] + * Remove constraints unnecessary since buster + * Bump debhelper from old 12 to 13. + * Update standards version to 4.5.1, no changes needed. + + [ HIGUCHI Daisuke (VDR dai) ] + * eliminate lintian warning: ruby-interpreter-is-deprecated. + * eliminate lintian error: ruby-script-but-no-ruby-dep + + -- HIGUCHI Daisuke (VDR dai) Sat, 09 Oct 2021 15:35:57 +0900 + +ruby-serverspec (2.41.8-1) unstable; urgency=medium + + [ Debian Janitor ] + * Fix day-of-week for changelog entry 0.7.2-1. + * Update standards version to 4.5.0, no changes needed. + + [ Cédric Boutillier ] + * [ci skip] Update team name + * [ci skip] Add .gitattributes to keep unwanted files out of the source + package + + [ HIGUCHI Daisuke (VDR dai) ] + * remove wrong serverspec-init.1 manpage (Closes: #985897) + * New upstream version 2.41.6 + * New upstream version 2.41.8 + + -- HIGUCHI Daisuke (VDR dai) Mon, 30 Aug 2021 16:14:30 +0900 + ruby-serverspec (2.41.5-1) unstable; urgency=medium [ Utkarsh Gupta ] @@ -167,4 +198,4 @@ * Initial release (Closes: #716662) - -- KURASHIKI Satoru Thu, 31 Jul 2013 09:52:26 +0900 + -- KURASHIKI Satoru Wed, 31 Jul 2013 09:52:26 +0900 diff -Nru ruby-serverspec-2.41.5/debian/control ruby-serverspec-2.41.8/debian/control --- ruby-serverspec-2.41.5/debian/control 2019-08-20 09:10:33.000000000 +0000 +++ ruby-serverspec-2.41.8/debian/control 2021-10-09 06:31:48.000000000 +0000 @@ -1,18 +1,18 @@ Source: ruby-serverspec Section: ruby Priority: optional -Maintainer: Debian Ruby Extras Maintainers +Maintainer: Debian Ruby Team Uploaders: KURASHIKI Satoru , Scott Leggett , HIGUCHI Daisuke (VDR dai) -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), gem2deb, rake, ruby-multi-json, - ruby-rspec (>= 3.0), + ruby-rspec, ruby-rspec-its, - ruby-specinfra (>= 2.72) -Standards-Version: 4.4.0 + ruby-specinfra +Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/ruby-team/ruby-serverspec.git Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-serverspec Homepage: https://serverspec.org/ @@ -21,11 +21,11 @@ Package: ruby-serverspec Architecture: all XB-Ruby-Versions: ${ruby:Versions} -Depends: ruby | ruby-interpreter, +Depends: ruby:any, ruby-multi-json, - ruby-rspec (>= 3.0), + ruby-rspec, ruby-rspec-its, - ruby-specinfra (>= 2.72), + ruby-specinfra, ${misc:Depends}, ${shlibs:Depends} Suggests: net-tools diff -Nru ruby-serverspec-2.41.5/debian/ruby-serverspec.manpages ruby-serverspec-2.41.8/debian/ruby-serverspec.manpages --- ruby-serverspec-2.41.5/debian/ruby-serverspec.manpages 2017-08-13 02:45:44.000000000 +0000 +++ ruby-serverspec-2.41.8/debian/ruby-serverspec.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/serverspec-init.1 diff -Nru ruby-serverspec-2.41.5/debian/serverspec-init.1 ruby-serverspec-2.41.8/debian/serverspec-init.1 --- ruby-serverspec-2.41.5/debian/serverspec-init.1 2017-08-13 02:45:44.000000000 +0000 +++ ruby-serverspec-2.41.8/debian/serverspec-init.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH GOLDENCHEETAH 1 "December 30, 2010" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -GoldenCheetah \- Cycling Performance Software -.SH SYNOPSIS -.B GoldenCheetah -.SH DESCRIPTION -This manual page was written for the Debian GNU/Linux distribution -because the original program does not have a manual page. -.PP -GoldenCheetah is a software package that: -.IP -\(bu Downloads ride data directly from the CycleOps PowerTap and the SRM PowerControl V. Support for SRM PowerControl VI and VII is planned for the future. -.br -\(bu Imports ride data downloaded with other programs, including TrainingPeaks WKO+ and the manufacturers' software for the Ergomo, Garmin, Polar, PowerTap, and SRM devices. -.br -\(bu Provides a rich set of analysis tools, including a critical power graph, BikeScore calculation, histogram analysis, a best interval finder, and a pedal force versus pedal velocity chart, to name just a few. -.br -\(bu Is available for Linux, Mac OS X, and Windows. (The Windows version does not yet support direct downloads from the SRM PowerControl.) -.br -\(bu Is released under an Open Source license. -.PP -We believe that cyclists should be able to download their power data to the computer of their choice, analyze it in whatever way they see fit, and share their methods of analysis with others. -.SH OPTIONS -There are no options. -.SH COPYRIGHT -Copyright \(co since 2006 Sean Rhea. -.SH AUTHOR -GoldenCheetah was written by Sean Rhea . -.PP -This manual page was written by KURASHIKI Satoru , -for the Debian project (but may be used by others). - diff -Nru ruby-serverspec-2.41.5/lib/serverspec/type/command.rb ruby-serverspec-2.41.8/lib/serverspec/type/command.rb --- ruby-serverspec-2.41.5/lib/serverspec/type/command.rb 2019-08-20 09:09:09.000000000 +0000 +++ ruby-serverspec-2.41.8/lib/serverspec/type/command.rb 2021-07-09 07:28:36.000000000 +0000 @@ -18,9 +18,14 @@ command_result.exit_status.to_i end + protected + def command + @name + end + private def command_result() - @command_result ||= @runner.run_command(@name) + @command_result ||= @runner.run_command(command) end end end diff -Nru ruby-serverspec-2.41.5/lib/serverspec/type/x509_certificate.rb ruby-serverspec-2.41.8/lib/serverspec/type/x509_certificate.rb --- ruby-serverspec-2.41.5/lib/serverspec/type/x509_certificate.rb 2019-08-20 09:09:09.000000000 +0000 +++ ruby-serverspec-2.41.8/lib/serverspec/type/x509_certificate.rb 2021-07-09 07:28:36.000000000 +0000 @@ -7,11 +7,11 @@ end def subject - run_openssl_command_with("-subject -noout").stdout.chomp.gsub(/^subject= */,'') + normalize_dn(run_openssl_command_with("-subject -noout").stdout.chomp.gsub(/^subject= */,'')) end def issuer - run_openssl_command_with("-issuer -noout").stdout.chomp.gsub(/^issuer= */,'') + normalize_dn(run_openssl_command_with("-issuer -noout").stdout.chomp.gsub(/^issuer= */,'')) end def email @@ -81,5 +81,12 @@ res.merge({ kv_arr[0].to_sym => time }) end end + + # Normalize output between openssl versions. + def normalize_dn(dn) + return dn unless dn.start_with?('/') + # normalize openssl < 1.1 to >= 1.1 output + dn[1..-1].split('/').join(', ').gsub('=', ' = ') + end end end diff -Nru ruby-serverspec-2.41.5/lib/serverspec/version.rb ruby-serverspec-2.41.8/lib/serverspec/version.rb --- ruby-serverspec-2.41.5/lib/serverspec/version.rb 2019-08-20 09:09:09.000000000 +0000 +++ ruby-serverspec-2.41.8/lib/serverspec/version.rb 2021-07-09 07:28:36.000000000 +0000 @@ -1,3 +1,3 @@ module Serverspec - VERSION = "2.41.5" + VERSION = "2.41.8" end diff -Nru ruby-serverspec-2.41.5/spec/type/linux/x509_certificate_spec.rb ruby-serverspec-2.41.8/spec/type/linux/x509_certificate_spec.rb --- ruby-serverspec-2.41.5/spec/type/linux/x509_certificate_spec.rb 2019-08-20 09:09:09.000000000 +0000 +++ ruby-serverspec-2.41.8/spec/type/linux/x509_certificate_spec.rb 2021-07-09 07:28:36.000000000 +0000 @@ -12,14 +12,24 @@ it { should_not be_certificate } end -describe x509_certificate('test.pem') do - let(:stdout) { sample_subj } - its(:subject) { should eq '/O=some/OU=thing' } +describe x509_certificate('test-openssl-1.0.pem') do + let(:stdout) { sample_subj_openssl_1_0 } + its(:subject) { should eq 'O = some, OU = thing' } end -describe x509_certificate('test.pem') do - let(:stdout) { sample_issuer } - its(:issuer) { should eq '/O=some/OU=issuer' } +describe x509_certificate('test-openssl-1.1.pem') do + let(:stdout) { sample_subj_openssl_1_1 } + its(:subject) { should eq 'O = some, OU = thing' } +end + +describe x509_certificate('test-openssl-1.0.pem') do + let(:stdout) { sample_issuer_openssl_1_0 } + its(:issuer) { should eq 'O = some, OU = issuer' } +end + +describe x509_certificate('test-openssl-1.1.pem') do + let(:stdout) { sample_issuer_openssl_1_1 } + its(:issuer) { should eq 'O = some, OU = issuer' } end describe x509_certificate('test.pem') do @@ -38,18 +48,30 @@ its(:subject_alt_names) { should eq %w[DNS:*.example.com DNS:www.example.net IP:192.0.2.10] } end -def sample_subj +def sample_subj_openssl_1_0 <<'EOS' subject= /O=some/OU=thing EOS end -def sample_issuer +def sample_subj_openssl_1_1 + <<'EOS' +subject=O = some, OU = thing +EOS +end + +def sample_issuer_openssl_1_0 <<'EOS' issuer= /O=some/OU=issuer EOS end +def sample_issuer_openssl_1_1 + <<'EOS' +issuer=O = some, OU = issuer +EOS +end + def sample_validity <<'EOS' notBefore=Jul 1 11:11:00 2000 GMT diff -Nru ruby-serverspec-2.41.5/.travis.yml ruby-serverspec-2.41.8/.travis.yml --- ruby-serverspec-2.41.5/.travis.yml 2019-08-20 09:09:09.000000000 +0000 +++ ruby-serverspec-2.41.8/.travis.yml 2021-07-09 07:28:36.000000000 +0000 @@ -1,7 +1,6 @@ language: ruby rvm: - - 1.8.7 - 1.9.3 - 2.0.0 - 2.1.1 @@ -18,6 +17,7 @@ script: - bundle exec rake spec +dist: trusty sudo: false cache: bundler notifications: