From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../files/facter-1.7.1-fix-proc-self-status.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 dev-ruby/facter/files/facter-1.7.1-fix-proc-self-status.patch (limited to 'dev-ruby/facter/files') diff --git a/dev-ruby/facter/files/facter-1.7.1-fix-proc-self-status.patch b/dev-ruby/facter/files/facter-1.7.1-fix-proc-self-status.patch new file mode 100644 index 000000000000..1119bdf510b9 --- /dev/null +++ b/dev-ruby/facter/files/facter-1.7.1-fix-proc-self-status.patch @@ -0,0 +1,39 @@ +From d54c86abfba35f48cad78bb99b1d199afe8c2095 Mon Sep 17 00:00:00 2001 +From: Jeff McCune +Date: Tue, 16 Apr 2013 11:27:30 -0400 +Subject: [PATCH] (#14522) Force /proc/self/status encoding to valid UTF-8 (try + 2) + +Without this patch the previous attempt to fix issue 14522 is +insufficient because the String#encode method is a no-op when the source +and destination encodings are the same encoding, even if there are +invalid byte sequences. + +This is a problem because we're still getting unhandled `invalid byte +sequence in UTF-8` errors running the specs. + +This patch addresses the problem by changing encoding from UTF-8 to +UTF-16, replacing all invalid byte sequences with the default unicode +string of "uFFFD" We then convert back to UTF-8 to guarantee only valid +byte sequences remain. +--- + lib/facter/util/virtual.rb | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/facter/util/virtual.rb b/lib/facter/util/virtual.rb +index 8223b41..65cf58a 100644 +--- a/lib/facter/util/virtual.rb ++++ b/lib/facter/util/virtual.rb +@@ -63,7 +63,8 @@ def self.vserver? + return false unless FileTest.exists?("/proc/self/status") + txt = File.open("/proc/self/status", "rb").read + if txt.respond_to?(:encode!) +- txt.encode!('UTF-8', 'UTF-8', :invalid => :replace) ++ txt.encode!('UTF-16', 'UTF-8', :invalid => :replace) ++ txt.encode!('UTF-8', 'UTF-16') + end + return true if txt =~ /^(s_context|VxID):[[:blank:]]*[0-9]/ + return false +-- +1.8.1.6 + -- cgit v1.2.3-65-gdbad