From 6ed134f33f23a3d47cc00c59433c27768e34d29e Mon Sep 17 00:00:00 2001 From: Guillaume Bougard Date: Thu, 21 Dec 2023 14:56:46 +0100 Subject: [PATCH 1/2] feat: Updated IDS files --- Changes | 1 + share/sysobject.ids | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/Changes b/Changes index 01ecb0be3..87f82b12f 100644 --- a/Changes +++ b/Changes @@ -53,6 +53,7 @@ netdiscovery/netinventory: * Use new local target API to set expected saving folder * Bump NetDiscovery task version to 6.1 * Bump NetInventory task version to 6.1 +* Updated sysobject.ids esx: * Fix first connection timeout support diff --git a/share/sysobject.ids b/share/sysobject.ids index 107666f3d..bcbc47dcc 100644 --- a/share/sysobject.ids +++ b/share/sysobject.ids @@ -7297,6 +7297,13 @@ 20301 IBM NETWORKING 20301.1.18.15 IBM NETWORKING Flex System Fabric CN4093 10Gb Converged Scalable Switch +20998 Honeywell +20998.3.1.1.1 Honeywell PRINTER PM43 +20998.3.2.1.1 Honeywell PRINTER PM43C +20998.5.1.1.1 Honeywell PRINTER PD43 +20998.7.1.1.1 Honeywell PRINTER PM42 +20998.10.1.1.1 Honeywell PRINTER PX940A + 21013 Xirrus NETWORKING 21013.1.153 Xirrus NETWORKING XR620 21013.1.157 Xirrus NETWORKING XR2436 From ba5717bb0c7e8c349a8c44417621dd6eccd335cd Mon Sep 17 00:00:00 2001 From: Guillaume Bougard Date: Thu, 21 Dec 2023 14:56:46 +0100 Subject: [PATCH 2/2] feat: GLPI Agent 1.7 release --- Makefile.PL | 2 +- contrib/unix/installer/InstallerVersion.pm | 2 +- contrib/windows/glpi-agent-deployment.vbs | 4 ++-- debian/changelog | 6 ++++++ lib/GLPI/Agent/Version.pm | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index b685cfbd6..bd8e26fc1 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -14,7 +14,7 @@ include 'Module::AutoInstall'; abstract 'GLPI unified Agent for UNIX, Linux, Windows and MacOSX'; license 'gpl'; repository 'https://github.com/glpi-project/glpi-agent'; -version '1.7-dev'; +version '1.7'; perl_version '5.008'; authors 'Teclib Editions'; diff --git a/contrib/unix/installer/InstallerVersion.pm b/contrib/unix/installer/InstallerVersion.pm index 370041e91..da76788cf 100644 --- a/contrib/unix/installer/InstallerVersion.pm +++ b/contrib/unix/installer/InstallerVersion.pm @@ -1,7 +1,7 @@ package InstallerVersion; -use constant VERSION => "1.7-dev"; +use constant VERSION => "1.8-dev"; use constant DISTRO => "linux"; 1; diff --git a/contrib/windows/glpi-agent-deployment.vbs b/contrib/windows/glpi-agent-deployment.vbs index 319862cda..66a5ce6f2 100644 --- a/contrib/windows/glpi-agent-deployment.vbs +++ b/contrib/windows/glpi-agent-deployment.vbs @@ -64,12 +64,12 @@ Dim Setup, SetupArchitecture, SetupLocation, SetupNightlyLocation, SetupOptions, ' SetupVersion ' Setup version with the pattern ..[-] ' -SetupVersion = "1.6.1" +SetupVersion = "1.7" ' When using a nightly built version, uncomment the following SetupVersion definition line ' replacing gitABCDEFGH with the most recent git revision found on the nightly builds site ' In that case, SetupNightlyLocation will be selected as location in place of SetupLocation -'SetupVersion = "1.7-gitABCDEFGH" +'SetupVersion = "1.8-gitABCDEFGH" ' SetupLocation ' Depending on your needs or your environment, you can use either a HTTP or diff --git a/debian/changelog b/debian/changelog index bd7705161..472e59b8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +glpi-agent (1:1.7-1) unstable; urgency=medium + + * New upstream release 1.7 + + -- Guillaume Bougard Thu, 21 Dec 2023 14:56:46 +0100 + glpi-agent (1:1.6.1-1) unstable; urgency=medium * New upstream release 1.6.1 diff --git a/lib/GLPI/Agent/Version.pm b/lib/GLPI/Agent/Version.pm index a419e770c..22b0e9a09 100644 --- a/lib/GLPI/Agent/Version.pm +++ b/lib/GLPI/Agent/Version.pm @@ -3,7 +3,7 @@ package GLPI::Agent::Version; use strict; use warnings; -our $VERSION = "1.7-dev"; +our $VERSION = "1.7"; our $PROVIDER = "GLPI"; our $COMMENTS = []; @@ -31,5 +31,5 @@ agent issue is reported. One very useful information should be first defined like in that example: our $COMMENTS = [ - "Based on GLPI Agent 1.7-dev" + "Based on GLPI Agent 1.7" ];