summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphaël Doursenaud2018-09-18 16:18:47 +0200
committerRaphaël Doursenaud2018-09-18 16:18:47 +0200
commitff3dec5136a55ae38e734ac26ee4399f29791ac8 (patch)
treebb732720120ea452a7ac160b8bd154169bc905ab
parent40a3928484f0f6fa82e59b477797a599732761fb (diff)
downloadaur-ff3dec5136a55ae38e734ac26ee4399f29791ac8.tar.gz
Update to v2.4.1
-rw-r--r--.SRCINFO45
-rw-r--r--PKGBUILD97
-rw-r--r--fusioninventory-agent.config2
-rw-r--r--fusioninventory-agent.service10
-rw-r--r--setup.patch16
5 files changed, 91 insertions, 79 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f7684c3514b..4cada0b9a2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,45 @@
# Generated by mksrcinfo v8
-# Sun Sep 3 12:56:19 UTC 2017
+# Tue Sep 18 14:18:47 UTC 2018
pkgbase = fusioninventory-agent
pkgdesc = An application for keeping track of the hardware and software
- pkgver = 2.3.21
+ pkgver = 2.4.1
pkgrel = 1
url = http://fusioninventory.org
arch = any
license = GPL
+ checkdepends = perl-file-copy-recursive
checkdepends = perl-cgi
checkdepends = perl-http-proxy
checkdepends = perl-http-server-simple
+ checkdepends = perl-http-server-simple-authen
checkdepends = perl-io-socket-ssl
checkdepends = perl-io-capture
checkdepends = perl-ipc-run
+ checkdepends = perl-net-snmp
+ checkdepends = perl-lwp-protocol-https
+ checkdepends = perl-parallel-forkmanager
checkdepends = perl-test-compile
checkdepends = perl-test-deep
checkdepends = perl-test-exception
checkdepends = perl-test-mockmodule
checkdepends = perl-test-most
checkdepends = perl-test-nowarnings
- checkdepends = perl-lwp-protocol-https
checkdepends = perl-test-mockobject
- checkdepends = perl-json-pp
- checkdepends = perl-net-snmp
- checkdepends = perl-parallel-forkmanager
makedepends = perl-http-proxy
makedepends = perl-http-server-simple
makedepends = perl-http-server-simple-authen
makedepends = perl-io-socket-ssl
makedepends = perl-io-capture
makedepends = perl-ipc-run
+ makedepends = perl-lwp-protocol-https
+ makedepends = perl-net-snmp
makedepends = perl-test-compile
makedepends = perl-test-deep
makedepends = perl-test-exception
makedepends = perl-test-mockmodule
+ makedepends = perl-test-mockobject
makedepends = perl-test-most
makedepends = perl-test-nowarnings
- makedepends = perl-lwp-protocol-https
- makedepends = perl-test-mockobject
- makedepends = perl-json-pp
- makedepends = perl-net-snmp
depends = perl>=5.8
depends = perl-file-which
depends = perl-libwww>=5.8
@@ -47,16 +47,15 @@ pkgbase = fusioninventory-agent
depends = perl-text-template
depends = perl-universal-require
depends = perl-xml-treepp>=0.26
- depends = perl-data-structure-util
+ depends = perl-proc-daemon
optdepends = perl-compress-zlib: message compression
optdepends = perl-http-daemon: web interface
- optdepends = perl-io-socket-ssl>=1.14: HTTPS support
+ optdepends = perl-io-socket-ssl: HTTPS support
optdepends = perl-lwp-protocol-https: HTTPS support
optdepends = perl-proc-daemon: daemon mode
- optdepends = perl-proc-pid-file: daemon mode
- optdepends = perl-parse-edid: Inventory EDID data parsing
- optdepends = perl-net-cups>=0.60: Inventory printers detection
optdepends = perl-datetime
+ optdepends = perl-net-cups: Inventory printers detection
+ optdepends = perl-parse-edid: Inventory EDID data parsing
optdepends = dmidecode: Inventory DMI data retrieval
optdepends = pciutils: Inventory PCI bus scanning (lspci)
optdepends = hdparm: Inventory additional disk drive info retrieval
@@ -64,20 +63,18 @@ pkgbase = fusioninventory-agent
optdepends = openssh: Inventory host SSH public key retrieval (ssh-keyscan)
optdepends = perl-archive-extract: Deploy
optdepends = perl-file-copy-recursive: Deploy
- optdepends = perl-json-pp: Deploy
- optdepends = perl-uri: Deploy
- optdepends = perl-net-ping: Deploy
optdepends = perl-parallel-forkmanager: Deploy
+ optdepends = perl-uri: Deploy
+ optdepends = perl-net-nbname: Network
optdepends = perl-net-snmp: Network inventory
optdepends = perl-crypt-des: Network inventory SNMPv3 support
optdepends = nmap: Network discovery
optdepends = perl-net-write: Wake on Lan ethernet method support
- source = https://github.com/fusioninventory/fusioninventory-agent/releases/download/2.3.21/FusionInventory-Agent-2.3.21.tar.gz
- source = fusioninventory-agent.service
- source = fusioninventory-agent.config
- md5sums = 0f47d238b82c2ea7c02a6309e1d9ed87
- md5sums = cd0d59b266a41977f51d9e99ecca8cd5
- md5sums = 7cce12647a737aadcdd79dee4575aff3
+ backup = etc/fusioninventory/agent.cfg
+ source = https://github.com/fusioninventory/fusioninventory-agent/releases/download/2.4.1/FusionInventory-Agent-2.4.1.tar.gz
+ source = setup.patch
+ md5sums = 417fd23dd681f615055b65cd4e414187
+ md5sums = 51f15a7346dda3d3337b514e73a00132
pkgname = fusioninventory-agent
diff --git a/PKGBUILD b/PKGBUILD
index 4cff821521a..420ac817ec6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@
# Contributor: Alex 'AdUser' Z
pkgname=fusioninventory-agent
_pkgname="FusionInventory-Agent"
-pkgver=2.3.21
+pkgver=2.4.1
pkgrel=1
pkgdesc="An application for keeping track of the hardware and software"
arch=(any)
url="http://fusioninventory.org"
-_watch="https://github.com/fusinv/fusioninventory-agent/releases"
+_watch="https://github.com/fusinventory/fusioninventory-agent/releases"
license=('GPL')
depends=(
'perl>=5.8'
@@ -20,7 +20,8 @@ depends=(
'perl-text-template'
'perl-universal-require'
'perl-xml-treepp>=0.26'
- 'perl-data-structure-util'
+ # Daemon mode is required for systemd
+ 'perl-proc-daemon'
)
makedepends=(
'perl-http-proxy'
@@ -30,37 +31,37 @@ makedepends=(
# Provides IO::Capture::Stderr
'perl-io-capture'
'perl-ipc-run'
+ 'perl-lwp-protocol-https'
+ # Provided by Perl
+ #'perl-json-pp'
+ 'perl-net-snmp'
'perl-test-compile'
'perl-test-deep'
'perl-test-exception'
'perl-test-mockmodule'
+ 'perl-test-mockobject'
# Provided by 'perl-test-most'
# 'perl-test-more>=0.93'
'perl-test-most'
'perl-test-nowarnings'
- 'perl-lwp-protocol-https'
- 'perl-test-mockobject'
- 'perl-json-pp'
- 'perl-net-snmp'
)
-
optdepends=(
# Global
- # FIXME: Doesn't build from AUR anymore. Needs a patch:
- #-use private::MakeUtil;
- #+require './private/MakeUtil.pm';
+ # FIXME: Not available in the AUR anymore. Provided by perl?
'perl-compress-zlib: message compression'
'perl-http-daemon: web interface'
- 'perl-io-socket-ssl>=1.14: HTTPS support'
+ # >=1.14
+ 'perl-io-socket-ssl: HTTPS support'
'perl-lwp-protocol-https: HTTPS support'
+ # Required for Systemd. Added to depends.
'perl-proc-daemon: daemon mode'
- 'perl-proc-pid-file: daemon mode'
# Inventory
+ 'perl-datetime'
+ # >=0.60
+ 'perl-net-cups: Inventory printers detection'
# FIXME: Not available in the AUR anymore
'perl-parse-edid: Inventory EDID data parsing'
- 'perl-net-cups>=0.60: Inventory printers detection'
- 'perl-datetime'
'dmidecode: Inventory DMI data retrieval'
# Provides lspci
'pciutils: Inventory PCI bus scanning (lspci)'
@@ -74,18 +75,20 @@ optdepends=(
# Provided by Perl
# 'perl-digest-sha: Deploy'
'perl-file-copy-recursive: Deploy'
- 'perl-json-pp: Deploy'
+ # Provided by Perl
+ #'perl-json-pp: Deploy'
+ # Provided by Perl
+ #'perl-net-ping: Deploy'
+ 'perl-parallel-forkmanager: Deploy'
# Provided by perl-uri
# 'perl-uri-escape: Deploy'
'perl-uri: Deploy'
- 'perl-net-ping: Deploy'
- 'perl-parallel-forkmanager: Deploy'
# Network
+ # FIXME: not in AUR yet
+ 'perl-net-nbname: Network'
'perl-net-snmp: Network inventory'
- # FIXME: not in AUR
- # 'perl-net-nbname: Network'
- # provided by perl
+ # provided by Perl
# 'perl-thread-queue>=2.0.1'
'perl-crypt-des: Network inventory SNMPv3 support'
'nmap: Network discovery'
@@ -96,17 +99,22 @@ optdepends=(
'perl-net-write: Wake on Lan ethernet method support'
)
checkdepends=(
+ 'perl-file-copy-recursive'
# Needed for perl-http-server-simple to work properly
'perl-cgi'
'perl-http-proxy'
'perl-http-server-simple'
- # TESTME: is it provided by perl-http-server-simple?
- # 'perl-http-server-simple-authen'
+ 'perl-http-server-simple-authen'
'perl-io-socket-ssl'
# Provided by perl-io-capture
- #'perl-io-capture-sderr'
+ #'perl-io-capture-stderr'
'perl-io-capture'
'perl-ipc-run'
+ # Provided by Perl
+ #'perl-json-pp'
+ 'perl-net-snmp'
+ 'perl-lwp-protocol-https'
+ 'perl-parallel-forkmanager'
'perl-test-compile'
'perl-test-deep'
'perl-test-exception'
@@ -115,18 +123,19 @@ checkdepends=(
# 'perl-test-more'
'perl-test-most'
'perl-test-nowarnings'
- 'perl-lwp-protocol-https'
'perl-test-mockobject'
- 'perl-json-pp'
- 'perl-net-snmp'
- 'perl-parallel-forkmanager'
)
source=("https://github.com/fusioninventory/fusioninventory-agent/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
- 'fusioninventory-agent.service'
- 'fusioninventory-agent.config')
-md5sums=('0f47d238b82c2ea7c02a6309e1d9ed87'
- 'cd0d59b266a41977f51d9e99ecca8cd5'
- '7cce12647a737aadcdd79dee4575aff3')
+ "setup.patch")
+md5sums=('417fd23dd681f615055b65cd4e414187'
+ '51f15a7346dda3d3337b514e73a00132')
+backup=('etc/fusioninventory/agent.cfg')
+
+prepare() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ # Fixes setup paths. See: https://github.com/fusioninventory/fusioninventory-agent/issues/451#issuecomment-361326178
+ patch -Np1 -i "${srcdir}/setup.patch"
+}
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -139,20 +148,22 @@ build() {
make
}
-check() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
-
- make test
-}
+# FIXME: stalls at t/agent/http/client/connection.t .................... 7/36
+#check() {
+# cd "${srcdir}/${_pkgname}-${pkgver}"
+#
+# make test
+#}
package() {
cd "${srcdir}/${_pkgname}-${pkgver}"
+
make install DESTDIR="${pkgdir}/"
- install -D -m644 ${srcdir}/fusioninventory-agent.service \
+
+ install -D -m644 contrib/unix/fusioninventory-agent.service \
${pkgdir}/usr/lib/systemd/system/fusioninventory-agent.service
- mv ${pkgdir}/etc/fusioninventory/agent.cfg \
- ${pkgdir}/etc/fusioninventory/agent.cfg.default
- install -D -m644 ${srcdir}/fusioninventory-agent.config \
- ${pkgdir}/etc/conf.d/fusioninventory-agent
+ install -D -m644 etc/agent.cfg \
+ ${pkgdir}/etc/agent.cfg
+
mkdir -p "${pkgdir}/var/lib/fusioninventory-agent"
}
diff --git a/fusioninventory-agent.config b/fusioninventory-agent.config
deleted file mode 100644
index c5eaa8fe2aa..00000000000
--- a/fusioninventory-agent.config
+++ /dev/null
@@ -1,2 +0,0 @@
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-FUSINVOPT="--daemon -no-fork"
diff --git a/fusioninventory-agent.service b/fusioninventory-agent.service
deleted file mode 100644
index 20e54c27ae7..00000000000
--- a/fusioninventory-agent.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=FusionInventory Agent
-After=network.service
-
-[Service]
-EnvironmentFile=/etc/conf.d/fusioninventory-agent
-ExecStart=/usr/bin/fusioninventory-agent $FUSINVOPT
-
-[Install]
-WantedBy=multi-user.target
diff --git a/setup.patch b/setup.patch
new file mode 100644
index 00000000000..7b829cd13a8
--- /dev/null
+++ b/setup.patch
@@ -0,0 +1,16 @@
+diff -Nupr FusionInventory-Agent-2.4.1.orig/lib/setup.pm FusionInventory-Agent-2.4.1.patched/lib/setup.pm
+--- FusionInventory-Agent-2.4.1.orig/lib/setup.pm 2018-06-29 11:17:46.000000000 +0200
++++ FusionInventory-Agent-2.4.1.patched/lib/setup.pm 2018-09-18 16:01:16.999963130 +0200
+@@ -11,9 +11,9 @@ use Cwd qw(abs_path);
+ our @EXPORT = ('%setup');
+
+ our %setup = (
+- datadir => './share',
+- libdir => './lib',
+- vardir => './var',
++ datadir => '/usr/share/fusioninventory',
++ libdir => '/usr/share/fusioninventory/lib',
++ vardir => '/var/lib/fusioninventory-agent',
+ );
+
+ # Compute directly libdir from this setup file as it should be installed