Skip to content

Commit

Permalink
Merge branch 'main' into openvasd-result-detail
Browse files Browse the repository at this point in the history
  • Loading branch information
mattmundell authored Jan 11, 2025
2 parents cb1a00d + 5c33575 commit 8be2ab9
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 370 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
--current-version ${{ env.LATEST_VERSION }} \
--next-version ${{ env.NEW_VERSION }} \
--config changelog.toml \
--project $PROJECT \
--repository ${{ github.repository }} \
--versioning-scheme semver \
-o /tmp/changelog.md || true
# we would rather have empty release notes than no release
Expand Down
295 changes: 0 additions & 295 deletions CHANGELOG.md

This file was deleted.

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ message ("-- Configuring the Greenbone Vulnerability Management Libraries...")

# VERSION: Always include major, minor and patch level.
project (gvm-libs
VERSION 22.15.0
VERSION 22.15.1
LANGUAGES C)

if (POLICY CMP0005)
Expand Down
64 changes: 32 additions & 32 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,74 +1,76 @@
INSTALLATION INSTRUCTIONS FOR GVM-LIBS
======================================
# Installation Instructions for gvm-libs

Please note: The reference system used by most of the developers is Debian
GNU/Linux 'Bullseye' 11. The build might fail on any other system. Also, it is
necessary to install dependent development packages.
stable. The build might fail on any other system. Also, it is necessary to
install dependent development packages.

Prerequisites for gvm-libs
--------------------------
## Prerequisites for gvm-libs

See at the end of this section how to easily install these prerequisites on
some supported platforms.

General build environment:

* a C compiler (e.g. gcc)
* cmake >= 3.0
* pkg-config

Specific development libraries:

* libcjson >= 1.7.14 (util)
* libcurl >= 7.83.0 (openvasd)
* libglib >= 2.42 (all)
* libgcrypt
* libgio >= 2.42 (util)
* zlib >= 1.2.8 (util)
* libgpgme >= 1.7.0 (util)
* libglib >= 2.42 (all)
* libgnutls >= 3.2.15 (util)
* libuuid >= 2.25.0 (util)
* libssh >= 0.6.0 (util)
* libgpgme >= 1.7.0 (util)
* libhiredis >= 0.10.1 (util)
* libxml2 >= 2.0 (util)
* libnet1 >= 1.1.2.1 (boreas)
* libpcap
* libgcrypt
* libpaho-mqtt >= 1.3.0 (utils)
* libpcap
* libssh >= 0.6.0 (util)
* libuuid >= 2.25.0 (util)
* libxml2 >= 2.0 (util)
* zlib >= 1.2.8 (util)

Prerequisites for building documentation:

* doxygen
* xmltoman (optional, for building man page)

Prerequisites for building tests:

* [Cgreen](https://cgreen-devs.github.io/cgreen/cgreen-guide-en.html#_installing_cgreen) (optional, for building tests)

Install prerequisites on Debian GNU/Linux 'Bullseye' 11:
Install prerequisites on Debian stable:

apt-get install \
cmake \
pkg-config \
libcjson-dev \
libcurl4-openssl-dev \
libgcrypt-dev \
libglib2.0-dev \
libgpgme-dev \
libgnutls28-dev \
uuid-dev \
libgcrypt-dev \
libssh-dev \
libgpgme-dev \
libhiredis-dev \
libxml2-dev \
libpcap-dev \
libnet1-dev \
libpaho-mqtt-dev

libpaho-mqtt-dev \
libpcap-dev \
libssh-dev \
libxml2-dev \
pkg-config \
uuid-dev

Prerequisites for Optional Features
-----------------------------------
## Prerequisites for Optional Features

Certain features of gvm-libs are optional and require the following:

Prerequisites for LDAP authentication:

* libldap2 library >= 2.4.44 (util) (Debian package: libldap2-dev)

Prerequisites for RADIUS authentication:

* libradcli4 library >= 1.2.6 (util) (Debian package: libradcli-dev)
* Alternative: libfreeradius3 library (util) (Debian package: libfreeradius-dev)

Expand All @@ -78,8 +80,7 @@ Install prerequisites for optional features on Debian GNU/Linux 'Buster' 10:
libldap2-dev \
libradcli-dev

Compiling gvm-libs
------------------
## Compiling gvm-libs

If you have installed required libraries to a non-standard location, remember to
set the `PKG_CONFIG_PATH` environment variable to the location of your pkg-config
Expand All @@ -92,6 +93,7 @@ Create a build directory and change working directory into it with
mkdir build && cd build

Afterwards you can run `cmake` with different options:

* Configure `gvm-libs` build with a custom installation path:

cmake -DCMAKE_INSTALL_PREFIX=/path/to/your/installation ..
Expand Down Expand Up @@ -131,8 +133,7 @@ directory you created above.
cd .. && rm -rf build


Configurable Options
--------------------
## Configurable Options

During compilation, the build process uses a set of compiler options which
enable very strict error checking and asks the compiler to abort should it detect
Expand All @@ -149,8 +150,7 @@ Portal](https://community.greenbone.net/c/gse). Don't forget to include the
name and version of your compiler and distribution in your message.


Building GVM Libraries statically linked
----------------------------------------
## Building GVM Libraries statically linked

If you want to build a statically linked version -- for example to subsequently
build a statically linked program using this library -- you need statically
Expand Down
8 changes: 0 additions & 8 deletions changelog.toml

This file was deleted.

32 changes: 0 additions & 32 deletions changelog/v22.4.0.md

This file was deleted.

1 change: 0 additions & 1 deletion openvasd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ pkg_check_modules (CURL REQUIRED libcurl>=7.83.0)

# for json parsing we need cJSON
pkg_check_modules (CJSON REQUIRED libcjson>=1.7.14)
pkg_check_modules (GLIB_JSON REQUIRED json-glib-1.0>=1.4.4)


include_directories (${GLIB_INCLUDE_DIRS} ${GLIB_JSON_INCLUDE_DIRS}
Expand Down

0 comments on commit 8be2ab9

Please sign in to comment.