From 821fd930d8d6700a94559f71f8b5ec688fadf0c9 Mon Sep 17 00:00:00 2001 From: Juan Jose Nicola Date: Mon, 1 Feb 2021 11:51:55 +0100 Subject: [PATCH 1/2] Prepare for release 20.8.1 --- CHANGELOG.md | 4 ++-- CMakeLists.txt | 2 +- misc/CMakeLists.txt | 2 +- nasl/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f41aac818..e8f811055 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## [20.08.1] (unreleased) +## [20.08.1] (2021.02.01) ### Added - Extend nasl lint to detect if function parameter is used twice. [#590](https://github.com/greenbone/openvas/pull/590) @@ -36,7 +36,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix technique switch for getting the appropriate interface to use for IPv6 dst addr. [#636](https://github.com/greenbone/openvas/pull/636) - Fix host count. Set to -1 when the target string is invalid. [#646](https://github.com/greenbone/openvas/pull/646) -[20.08]: https://github.com/greenbone/openvas/compare/v20.8.0...openvas-20.08 +[20.08.1]: https://github.com/greenbone/openvas/compare/v20.8.0...v20.8.1 ## [20.08] (2020-08-11) diff --git a/CMakeLists.txt b/CMakeLists.txt index da30e54e1..2898647f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ cmake_minimum_required (VERSION 3.0) message ("-- Configuring the Scanner...") project (openvas - VERSION 20.8.0 + VERSION 20.8.1 LANGUAGES C) if (POLICY CMP0005) diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt index 17ff53921..c5ec0685d 100644 --- a/misc/CMakeLists.txt +++ b/misc/CMakeLists.txt @@ -96,7 +96,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -fPIC") # we require CMake >= 3.0 set (MISC_VERSION_MAJOR 20) set (MISC_VERSION_MINOR 8) -set (MISC_VERSION_PATCH 0) +set (MISC_VERSION_PATCH 1) if (PROJECT_BETA_RELEASE) set (MISC_VERSION_SUFFIX "+beta${PROJECT_BETA_RELEASE}") diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt index 2ba17693b..d0aa99d7f 100644 --- a/nasl/CMakeLists.txt +++ b/nasl/CMakeLists.txt @@ -23,7 +23,7 @@ # we require CMake >= 3.0 set (NASL_VERSION_MAJOR 20) set (NASL_VERSION_MINOR 8) -set (NASL_VERSION_PATCH 0) +set (NASL_VERSION_PATCH 1) if (PROJECT_BETA_RELEASE) set (NASL_VERSION_SUFFIX "+beta${PROJECT_BETA_RELEASE}") From 3d30d59658e877798f47632cca029101752918d7 Mon Sep 17 00:00:00 2001 From: Juan Jose Nicola Date: Mon, 1 Feb 2021 12:21:58 +0100 Subject: [PATCH 2/2] Update year where necessary --- doc/openvas-nasl-lint.1 | 2 +- doc/openvas-nasl.1 | 2 +- doc/openvas.8.in | 2 +- nasl/nasl.c | 5 +++-- nasl/nasl_builtin_find_service.c | 2 +- nasl/nasl_text_utils.c | 2 +- src/openvas.c | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/doc/openvas-nasl-lint.1 b/doc/openvas-nasl-lint.1 index 9c4817d22..79f00f5d3 100644 --- a/doc/openvas-nasl-lint.1 +++ b/doc/openvas-nasl-lint.1 @@ -1,4 +1,4 @@ -.TH OPENVAS-NASL-LINT 1 "May 26, 2015" +.TH OPENVAS-NASL-LINT 1 "February, 2021" .SH NAME openvas-nasl-lint \- OpenVAS standalone NASL linter .SH SYNOPSIS diff --git a/doc/openvas-nasl.1 b/doc/openvas-nasl.1 index bbca8daaa..33fddf20f 100644 --- a/doc/openvas-nasl.1 +++ b/doc/openvas-nasl.1 @@ -1,4 +1,4 @@ -.TH NASL 1 "October 2018" "Greenbone Vulnerability Management" "NASL Attack Scripting Language" +.TH NASL 1 "February 2021" "Greenbone Vulnerability Management" "NASL Attack Scripting Language" .SH NAME openvas-nasl \- NASL Attack Scripting Language .SH SYNOPSIS diff --git a/doc/openvas.8.in b/doc/openvas.8.in index eaf902dc9..73061df84 100644 --- a/doc/openvas.8.in +++ b/doc/openvas.8.in @@ -1,4 +1,4 @@ -.TH OpenVAS 8 "June 2019" "Greenbone Vulnerability Management" "User Manuals" +.TH OpenVAS 20.8.1 "February 2021" "Greenbone Vulnerability Management" "User Manuals" .SH NAME openvas \- The Scanner of the Greenbone Vulnerability Management .SH SYNOPSIS diff --git a/nasl/nasl.c b/nasl/nasl.c index 2f2580375..b312e4fb5 100644 --- a/nasl/nasl.c +++ b/nasl/nasl.c @@ -1,4 +1,5 @@ -/* Based on work Copyright (C) 2002 - 2005 Tenable Network Security +/* Portions Copyright (C) 2009-2021 Greenbone Networks GmbH + * Based on work Copyright (C) 2002 - 2005 Tenable Network Security * * SPDX-License-Identifier: GPL-2.0-only * @@ -243,7 +244,7 @@ main (int argc, char **argv) else putchar ('\n'); printf ("Copyright (C) 2002 - 2004 Tenable Network Security\n"); - printf ("Copyright (C) 2020 Greenbone Networks GmbH\n\n"); + printf ("Copyright (C) 2021 Greenbone Networks GmbH\n\n"); exit (0); } if (nasl_debug) diff --git a/nasl/nasl_builtin_find_service.c b/nasl/nasl_builtin_find_service.c index 8bc96ff52..f4de7a801 100644 --- a/nasl/nasl_builtin_find_service.c +++ b/nasl/nasl_builtin_find_service.c @@ -1,4 +1,4 @@ -/* Portions Copyright (C) 2009-2020 Greenbone Networks GmbH +/* Portions Copyright (C) 2009-2021 Greenbone Networks GmbH * Based on work Copyright (C) 2002 Renaud Deraison * * SPDX-License-Identifier: GPL-2.0-only diff --git a/nasl/nasl_text_utils.c b/nasl/nasl_text_utils.c index 99a8a6d83..4c0c93bf9 100644 --- a/nasl/nasl_text_utils.c +++ b/nasl/nasl_text_utils.c @@ -1,4 +1,4 @@ -/* Portions Copyright (C) 2009-2020 Greenbone Networks GmbH +/* Portions Copyright (C) 2009-2021 Greenbone Networks GmbH * Based on work Copyright (C) 2002 - 2004 Tenable Network Security * * SPDX-License-Identifier: GPL-2.0-only diff --git a/src/openvas.c b/src/openvas.c index b1b72ea6f..b6950706f 100644 --- a/src/openvas.c +++ b/src/openvas.c @@ -492,7 +492,7 @@ openvas (int argc, char *argv[]) printf ("GIT revision %s\n", OPENVAS_GIT_REVISION); #endif printf ("gvm-libs %s\n", gvm_libs_version ()); - printf ("Most new code since 2005: (C) 2020 Greenbone Networks GmbH\n"); + printf ("Most new code since 2005: (C) 2021 Greenbone Networks GmbH\n"); printf ( "Nessus origin: (C) 2004 Renaud Deraison \n"); printf ("License GPLv2: GNU GPL version 2\n");