Skip to content

Commit

Permalink
Merge pull request #240 from OCSInventory-NG/update2.9.1
Browse files Browse the repository at this point in the history 
Update 2.9.1
  • Loading branch information
@gillesdubois
gillesdubois authored Feb 21, 2022
2 parents 63ddaf7 + 86a9cab commit 235bf30
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 43 deletions.
8 changes: 4 additions & 4 deletions Agent/OCSInventory.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ IDR_MAINFRAME ICON "res\\OCSInventory.ico"
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,9,0,0
PRODUCTVERSION 2,9,0,0
FILEVERSION 2,9,1,0
PRODUCTVERSION 2,9,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -54,13 +54,13 @@ BEGIN
VALUE "Comments", "OCS Inventory Agent"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory Agent"
VALUE "FileVersion", "2.9.0.0"
VALUE "FileVersion", "2.9.1.0"
VALUE "InternalName", "OCSInventory.exe"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "OCSInventory.exe"
VALUE "ProductName", "OCS Inventory Windows Agent"
VALUE "ProductVersion", "2.9.0.0"
VALUE "ProductVersion", "2.9.1.0"
END
END
BLOCK "VarFileInfo"
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
2.9.0.0
2.9.1.0
* Add configuration parameter WMI_FLAG_MODE
* Add configuration parameter DEFAULT_USER_DOMAIN
* Fix openssl vulnerability

