| 1 |
commit: 17a913b066ba5750abc500964b9aaed5b227ece4 |
| 2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 27 11:20:09 2020 +0000 |
| 4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 27 11:20:20 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a913b0 |
| 7 |
|
| 8 |
app-metrics/fusioninventory-agent: Fix agent daemon startup |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 11 |
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/fusioninventory-agent-2.5.2-dirs.patch | 44 +++++++++++++++------- |
| 14 |
.../fusioninventory-agent-2.5.2.ebuild | 1 + |
| 15 |
2 files changed, 31 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index e37b58c43a0..a3a6b439713 100644 |
| 19 |
--- a/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch |
| 20 |
+++ b/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch |
| 21 |
@@ -1,5 +1,33 @@ |
| 22 |
---- a/Makefile.PL 2020-05-27 02:16:42.106531746 +0300 |
| 23 |
-+++ b/Makefile.PL 2020-05-27 02:17:30.568531767 +0300 |
| 24 |
+diff -urN a/lib/FusionInventory/Agent/Config.pm b/lib/FusionInventory/Agent/Config.pm |
| 25 |
+--- a/lib/FusionInventory/Agent/Config.pm 2020-05-27 11:09:31.969999393 -0000 |
| 26 |
++++ b/lib/FusionInventory/Agent/Config.pm 2020-05-27 11:09:39.833332729 -0000 |
| 27 |
+@@ -67,7 +67,7 @@ |
| 28 |
+ my ($class, %params) = @_; |
| 29 |
+ |
| 30 |
+ my $self = { |
| 31 |
+- '_confdir' => undef, # SYSCONFDIR replaced here from Makefile |
| 32 |
++ '_confdir' => '/etc/fusioninventory', # SYSCONFDIR replaced here from Makefile |
| 33 |
+ }; |
| 34 |
+ bless $self, $class; |
| 35 |
+ $self->_loadDefaults(); |
| 36 |
+diff -urN a/lib/setup.pm b/lib/setup.pm |
| 37 |
+--- a/lib/setup.pm 2020-05-27 11:09:31.989999393 -0000 |
| 38 |
++++ b/lib/setup.pm 2020-05-27 11:11:02.233332727 -0000 |
| 39 |
+@@ -11,9 +11,9 @@ |
| 40 |
+ our @EXPORT = ('%setup'); |
| 41 |
+ |
| 42 |
+ our %setup = ( |
| 43 |
+- datadir => './share', |
| 44 |
++ datadir => '/usr/share/fusioninventory', |
| 45 |
+ libdir => './lib', |
| 46 |
+- vardir => './var', |
| 47 |
++ vardir => '/var/lib/fusioninventory', |
| 48 |
+ ); |
| 49 |
+ |
| 50 |
+ # Compute directly libdir from this setup file as it should be installed |
| 51 |
+diff -urN a/Makefile.PL b/Makefile.PL |
| 52 |
+--- a/Makefile.PL 2020-05-27 11:09:31.966666059 -0000 |
| 53 |
++++ b/Makefile.PL 2020-05-27 11:09:39.833332729 -0000 |
| 54 |
@@ -170,18 +170,15 @@ |
| 55 |
INSTALLSCRIPT => '$(PREFIX)/bin', |
| 56 |
INSTALLSITESCRIPT => '$(PREFIX)/bin', |
| 57 |
@@ -21,15 +49,3 @@ |
| 58 |
); |
| 59 |
|
| 60 |
# allow variables defined on command line to override defaults |
| 61 |
---- a/lib/FusionInventory/Agent/Config.pm 2020-05-27 10:06:21.248964808 +0300 |
| 62 |
-+++ b/lib/FusionInventory/Agent/Config.pm 2020-05-27 10:06:57.324964823 +0300 |
| 63 |
-@@ -67,7 +67,7 @@ |
| 64 |
- my ($class, %params) = @_; |
| 65 |
- |
| 66 |
- my $self = { |
| 67 |
-- '_confdir' => undef, # SYSCONFDIR replaced here from Makefile |
| 68 |
-+ '_confdir' => '/etc/fusioninventory', # SYSCONFDIR replaced here from Makefile |
| 69 |
- }; |
| 70 |
- bless $self, $class; |
| 71 |
- $self->_loadDefaults(); |
| 72 |
- |
| 73 |
|
| 74 |
diff --git a/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild b/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild |
| 75 |
index 9b0a5d9d145..50d906752ad 100644 |
| 76 |
--- a/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild |
| 77 |
+++ b/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild |
| 78 |
@@ -21,6 +21,7 @@ DEPEND=" |
| 79 |
dev-perl/Text-Template |
| 80 |
dev-perl/UNIVERSAL-require |
| 81 |
dev-perl/XML-TreePP |
| 82 |
+ dev-perl/XML-XPath |
| 83 |
virtual/perl-IO-Compress |
| 84 |
dev-perl/HTTP-Daemon |
| 85 |
dev-perl/IO-Socket-SSL |
Archives