Source: facter Version: 3.11.0-4 Severity: normal Tags: patch I just uploaded the attached diff as an NMU to unblock the Ruby transition. Please apply it to your packaging vcs.
-- System Information: Debian Release: bullseye/sid APT prefers unstable-debug APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'unstable'), (500, 'testing'), (1, 'experimental-debug'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 5.5.0-1-amd64 (SMP w/4 CPU cores) Kernel taint flags: TAINT_CRAP Locale: LANG=pt_BR.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8), LANGUAGE=pt_BR:pt:en (charmap=UTF-8) Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled -- no debconf information
diff --git a/debian/changelog b/debian/changelog index 9f575b68..3c1bc8c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +facter (3.11.0-4.1) unstable; urgency=medium + + * Non-maintainer upload + * Add patch to not fail build when bundler is installed (Closes: #956300) + * Add a dependency on the minimal Ruby version needed (Closes: #956301) + + -- Antonio Terceiro <[email protected]> Mon, 13 Apr 2020 16:45:20 -0300 + facter (3.11.0-4) unstable; urgency=medium * Team upload diff --git a/debian/control b/debian/control index bb5757bd..9b6cdc87 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,7 @@ Homepage: https://github.com/puppetlabs/facter Package: facter Architecture: any -Depends: libfacter3.11.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libfacter3.11.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${ruby-interpreter:Depends} Description: collect and display facts about the system Facter is Puppet’s cross-platform system profiling library. It discovers and reports per-node facts, which are collected by the Puppet agent and are made diff --git a/debian/gen-ruby-dependency b/debian/gen-ruby-dependency new file mode 100755 index 00000000..bcfd2a84 --- /dev/null +++ b/debian/gen-ruby-dependency @@ -0,0 +1,9 @@ +#!/usr/bin/ruby + +require 'ruby_debian_dev' + +dependency = RubyDebianDev::RUBY_INTERPRETERS.map do |interp, data| + lib = data[:shared_library] + RubyDebianDev.min_ruby_dependency_for(lib) +end.join(', ') +puts "ruby-interpreter:Depends=#{dependency}" diff --git a/debian/patches/0007-Don-t-run-rspec-via-bundler.patch b/debian/patches/0007-Don-t-run-rspec-via-bundler.patch new file mode 100644 index 00000000..31dc149b --- /dev/null +++ b/debian/patches/0007-Don-t-run-rspec-via-bundler.patch @@ -0,0 +1,26 @@ +From: Antonio Terceiro <[email protected]> +Date: Thu, 9 Apr 2020 11:10:03 -0300 +Subject: Don't run rspec via bundler + +Closes: #956300 +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ab7eb2e..4ca0392 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -160,9 +160,9 @@ add_subdirectory(locales) + # Add test executables for unit testing + add_test(NAME "libfacter\\ tests" COMMAND libfacter_test) + if (RUBY_FOUND) +- find_program(BUNDLER_PATH NAMES bundle.bat bundle) +- if (BUNDLER_PATH) +- add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib") ++ find_program(RSPEC_PATH NAMES rspec) ++ if (RSPEC_PATH) ++ add_test(NAME "libfacter\\ specs" COMMAND rspec WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib") + endif() + endif() + # Debian: disable the smoke tests, as the build environment lacks necessary diff --git a/debian/patches/series b/debian/patches/series index 8bae5647..9f3fef85 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 0004-rapidjson-1.1-compat.patch 0005-fix-custom-facts-overriding-core.patch 0006-FACT-1916-fix-route-parsing-on-Linux.patch +0007-Don-t-run-rspec-via-bundler.patch diff --git a/debian/rules b/debian/rules index 5de884da..fda516b0 100755 --- a/debian/rules +++ b/debian/rules @@ -19,3 +19,7 @@ override_dh_link: /usr/lib/$(DEB_HOST_MULTIARCH)/libfacter.so.$(DEB_VERSION_UPSTREAM) \ "$${target}/libfacter.so"; \ done + +override_dh_gencontrol: + ./debian/gen-ruby-dependency >> debian/facter.substvars + dh_gencontrol
signature.asc
Description: PGP signature
