diff --git a/ca-certs.diff b/ca-certs.diff index b6d6a2d..20f8b2e 100644 --- a/ca-certs.diff +++ b/ca-certs.diff @@ -21,7 +21,7 @@ index 6de71b73..29f131e9 100644 + + # if no server specific cacert.pem, look for a bundle in our config dir + unless (-e $config->{config}{vardir}.'/cacert.pem') { -+ foreach (@{$self->{config}{etcdir}}) { ++ foreach (@{$config->{config}{etcdir}}) { + if (-e $_.'/ocsinventory-agent-cacert.pem') { + $config->{config}{ca} = $_.'/ocsinventory-agent-cacert.pem'; + last; diff --git a/fix_utf8.diff b/fix_utf8.diff index 948eb9c..1ff8968 100644 --- a/fix_utf8.diff +++ b/fix_utf8.diff @@ -38,7 +38,7 @@ index d5ba4c23..8feef697 100644 - # s/[A-z0-9_\-<>\/:\.,#\ \?="'\(\)]//g; - $clean_content .= $_."\n"; - } -+ logger->debug("cleanXml changed content") if ($content -ne $clean_content); ++ $logger->debug("cleanXml changed content") if ($content ne $clean_content); - return $clean_content; + return $clean_content."\n"; diff --git a/ocsinventory-agent.spec b/ocsinventory-agent.spec index c418b6c..8549f3d 100644 --- a/ocsinventory-agent.spec +++ b/ocsinventory-agent.spec @@ -22,7 +22,7 @@ Name: ocsinventory-agent Summary: Open Computer and Software Inventory Next Generation client Version: 2.6.0 -Release: 3.1%{?dist} +Release: 3.2%{?dist} Source0: https://github.com/OCSInventory-NG/UnixAgent/releases/download/v%{official_version}/Ocsinventory-Unix-Agent-%{official_version}.tar.gz @@ -302,6 +302,10 @@ rm %{buildroot}%{_sbindir}/ipdiscover %changelog +* Mon Jan 6 2020 Pat Riehecky - 2.6.0-3.2 +- More cleanup UTF8 parse +- Smarter use of local CA list + * Fri Dec 27 2019 Pat Riehecky - 2.6.0-3.1 - Cleanup UTF8 parse - drop system CA list, keep local CA list