From c1aa6e3561e975cc3b02041851644c69be420169 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 27 Jun 2018 21:18:58 +0200 Subject: [PATCH 01/45] Perl 5.28 rebuild --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 78e38b3..aade66e 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -10,7 +10,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.4 -Release: 5%{?dist} +Release: 6%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -306,6 +306,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum %changelog +* 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 From 0b26970a8d01f9b46d1614cda7a4ad198aaf54f8 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Tue, 3 Jul 2018 14:42:01 +0200 Subject: [PATCH 02/45] New upstream release --- fusioninventory-agent.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index aade66e..aafda83 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,8 +9,8 @@ Group: Applications/System License: GPLv2+ URL: http://fusioninventory.org/ -Version: 2.4 -Release: 6%{?dist} +Version: 2.4.1 +Release: 1%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -200,7 +200,8 @@ EOF perl Makefile.PL \ PREFIX=%{_prefix} \ SYSCONFDIR=%{_sysconfdir}/fusioninventory \ - LOCALSTATEDIR=%{_localstatedir}/lib/%{name} + LOCALSTATEDIR=%{_localstatedir}/lib/%{name} \ + VERSION=%{version}-%{release} make %{?_smp_mflags} @@ -306,6 +307,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum %changelog +* Tue Jul 02 2018 Johan Cwiklinski - 2.4.1-1 +- Last upstream release + * Wed Jun 27 2018 Jitka Plesnikova - 2.4-6 - Perl 5.28 rebuild From a5720d6b97c420cd29b1dc76230baf85781d7c25 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Tue, 3 Jul 2018 14:43:43 +0200 Subject: [PATCH 03/45] New sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8b35181..30f116d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /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 diff --git a/sources b/sources index eda5def..02f0cee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FusionInventory-Agent-2.4.tar.gz) = f232ad610d11c46e7f0feb6dee0073c7d7f95af9d6903300327195bf9239769265cb5d21ddd7e9b7ff35f3328a75acb442f6e7fb995cd8452be9b49dfc0f5491 +SHA512 (FusionInventory-Agent-2.4.1.tar.gz) = 4ed768f706114b3de30e235673661dcb45021a7320428134b6773517e8397c0aa4957056a5616e421f12d21f504776eaa07f6b0fc80ea2f41dd6add15838eaf2 From a1a2dd5a291f26000b0eb25c6107a2871b3c0591 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Tue, 3 Jul 2018 14:46:06 +0200 Subject: [PATCH 04/45] Fix date in changelog --- fusioninventory-agent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index aafda83..dbbfffe 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -307,7 +307,7 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum %changelog -* Tue Jul 02 2018 Johan Cwiklinski - 2.4.1-1 +* Tue Jul 03 2018 Johan Cwiklinski - 2.4.1-1 - Last upstream release * Wed Jun 27 2018 Jitka Plesnikova - 2.4-6 From 61d059816b1e008c1c4e325fa01202fccec77313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 6 Jul 2018 09:36:36 +0200 Subject: [PATCH 05/45] Perl 5.28 rebuild --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index dbbfffe..ff04e74 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -10,7 +10,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -307,6 +307,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum %changelog +* 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 From d6e020d6db57b92214ca014bda5a9a39ee2c5f9e Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Tue, 10 Jul 2018 13:03:44 +0200 Subject: [PATCH 06/45] Apply upstream patch to fix wrong variable name --- ...c7242660fa595f3877805d61d5fb05287bd3.patch | 32 +++++++++++++++++++ fusioninventory-agent.spec | 8 ++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 f950c7242660fa595f3877805d61d5fb05287bd3.patch diff --git a/f950c7242660fa595f3877805d61d5fb05287bd3.patch b/f950c7242660fa595f3877805d61d5fb05287bd3.patch new file mode 100644 index 0000000..60ab1c8 --- /dev/null +++ b/f950c7242660fa595f3877805d61d5fb05287bd3.patch @@ -0,0 +1,32 @@ +From f950c7242660fa595f3877805d61d5fb05287bd3 Mon Sep 17 00:00:00 2001 +From: Guillaume Bougard +Date: Wed, 4 Jul 2018 13:44:38 +0200 +Subject: [PATCH] Fix type and wrong variable usage in new Scheduler target + only visible while using --lazy option from agent script + +--- + lib/FusionInventory/Agent/Target/Scheduler.pm | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/FusionInventory/Agent/Target/Scheduler.pm b/lib/FusionInventory/Agent/Target/Scheduler.pm +index 7c063725d0..beb271a1c6 100644 +--- a/lib/FusionInventory/Agent/Target/Scheduler.pm ++++ b/lib/FusionInventory/Agent/Target/Scheduler.pm +@@ -16,7 +16,7 @@ sub new { + my $self = $class->SUPER::new(%params); + + $self->{storage} = $params{storage}; +- $self->{name} = 'scheduler' . $count++, ++ $self->{id} = 'scheduler' . $count++; + + # handle persistent state + $self->_loadState(); +@@ -32,7 +32,7 @@ sub new { + sub getName { + my ($self) = @_; + +- return $self->{name}; ++ return $self->{id}; + } + + sub getType { diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index ff04e74..b9899e1 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -10,10 +10,11 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service +Patch0: f950c7242660fa595f3877805d61d5fb05287bd3.patch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl-generators @@ -158,6 +159,8 @@ fusioninventory cron task %prep %setup -q -n FusionInventory-Agent-%{version} +%patch0 -p1 + sed \ -e "s/logger = .*/logger = syslog/" \ -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \ @@ -307,6 +310,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum %changelog +* 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 From 681cb745602f173ec01ca80aee312577a3cd5e12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 00:57:35 +0000 Subject: [PATCH 07/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index b9899e1..e3e40c6 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -10,7 +10,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -310,6 +310,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum %changelog +* 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 From 426d25abba522bec04b98216eabbd8e653a3e302 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Thu, 4 Oct 2018 15:04:01 +0200 Subject: [PATCH 08/45] New upstream release --- .gitignore | 1 + ...c7242660fa595f3877805d61d5fb05287bd3.patch | 32 ------------------- fusioninventory-agent.service | 2 ++ fusioninventory-agent.spec | 11 ++++--- sources | 2 +- 5 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 f950c7242660fa595f3877805d61d5fb05287bd3.patch diff --git a/.gitignore b/.gitignore index 30f116d..0636e04 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /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 diff --git a/f950c7242660fa595f3877805d61d5fb05287bd3.patch b/f950c7242660fa595f3877805d61d5fb05287bd3.patch deleted file mode 100644 index 60ab1c8..0000000 --- a/f950c7242660fa595f3877805d61d5fb05287bd3.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f950c7242660fa595f3877805d61d5fb05287bd3 Mon Sep 17 00:00:00 2001 -From: Guillaume Bougard -Date: Wed, 4 Jul 2018 13:44:38 +0200 -Subject: [PATCH] Fix type and wrong variable usage in new Scheduler target - only visible while using --lazy option from agent script - ---- - lib/FusionInventory/Agent/Target/Scheduler.pm | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/FusionInventory/Agent/Target/Scheduler.pm b/lib/FusionInventory/Agent/Target/Scheduler.pm -index 7c063725d0..beb271a1c6 100644 ---- a/lib/FusionInventory/Agent/Target/Scheduler.pm -+++ b/lib/FusionInventory/Agent/Target/Scheduler.pm -@@ -16,7 +16,7 @@ sub new { - my $self = $class->SUPER::new(%params); - - $self->{storage} = $params{storage}; -- $self->{name} = 'scheduler' . $count++, -+ $self->{id} = 'scheduler' . $count++; - - # handle persistent state - $self->_loadState(); -@@ -32,7 +32,7 @@ sub new { - sub getName { - my ($self) = @_; - -- return $self->{name}; -+ return $self->{id}; - } - - sub getType { diff --git a/fusioninventory-agent.service b/fusioninventory-agent.service index 2e220d4..56526ab 100644 --- a/fusioninventory-agent.service +++ b/fusioninventory-agent.service @@ -11,10 +11,12 @@ [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 e3e40c6..4fbb79a 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,12 +9,11 @@ Group: Applications/System License: GPLv2+ URL: http://fusioninventory.org/ -Version: 2.4.1 -Release: 4%{?dist} +Version: 2.4.2 +Release: 1%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service -Patch0: f950c7242660fa595f3877805d61d5fb05287bd3.patch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl-generators @@ -159,8 +158,6 @@ fusioninventory cron task %prep %setup -q -n FusionInventory-Agent-%{version} -%patch0 -p1 - sed \ -e "s/logger = .*/logger = syslog/" \ -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \ @@ -310,6 +307,10 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum %changelog +* 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 diff --git a/sources b/sources index 02f0cee..5171ea3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FusionInventory-Agent-2.4.1.tar.gz) = 4ed768f706114b3de30e235673661dcb45021a7320428134b6773517e8397c0aa4957056a5616e421f12d21f504776eaa07f6b0fc80ea2f41dd6add15838eaf2 +SHA512 (FusionInventory-Agent-2.4.2.tar.gz) = 02da9013011de3964ffff5f320516aa1a44aa0bc88f4b5ca5de0224feb7567ed9cb5c3529309ce42bfcc87cbb20f131d88c95ebe2136eb18d35b2837cebda45f From ab52212c105f4dbf846915b832a285acac1330fc Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:44 +0100 Subject: [PATCH 09/45] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- fusioninventory-agent.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 4fbb79a..bc2ae3e 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -5,7 +5,6 @@ Name: fusioninventory-agent Summary: FusionInventory agent -Group: Applications/System License: GPLv2+ URL: http://fusioninventory.org/ @@ -84,7 +83,6 @@ VMWare vCenter/ESX/ESXi server through SOAP interface %package yum-plugin Summary: Ask FusionInventory agent to send an inventory when yum exits -Group: System Environment/Base BuildArch: noarch Requires: yum Requires: %{name} @@ -97,7 +95,6 @@ This requires the service to be running with the --rpc-trust-localhost option. %package task-network Summary: NetDiscovery and NetInventory task for FusionInventory -Group: Applications/System BuildArch: noarch Requires: %{name} = %{version}-%{release} @@ -106,7 +103,6 @@ fusioninventory-task-netdiscovery and fusioninventory-task-netinventory %package task-deploy Summary: Software deployment support for FusionInventory agent -Group: Applications/System BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: perl(Archive::Extract) @@ -119,7 +115,6 @@ This package provides software deployment support for FusionInventory-agent # perl-Net-Write is licenced under Artistic Perl v1 licence, not accepted in Fedora %package task-wakeonlan Summary: WakeOnLan task for FusionInventory -Group: Applications/System BuildArch: noarch Requires: %{name} = %{version}-%{release} @@ -129,7 +124,6 @@ fusioninventory-task-wakeonlan %package task-inventory Summary: Inventory task for FusionInventory -Group: Applications/System Requires: %{name} = %{version}-%{release} Requires: perl(Net::CUPS) Requires: perl(Parse::EDID) @@ -139,7 +133,6 @@ fusioninventory-task-inventory %package task-collect Summary: Custom information retrieval support for FusionInventory agent -Group: Applications/System Requires: %{name} = %{version}-%{release} %description task-collect @@ -148,7 +141,6 @@ FusionInventory agent %package cron Summary: Cron for FusionInventory agent -Group: Applications/System Requires: %{name} = %{version}-%{release} %description cron From 30445f1d1e55eb4c5d62ec58456e169be3f4f070 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 20:19:44 +0000 Subject: [PATCH 10/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index bc2ae3e..a4a8dd4 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -299,6 +299,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum %changelog +* 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 From 89dc01366ce76089af633cd0d5f0a8d7b6489b59 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 25 Feb 2019 15:31:35 +0100 Subject: [PATCH 11/45] New upstream release --- .gitignore | 1 + fusioninventory-agent.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0636e04..b4e0edf 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /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 diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index a4a8dd4..cc17039 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -8,8 +8,8 @@ Summary: FusionInventory agent License: GPLv2+ URL: http://fusioninventory.org/ -Version: 2.4.2 -Release: 2%{?dist} +Version: 2.4.3 +Release: 1%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -299,6 +299,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum %changelog +* 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 diff --git a/sources b/sources index 5171ea3..bc0e88a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FusionInventory-Agent-2.4.2.tar.gz) = 02da9013011de3964ffff5f320516aa1a44aa0bc88f4b5ca5de0224feb7567ed9cb5c3529309ce42bfcc87cbb20f131d88c95ebe2136eb18d35b2837cebda45f +SHA512 (FusionInventory-Agent-2.4.3.tar.gz) = 079ce8355b347c213e330c0f5652da524579a29d72c668a05ec0a80978e9a113c8310f4e243a52151c03dfacd25014b2010aebc4ec3ea19b14bf320fd060964f From 3240e9ee529b9cb25ed58cec7c5ed9e955f25716 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Tue, 26 Feb 2019 17:36:17 +0100 Subject: [PATCH 12/45] Remove dependency on yum --- fusioninventory-agent.spec | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index cc17039..d3038bb 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -81,17 +81,6 @@ Requires: %{name} = %{version}-%{release} fusioninventory-agent-task-ESX ask the running service agent to inventory an VMWare vCenter/ESX/ESXi server through SOAP interface -%package yum-plugin -Summary: Ask FusionInventory agent to send an inventory when yum exits -BuildArch: noarch -Requires: yum -Requires: %{name} - -%description yum-plugin -fusioninventory-agent-yum-plugin asks the running service agent to send an -inventory when yum exits. - -This requires the service to be running with the --rpc-trust-localhost option. %package task-network Summary: NetDiscovery and NetInventory task for FusionInventory @@ -167,7 +156,7 @@ cat < - 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 From 4f71a4d8b78755683f66aaf637de013b82960491 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Tue, 26 Feb 2019 17:38:03 +0100 Subject: [PATCH 13/45] Fix syntax --- fusioninventory-agent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index d3038bb..9af1997 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -281,7 +281,7 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog -- Tue Deb 26 2019 Johan Cwiklinski - 2.4.3-2 +* 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 From 579d0b4c36c5755aba089beb465bde364dace559 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 15 Apr 2019 10:48:14 +0200 Subject: [PATCH 14/45] New upstream release, drop task files from main perl package --- .gitignore | 1 + fusioninventory-agent-7ae7c838b.patch | 56 +++++++++++++++++++++++++++ fusioninventory-agent.spec | 27 +++++++++---- sources | 2 +- 4 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 fusioninventory-agent-7ae7c838b.patch diff --git a/.gitignore b/.gitignore index b4e0edf..2f5d9f1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /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 diff --git a/fusioninventory-agent-7ae7c838b.patch b/fusioninventory-agent-7ae7c838b.patch new file mode 100644 index 0000000..ba96d23 --- /dev/null +++ b/fusioninventory-agent-7ae7c838b.patch @@ -0,0 +1,56 @@ +From 7ae7c838b156ba1b6bf89ab60ba9c8df04532dd0 Mon Sep 17 00:00:00 2001 +From: Guillaume Bougard +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 +--- + Changes | 8 ++++++++ + Makefile.PL | 1 + + lib/FusionInventory/Agent/Task/Inventory.pm | 2 +- + 3 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/Changes b/Changes +index 83be862d0d..36849904a7 100644 +--- a/Changes ++++ b/Changes +@@ -1,5 +1,13 @@ + Revision history for FusionInventory agent + ++2.5.1 not relased yet ++ ++core: ++* build: fix fusioninventory-remoteinventory was not installed ++ ++inventory: ++* fix error message while starting fusioninventory-inventory script ++ + 2.5 Fri, 12 Apr 2019 + + core: +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 diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 9af1997..c4bff8e 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -8,11 +8,12 @@ Summary: FusionInventory agent License: GPLv2+ URL: http://fusioninventory.org/ -Version: 2.4.3 -Release: 2%{?dist} +Version: 2.5 +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 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl-generators @@ -139,6 +140,9 @@ fusioninventory cron task %prep %setup -q -n FusionInventory-Agent-%{version} +%patch0 -p1 + + sed \ -e "s/logger = .*/logger = syslog/" \ -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \ @@ -221,6 +225,10 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %dir %{_sysconfdir}/fusioninventory %config(noreplace) %{_sysconfdir}/fusioninventory/agent.cfg %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 + %{_unitdir}/%{name}.service %dir %{_sysconfdir}/systemd/system/%{name}.service.d %{_bindir}/fusioninventory-agent @@ -233,13 +241,12 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %dir %{_datadir}/fusioninventory/lib/FusionInventory %dir %{_datadir}/fusioninventory/lib/FusionInventory/Agent %dir %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task -#excluding sub-packages files -#%%exclude %%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/ - %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 @@ -264,11 +271,12 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service #%%files task-wakeonlan %exclude %{_bindir}/fusioninventory-wakeonlan %exclude %{_mandir}/man1/fusioninventory-wakeonlan.1* -%exclude %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm +#%%exclude %%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm %files task-inventory %{_bindir}/fusioninventory-inventory -%{_mandir}/man1/fusioninventory-inventory.1* +%{_bindir}/fusioninventory-remoteinventory +%{_mandir}/man1/fusioninventory-*inventory.1* %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Inventory.pm %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Inventory @@ -281,6 +289,11 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 + * Tue Feb 26 2019 Johan Cwiklinski - 2.4.3-2 - Remove yum plugin (and therefore dependency on yum) diff --git a/sources b/sources index bc0e88a..9479a53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FusionInventory-Agent-2.4.3.tar.gz) = 079ce8355b347c213e330c0f5652da524579a29d72c668a05ec0a80978e9a113c8310f4e243a52151c03dfacd25014b2010aebc4ec3ea19b14bf320fd060964f +SHA512 (FusionInventory-Agent-2.5.tar.gz) = 37f0545df716e482fffd018a56b9c7482d7fce64fd0fa277c481a553a2108e7588f34077fb4775bb6352668efc96b3525fe97b1d6331d637401e8db8c0c91333 From c5f4c47da44535e6d5a323d59b46937c24dfa2d7 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 15 Apr 2019 11:31:57 +0200 Subject: [PATCH 15/45] Add wakeonlan task --- fusioninventory-agent.spec | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index c4bff8e..023b690 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -57,7 +57,7 @@ You can add additional packages for optional tasks: * fusioninventory-agent-task-collect Custom information retrieval support * fusioninventory-agent-task-wakeonlan - not included due to a licensing issue for perl-Net-Write + Wake o lan task %package -n perl-FusionInventory-Agent @@ -100,9 +100,6 @@ Requires: perl(Archive::Extract) %description task-deploy This package provides software deployment support for FusionInventory-agent -%if !%{defined perl_net_write} -# Excluded due to the absence of perl-Net-Write -# perl-Net-Write is licenced under Artistic Perl v1 licence, not accepted in Fedora %package task-wakeonlan Summary: WakeOnLan task for FusionInventory BuildArch: noarch @@ -110,7 +107,6 @@ Requires: %{name} = %{version}-%{release} %description task-wakeonlan fusioninventory-task-wakeonlan -%endif %package task-inventory Summary: Inventory task for FusionInventory @@ -267,11 +263,10 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Deploy.pm %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Deploy -# Excluding task-wakeonlan -#%%files task-wakeonlan -%exclude %{_bindir}/fusioninventory-wakeonlan -%exclude %{_mandir}/man1/fusioninventory-wakeonlan.1* -#%%exclude %%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm +%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 @@ -293,6 +288,7 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service - 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) From 5cfda3230be8084bc4a3a41b8d00831287e687b0 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Thu, 18 Apr 2019 13:43:17 +0200 Subject: [PATCH 16/45] Re-add tasks files in main perl package, to solve dependencies issues on package --- fusioninventory-agent.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 023b690..f010cca 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.5 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -242,7 +242,7 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %files -n perl-FusionInventory-Agent %doc Changes LICENSE THANKS #excluding sub-packages files -%exclude %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/* +#%%exclude %%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/* %{_datadir}/fusioninventory %files task-esx @@ -284,6 +284,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 607a6da4d137fef9526810977f845cce278c5d97 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Thu, 2 May 2019 11:21:09 +0200 Subject: [PATCH 17/45] Fix httpd server plugin integration --- fix-httpd-plugins-configs-folder.patch | 21 +++++++++++++++++++++ fix-install-httpd-plugins-configs.patch | 17 +++++++++++++++++ fusioninventory-agent-7ae7c838b.patch | 21 +-------------------- fusioninventory-agent.spec | 11 +++++++++-- 4 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 fix-httpd-plugins-configs-folder.patch create mode 100644 fix-install-httpd-plugins-configs.patch diff --git a/fix-httpd-plugins-configs-folder.patch b/fix-httpd-plugins-configs-folder.patch new file mode 100644 index 0000000..9db5b8c --- /dev/null +++ b/fix-httpd-plugins-configs-folder.patch @@ -0,0 +1,21 @@ +commit b4710078310e9a5243932ab90b77b760fa97faa3 +Author: Guillaume Bougard +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 diff --git a/fix-install-httpd-plugins-configs.patch b/fix-install-httpd-plugins-configs.patch new file mode 100644 index 0000000..3fabbc2 --- /dev/null +++ b/fix-install-httpd-plugins-configs.patch @@ -0,0 +1,17 @@ +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 diff --git a/fusioninventory-agent-7ae7c838b.patch b/fusioninventory-agent-7ae7c838b.patch index ba96d23..cafe66c 100644 --- a/fusioninventory-agent-7ae7c838b.patch +++ b/fusioninventory-agent-7ae7c838b.patch @@ -6,29 +6,10 @@ Subject: [PATCH] fix: Add few minor fixes * build: fix fusioninventory-remoteinventory was not installed * inventory: fix error message while starting fusioninventory-inventory script --- - Changes | 8 ++++++++ Makefile.PL | 1 + lib/FusionInventory/Agent/Task/Inventory.pm | 2 +- - 3 files changed, 10 insertions(+), 1 deletion(-) + 2 files changed, 2 insertions(+), 1 deletion(-) -diff --git a/Changes b/Changes -index 83be862d0d..36849904a7 100644 ---- a/Changes -+++ b/Changes -@@ -1,5 +1,13 @@ - Revision history for FusionInventory agent - -+2.5.1 not relased yet -+ -+core: -+* build: fix fusioninventory-remoteinventory was not installed -+ -+inventory: -+* fix error message while starting fusioninventory-inventory script -+ - 2.5 Fri, 12 Apr 2019 - - core: diff --git a/Makefile.PL b/Makefile.PL index 38e6eebdca..71aae700c9 100644 --- a/Makefile.PL diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index f010cca..56974fc 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,11 +9,13 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.5 -Release: 2%{?dist} +Release: 3%{?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 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl-generators @@ -137,6 +139,8 @@ fusioninventory cron task %setup -q -n FusionInventory-Agent-%{version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 sed \ @@ -284,10 +288,13 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 +* 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 From 4f73478826cc78f01d282c2ff943164663023a40 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Tue, 7 May 2019 14:47:06 +0200 Subject: [PATCH 18/45] Add patch to fix SSL on with http modules --- fusioninventory-agent-d4f29af.patch | 23 +++++++++++++++++++++++ fusioninventory-agent.spec | 7 ++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 fusioninventory-agent-d4f29af.patch diff --git a/fusioninventory-agent-d4f29af.patch b/fusioninventory-agent-d4f29af.patch new file mode 100644 index 0000000..8282318 --- /dev/null +++ b/fusioninventory-agent-d4f29af.patch @@ -0,0 +1,23 @@ +From d4f29affa9c9b8e80ea53171570c6d70eab28027 Mon Sep 17 00:00:00 2001 +From: Guillaume Bougard +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; diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 56974fc..d3d7e9f 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,13 +9,14 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.5 -Release: 3%{?dist} +Release: 4%{?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 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl-generators @@ -141,6 +142,7 @@ fusioninventory cron task %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 sed \ @@ -288,6 +290,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From e09c20a06a8165497a2cbebb3ca4b045481b041e Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 30 May 2019 13:23:30 +0200 Subject: [PATCH 19/45] Perl 5.30 rebuild --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index d3d7e9f..7220138 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.5 -Release: 4%{?dist} +Release: 5%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -290,6 +290,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From fdda74df57ded6dfa059f9a894a6fae9dba586ac Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 8 Jul 2019 14:10:14 +0200 Subject: [PATCH 20/45] New upstream release --- .gitignore | 1 + fix-httpd-plugins-configs-folder.patch | 21 -------------- fix-install-httpd-plugins-configs.patch | 17 ------------ fusioninventory-agent-7ae7c838b.patch | 37 ------------------------- fusioninventory-agent-d4f29af.patch | 23 --------------- fusioninventory-agent.spec | 18 ++++-------- sources | 2 +- 7 files changed, 8 insertions(+), 111 deletions(-) delete mode 100644 fix-httpd-plugins-configs-folder.patch delete mode 100644 fix-install-httpd-plugins-configs.patch delete mode 100644 fusioninventory-agent-7ae7c838b.patch delete mode 100644 fusioninventory-agent-d4f29af.patch diff --git a/.gitignore b/.gitignore index 2f5d9f1..8607f58 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /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 diff --git a/fix-httpd-plugins-configs-folder.patch b/fix-httpd-plugins-configs-folder.patch deleted file mode 100644 index 9db5b8c..0000000 --- a/fix-httpd-plugins-configs-folder.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit b4710078310e9a5243932ab90b77b760fa97faa3 -Author: Guillaume Bougard -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 diff --git a/fix-install-httpd-plugins-configs.patch b/fix-install-httpd-plugins-configs.patch deleted file mode 100644 index 3fabbc2..0000000 --- a/fix-install-httpd-plugins-configs.patch +++ /dev/null @@ -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 diff --git a/fusioninventory-agent-7ae7c838b.patch b/fusioninventory-agent-7ae7c838b.patch deleted file mode 100644 index cafe66c..0000000 --- a/fusioninventory-agent-7ae7c838b.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7ae7c838b156ba1b6bf89ab60ba9c8df04532dd0 Mon Sep 17 00:00:00 2001 -From: Guillaume Bougard -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 diff --git a/fusioninventory-agent-d4f29af.patch b/fusioninventory-agent-d4f29af.patch deleted file mode 100644 index 8282318..0000000 --- a/fusioninventory-agent-d4f29af.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d4f29affa9c9b8e80ea53171570c6d70eab28027 Mon Sep 17 00:00:00 2001 -From: Guillaume Bougard -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; diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 7220138..0c53a09 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -8,15 +8,11 @@ Summary: FusionInventory agent 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 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl-generators @@ -139,12 +135,6 @@ fusioninventory cron task %prep %setup -q -n FusionInventory-Agent-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - - sed \ -e "s/logger = .*/logger = syslog/" \ -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \ @@ -290,6 +280,10 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 diff --git a/sources b/sources index 9479a53..3592c0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FusionInventory-Agent-2.5.tar.gz) = 37f0545df716e482fffd018a56b9c7482d7fce64fd0fa277c481a553a2108e7588f34077fb4775bb6352668efc96b3525fe97b1d6331d637401e8db8c0c91333 +SHA512 (FusionInventory-Agent-2.5.1.tar.gz) = c8c44801acdd574d5b4a2173f5f7b0b6275abc2ac4925c64313a1dde3a717d796e7f5d9a35e9b02b966f08cb985e3ae064d8797de0c30fede8b131bc9bb64955 From 745c4a74db6429c7d4ef1153eb6829b0c6b6457d Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 15 Jul 2019 07:42:04 +0200 Subject: [PATCH 21/45] Add upstream fix on http server, add missing configuration files --- ...stall-all-httpd-plugins-default-configs.patch | 16 ++++++++++++++++ fusioninventory-agent.spec | 9 ++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 fix-install-all-httpd-plugins-default-configs.patch diff --git a/fix-install-all-httpd-plugins-default-configs.patch b/fix-install-all-httpd-plugins-default-configs.patch new file mode 100644 index 0000000..3e079c4 --- /dev/null +++ b/fix-install-all-httpd-plugins-default-configs.patch @@ -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; \ diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 0c53a09..06b2595 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,10 +9,11 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service +Patch0: fix-install-all-httpd-plugins-default-configs.patch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl-generators @@ -220,6 +221,8 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %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 @@ -280,6 +283,10 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 72759a0b8de558cd062d9023da4cc79c6e89b346 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 01:12:01 +0000 Subject: [PATCH 22/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 06b2595..38ed34b 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -283,6 +283,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From dba7d0eddf97b182a498345cccd3e36b40805660 Mon Sep 17 00:00:00 2001 From: Marianne Lombard Date: Mon, 12 Aug 2019 12:45:22 +0200 Subject: [PATCH 23/45] fixing space / tabulation issue in patch --- ...ll-all-httpd-plugins-default-configs.patch | 20 +++++++++---------- fusioninventory-agent.spec | 7 ++++++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/fix-install-all-httpd-plugins-default-configs.patch b/fix-install-all-httpd-plugins-default-configs.patch index 3e079c4..45604d9 100644 --- a/fix-install-all-httpd-plugins-default-configs.patch +++ b/fix-install-all-httpd-plugins-default-configs.patch @@ -4,13 +4,13 @@ index 6c62baa1f..551bf89f6 100644 +++ 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; \ + $(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; \ diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 38ed34b..3ac5067 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -135,6 +135,7 @@ fusioninventory cron task %prep %setup -q -n FusionInventory-Agent-%{version} +%patch0 -p1 sed \ -e "s/logger = .*/logger = syslog/" \ @@ -283,6 +284,10 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From fe0c1cca9b7895c4aa5ea514a65406e566e685a8 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Tue, 17 Dec 2019 08:33:38 +0100 Subject: [PATCH 24/45] New upstream release --- .gitignore | 1 + ...stall-all-httpd-plugins-default-configs.patch | 16 ---------------- fusioninventory-agent.spec | 10 ++++++---- sources | 2 +- 4 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 fix-install-all-httpd-plugins-default-configs.patch diff --git a/.gitignore b/.gitignore index 8607f58..e8e9515 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /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 diff --git a/fix-install-all-httpd-plugins-default-configs.patch b/fix-install-all-httpd-plugins-default-configs.patch deleted file mode 100644 index 45604d9..0000000 --- a/fix-install-all-httpd-plugins-default-configs.patch +++ /dev/null @@ -1,16 +0,0 @@ -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; \ diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 3ac5067..3289f1a 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -8,12 +8,11 @@ Summary: FusionInventory agent License: GPLv2+ URL: http://fusioninventory.org/ -Version: 2.5.1 -Release: 4%{?dist} +Version: 2.5.2 +Release: 1%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service -Patch0: fix-install-all-httpd-plugins-default-configs.patch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl-generators @@ -135,7 +134,6 @@ fusioninventory cron task %prep %setup -q -n FusionInventory-Agent-%{version} -%patch0 -p1 sed \ -e "s/logger = .*/logger = syslog/" \ @@ -284,6 +282,10 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 diff --git a/sources b/sources index 3592c0b..c30ad82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FusionInventory-Agent-2.5.1.tar.gz) = c8c44801acdd574d5b4a2173f5f7b0b6275abc2ac4925c64313a1dde3a717d796e7f5d9a35e9b02b966f08cb985e3ae064d8797de0c30fede8b131bc9bb64955 +SHA512 (FusionInventory-Agent-2.5.2.tar.gz) = ddfcd5c811a118d06a07b21028781d211908afaca2276eeea25fdea0e08a880d5c38f3eeb27bda10cda5a7cee5befbb74071e78c908d9f14223d365ea2aa7757 From 189c2bb86c1f4b6d9905af8c21822b9bf47b3282 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 19:10:45 +0000 Subject: [PATCH 25/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 3289f1a..671f619 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -282,6 +282,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 93a4306728b0139c9e1365b2cdc549692193c083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 12 Mar 2020 12:38:10 +0100 Subject: [PATCH 26/45] Specify all dependencies and unbundle Module::Install --- fusioninventory-agent.spec | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 671f619..75d31ce 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,14 +9,29 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make BuildRequires: perl-generators -BuildRequires: perl(ExtUtils::MakeMaker) +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} @@ -135,6 +150,10 @@ fusioninventory cron task %prep %setup -q -n FusionInventory-Agent-%{version} +# Remove bundled modules +rm -rf ./inc +sed -e '/^inc\//d' -i MANIFEST + sed \ -e "s/logger = .*/logger = syslog/" \ -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \ @@ -282,6 +301,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From a042272d6d90aa3663f4dd2d1b5345af0da1b6fc Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 23 Jun 2020 10:17:38 +0200 Subject: [PATCH 27/45] Perl 5.32 rebuild --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 75d31ce..8fb2f77 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -301,6 +301,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 24feff36291960291e8dfb16fc6892eda6e7fc4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 17:58:09 +0000 Subject: [PATCH 28/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 8fb2f77..f45611b 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.5.2 -Release: 4%{?dist} +Release: 5%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -301,6 +301,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 6460b5987981cf487973b1d6918302713feae550 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 06:03:32 +0000 Subject: [PATCH 29/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index f45611b..218802e 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.5.2 -Release: 5%{?dist} +Release: 6%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -301,6 +301,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From ad05370a3b6692fede1b73bdd2ff941bb7be92d3 Mon Sep 17 00:00:00 2001 From: Marianne Lombard Date: Fri, 29 Jan 2021 12:07:15 +0100 Subject: [PATCH 30/45] Bump release to 2.6 --- .gitignore | 1 + fusioninventory-agent.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e8e9515..2b7f668 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /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.spec b/fusioninventory-agent.spec index 218802e..f9dad07 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -8,8 +8,8 @@ Summary: FusionInventory agent License: GPLv2+ URL: http://fusioninventory.org/ -Version: 2.5.2 -Release: 6%{?dist} +Version: 2.6 +Release: 1%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -301,6 +301,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 diff --git a/sources b/sources index c30ad82..76629c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FusionInventory-Agent-2.5.2.tar.gz) = ddfcd5c811a118d06a07b21028781d211908afaca2276eeea25fdea0e08a880d5c38f3eeb27bda10cda5a7cee5befbb74071e78c908d9f14223d365ea2aa7757 +SHA512 (FusionInventory-Agent-2.6.tar.gz) = b400e8bbf1be117c110622e6f1e2e2eee744c4e79bf3686c9e4c9126f7d4cb7f2224149ab4e7ad9a686d0cdbcbe2aef1128766359270c7e9f00d78552f51aa45 From de66d0d6965ac29f60d01355ef6addfed5a96b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:46 +0100 Subject: [PATCH 31/45] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- fusioninventory-agent.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index f9dad07..f94309c 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.6 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -301,6 +301,10 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 5e27f5eb73e6d1d89595ca1ea29c5edbbc14c608 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 22:56:49 +0200 Subject: [PATCH 32/45] Perl 5.34 rebuild --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index f94309c..fe06170 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.6 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -301,6 +301,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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. From 5f786c0e482a3664408e732ac07645415833a056 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 23:29:43 +0000 Subject: [PATCH 33/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index fe06170..0a2dd8e 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.6 -Release: 3%{?dist} +Release: 4%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -301,6 +301,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 9e6c150271f38a849bb5d7cf39b9838870dfd3f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 03:33:56 +0000 Subject: [PATCH 34/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 0a2dd8e..482eb6e 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.6 -Release: 4%{?dist} +Release: 5%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -301,6 +301,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 88af0f06cab4515f84925e0bd545088e5e44be0f Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 1 Jun 2022 11:35:51 +0200 Subject: [PATCH 35/45] Perl 5.36 rebuild --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 482eb6e..e82db99 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.6 -Release: 5%{?dist} +Release: 6%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -301,6 +301,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 714c55ab02105244e2b84747e8a1223660cc54d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 03:46:49 +0000 Subject: [PATCH 36/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index e82db99..cace1f2 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.6 -Release: 6%{?dist} +Release: 7%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -301,6 +301,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 687049deb49a2394403c5d504991fd782243cf0a Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 09:35:06 +0100 Subject: [PATCH 37/45] Remove perl(MODULE_COMPAT), it will be replaced by generators --- fusioninventory-agent.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index cace1f2..0a28ee3 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -14,7 +14,6 @@ Source0: https://github.com/fusioninventory/%{name}/releases/download/%{vers Source1: %{name}.cron Source10: %{name}.service -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: coreutils BuildRequires: findutils BuildRequires: make @@ -77,7 +76,6 @@ You can add additional packages for optional tasks: %package -n perl-FusionInventory-Agent Summary: Libraries for Fusioninventory agent BuildArch: noarch -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(LWP) Requires: perl(Net::CUPS) Requires: perl(Net::SSLeay) From 9c1fa7578b943338e1c2faae12f6e7ac08f9cd95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 04:03:02 +0000 Subject: [PATCH 38/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 0a28ee3..92b9dbd 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.6 -Release: 7%{?dist} +Release: 8%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -299,6 +299,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 8fe8d7a4b7782da7b00edcadd4dc8f2b0e11eee9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 20:25:24 +0000 Subject: [PATCH 39/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 92b9dbd..8688d8b 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.6 -Release: 8%{?dist} +Release: 9%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -299,6 +299,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 55a2989d5c6ce21147244b3071f6cc7fa00bbd6a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:56:43 +0000 Subject: [PATCH 40/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 8688d8b..85c5697 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.6 -Release: 9%{?dist} +Release: 10%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -299,6 +299,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 0d561d42c3c85f3cad3f178eec7d10ec461a9cd8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 12:11:19 +0000 Subject: [PATCH 41/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 85c5697..05d211c 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.6 -Release: 10%{?dist} +Release: 11%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -299,6 +299,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From b77ee3bddbad61f0ad772cc41885bca01aa54d7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:48:41 +0000 Subject: [PATCH 42/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 05d211c..99e777e 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -9,7 +9,7 @@ License: GPLv2+ URL: http://fusioninventory.org/ Version: 2.6 -Release: 11%{?dist} +Release: 12%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -299,6 +299,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 7eca12a54725ba5b3747e909d5b81b2e3a6a5547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 23:56:13 +0200 Subject: [PATCH 43/45] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- fusioninventory-agent.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 99e777e..44ae1f2 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -5,11 +5,12 @@ Name: fusioninventory-agent Summary: FusionInventory agent -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://fusioninventory.org/ Version: 2.6 -Release: 12%{?dist} +Release: 13%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -299,6 +300,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 128e0e2eec02f78108cc4dce0c3bbb944569de13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 19:01:29 +0000 Subject: [PATCH 44/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 44ae1f2..8138379 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -10,7 +10,7 @@ License: GPL-2.0-or-later URL: http://fusioninventory.org/ Version: 2.6 -Release: 13%{?dist} +Release: 14%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -300,6 +300,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog +* 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 From 61c65f6c930cbc8dcfda04872025182ba82276cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:53:29 +0000 Subject: [PATCH 45/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- fusioninventory-agent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 8138379..8b94faf 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -10,7 +10,7 @@ License: GPL-2.0-or-later URL: http://fusioninventory.org/ Version: 2.6 -Release: 14%{?dist} +Release: 15%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service @@ -300,6 +300,9 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %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