2.9.0.0
* Add italian support for SAAS script
* Remove DMI call
* Minor fix on subnet loop
Expand Down
8 changes: 4 additions & 4 deletions ComHTTP/HTTP.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,9,0,0
PRODUCTVERSION 2,9,0,0
FILEVERSION 2,9,1,0
PRODUCTVERSION 2,9,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory Communication Provider"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory cURL Communication Provider"
VALUE "FileVersion", "2.9.0.0"
VALUE "FileVersion", "2.9.1.0"
VALUE "InternalName", "ComHTTP.dll"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "ComHTTP.dll"
VALUE "ProductName", "OCS Inventory Windows Agent"
VALUE "ProductVersion", "2.9.0.0"
VALUE "ProductVersion", "2.9.1.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Download/Download.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,9,0,0
PRODUCTVERSION 2,9,0,0
FILEVERSION 2,9,1,0
PRODUCTVERSION 2,9,1,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -47,13 +47,13 @@ BEGIN
VALUE "Comments", "OCS Inventory Package Download and Setup Tool"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory Package Download and Setup Tool"
VALUE "FileVersion", "2.9.0.0"
VALUE "FileVersion", "2.9.1.0"
VALUE "InternalName", "Download.exe"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "Download.exe"
VALUE "ProductName", "OCS Inventory Windows Agent"
VALUE "ProductVersion", "2.9.0.0"
VALUE "ProductVersion", "2.9.1.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x64.nsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ setcompressor /SOLID lzma
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "OCS Inventory NG Agent"
!define OLD_PRODUCT_NAME "OCS Inventory Agent"
!define PRODUCT_VERSION "2.9.0.0"
!define PRODUCT_VERSION "2.9.1.0"
!define PRODUCT_PUBLISHER "OCS Inventory NG Team"
!define PRODUCT_WEB_SITE "http://www.ocsinventory-ng.org"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\OCSInventory.exe"
Expand Down
2 changes: 1 addition & 1 deletion NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x86.nsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ setcompressor /SOLID lzma
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "OCS Inventory NG Agent"
!define OLD_PRODUCT_NAME "OCS Inventory Agent"
!define PRODUCT_VERSION "2.9.0.0"
!define PRODUCT_VERSION "2.9.1.0"
!define PRODUCT_PUBLISHER "OCS Inventory NG Team"
!define PRODUCT_WEB_SITE "http://www.ocsinventory-ng.org"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\OCSInventory.exe"
Expand Down
8 changes: 4 additions & 4 deletions OCSInventory Front/OCSInventory Front.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,9,0,0
PRODUCTVERSION 2,9,0,0
FILEVERSION 2,9,1,0
PRODUCTVERSION 2,9,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory Framework Provider"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory Framework Provider"
VALUE "FileVersion", "2.9.0.0"
VALUE "FileVersion", "2.9.1.0"
VALUE "InternalName", "OCSInventory Front.dll"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "OCSInventory Front.dll"
VALUE "ProductName", "OCS Inventory Windows Agent"
VALUE "ProductVersion", "2.9.0.0"
VALUE "ProductVersion", "2.9.1.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions OcsNotifyUser/OcsNotifyUser.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,8 @@ IDR_MAINFRAME ICON "..\\Agent\\res\\OCSInventory.ic
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,9,0,0
PRODUCTVERSION 2,9,0,0
FILEVERSION 2,9,1,0
PRODUCTVERSION 2,9,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -405,13 +405,13 @@ BEGIN
VALUE "Comments", "OCS Inventory User Notification Provider"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory User Notification Provider"
VALUE "FileVersion", "2.9.0.0"
VALUE "FileVersion", "2.9.1.0"
VALUE "InternalName", "OcsNotifyUser.exe"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "OcsNotifyUser.exe"
VALUE "ProductName", "OCS Inventory Windows Agent"
VALUE "ProductVersion", "2.9.0.0"
VALUE "ProductVersion", "2.9.1.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions OcsSystray/OcsSystray.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,8 +388,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,9,0,0
PRODUCTVERSION 2,9,0,0
FILEVERSION 2,9,1,0
PRODUCTVERSION 2,9,1,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -407,13 +407,13 @@ BEGIN
VALUE "Comments", "OCS Inventory Systray applet"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory Systray applet"
VALUE "FileVersion", "2.9.0.0"
VALUE "FileVersion", "2.9.1.0"
VALUE "InternalName", "OcsSystray.exe"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "OcsSystray.exe"
VALUE "ProductName", "OCS Inventory Windows Agent"
VALUE "ProductVersion", "2.9.0.0"
VALUE "ProductVersion", "2.9.1.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions OcsWmi/OcsWmi.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,9,0,0
PRODUCTVERSION 2,9,0,0
FILEVERSION 2,9,1,0
PRODUCTVERSION 2,9,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory WMI Provider"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory WMI Provider"
VALUE "FileVersion", "2.9.0.0"
VALUE "FileVersion", "2.9.1.0"
VALUE "InternalName", "OcsWmi.dll"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "OcsWmi.dll"
VALUE "ProductName", "OCS Inventory Windows Agent"
VALUE "ProductVersion", "2.9.0.0"
VALUE "ProductVersion", "2.9.1.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Service/Service.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,9,0,0
PRODUCTVERSION 2,9,0,0
FILEVERSION 2,9,1,0
PRODUCTVERSION 2,9,1,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory Service"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory Service"
VALUE "FileVersion", "2.9.0.0"
VALUE "FileVersion", "2.9.1.0"
VALUE "InternalName", "OcsService.exe"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "OcsService.exe"
VALUE "ProductName", "OCS Inventory Windows Agent"
VALUE "ProductVersion", "2.9.0.0"
VALUE "ProductVersion", "2.9.1.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions SysInfo/SysInfo.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,9,0,0
PRODUCTVERSION 2,9,0,0
FILEVERSION 2,9,1,0
PRODUCTVERSION 2,9,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory System Provider"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory System Provider"
VALUE "FileVersion", "2.9.0.0"
VALUE "FileVersion", "2.9.1.0"
VALUE "InternalName", "SysInfo.dll"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "SysInfo.dll"
VALUE "ProductName", "OCS Inventory Windows Agent"
VALUE "ProductVersion", "2.9.0.0"
VALUE "ProductVersion", "2.9.1.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions TestSysInfo/TestSysInfo.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,9,0,0
PRODUCTVERSION 2,9,0,0
FILEVERSION 2,9,1,0
PRODUCTVERSION 2,9,1,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -69,13 +69,13 @@ BEGIN
VALUE "Comments", "OCS Inventory System Information Testing tool"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory System Information Testing tool"
VALUE "FileVersion", "2.9.0.0"
VALUE "FileVersion", "2.9.1.0"
VALUE "InternalName", "TestSysInfo.exe"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "TestSysInfo.exe"
VALUE "ProductName", "OCS Inventory Windows Agent"
VALUE "ProductVersion", "2.9.0.0"
VALUE "ProductVersion", "2.9.1.0"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit 235bf30

Please sign in to comment.