From e40d3ac6c34c1f042a7186e50666ec69bda0e14a Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Tue, 3 Jul 2018 14:42:01 +0200 Subject: [PATCH 1/3] New upstream release --- .gitignore | 1 + fusioninventory-agent.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) 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/fusioninventory-agent.spec b/fusioninventory-agent.spec index 78e38b3..ffbe264 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: 5%{?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 03 2018 Johan Cwiklinski - 2.4.1-1 +- Last upstream release + * Wed Feb 07 2018 Fedora Release Engineering - 2.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild 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 d2c21eeb25ec1d4d078a49cd6979c4bd803bbfd0 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Tue, 10 Jul 2018 13:03:44 +0200 Subject: [PATCH 2/3] 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 ffbe264..355a4a6 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -10,10 +10,11 @@ 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 +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-2 +- Add upstream patch to fix wrong variable name + * Tue Jul 03 2018 Johan Cwiklinski - 2.4.1-1 - Last upstream release From 366746468a7ce746f7a976cc3b091031807e90d2 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Thu, 4 Oct 2018 15:04:01 +0200 Subject: [PATCH 3/3] New upstream release --- .gitignore | 1 + ...c7242660fa595f3877805d61d5fb05287bd3.patch | 32 ------------------- fusioninventory-agent.service | 2 ++ fusioninventory-agent.spec | 12 +++---- sources | 2 +- 5 files changed, 10 insertions(+), 39 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 355a4a6..c3ea6d1 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: 2%{?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,7 +307,10 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum %changelog -* Tue Jul 10 2018 Johan Cwiklinski - 2.4.1-2 +* Wed Oct 03 2018 Johan Cwiklinski - 2.4.2-1 +- Last upstream release +- Drop patch applied upstream + - Add upstream patch to fix wrong variable name * Tue Jul 03 2018 Johan Cwiklinski - 2.4.1-1 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