From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 694671382C5 for ; Wed, 27 May 2020 11:21:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89B62E087F; Wed, 27 May 2020 11:21:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44668E087F for ; Wed, 27 May 2020 11:21:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B72534EDF9 for ; Wed, 27 May 2020 11:20:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BAC021E for ; Wed, 27 May 2020 11:20:57 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1590578420.17a913b066ba5750abc500964b9aaed5b227ece4.alexxy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-metrics/fusioninventory-agent/, app-metrics/fusioninventory-agent/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild X-VCS-Directories: app-metrics/fusioninventory-agent/files/ app-metrics/fusioninventory-agent/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 17a913b066ba5750abc500964b9aaed5b227ece4 X-VCS-Branch: master Date: Wed, 27 May 2020 11:20:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e39b0bf-dd07-4895-9ea2-4ce1f27dc472 X-Archives-Hash: 11e3062bd3e3d02ce13c71dbc6b3b0ca commit: 17a913b066ba5750abc500964b9aaed5b227ece4 Author: Alexey Shvetsov gentoo org> AuthorDate: Wed May 27 11:20:09 2020 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Wed May 27 11:20:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a913b0 app-metrics/fusioninventory-agent: Fix agent daemon startup Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Alexey Shvetsov gentoo.org> .../files/fusioninventory-agent-2.5.2-dirs.patch | 44 +++++++++++++++------- .../fusioninventory-agent-2.5.2.ebuild | 1 + 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch b/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch index e37b58c43a0..a3a6b439713 100644 --- a/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch +++ b/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch @@ -1,5 +1,33 @@ ---- a/Makefile.PL 2020-05-27 02:16:42.106531746 +0300 -+++ b/Makefile.PL 2020-05-27 02:17:30.568531767 +0300 +diff -urN a/lib/FusionInventory/Agent/Config.pm b/lib/FusionInventory/Agent/Config.pm +--- a/lib/FusionInventory/Agent/Config.pm 2020-05-27 11:09:31.969999393 -0000 ++++ b/lib/FusionInventory/Agent/Config.pm 2020-05-27 11:09:39.833332729 -0000 +@@ -67,7 +67,7 @@ + my ($class, %params) = @_; + + my $self = { +- '_confdir' => undef, # SYSCONFDIR replaced here from Makefile ++ '_confdir' => '/etc/fusioninventory', # SYSCONFDIR replaced here from Makefile + }; + bless $self, $class; + $self->_loadDefaults(); +diff -urN a/lib/setup.pm b/lib/setup.pm +--- a/lib/setup.pm 2020-05-27 11:09:31.989999393 -0000 ++++ b/lib/setup.pm 2020-05-27 11:11:02.233332727 -0000 +@@ -11,9 +11,9 @@ + our @EXPORT = ('%setup'); + + our %setup = ( +- datadir => './share', ++ datadir => '/usr/share/fusioninventory', + libdir => './lib', +- vardir => './var', ++ vardir => '/var/lib/fusioninventory', + ); + + # Compute directly libdir from this setup file as it should be installed +diff -urN a/Makefile.PL b/Makefile.PL +--- a/Makefile.PL 2020-05-27 11:09:31.966666059 -0000 ++++ b/Makefile.PL 2020-05-27 11:09:39.833332729 -0000 @@ -170,18 +170,15 @@ INSTALLSCRIPT => '$(PREFIX)/bin', INSTALLSITESCRIPT => '$(PREFIX)/bin', @@ -21,15 +49,3 @@ ); # allow variables defined on command line to override defaults ---- a/lib/FusionInventory/Agent/Config.pm 2020-05-27 10:06:21.248964808 +0300 -+++ b/lib/FusionInventory/Agent/Config.pm 2020-05-27 10:06:57.324964823 +0300 -@@ -67,7 +67,7 @@ - my ($class, %params) = @_; - - my $self = { -- '_confdir' => undef, # SYSCONFDIR replaced here from Makefile -+ '_confdir' => '/etc/fusioninventory', # SYSCONFDIR replaced here from Makefile - }; - bless $self, $class; - $self->_loadDefaults(); - diff --git a/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild b/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild index 9b0a5d9d145..50d906752ad 100644 --- a/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild +++ b/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild @@ -21,6 +21,7 @@ DEPEND=" dev-perl/Text-Template dev-perl/UNIVERSAL-require dev-perl/XML-TreePP + dev-perl/XML-XPath virtual/perl-IO-Compress dev-perl/HTTP-Daemon dev-perl/IO-Socket-SSL