diff --git a/.gitignore b/.gitignore index bfb8c90..2b7f668 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,16 @@ -*spec~ -/FusionInventory-Agent-2.1.9.tar.gz -/FusionInventory-Agent-2.1.12.tar.gz +/FusionInventory-Agent-2.3.15.tar.gz +/FusionInventory-Agent-2.3.16.tar.gz +/2.3.17.tar.gz +/2.3.18.tar.gz +/FusionInventory-Agent-2.3.18.tar.gz +/FusionInventory-Agent-2.3.19.tar.gz +/FusionInventory-Agent-2.3.20.tar.gz +/FusionInventory-Agent-2.3.21.tar.gz +/FusionInventory-Agent-2.4.tar.gz +/FusionInventory-Agent-2.4.1.tar.gz +/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 +/FusionInventory-Agent-2.6.tar.gz diff --git a/fusioninventory-agent-git.patch b/fusioninventory-agent-git.patch deleted file mode 100644 index 9b131dc..0000000 --- a/fusioninventory-agent-git.patch +++ /dev/null @@ -1,112 +0,0 @@ -commit a291e4d5d73c13fc8076211b004e7349cd4bbf7d -Author: Gonéri Le Bouder -Date: Mon Nov 28 21:37:48 2011 +0100 - - try to use ssl_opts on LWP<6 too - - previously this block was only for LWP6. For some modern - LWP5/Crypt::SSLeay also need it, I use an eval here to avoid - failure on ancient LWP::UserAgent with no ssl_opts() - - closes: #1161 - - Reported-by: Remi Collet - -diff --git a/lib/FusionInventory/Agent/Network.pm b/lib/FusionInventory/Agent/Network.pm -index b349de5..6bc6fbf 100644 ---- a/lib/FusionInventory/Agent/Network.pm -+++ b/lib/FusionInventory/Agent/Network.pm -@@ -107,8 +107,11 @@ sub createUA { - - my $ua = LWP::UserAgent->new(keep_alive => 1, requests_redirectable => ['POST', 'GET', 'HEAD']); - -- -- if ($LWP::VERSION >= 6) { -+ # previously this block was only for LWP6. -+ # For some modern LWP5/Crypt::SSLeay also need it, I use -+ # an eval here to avoid failure on ancient LWP::UserAgent with -+ # no ssl_opts() -+ eval { - # LWP6 default behavior is to check the SSL hostname - if ($config->{'no-ssl-check'}) { - $ua->ssl_opts(verify_hostname => 0); -@@ -119,7 +122,7 @@ sub createUA { - if ($config->{'ca-cert-dir'}) { - $ua->ssl_opts(SSL_ca_path => $config->{'ca-cert-dir'}); - } -- } -+ }; - - if ($noProxy) { - -commit 5001036e8eabac54a5058306c44793df325109a2 -Author: Gonéri Le Bouder -Date: Mon Nov 28 21:39:21 2011 +0100 - - improve the regex used to parse the SSL-Cert - - - Drop the port from the hostname - - Use a wildcare only if there is a domain - -diff --git a/lib/FusionInventory/Agent/Network.pm b/lib/FusionInventory/Agent/Network.pm -index 6bc6fbf..96d7513 100644 ---- a/lib/FusionInventory/Agent/Network.pm -+++ b/lib/FusionInventory/Agent/Network.pm -@@ -362,9 +362,10 @@ sub setSslRemoteHost { - # Check server name against provided SSL certificate - if ( $self->{URI} =~ /^https:\/\/([^\/]+).*$/i ) { - my $re = $1; -+ $re =~ s/:\d+//; - # Accept SSL cert will hostname with wild-card - # http://forge.fusioninventory.org/issues/542 -- $re =~ s/^([^\.]+)/($1|\\*)/; -+ $re =~ s/^([^\.]+)\.(.+)/($1|\\*)/; - # protect some characters, $re will be evaluated as a regex - $re =~ s/([\-\.])/\\$1/g; - $ua->default_header('If-SSL-Cert-Subject' => '/CN='.$re.'($|\/)'); -commit 8035bde109d9684dac5fd9369ce6a7a641c54f99 -Author: Gonéri Le Bouder -Date: Mon Nov 28 21:48:52 2011 +0100 - - SSL: skip some test on LWP<6 - - Those cases are just unsupported. - - closes: #1161 - - Reported-by: Remi Collet - -diff --git a/t/ssl.t b/t/ssl.t -index ff8c25e..d8b384f 100644 ---- a/t/ssl.t -+++ b/t/ssl.t -@@ -107,10 +107,14 @@ $server->set_dispatch({ - }); - $server->background(); - -+ -+SKIP: { -+skip "Too all LWP for alternate hostname", 1 unless $LWP::VERSION >= 6; - ok( - $secure_client->send({message => $message}), - 'trusted certificate, alternate hostname: connection success' - ); -+} - - $server->stop(); - -@@ -161,10 +165,14 @@ ok( - 'untrusted certificate, correct hostname: connection failure' - ); - -+SKIP: { -+skip "Check disabled on LWP<6", 1 unless $LWP::VERSION >= 6; -+# Unless you wan to fix this - ok( - $unsafe_client->send({message => $message}), - 'untrusted certificate, correct hostname, no check: connection success' - ); -+} - - $server->stop(); - diff --git a/fusioninventory-agent.cron b/fusioninventory-agent.cron index e09c0db..8129715 100644 --- a/fusioninventory-agent.cron +++ b/fusioninventory-agent.cron @@ -11,27 +11,27 @@ export PATH i=0 while [ $i -lt ${#OCSMODE[*]} ] do - if [ ${OCSMODE[$i]:-none} == cron ]; then - OPTS= - if [ ! -z "${OCSPAUSE[$i]}" ]; then - OPTS="--wait ${OCSPAUSE[$i]}" - fi + if [ ${OCSMODE[$i]:-none} == cron ]; then + OPTS= + if [ ! -z "${OCSPAUSE[$i]}" ]; then + OPTS="--wait ${OCSPAUSE[$i]}" + fi - if [ ! -z "${OCSTAG[$i]}" ]; then - OPTS="$OPTS --tag=${OCSTAG[$i]}" - fi + if [ ! -z "${OCSTAG[$i]}" ]; then + OPTS="$OPTS --tag=${OCSTAG[$i]}" + fi - if [ "z${OCSSERVER[$i]}" = 'zlocal' ]; then - # Local inventory - OPTS="$OPTS --local=/var/lib/$NAME" - elif [ ! -z "${OCSSERVER[$i]}" ]; then - # Remote inventory - OPTS="$OPTS --lazy --server=${OCSSERVER[$i]}" - fi - echo "[$(date '+%c')] Running $NAME $OPTS" - /usr/bin/$NAME $FUSINVOPT --logfile=$LOG $OPTS - fi - ((i++)) + if [ "z${OCSSERVER[$i]}" = 'zlocal' ]; then + # Local inventory + OPTS="$OPTS --local=/var/lib/$NAME" + elif [ ! -z "${OCSSERVER[$i]}" ]; then + # Remote inventory + OPTS="$OPTS --lazy --server=${OCSSERVER[$i]}" + fi + echo "[$(date '+%c')] Running $NAME $OPTS" + /usr/bin/$NAME $OPTIONS --logfile=$LOG $OPTS + fi + ((i++)) done echo "[$(date '+%c')] End of cron job ($PATH)" diff --git a/fusioninventory-agent.init b/fusioninventory-agent.init deleted file mode 100755 index 4a488f2..0000000 --- a/fusioninventory-agent.init +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 88 12 -# description: FusionInventory Agent -# processname: fusioninventory-agent -# config: /etc/sysconfig/fusioninventory-agent.pid -# pidfile: /var/run/fusioninventory-agent.pid -### BEGIN INIT INFO -# Provides: fusioninventory-agent -# Required-Start: $local_fs $remote_fs $network $named $syslog $time -# Required-Stop: $local_fs $remote_fs $network $named $syslog $time -# Default-Start: -# Default-Stop: 0 1 6 -# Short-Description: FusionInventory agent -# Description: FusionInventory agent -### END INIT INFO - -# source function library -. /etc/rc.d/init.d/functions - -RETVAL=0 -desc="FusionInventory Agent" -prog=fusioninventory-agent -lockfile=/var/lock/subsys/$prog -pidfile=/var/run/$prog.pid -logfile=/var/log/$prog/$prog.log - -# pull in sysconfig settings -[ -r /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - -# -# Function that starts the daemon/service -# -do_start() -{ - # Read configuration - i=0 - OPTS= - SERVERS= - while [ $i -lt ${#OCSMODE[*]} ] - do - if [ ${OCSMODE[$i]:-none} == daemon ]; then - if [ ! -z "${OCSTAG[$i]}" ]; then - OPTS="$OPTS --tag=${OCSTAG[$i]}" - fi - if [ "z${OCSSERVER[$i]}" = 'zlocal' ]; then - # Local inventory - OPTS="$OPTS --local=/var/lib/$prog" - elif [ ! -z "${OCSSERVER[$i]}" ]; then - # Remote inventory - if [ -z "$SERVERS" ]; then - SERVERS=${OCSSERVER[$i]} - else - SERVERS="$SERVERS,${OCSSERVER[$i]}" - fi - fi - fi - ((i++)) - done - if [ -n "$SERVERS" ]; then - OPTS="$OPTS --server=$SERVERS" - fi - if [ -n "$OPTS" ]; then - echo -n $"Starting $prog: " - daemon $prog --logfile-maxsize=999 --logfile=$logfile $FUSINVOPT --daemon $OPTS 2>/dev/null - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - else - RETVAL=0 - fi -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - echo -n $"Stopping $prog: " - killproc $prog - RETVAL=$? - echo - if [ $RETVAL -eq 0 ] ; then - rm -f $lockfile $pidfile - fi -} - -case "$1" in - start) - do_start - ;; - stop) - do_stop - ;; - status) - status $prog - ;; - restart|reload|force-reload) - do_stop - do_start - ;; - condrestart) - [ -f $lockfile ] && do_stop && do_start || : - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}" - exit 1 - ;; -esac -exit $RETVAL - diff --git a/fusioninventory-agent.service b/fusioninventory-agent.service new file mode 100644 index 0000000..56526ab --- /dev/null +++ b/fusioninventory-agent.service @@ -0,0 +1,22 @@ +# It is not recommended to modify this file in-place, because it will be +# overwritten during package upgrades. If you want to customize, the best +# way is to use the "systemctl edit" command to create an override unit. + +# For example, to pass additional options (for instance, +# --no-category=software) to the agent at startup, create an override unit +# (as is done by systemctl edit) and enter the following: + +# [Service] +# Environment="OPTIONS=--no-category=software" + +[Unit] +Description=FusionInventory agent +Documentation=man:fusioninventory-agent +After=syslog.target network.target + +[Service] +ExecStart=/usr/bin/fusioninventory-agent --daemon --no-fork $OPTIONS +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 3cc0702..8b94faf 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -1,69 +1,54 @@ -#global gitver 9bd1238 -#global prever _beta1 +## Disabling debug package +## Can't build as noarch due to dmidecode requires +%global debug_package %{nil} + Name: fusioninventory-agent Summary: FusionInventory agent -Summary(fr): Agent FusionInventory -Group: Applications/System -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://fusioninventory.org/ -Version: 2.1.12 +Version: 2.6 +Release: 15%{?dist} +Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz +Source1: %{name}.cron +Source10: %{name}.service -%if 0%{?gitver:1} -Release: 0.1.git%{gitver}%{?dist} -# From http://github.com/fusinv/fusioninventory-agent/tarball/master -Source0: fusinv-fusioninventory-agent-2.1.8-95-g9bd1238.tar.gz -%else -Release: 1%{?dist} -Source0: http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make +BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: perl(Config) +BuildRequires: perl(English) +BuildRequires: perl(inc::Module::Install) +BuildRequires: perl(Module::AutoInstall) +BuildRequires: perl(Module::Install::Include) +BuildRequires: perl(Module::Install::Makefile) +BuildRequires: perl(Module::Install::Metadata) +BuildRequires: perl(Module::Install::Scripts) +BuildRequires: perl(Module::Install::WriteAll) +BuildRequires: perl(strict) +BuildRequires: perl(warnings) +BuildRequires: sed +BuildRequires: systemd + +Requires: perl-FusionInventory-Agent = %{version}-%{release} +Requires: cronie +%ifarch %{ix86} x86_64 +Requires: dmidecode %endif -Source1: %{name}.cron -Source2: %{name}.init +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd -Patch0: %{name}-git.patch - - -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: perl(Module::Install) -# For tests -BuildRequires: perl(Time::HiRes) perl(XML::Simple) perl(UNIVERSAL::require) perl(Test::More) -BuildRequires: perl(Class::Accessor::Fast) perl(Class::Data::Inheritable) perl(Test::Exception) -%if 0%{?fedora} >= 14 -BuildRequires: perl(LWP::Protocol::https) perl(IO::Socket::SSL) -BuildRequires: perl(HTTP::Server::Simple::Authen) perl(CGI) -%endif -%if 0%{?fedora}>= 12 || 0%{?rhel} >= 5 -BuildRequires: perl(XML::TreePP) -%endif -%if 0%{?fedora}>= 10 || 0%{?rhel} >= 5 -BuildRequires: perl(JSON) -%endif -%if 0%{?fedora} >= 11 -BuildRequires: perl(Test::Compile) -%endif - -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(LWP) perl(Net::IP) perl(HTTP::Status) perl(Net::SSLeay) perl(Crypt::SSLeay) -Requires: perl(Proc::Daemon) perl(Proc::PID::File) -%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 -Requires: perl(Archive::Extract) -Requires: perl(Net::CUPS) -%endif -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig, /sbin/service -Requires(postun): /sbin/service - - -# RPM 4.8 -%{?filter_from_requires: %filter_from_requires /perl(Win32/d} +# excluding internal requires and windows stuff +# excluding perl(setup) and windows stuff %{?perl_default_filter} -# RPM 4.9 -%global __requires_exclude %{?__requires_exclude:__requires_exclude|}^perl\\(Win32 - +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(setup\\)$ +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Win32|setup\\)$ %description FusionInventory Agent is an application designed to help a network @@ -75,109 +60,122 @@ or GLPI server with the FusionInventory for GLPI plugin. You can add additional packages for optional tasks: -* perl-FusionInventory-Agent-Task-OcsDeploy - OCS Inventory Software deployment support -* perl-FusionInventory-Agent-Task-NetDiscovery - Network Discovery support -* perl-FusionInventory-Agent-Task-SNMPQuery - SNMP Query support -* perl-FusionInventory-Agent-Task-ESX +* fusioninventory-agent-task-network + Network Discovery and Inventory support +* fusioninventory-agent-inventory + Local inventory support for FusionInventory +* fusioninventory-agent-task-deploy + Software deployment support +* fusioninventory-agent-task-esx vCenter/ESX/ESXi remote inventory - -Edit the /etc/sysconfig/%{name} file for service configuration. - -%description -l fr -L'agent FusionInventory est une application destinée à aider l'administrateur -système ou réseau à surveiller la configuration des machines du réseau -et les logiciels qui y sont installés. - -Cet agent peut envoyer les informations de l'ordinateur à un serveur -OCS Inventory NG ou à un serveur GLPI disposant de l'extension FusionInventory. - -Vous pouvez ajouter les paquets additionnels pour les tâches optionnelles : - -* perl-FusionInventory-Agent-Task-OcsDeploy - Gestion du déploiement logiciel OCS Inventory -* perl-FusionInventory-Agent-Task-NetDiscovery - Gestion de la découverte réseau -* perl-FusionInventory-Agent-Task-SNMPQuery - Gestion de l'interrogation SNMP -* perl-FusionInventory-Agent-Task-ESX - Inventaire à distance des vCenter/ESX/ESXi - -Modifier le fichier /etc/sysconfig/%{name} pour configurer -le service. +* fusioninventory-agent-task-collect + Custom information retrieval support +* fusioninventory-agent-task-wakeonlan + Wake o lan task -%package yum-plugin -Summary: Ask FusionInventory agent to send an inventory when yum exits -Summary(fr): Demande à l'agent FusionInventory l'envoi d'un inventaire -Group: System Environment/Base -BuildRequires: python-devel -Requires: yum >= 2.4 -Requires: %{name} +%package -n perl-FusionInventory-Agent +Summary: Libraries for Fusioninventory agent +BuildArch: noarch +Requires: perl(LWP) +Requires: perl(Net::CUPS) +Requires: perl(Net::SSLeay) +Requires: perl(Proc::Daemon) +Requires: perl(Socket::GetAddrInfo) -%description yum-plugin -fusioninventory-agent-yum-plugin asks the running service agent to send an -inventory when yum exits. +%description -n perl-FusionInventory-Agent +Libraries for Fusioninventory agent. -This requires the service to be running with the --rpc-trust-localhost option. +%package task-esx +Summary: FusionInventory plugin to inventory vCenter/ESX/ESXi +BuildArch: noarch +Requires: %{name} = %{version}-%{release} -%description -l fr yum-plugin -fusioninventory-agent-yum-plugin demande au service de l'agent d'envoyer un -inventaire à la fin de l'exécution de yum. +%description task-esx +fusioninventory-agent-task-ESX ask the running service agent to inventory an +VMWare vCenter/ESX/ESXi server through SOAP interface + + +%package task-network +Summary: NetDiscovery and NetInventory task for FusionInventory +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description task-network +fusioninventory-task-netdiscovery and fusioninventory-task-netinventory + +%package task-deploy +Summary: Software deployment support for FusionInventory agent +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Requires: perl(Archive::Extract) + +%description task-deploy +This package provides software deployment support for FusionInventory-agent + +%package task-wakeonlan +Summary: WakeOnLan task for FusionInventory +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description task-wakeonlan +fusioninventory-task-wakeonlan + +%package task-inventory +Summary: Inventory task for FusionInventory +Requires: %{name} = %{version}-%{release} +Requires: perl(Net::CUPS) +Requires: perl(Parse::EDID) + +%description task-inventory +fusioninventory-task-inventory + +%package task-collect +Summary: Custom information retrieval support for FusionInventory agent +Requires: %{name} = %{version}-%{release} + +%description task-collect +This package provides custom information retrieval support for +FusionInventory agent + +%package cron +Summary: Cron for FusionInventory agent +Requires: %{name} = %{version}-%{release} + +%description cron +fusioninventory cron task -Le service doit être actif et lancé avec l'option --rpc-trust-localhost. %prep -%if 0%{?gitver:1} -%setup -q -n fusinv-fusioninventory-agent-%{gitver} -%else -%setup -q -n FusionInventory-Agent-%{version}%{?prever} -%endif +%setup -q -n FusionInventory-Agent-%{version} -%patch0 -p1 +# Remove bundled modules +rm -rf ./inc +sed -e '/^inc\//d' -i MANIFEST -# This work only on older version, and is ignored on recent -cat </dev/null ';' %{_fixperms} %{buildroot}/* +mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} +mkdir -p %{buildroot}%{_sysconfdir}/fusioninventory/conf.d +mkdir -p %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d -mkdir -p %{buildroot}%{_localstatedir}/{log,lib}/%{name} - -install -m 644 -D logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -install -m 644 -D %{name}.conf %{buildroot}%{_sysconfdir}/sysconfig/%{name} -install -m 644 -D agent.cfg %{buildroot}%{_sysconfdir}/fusioninventory/agent.cfg -install -m 755 -Dp %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.hourly/%{name} -install -m 755 -Dp %{SOURCE2} %{buildroot}%{_initrddir}/%{name} - -# Yum plugin installation -install -m 644 -D contrib/yum-plugin/%{name}.py %{buildroot}%{_prefix}/lib/yum-plugins/%{name}.py -install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum/pluginconf.d/%{name}.conf +install -m 644 -D %{name}.conf %{buildroot}%{_sysconfdir}/sysconfig/%{name} +install -m 755 -Dp %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.hourly/%{name} +install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %check -%if 0%{?rhel} || 0%{?fedora} < 14 -# requires perl(HTTP::Server::Simple::Authen) not yet available -rm t/ssl.t -%endif - -make test - - -%clean -rm -rf %{buildroot} %{buildroot}%{_datarootdir} - +#make test %post -/sbin/chkconfig --add %{name} +%systemd_post fusioninventory-agent.service %preun -if [ $1 -eq 0 ] ; then - /sbin/service %{name} stop &>/dev/null - /sbin/chkconfig --del %{name} -fi -exit 0 +%systemd_preun fusioninventory-agent.service %postun -if [ $1 -ge 1 ]; then - /sbin/service %{name} condrestart &>/dev/null -fi -exit 0 +%systemd_postun_with_restart fusioninventory-agent.service %files -%defattr(-, root, root, -) -%doc AUTHORS Changes LICENSE THANKS %dir %{_sysconfdir}/fusioninventory -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/fusioninventory/agent.cfg -%{_sysconfdir}/cron.hourly/%{name} -%{_initrddir}/%{name} -%{perl_vendorlib}/FusionInventory -%{perl_vendorlib}/auto +%config(noreplace) %{_sysconfdir}/fusioninventory/conf.d +%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 %{_bindir}/fusioninventory-agent %{_bindir}/fusioninventory-injector -%exclude %{_bindir}/%{name}-config %{_mandir}/man1/fusioninventory-agent* %{_mandir}/man1/fusioninventory-injector* -%{_mandir}/man3/Fusion* -%dir %{_localstatedir}/log/%{name} %dir %{_localstatedir}/lib/%{name} +%dir %{_datadir}/fusioninventory +%dir %{_datadir}/fusioninventory/lib +%dir %{_datadir}/fusioninventory/lib/FusionInventory +%dir %{_datadir}/fusioninventory/lib/FusionInventory/Agent +%dir %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task -%files yum-plugin -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf -%{_prefix}/lib/yum-plugins/%{name}.* + +%files -n perl-FusionInventory-Agent +%doc Changes LICENSE THANKS +#excluding sub-packages files +#%%exclude %%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/* +%{_datadir}/fusioninventory + +%files task-esx +%{_bindir}/fusioninventory-esx +%{_mandir}/man1/fusioninventory-esx.1* +%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/ESX.pm +%{_datadir}/fusioninventory/lib/FusionInventory/Agent/SOAP + +%files task-network +%{_bindir}/fusioninventory-netdiscovery +%{_bindir}/fusioninventory-netinventory +%{_mandir}/man1/fusioninventory-netdiscovery.1* +%{_mandir}/man1/fusioninventory-netinventory.1* +%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery.pm +%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/NetInventory.pm + +%files task-deploy +%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Deploy.pm +%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Deploy + +%files task-wakeonlan +%{_bindir}/fusioninventory-wakeonlan +%{_mandir}/man1/fusioninventory-wakeonlan.1* +%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm + +%files task-inventory +%{_bindir}/fusioninventory-inventory +%{_bindir}/fusioninventory-remoteinventory +%{_mandir}/man1/fusioninventory-*inventory.1* +%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Inventory.pm +%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Inventory + +%files task-collect +%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Collect.pm + +%files cron +%{_sysconfdir}/cron.hourly/%{name} +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 2.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 25 2024 Miroslav Suchý - 2.6-13 +- convert license to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 2.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 2.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 2.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 2.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 2.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jun 01 2022 Jitka Plesnikova - 2.6-6 +- Perl 5.36 rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 2.6-3 +- Perl 5.34 rebuild + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.6-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Fri Jan 29 2021 Marianne Lombard - 2.6-1 +- Bump release to 2.6 + +* Tue Jan 26 2021 Fedora Release Engineering - 2.5.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.5.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 23 2020 Jitka Plesnikova - 2.5.2-4 +- Perl 5.32 rebuild + +* Thu Mar 12 2020 Petr Pisar - 2.5.2-3 +- Specify all dependencies and unbundle Module::Install + +* Tue Jan 28 2020 Fedora Release Engineering - 2.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Dec 17 2019 Johan Cwiklinski - 2.5.2-1 +- Last upstream release +- Drop patch applied upstream + +* Mon Aug 12 2019 Marianne Lombard - 2.5.1-4 +- Fixing patch (thanks to E. Seyman - eseyman AT fedoraproject DOT org - help) and applying it +- Fix issue #1735227 : FTBFS + +* Thu Jul 25 2019 Fedora Release Engineering - 2.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jul 15 2019 Johan Cwiklinski - 2.5.1-2 +- Add upstream HTTP server patch +- add missing configuration files + +* Mon Jul 08 2019 Johan Cwiklinski - 2.5.1-1 +- Last upstream release +- Remove patches applied upstream + +* Thu May 30 2019 Jitka Plesnikova - 2.5-5 +- Perl 5.30 rebuild + +* Tue May 07 2019 Johan Cwiklinski - 2.5-4 +- Add patch to fix SSL on with http modules + +* Thu May 02 2019 Guillaume Bougard - 2.5-3 +- Add patches to fix agent HTTP server plugins integration + +* Thu Apr 18 2019 Johan Cwiklinski - 2.5-2 +- Re-add tasks files in main perl package, to solve dependencies issues on package + +* Mon Apr 15 2019 Johan Cwiklinski - 2.5-1 +- Last upstream release +- Tasks files were provided also in main perl package +- Apply upstream minor fixes patch +- task-wakeonlan is back (see https://github.com/fusioninventory/fusioninventory-agent/issues/495#issuecomment-435110369 about dependancy issue) + +* Tue Feb 26 2019 Johan Cwiklinski - 2.4.3-2 +- Remove yum plugin (and therefore dependency on yum) + +* Mon Feb 25 2019 Johan Cwiklinski - 2.4.3-1 +- Last upstream release + +* Thu Jan 31 2019 Fedora Release Engineering - 2.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Oct 03 2018 Johan Cwiklinski - 2.4.2-1 +- Last upstream release +- Drop patch applied upstream + +* Fri Jul 13 2018 Fedora Release Engineering - 2.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jul 10 2018 Johan Cwiklinski - 2.4.1-3 +- Add upstream patch to fix wrong variable name + +* Fri Jul 06 2018 Petr Pisar - 2.4.1-2 +- Perl 5.28 rebuild + +* Tue Jul 03 2018 Johan Cwiklinski - 2.4.1-1 +- Last upstream release + +* Wed Jun 27 2018 Jitka Plesnikova - 2.4-6 +- Perl 5.28 rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 2.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 26 2018 Johan Cwiklinski - 2.4-4 +- Logrotate is no longer needed since we now use syslog + +* Mon Jan 15 2018 Johan Cwiklinski - 2.4-3 +- Change logging according to upstream recommandations + +* Thu Jan 11 2018 Johan Cwiklinski - 2.4-2 +- Drop systemd override conf file, thits is no longer needed + +* Thu Jan 11 2018 Johan Cwiklinski - 2.4-1 +- Last upstream release +- Put cron stuff in a separate sub-package +- Provide conf.d configuration directory + +* Mon Oct 16 2017 Johan Cwiklinski - 2.3.21-3 +- Do not provides perl(setup); BZ #1485919 - thanks to E. Seyman + +* Thu Aug 10 2017 Johan Cwiklinski - 2.3.21-2 +- Fix missing provides issue on perl(setup) + +* Tue Aug 01 2017 Marianne Lombard - 2.3.21-1 +- Last upstream release + +* Wed Jul 26 2017 Fedora Release Engineering - 2.3.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jun 07 2017 Jitka Plesnikova - 2.3.20-2 +- Perl 5.26 re-rebuild of bootstrapped packages + +* Tue Jun 06 2017 Johan Cwiklinski - 2.3.20-1 +- Last upstream release +- Drop patches, upstream has provided fixes + +* Sun Jun 04 2017 Jitka Plesnikova - 2.3.19-4 +- Perl 5.26 rebuild + +* Wed May 17 2017 Jitka Plesnikova - 2.3.19-3 +- Fix building on Perl without '.' in @INC + +* Mon Feb 20 2017 Johan Cwiklinski - 2.3.19-2 +- Fix setup.pm values + +* Sat Feb 18 2017 Johan Cwiklinski - 2.3.19-1 +- Last upstream release + +* Thu Feb 09 2017 Johan Cwiklinski - 2.3.18-3 +- Change systemd unit to not use fork mode +- Re-add options in sysconfig file to get cron mode running + +* Wed Jun 22 2016 Johan Cwiklinski - 2.3.18-2 +- Add task-collect subpackage +- Change package source according to upstream recomendations + +* Tue Jun 21 2016 Johan Cwiklinski - 2.3.18-1 +- Last upstream release +- Handle macros in comments to make rpmlint happy +- Cleanup comments + +* Sun May 15 2016 Jitka Plesnikova - 2.3.17-3 +- Perl 5.24 rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 2.3.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Oct 7 2015 Marianne Lombard - 2.3.17 +- new version +- Upstream switch to github, minor spec adaptation + +* Wed Jul 8 2015 Marianne Lombard - 2.3.16-5 +- fix for #1240964 + +* Wed Jun 17 2015 Fedora Release Engineering - 2.3.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 06 2015 Jitka Plesnikova - 2.3.16-3 +- Perl 5.22 rebuild + +* Sun Mar 29 2015 Marianne Lombard - 2.3.16-2 +- commenting un-used BuildRequires + +* Sun Mar 1 2015 Marianne Lombard - 2.3.16 +- update to 2.3.16 +- adding BuildRequires needed by test + +* Sun Mar 1 2015 Marianne Lombard - 2.3.15-4 +- arch build (due to dmidecode dependancy in x86_64) + +* Fri Feb 20 2015 Marianne Lombard - 2.3.15-3 +- building as noarch + +* Wed Feb 11 2015 Marianne Lombard - 2.3.15-2 +- fix description of subpackage +- using upstream systemd unit file + +* Mon Feb 9 2015 Marianne Lombard - 2.3.15 +- new version and back in Fedora + +* Mon Jan 19 2015 Marianne Lombard - 2.3.14-2 +- enhancing spec according to review + +* Wed Dec 24 2014 Marianne Lombard - 2.3.14 +- new version + +* Mon Dec 15 2014 Marianne Lombard - 2.3.13 +- new version +- updating spec according to fedora-review + +* Tue Aug 5 2014 Marianne Lombard - 2.3.12 +- new version + +* Tue Aug 5 2014 Marianne Lombard - 2.3.10.1-2 +- adding missing requires +- updating config file + +* Mon Aug 4 2014 Marianne Lombard - 2.3.10.1 +- new version (bug fixes) + +* Fri Aug 1 2014 Marianne Lombard - 2.3.10 +- new version + +* Wed Jul 23 2014 Marianne Lombard - 2.3.9.1 +- new version + +* Tue May 20 2014 Marianne Lombard - 2.3.8-1 +- enhancing spec according to Michael Schwendt review +- adding missing requires + +* Fri May 16 2014 Marianne Lombard - 2.3.8 +- new version + +* Wed May 14 2014 Marianne Lombard - 2.3.7.1 +- new version + +* Sat Feb 1 2014 Marianne Lombard - 2.3.6 +- new version, reintroduction in fedora and epel +- cleanup of the spec (removing sysVinit stuff, old BuildRequires, old releases stuff) +- adding sub-packages for task-* (using Guillaume Rousse OBS spec as model https://build.opensuse.org/package/view_file/home:guillomovitch/fusioninventory-agent/fusioninventory-agent.spec) +- task-wakeonlan is excluded (dependancy issue) + +* Wed Aug 8 2012 Remi Collet - 2.2.4-2 +- dump release + +* Wed Aug 8 2012 Remi Collet - 2.2.4-1 +- version 2.2.4 fixes various bugs as described in + http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.4/Changes + http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.3/Changes + +* Thu Jul 19 2012 Fedora Release Engineering - 2.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jun 25 2012 Petr Pisar - 2.2.2-4 +- Perl 5.16 rebuild + +* Tue Jun 05 2012 Remi Collet - 2.2.2-3 +- no need for debuginfo (not really arch, fix #828960) +- yum plugin is also noarch + +* Thu May 31 2012 Remi Collet - 2.2.2-2 +- make package "arch" +- requires dmidecode when available (x86) +- add sub-package perl-FusionInventory-Agent (noarch) + +* Wed May 30 2012 Remi Collet - 2.2.2-1 +- update to 2.2.2 + http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.2/Changes + http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.1/Changes + +* Fri May 11 2012 Remi Collet - 2.2.0-2 +- filter private provides/requires + +* Thu May 10 2012 Remi Collet - 2.2.0-1 +- update to 2.2.0 + http://search.cpan.org/src/FUSINV/FusionInventory-Agent-2.2.0/Changes +- revert change in 2.2.0: don't loose arch information + see http://forge.fusioninventory.org/issues/1581 + +* Sun Feb 26 2012 Remi Collet - 2.1.14-1 +- update to 2.1.14 + http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.14/Changes + +* Fri Jan 13 2012 Fedora Release Engineering - 2.1.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Nov 28 2011 Remi Collet - 2.1.12-1 - update to 2.1.12 http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.12/Changes @@ -296,7 +620,7 @@ exit 0 * Sat Aug 06 2011 Remi Collet - 2.1.9-3 - adapt filter -* Fri Jul 25 2011 Petr Sabata - 2.1.9-2 +* Mon Jul 25 2011 Petr Sabata - 2.1.9-2 - Perl mass rebuild * Sun Jun 26 2011 Remi Collet 2.1.9-1 diff --git a/sources b/sources index 27bbf1d..76629c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ef5237d3504c0651fcbdb1a04d1cd26 FusionInventory-Agent-2.1.12.tar.gz +SHA512 (FusionInventory-Agent-2.6.tar.gz) = b400e8bbf1be117c110622e6f1e2e2eee744c4e79bf3686c9e4c9126f7d4cb7f2224149ab4e7ad9a686d0cdbcbe2aef1128766359270c7e9f00d78552f51aa45