diff --git a/.gitignore b/.gitignore index 2f5d9f1..e8e9515 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /FusionInventory-Agent-2.4.2.tar.gz /FusionInventory-Agent-2.4.3.tar.gz /FusionInventory-Agent-2.5.tar.gz +/FusionInventory-Agent-2.5.1.tar.gz +/FusionInventory-Agent-2.5.2.tar.gz diff --git a/fix-httpd-plugins-configs-folder.patch b/fix-httpd-plugins-configs-folder.patch deleted file mode 100644 index 9db5b8c..0000000 --- a/fix-httpd-plugins-configs-folder.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit b4710078310e9a5243932ab90b77b760fa97faa3 -Author: Guillaume Bougard -Date: Tue Apr 30 12:56:06 2019 +0200 - - fix: HTTP server plugins base configuration folder - -diff --git a/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm b/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm -index 5d570aab5..1076eb30e 100644 ---- a/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm -+++ b/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm -@@ -23,6 +23,10 @@ sub new { - - bless $self, $class; - -+ # Import _confdir from agent configuration -+ $self->{_confdir} = $self->{server}->{agent}->{config}->{_confdir} -+ if $self->{server}; -+ - # Check _confdir imported from FusionInventory::Agent::Config - unless ($self->{_confdir} && -d $self->{_confdir}) { - # Set absolute confdir from default if replaced by Makefile otherwise search diff --git a/fix-install-httpd-plugins-configs.patch b/fix-install-httpd-plugins-configs.patch deleted file mode 100644 index 3fabbc2..0000000 --- a/fix-install-httpd-plugins-configs.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/Makefile.PL b/Makefile.PL -index 38e6eebdc..db2edcf5e 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -245,10 +245,10 @@ config_install : pure_install - do \ - if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \ - $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \ -- $(CP) etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/$$config.new; \ -+ $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \ - $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \ - else \ -- $(CP) etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/$$config; \ -+ $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config; \ - $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config; \ - fi; \ - done diff --git a/fusioninventory-agent-7ae7c838b.patch b/fusioninventory-agent-7ae7c838b.patch deleted file mode 100644 index cafe66c..0000000 --- a/fusioninventory-agent-7ae7c838b.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7ae7c838b156ba1b6bf89ab60ba9c8df04532dd0 Mon Sep 17 00:00:00 2001 -From: Guillaume Bougard -Date: Sat, 13 Apr 2019 18:47:36 +0200 -Subject: [PATCH] fix: Add few minor fixes - -* build: fix fusioninventory-remoteinventory was not installed -* inventory: fix error message while starting fusioninventory-inventory script ---- - Makefile.PL | 1 + - lib/FusionInventory/Agent/Task/Inventory.pm | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index 38e6eebdca..71aae700c9 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -104,6 +104,7 @@ install_script 'bin/fusioninventory-wakeonlan'; - install_script 'bin/fusioninventory-netdiscovery'; - install_script 'bin/fusioninventory-netinventory'; - install_script 'bin/fusioninventory-esx'; -+install_script 'bin/fusioninventory-remoteinventory'; - - resources - homepage => "http://www.fusioninventory.org", -diff --git a/lib/FusionInventory/Agent/Task/Inventory.pm b/lib/FusionInventory/Agent/Task/Inventory.pm -index 84a3cafbda..8fb2cd8806 100644 ---- a/lib/FusionInventory/Agent/Task/Inventory.pm -+++ b/lib/FusionInventory/Agent/Task/Inventory.pm -@@ -59,7 +59,7 @@ sub run { - tag => $tag - ); - -- $self->{logger}->info("New inventory from $self->{deviceid} for $self->{target}->{id}". -+ $self->{logger}->info("New inventory from ".$inventory->getDeviceId()." for $self->{target}->{id}". - ( (defined($tag) && length($tag)) ? " (tag=$tag)" : "" )); - - # Set inventory as remote if running remote inventory like from wmi task diff --git a/fusioninventory-agent-d4f29af.patch b/fusioninventory-agent-d4f29af.patch deleted file mode 100644 index 8282318..0000000 --- a/fusioninventory-agent-d4f29af.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d4f29affa9c9b8e80ea53171570c6d70eab28027 Mon Sep 17 00:00:00 2001 -From: Guillaume Bougard -Date: Tue, 7 May 2019 14:33:09 +0200 -Subject: [PATCH] fix: Keep HTTP Server SSL plugin sessions opened - ---- - lib/FusionInventory/Agent/HTTP/Server/SSL.pm | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/FusionInventory/Agent/HTTP/Server/SSL.pm b/lib/FusionInventory/Agent/HTTP/Server/SSL.pm -index f6238104a5..32442ec2cc 100644 ---- a/lib/FusionInventory/Agent/HTTP/Server/SSL.pm -+++ b/lib/FusionInventory/Agent/HTTP/Server/SSL.pm -@@ -139,6 +139,9 @@ sub new { - return; - } - -+ # Disable Timeout to leave SSL session opened until we get data -+ $client->timeout(0); -+ - $plugin->debug("HTTPD started new SSL session"); - - bless $client, $class; diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index d3d7e9f..351f6ba 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -8,15 +8,11 @@ Summary: FusionInventory agent License: GPLv2+ URL: http://fusioninventory.org/ -Version: 2.5 -Release: 4%{?dist} +Version: 2.5.2 +Release: 1%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service -Patch0: fusioninventory-agent-7ae7c838b.patch -Patch1: fix-install-httpd-plugins-configs.patch -Patch2: fix-httpd-plugins-configs-folder.patch -Patch3: fusioninventory-agent-d4f29af.patch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl-generators @@ -139,12 +135,6 @@ fusioninventory cron task %prep %setup -q -n FusionInventory-Agent-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - - sed \ -e "s/logger = .*/logger = syslog/" \ -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \ @@ -230,6 +220,8 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %config(noreplace) %{_sysconfdir}/fusioninventory/inventory-server-plugin.cfg %config(noreplace) %{_sysconfdir}/fusioninventory/server-test-plugin.cfg %config(noreplace) %{_sysconfdir}/fusioninventory/ssl-server-plugin.cfg +%config(noreplace) %{_sysconfdir}/fusioninventory/proxy-server-plugin.cfg +%config(noreplace) %{_sysconfdir}/fusioninventory/proxy2-server-plugin.cfg %{_unitdir}/%{name}.service %dir %{_sysconfdir}/systemd/system/%{name}.service.d @@ -290,6 +282,14 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Tue Dec 17 2019 Johan Cwiklinski - 2.5.2-1 +- Last upstream release +- Add missing configuration files + +* Mon Jul 08 2019 Johan Cwiklinski - 2.5.1-1 +- Last upstream release +- Remove patches applied upstream + * Tue May 07 2019 Johan Cwiklinski - 2.5-4 - Add patch to fix SSL on with http modules diff --git a/sources b/sources index 9479a53..c30ad82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FusionInventory-Agent-2.5.tar.gz) = 37f0545df716e482fffd018a56b9c7482d7fce64fd0fa277c481a553a2108e7588f34077fb4775bb6352668efc96b3525fe97b1d6331d637401e8db8c0c91333 +SHA512 (FusionInventory-Agent-2.5.2.tar.gz) = ddfcd5c811a118d06a07b21028781d211908afaca2276eeea25fdea0e08a880d5c38f3eeb27bda10cda5a7cee5befbb74071e78c908d9f14223d365ea2aa7757