#1 FusionInventory-Agent 2.5.1
Closed 20 days ago by gbougard. Opened 3 months ago by gbougard.
https://github.com/g-bougard/rpm_repository.git upstream  into  master

New upstream release
Guillaume Bougard • 3 months ago  
fix-httpd-plugins-configs-folder.patch
file removed
-21

@@ -1,21 +0,0 @@

- commit b4710078310e9a5243932ab90b77b760fa97faa3

- Author: Guillaume Bougard <gbougard@teclib.com>

- 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

fix-install-all-httpd-plugins-default-configs.patch
file added
+16

@@ -0,0 +1,16 @@

+ diff --git a/Makefile.PL b/Makefile.PL

+ index 6c62baa1f..551bf89f6 100644

+ --- a/Makefile.PL

+ +++ b/Makefile.PL

+ @@ -240,9 +240,9 @@ sub install {

+  config_install : pure_install

+         $(MKPATH) $(DESTDIR)$(SYSCONFDIR)

+         $(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR)

+ -       for config in agent.cfg inventory-server-plugin.cfg server-test-plugin.cfg ssl-server-plugin.cfg ; \

+ +       for config in agent.cfg $(shell cd etc; echo *-plugin.cfg ); \

+         do \

+ -         if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \

+ +         if $(TEST_F) $(DESTDIR)$(SYSCONFDIR)/$$config; then \

+             $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \

+             $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \

+             $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \

fix-install-httpd-plugins-configs.patch
file removed
-17

@@ -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

fusioninventory-agent-7ae7c838b.patch
file removed
-37

@@ -1,37 +0,0 @@

- From 7ae7c838b156ba1b6bf89ab60ba9c8df04532dd0 Mon Sep 17 00:00:00 2001

- From: Guillaume Bougard <gbougard@teclib.com>

- 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

fusioninventory-agent-d4f29af.patch
file removed
-23

@@ -1,23 +0,0 @@

- From d4f29affa9c9b8e80ea53171570c6d70eab28027 Mon Sep 17 00:00:00 2001

- From: Guillaume Bougard <gbougard@teclib.com>

- 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;

fusioninventory-agent.spec
file modified
+11 -6

@@ -8,15 +8,12 @@

  License:     GPLv2+

  URL:         http://fusioninventory.org/

  

- Version:     2.5

- Release:     5%{?dist}

+ Version:     2.5.1

+ 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

+ Patch0:      fix-install-all-httpd-plugins-default-configs.patch

  

  Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

  BuildRequires: perl-generators

@@ -230,6 +227,8 @@

  %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 +289,12 @@

  

  

  %changelog

+ * Wed Jul 03 2019 Guillaume Bougard <gbougard AT teclib DOT com> - 2.5.1-1

+ - Last upstream release

+ - Removed obsolete patches

+ - Add upstream patch to fix Proxy and SecondaryProxy http server plugins default

+   configuration install

+ 

  * Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.5-5

  - Perl 5.30 rebuild