Fix test failures that occur when nokogiri is using system libxml: https://github.com/rgrove/sanitize/issues/198 Taken from upstream: https://github.com/rgrove/sanitize/commit/21da9b62baf9ea659811d92e6b574130aee57eba diff --git a/test/test_malicious_html.rb b/test/test_malicious_html.rb index 2c23074..0756de0 100644 --- a/test/test_malicious_html.rb +++ b/test/test_malicious_html.rb @@ -135,6 +135,8 @@ # The relevant libxml2 code is here: # describe 'unsafe libxml2 server-side includes in attributes' do + using_unpatched_libxml2 = Nokogiri::VersionInfo.instance.libxml2_using_system? + tag_configs = [ { tag_name: 'a', @@ -166,6 +168,8 @@ input = %[<#{tag_name} #{attr_name}='example.com'>foo] it 'should escape unsafe characters in attributes' do + skip "behavior should only exist in nokogiri's patched libxml" if using_unpatched_libxml2 + # This uses Nokogumbo's HTML-compliant serializer rather than # libxml2's. @s.fragment(input). @@ -191,6 +195,8 @@ input = %[<#{tag_name} #{attr_name}='example.com'>foo] it 'should not escape characters unnecessarily' do + skip "behavior should only exist in nokogiri's patched libxml" if using_unpatched_libxml2 + # This uses Nokogumbo's HTML-compliant serializer rather than # libxml2's. @s.fragment(input). s='form'>
path: root/gnu/installer/newt/substitutes.scm
AgeCommit message (Expand)Author
2020-12-11install: Discover local substitute servers....* gnu/installer/substitutes.scm: New file. * gnu/installer/newt/substitutes.scm: New file. * gnu/local.mk (INSTALLER_MODULES): Add them. * po/guix/POTFILES.in: Add gnu/installer/newt/substitutes.scm. * gnu/installer/proxy.scm (with-silent-shepherd): Move to ... * gnu/installer/utils.scm: ... here. * gnu/installer/record.scm (<installer>)[substitutes-page]: New field. * gnu/installer/newt.scm (substitutes-page): New procedure, (newt-installer): register it. * gnu/installer.scm (installer-steps): Add "substitutes-page" step. * gnu/system/install.scm (%installation-services): Add avahi-service-type and enable substitute server discover in guix-service-type. [<name-service-switch>]: Set it to %mdns-host-lookup-nss. Mathieu Othacehe