* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/greenbone-security-assistant/, ...
@ 2019-03-13 14:59 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2019-03-13 14:59 UTC (permalink / raw
To: gentoo-commits
commit: 52aa196c5f6eaae0ca6639baa03a422aab2c7791
Author: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit <DOT> com>
AuthorDate: Thu Feb 7 01:52:55 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 14:58:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52aa196c
net-analyzer/greenbone-security-assistant: version bump to 7.0.3.
Bump to 7.0.3.
This also brings new improvements and introduces the new USE flag 'extras'.
Introduces two new patches that fixes various issues:
- auth patch fixes saving of auth config.
- memleak patch fixes memleak issue.
Introduces one new file that has proper nginx reverse proxy config
for WebUI: gsad.nginx.reverse.proxy.example file
systemd unit file & init script updated.
Because of new dependencies ~arm ~ppc keywords have been dropped.
This package is part of net-analyzer/openvas.
Reported-by: NP-Hardass <np-hardass <AT> gentoo.org>
Acked-by: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit.com>
Tested-by: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit.com>
Signed-off-by: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
net-analyzer/greenbone-security-assistant/Manifest | 1 +
.../greenbone-security-assistant-7.0.3-auth.patch | 107 +++++++++++++++++++++
...reenbone-security-assistant-7.0.3-memleak.patch | 42 ++++++++
.../files/gsa-daemon.conf | 20 ++++
.../greenbone-security-assistant/files/gsa.init | 14 +++
.../files/gsa.logrotate | 9 ++
.../files/gsa.nginx.reverse.proxy.example | 78 +++++++++++++++
.../greenbone-security-assistant/files/gsa.service | 19 ++++
.../files/gsa.tmpfiles.d | 1 +
.../greenbone-security-assistant-7.0.3.ebuild | 92 ++++++++++++++++++
.../greenbone-security-assistant/metadata.xml | 12 ++-
11 files changed, 394 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index a8228051d49..15ef6d5326c 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1 +1,2 @@
DIST greenbone-security-assistant-6.0.9.tar.gz 1476238 BLAKE2B 3311056256885102518e3b0e3106c23965e5a69ad4cfe13a2b34c68079a916466915b3296c80984656ff8a9f9b0aa35f5256c225250ae549d9727ad61f3a6b2b SHA512 4afb50f044b6853181c3c3e6466e7329915356bbcccecf98b89d9dc39a193392f45850f9073ac055ec826753af78e8a6368e7f9ac52734a3b5e254d124180d68
+DIST greenbone-security-assistant-7.0.3.tar.gz 2918954 BLAKE2B 4a6cd5d8378bcbb0a9df6cb5b8f6560060f15d0b0cb53d2c61692cb2bc2cd86af6e9cdeb5040c4d7020c3b016779a76ec517d54614388c62aaedd596f55fa3c4 SHA512 7e1c1ef939ba08dab3b78baf1aa9c110be2febfbed5d67eefe8110c60f5089a1af44bc26693657226f417c6bd516a4a656eb159dae2a78f878e1a1b6c222b117
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-auth.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-auth.patch
new file mode 100644
index 00000000000..cce885e10e0
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-auth.patch
@@ -0,0 +1,107 @@
+--- gsa-7.0.3/src/gsad_omp.c 2019-02-02 03:22:19.297954361 +0300
++++ gsa-7.0.3/src/gsad_omp.c 2019-02-02 03:27:57.690214371 +0300
+@@ -1366,7 +1366,8 @@
+ || (strstr (param_name, "_id")
+ == param_name + strlen (param_name) - strlen ("_id"))
+ || (strcmp (param_name, "name") == 0
+- && strcasecmp (prev_action, "Run Wizard") == 0)
++ && (strcasecmp (prev_action, "Run Wizard") == 0
++ || strcasecmp (next_cmd, "auth_settings") == 0))
+ || (strcmp (param_name, "get_name") == 0
+ && strcasecmp (next_cmd, "wizard_get") == 0))
+ {
+@@ -25984,7 +25976,7 @@
+
+ html = response_from_entity (connection, credentials, params, entity,
+ (no_redirect && strcmp (no_redirect, "0")),
+- NULL, NULL,
++ NULL, "auth_settings",
+ NULL, "modify_auth",
+ "Save Authentication Configuration",
+ response_data);
+--- gsa-7.0.3/src/html/classic/js/greenbone.js 2018-03-28 16:23:57.000000000 +0300
++++ gsa-7.0.3/src/html/classic/js/greenbone.js 2019-02-02 03:40:37.162714538 +0300
+@@ -1559,6 +1559,9 @@
+ if (reload === 'next') {
+ reload_next(response);
+ }
++ else if (reload === 'window') {
++ location.reload();
++ }
+ },
+ function(jqXHR) {
+ if (jqXHR.status == 0 && jqXHR.readyState == 0) {
+--- gsa-7.0.3/src/html/classic/omp.xsl 2018-03-28 16:23:57.000000000 +0300
++++ gsa-7.0.3/src/html/classic/omp.xsl 2019-02-02 03:44:28.470599715 +0300
+@@ -36775,7 +36822,8 @@
+ <!-- AUTHENTICATION DESCRIPTION -->
+
+ <xsl:template match="group" mode="ldapauth">
+- <div class="section-box" id="ldap-box">
++ <div class="section-box ajax-post" id="ldap-box"
++ data-button="form #save_button" data-reload="window">
+ <form action="/omp" method="post" enctype="multipart/form-data">
+ <input type="hidden" name="token" value="{/envelope/token}"/>
+ <input type="hidden" name="cmd" value="save_auth"/>
+@@ -36784,6 +36832,15 @@
+ <input type="hidden" name="filter" value="{gsa:envelope-filter ()}"/>
+ <!-- group name is e.g. of method:ldap -->
+ <input type="hidden" name="group" value="{@name}"/>
++ <!-- Auth type name for next page -->
++ <input type="hidden" name="name" value="ldap"/>
++
++ <div class="error-dialog">
++ <div class="text-center">
++ <xsl:value-of select="gsa:i18n ('LDAP authentication config could not be modified.')"/>
++ </div>
++ </div>
++
+ <table class="gbntable">
+ <tr class="gbntablehead2">
+ <td><xsl:value-of select="gsa:i18n ('Setting')"/></td>
+@@ -36838,7 +36895,8 @@
+ </tr>
+ <tr>
+ <td colspan="2" style="text-align:right;">
+- <input type="submit" name="submit" value="{gsa:i18n ('Save')}"/>
++ <input type="submit" name="submit" id="save_button"
++ value="{gsa:i18n ('Save')}"/>
+ </td>
+ </tr>
+ </table>
+@@ -36847,7 +36905,8 @@
+ </xsl:template>
+
+ <xsl:template match="group" mode="radiusauth">
+- <div class="section-box" id="radius-box">
++ <div class="section-box ajax-post" id="radius-box"
++ data-button="form #save_button" data-reload="window">
+ <form action="/omp" method="post" enctype="multipart/form-data">
+ <input type="hidden" name="token" value="{/envelope/token}"/>
+ <input type="hidden" name="cmd" value="save_auth"/>
+@@ -36856,6 +36915,15 @@
+ <input type="hidden" name="filter" value="{gsa:envelope-filter ()}"/>
+ <!-- group name is e.g. of method:radius_connect -->
+ <input type="hidden" name="group" value="{@name}"/>
++ <!-- Auth type name for next page -->
++ <input type="hidden" name="name" value="radius"/>
++
++ <div class="error-dialog">
++ <div class="text-center">
++ <xsl:value-of select="gsa:i18n ('Radius authentication config could not be modified.')"/>
++ </div>
++ </div>
++
+ <table class="gbntable">
+ <tr class="gbntablehead2">
+ <td><xsl:value-of select="gsa:i18n ('Setting')"/></td>
+@@ -36890,7 +36958,8 @@
+ </tr>
+ <tr>
+ <td colspan="2" style="text-align:right;">
+- <input type="submit" name="submit" value="{gsa:i18n ('Save')}"/>
++ <input type="submit" name="submit" id="save_button"
++ value="{gsa:i18n ('Save')}"/>
+ </td>
+ </tr>
+ </table>
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-memleak.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-memleak.patch
new file mode 100644
index 00000000000..5132e344a79
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-memleak.patch
@@ -0,0 +1,42 @@
+--- gsa-7.0.3/src/gsad_omp.c 2018-03-28 16:23:57.000000000 +0300
++++ gsa-7.0.3/src/gsad_omp.c 2019-02-02 03:12:16.617046562 +0300
+@@ -7737,16 +7738,21 @@
+ g_string_append (xml, command_escaped);
+ g_free (command_escaped);
+
++ response = NULL;
+ ret = omp (connection, credentials, &response, &entity, response_data,
+ command->str);
+ g_string_free (command, TRUE);
++
++ if (ret)
++ {
++ free_entity (entity);
++ g_string_free (xml, TRUE);
++ }
++
+ switch (ret)
+ {
+ case 0:
+ break;
+- case -1:
+- /* 'omp' set response. */
+- return response;
+ case 1:
+ response_data->http_status_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
+ return gsad_message (credentials,
+@@ -7770,10 +7776,14 @@
+ "/omp?cmd=get_tasks", response_data);
+ }
+
++ if (omp_success (entity) == 0)
++ set_http_status_from_entity (entity, response_data);
+ g_string_append (xml, response);
+
+ g_string_append (xml, "</get_aggregate>");
+
++ free_entity (entity);
++ g_free (response);
+ return xsl_transform_omp (connection, credentials, params,
+ g_string_free (xml, FALSE), response_data);
+ }
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf b/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf
new file mode 100644
index 00000000000..9d34da62659
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf
@@ -0,0 +1,20 @@
+# OpenVAS Security Assistant command args
+# man page --> https://www.mankier.com/8/gsad
+
+# e.g. --foreground | e.g. --no-redirect -- > Don't listen port 80 anymore
+OPENVAS_SECURITY_ASSISTANT_OPTIONS="--no-redirect"
+
+# WebUI adress
+OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS="--listen=127.0.0.1"
+
+# WebUI Port
+OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT="--port=9392"
+
+# WebUI Manager Address
+OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS="--mlisten=127.0.0.1"
+
+# WebUI Manager Port
+OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT="--mport=9390"
+
+# TLS Settings
+OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES="--gnutls-priorities=NORMAL"
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.init b/net-analyzer/greenbone-security-assistant/files/gsa.init
new file mode 100644
index 00000000000..6e625a96a25
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsa.init
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Greenbone Security Assistant Daemon"
+command="/usr/sbin/gsad"
+command_args="${OPENVAS_SECURITY_ASSISTANT_OPTIONS} ${OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS} ${OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT} ${OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS} ${OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT} ${OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES}"
+pidfile="/var/run/gsad.pid"
+command_background="true"
+
+depend() {
+ after bootmisc
+ need localmount net openvas-scanner gvmd
+}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.logrotate b/net-analyzer/greenbone-security-assistant/files/gsa.logrotate
new file mode 100644
index 00000000000..79e54e85431
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsa.logrotate
@@ -0,0 +1,9 @@
+# logrotate for openvas security agent
+/var/log/openvas/gsad.log {
+ daily
+ rotate 7
+ compress
+ missingok
+ notifempty
+ sharedscripts
+}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.nginx.reverse.proxy.example b/net-analyzer/greenbone-security-assistant/files/gsa.nginx.reverse.proxy.example
new file mode 100644
index 00000000000..b233911a2f1
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsa.nginx.reverse.proxy.example
@@ -0,0 +1,78 @@
+upstream backend {
+ server 127.0.0.1:9392;
+ keepalive 64;
+}
+
+server {
+ listen IP:80;
+ server_name openvas.domain.tdl;
+ return 301 https://openvas.domain.tdl$request_uri;
+}
+
+server {
+ listen IP:443 ssl http2;
+ server_name openvas.domain.tdl;
+ access_log /var/log/nginx/openvas.domain.tdl.access.log;
+ error_log /var/log/nginx/openvas.domain.tdl.error.log;
+ # Not sourcing directly from file
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param QUERY_STRING $query_string;
+ fastcgi_param REQUEST_METHOD $request_method;
+ fastcgi_param CONTENT_TYPE $content_type;
+ fastcgi_param CONTENT_LENGTH $content_length;
+ fastcgi_param SCRIPT_NAME $fastcgi_script_name;
+ fastcgi_param REQUEST_URI $request_uri;
+ fastcgi_param DOCUMENT_URI $document_uri;
+ fastcgi_param SERVER_PROTOCOL $server_protocol;
+ fastcgi_param REQUEST_SCHEME $scheme;
+ fastcgi_param HTTPS $https;
+ fastcgi_param GATEWAY_INTERFACE CGI/1.1;
+ fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
+ fastcgi_param REMOTE_ADDR $remote_addr;
+ fastcgi_param REMOTE_PORT $remote_port;
+ fastcgi_param SERVER_ADDR $server_addr;
+ fastcgi_param SERVER_PORT $server_port;
+ fastcgi_param SERVER_NAME $server_name;
+ fastcgi_param REDIRECT_STATUS 200;
+ fastcgi_param HTTP_PROXY "";
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
+ fastcgi_param DOCUMENT_ROOT $document_root;
+
+ location / {
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header REMOTE_HOST $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-FORWARDED-PROTOCOL $scheme;
+ proxy_pass https://backend;
+ proxy_http_version 1.1;
+ proxy_pass_request_headers on;
+ proxy_set_header Connection "keep-alive";
+ proxy_store off;
+ gzip on;
+ gzip_proxied any;
+ gzip_types *;
+ }
+
+ resolver 127.0.0.1;
+ resolver_timeout 6s;
+ ssl_certificate /openvas.domain.tdl/fullchain.pem;
+ ssl_certificate_key /openvas.domain.tdl/privkey.pem;
+ ssl_trusted_certificate /openvas.domain.tdl/chain.pem;
+ ssl_dhparam /openvas.domain.tdl/dhparam.pem;
+ ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+ ssl_prefer_server_ciphers on;
+ ssl_ciphers ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS;
+ ssl_ecdh_curve secp384r1;
+ ssl_stapling on;
+ ssl_stapling_verify on;
+ ssl_session_cache shared:SSL:40m;
+ ssl_session_timeout 21h;
+ ssl_session_tickets off;
+ ssl_buffer_size 4k;
+ add_header Referrer-Policy no-referrer-when-downgrade;
+ add_header X-Frame-Options "SAMEORIGIN";
+ add_header X-Content-Type-Options "nosniff";
+ add_header X-XSS-Protection "1; mode=block";
+}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.service b/net-analyzer/greenbone-security-assistant/files/gsa.service
new file mode 100644
index 00000000000..3d0f2d37a45
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsa.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=OpenVAS Manager
+After=network.target
+After=openvas-scanner.service
+After=gvmd.service
+Wants=gvmd.service
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/openvas/sysconfig/gsa-daemon.conf
+ExecStart=/usr/sbin/gsad $OPENVAS_SECURITY_ASSISTANT_OPTIONS $OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS $OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT $OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS $OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT $OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=mixed
+User=root
+Group=root
+TimeoutSec=1200
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.tmpfiles.d b/net-analyzer/greenbone-security-assistant/files/gsa.tmpfiles.d
new file mode 100644
index 00000000000..18e820caec1
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsa.tmpfiles.d
@@ -0,0 +1 @@
+d /var/cache/openvassd 0775
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3.ebuild
new file mode 100644
index 00000000000..c58b1ab920e
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake-utils systemd
+MY_PN="gsa"
+
+DESCRIPTION="Greenbone Security Assistant for OpenVAS"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+ BSD MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="extras"
+
+DEPEND="
+ dev-libs/libgcrypt:0=
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=net-analyzer/openvas-libraries-9.0.3
+ net-libs/gnutls:=[tools]
+ net-libs/libmicrohttpd[messages]
+ extras? ( dev-python/polib )"
+
+RDEPEND="
+ ${DEPEND}
+ >=net-analyzer/openvas-scanner-5.1.3
+ >=net-analyzer/openvas-manager-7.0.3
+ extras? ( dev-texlive/texlive-latexextra )"
+
+BDEPEND="
+ virtual/pkgconfig
+ extras? ( app-doc/doxygen[dot]
+ app-doc/xmltoman
+ app-text/htmldoc
+ sys-devel/gettext
+ )"
+
+BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-memleak.patch"
+ "${FILESDIR}/${P}-auth.patch"
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+ if use extras; then
+ doxygen -u "$S"/doc/Doxyfile_full.in || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
+ "-DLOCALSTATEDIR=${EPREFIX}/var"
+ "-DSYSCONFDIR=${EPREFIX}/etc"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ if use extras; then
+ cmake-utils_src_make -C "${BUILD_DIR}" doc
+ cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+ HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ insinto /etc/openvas/sysconfig
+ doins "${FILESDIR}"/${MY_PN}-daemon.conf
+
+ insinto /etc/openvas/reverse-proxy
+ doins "${FILESDIR}"/gsa.nginx.reverse.proxy.example
+
+ newinitd "${FILESDIR}/${MY_PN}.init" ${MY_PN}
+ newconfd "${FILESDIR}/${MY_PN}-daemon.conf" ${MY_PN}
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
+
+ systemd_newtmpfilesd "${FILESDIR}/${MY_PN}.tmpfiles.d" ${MY_PN}.conf
+ systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/greenbone-security-assistant/metadata.xml b/net-analyzer/greenbone-security-assistant/metadata.xml
index 6f49eba8f49..6a3196eff3b 100644
--- a/net-analyzer/greenbone-security-assistant/metadata.xml
+++ b/net-analyzer/greenbone-security-assistant/metadata.xml
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>hasan.calisir@psauxit.com</email>
+ <name>Hasan ÇALIŞIR</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="extras">Pdf results, extra fonts, html docs support</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/greenbone-security-assistant/, ...
@ 2019-03-22 23:59 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2019-03-22 23:59 UTC (permalink / raw
To: gentoo-commits
commit: 499a8a74759e1600402d6774c4c790649b1e7540
Author: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit <DOT> com>
AuthorDate: Tue Mar 19 13:10:04 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 23:59:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=499a8a74
net-analyzer/greenbone-security-assistant: revbump to 7.0.3-r1.
Introduces the new daemon arg for systemd & init.d.
This fixes the reverse proxy error comes with openvas WebUI(GSA).
Signed-off-by: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit.com>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/11410
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../greenbone-security-assistant/files/gsa-daemon.conf | 11 +++++++++++
net-analyzer/greenbone-security-assistant/files/gsa.init | 2 +-
net-analyzer/greenbone-security-assistant/files/gsa.service | 2 +-
....3.ebuild => greenbone-security-assistant-7.0.3-r1.ebuild} | 0
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf b/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf
index 9d34da62659..2c9a62eef81 100644
--- a/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf
+++ b/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf
@@ -18,3 +18,14 @@ OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT="--mport=9390"
# TLS Settings
OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES="--gnutls-priorities=NORMAL"
+
+# If you use reverse proxy you must set OPENVAS_REVERSE_PROXY daemon arg
+# otherwise you will get the below error.
+# ---------------------------------------------------------------
+# The request contained an unknown or invalid Host header.
+# If you are trying to access GSA via its hostname or a proxy,
+# make sure GSA is set up to allow it.
+# ---------------------------------------------------------------
+
+# Reverse Proxy Settings ( e.g. --allow-header-host=subdomain.example.com )
+OPENVAS_REVERSE_PROXY="--allow-header-host="
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.init b/net-analyzer/greenbone-security-assistant/files/gsa.init
index 6e625a96a25..2b463642242 100644
--- a/net-analyzer/greenbone-security-assistant/files/gsa.init
+++ b/net-analyzer/greenbone-security-assistant/files/gsa.init
@@ -4,7 +4,7 @@
name="Greenbone Security Assistant Daemon"
command="/usr/sbin/gsad"
-command_args="${OPENVAS_SECURITY_ASSISTANT_OPTIONS} ${OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS} ${OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT} ${OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS} ${OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT} ${OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES}"
+command_args="${OPENVAS_SECURITY_ASSISTANT_OPTIONS} ${OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS} ${OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT} ${OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS} ${OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT} ${OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES} ${OPENVAS_REVERSE_PROXY}"
pidfile="/var/run/gsad.pid"
command_background="true"
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.service b/net-analyzer/greenbone-security-assistant/files/gsa.service
index 3d0f2d37a45..bc8c1d9e285 100644
--- a/net-analyzer/greenbone-security-assistant/files/gsa.service
+++ b/net-analyzer/greenbone-security-assistant/files/gsa.service
@@ -8,7 +8,7 @@ Wants=gvmd.service
[Service]
Type=forking
EnvironmentFile=-/etc/openvas/sysconfig/gsa-daemon.conf
-ExecStart=/usr/sbin/gsad $OPENVAS_SECURITY_ASSISTANT_OPTIONS $OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS $OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT $OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS $OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT $OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES
+ExecStart=/usr/sbin/gsad $OPENVAS_SECURITY_ASSISTANT_OPTIONS $OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS $OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT $OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS $OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT $OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES $OPENVAS_REVERSE_PROXY
ExecReload=/bin/kill -HUP $MAINPID
KillMode=mixed
User=root
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3-r1.ebuild
similarity index 100%
rename from net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3.ebuild
rename to net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3-r1.ebuild
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/greenbone-security-assistant/, ...
@ 2019-08-12 4:54 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2019-08-12 4:54 UTC (permalink / raw
To: gentoo-commits
commit: 2d484f2e8283520712c22745c0bab47a946135c8
Author: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit <DOT> com>
AuthorDate: Sat Aug 10 13:24:21 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 04:54:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d484f2e
net-analyzer/greenbone-security-assistant: drop old 6.0.9
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-analyzer/greenbone-security-assistant/Manifest | 1 -
.../greenbone-security-assistant-5.0.3-run.patch | 16 ------
.../greenbone-security-assistant/files/gsad | 22 --------
.../files/gsad-daemon.conf | 14 -----
.../greenbone-security-assistant/files/gsad.init | 13 -----
.../files/gsad.logrotate | 11 ----
.../files/gsad.service | 16 ------
.../files/gsad.tmpfiles.d | 1 -
.../greenbone-security-assistant-6.0.9.ebuild | 63 ----------------------
9 files changed, 157 deletions(-)
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index 15ef6d5326c..db30d43db81 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1,2 +1 @@
-DIST greenbone-security-assistant-6.0.9.tar.gz 1476238 BLAKE2B 3311056256885102518e3b0e3106c23965e5a69ad4cfe13a2b34c68079a916466915b3296c80984656ff8a9f9b0aa35f5256c225250ae549d9727ad61f3a6b2b SHA512 4afb50f044b6853181c3c3e6466e7329915356bbcccecf98b89d9dc39a193392f45850f9073ac055ec826753af78e8a6368e7f9ac52734a3b5e254d124180d68
DIST greenbone-security-assistant-7.0.3.tar.gz 2918954 BLAKE2B 4a6cd5d8378bcbb0a9df6cb5b8f6560060f15d0b0cb53d2c61692cb2bc2cd86af6e9cdeb5040c4d7020c3b016779a76ec517d54614388c62aaedd596f55fa3c4 SHA512 7e1c1ef939ba08dab3b78baf1aa9c110be2febfbed5d67eefe8110c60f5089a1af44bc26693657226f417c6bd516a4a656eb159dae2a78f878e1a1b6c222b117
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-5.0.3-run.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-5.0.3-run.patch
deleted file mode 100644
index ec5ee92fd73..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-5.0.3-run.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 67cf344..c15f785 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -272,7 +272,7 @@ endif (NOT DATADIR)
-
- set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas")
- set (OPENVAS_LOG_DIR "${LOCALSTATEDIR}/log/openvas")
--set (GSAD_PID_DIR "${LOCALSTATEDIR}/run")
-+set (GSAD_PID_DIR "/run")
- set (GSA_DATA_DIR "${DATADIR}/openvas/gsa")
-
- # TODO: Eventually use own certificates
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad b/net-analyzer/greenbone-security-assistant/files/gsad
deleted file mode 100644
index f5d76179a55..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting Greenbone Security Assistant Daemon"
- start-stop-daemon --start --name gsad \
- --exec /usr/sbin/gsad \
- --pidfile /var/run/gsad.pid
- eend $?
-}
-
-stop() {
- ebegin "Stop openvassd"
- start-stop-daemon --stop --name gsad \
- --pidfile /var/run/gsad.pid
- eend $?
-}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf b/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf
deleted file mode 100644
index 0de53063512..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-#Listen on given address - by default assistant listens on all addresses
-# ASSISTANT_LISTEN=--listen=127.0.0.1
-
-#Listen on given port - by default 9391
-#ASSISTANT_PORT=--port=9392
-
-#Contact manager on given address
-#MANAGER_LISTEN=--mlisten=127.0.0.1
-
-#Manager listens on given port - by default 9390
-#MANAGER_PORT=--mport=9390
-
-# Additional arguments
-# ASSISTANT_EXTRA_ARGS=""
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.init b/net-analyzer/greenbone-security-assistant/files/gsad.init
deleted file mode 100644
index df69f2fb7f8..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad.init
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-name="Greenbone Security Assistant Daemon"
-command="/usr/sbin/gsad"
-command_args="${ASSISTANT_LISTEN} ${ASSISTANT_PORT} ${MANAGER_LISTEN} ${MANAGER_PORT} ${ASSISTANT_EXTRA_ARGS}"
-pidfile="/run/gsad.pid"
-
-depend() {
- after bootmisc
- need localmount net openvasmd
-}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate b/net-analyzer/greenbone-security-assistant/files/gsad.logrotate
deleted file mode 100644
index f0948cbea1f..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# logrotate for openvas
-/var/log/openvas/gsad.log {
- rotate 4
- weekly
- compress
- delaycompress
- missingok
- postrotate
- /bin/kill -HUP `pidof gsad`
- endscript
-}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.service b/net-analyzer/greenbone-security-assistant/files/gsad.service
deleted file mode 100644
index 8825f52f094..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Greenbone Security Assistant Daemon
-After=network.target
-Before=openvasmd.service
-
-[Service]
-EnvironmentFile=-/etc/openvas/gsad-daemon.conf
-ExecStart=/usr/sbin/gsad -f ${ASSISTANT_LISTEN} ${ASSISTANT_PORT} ${MANAGER_LISTEN} ${MANAGER_PORT} ${ASSISTANT_EXTRA_ARGS}
-Restart=always
-RestartSec=1
-User=root
-Group=root
-TimeoutSec=1200
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.tmpfiles.d b/net-analyzer/greenbone-security-assistant/files/gsad.tmpfiles.d
deleted file mode 100644
index 18e820caec1..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad.tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /var/cache/openvassd 0775
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild
deleted file mode 100644
index e65316ebf6f..00000000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=gsad
-
-DL_ID=2287
-
-DESCRIPTION="Greenbone Security Assistant for openvas"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+ BSD MIT"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/libgcrypt:0
- dev-libs/libxslt
- >=net-analyzer/openvas-libraries-8.0.3
- net-libs/libmicrohttpd[messages]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.0.3-run.patch
- )
-
-S="${WORKDIR}"/${P}
-
-src_prepare() {
- sed \
- -e '/^install.*OPENVAS_CACHE_DIR.*/d' \
- -i CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLOCALSTATEDIR="${EPREFIX}/var"
- -DSYSCONFDIR="${EPREFIX}/etc"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
- insinto /etc/openvas
- doins "${FILESDIR}"/${MY_PN}-daemon.conf
- dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${MY_PN}
-
- insinto /etc/logrotate.d
- doins "${FILESDIR}"/${MY_PN}.logrotate
-
- systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
- systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/greenbone-security-assistant/, ...
@ 2020-07-14 12:57 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2020-07-14 12:57 UTC (permalink / raw
To: gentoo-commits
commit: dcb61cb9be3f0b33d7093b2ab5ce3b1d21a2efaf
Author: Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Mon Jun 29 15:48:34 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jul 14 12:57:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb61cb9
net-analyzer/greenbone-security-assistant: drop old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-analyzer/greenbone-security-assistant/Manifest | 2 -
...ecurity-assistant-9.0.0-uninstall-snippet.patch | 12 --
.../greenbone-security-assistant-9.0.0.ebuild | 122 ---------------------
3 files changed, 136 deletions(-)
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index 6ac17399724..16c11eb444d 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1,6 +1,4 @@
DIST greenbone-security-assistant-8.0.1-node_modules.tar.gz 34084175 BLAKE2B 17c9e24961b63b957f932e4c5970113499ad65655b42e624284fb22a495d50c12e5f8289da4e17db717885b65909a6e18213fa312052c9c06c9bdc37816204f1 SHA512 552ea55fe218ae2345fa45b43af349825f255ccd86137dd245679efe6abc805d16c4ced3599f644d9b9f2686047b486d5e0c8aa4eaa0cbbf13157b9e2dbc8cc2
DIST greenbone-security-assistant-8.0.1.tar.gz 1558918 BLAKE2B 75287784ed215300cfb30101d39b06b134092ca2d4311bcca976be23cc289529c6a8d661b99cb28e890c68f27e93a9259681add067749a772b7e3aea28761f3b SHA512 b91c1c4b8073c3ad3d3d636abbaa7881393f1448eae7366636ff618391c199c240e6bc4c848740a4267b4142aa872fb91c0798b8034d152d16016e650fbda2b8
-DIST greenbone-security-assistant-9.0.0-node_modules.tar.gz 52811832 BLAKE2B e4d0f77722158b2fddfea55e8238abcc46de6aa821b81ca59087a0fc0a0c1383b9ce876a31d8f133cca53d9a81962a80925d5b26e036b09b3c3e7ef64edc3a29 SHA512 1bb3b338ac71c16375be6518fe371c1d8037de34067be9ecf1b423e5ac649825b2cbd36a29c43a3cc0b2b622a9b64ca356c4d073bbdf74b07c74953457f0b268
-DIST greenbone-security-assistant-9.0.0.tar.gz 1807537 BLAKE2B 00690e4f6dd1078a79c9309e19c751a6f31b856a2de762e0f1d0e8ce8601c82351b059a8995a9051a6fc1061d3ae9bf27c49fcaef6e76d3837f308eef06bf79f SHA512 5f2b955408e0231b96f4b2415df0c76e9003079acd65b9e1c771082999540121ff92a8c17d9529362be8f7fc632d91bd3f48854a5a2d9632efe10fb354361d8e
DIST greenbone-security-assistant-9.0.1-node_modules.tar.gz 44176347 BLAKE2B c8d1195ddc8167ff7a228a4e013c6139524e8527310c65529d37de8fe5e984379ba783e10544caf81ac801ceb1199ad7249c96a0e6032ade8a519068e6cefb42 SHA512 1718f97d330f7868afe34bf172699b8aa8ce795dc2e4a6f20b28135434623a68022c36310e381bd55bacbb621fd9bf5c8595c8030f5d3dc32bb427cc2febd028
DIST greenbone-security-assistant-9.0.1.tar.gz 1936391 BLAKE2B 22b9020a97e79b31555d66826740ca49d1eba5d55324f0e80349dc571a7b45bcf2c6403ac311e78f742c51900921f3e61ef0740f11fd794069242e2ab21b1c3e SHA512 688bde97722f31416406e43230253c05dc8d05eb9fea6d8fd084ec4e748b67bab238f78cc11534e4fc948d911e468d43b5be0b224f17959db5e59faae7f5d086
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.0-uninstall-snippet.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.0-uninstall-snippet.patch
deleted file mode 100644
index 8622fd81067..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.0-uninstall-snippet.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/gsa/CMakeLists.txt 2019-07-18 23:14:04.639202986 +0300
-+++ b/gsa/CMakeLists.txt 2019-07-18 23:21:54.568052589 +0300
-@@ -1164,9 +1164,6 @@
- install (FILES public/robots.txt
- DESTINATION ${GSA_DEST_DIR})
-
--# remove old generated files
--install (CODE "file(REMOVE_RECURSE ${GSA_DEST_DIR}/static)")
--
- install (DIRECTORY
- ${GSA_BUILD_DIR}/static
- ${GSA_BUILD_DIR}/img
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.0.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.0.ebuild
deleted file mode 100644
index d4ec6d1546f..00000000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake flag-o-matic systemd toolchain-funcs
-
-MY_PN="gsa"
-MY_DN="gsad"
-MY_NODE_N="node_modules"
-
-DESCRIPTION="Greenbone Security Assistant"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/greenbone/${MY_PN}/releases/download/v${PV}/gsa-node-modules-${PV}.tar.gz -> ${P}-${MY_NODE_N}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras"
-
-DEPEND="
- dev-libs/libgcrypt:0=
- dev-libs/libxml2
- dev-libs/libxslt
- >=net-analyzer/gvm-libs-10.0.1
- net-libs/gnutls:=
- net-libs/libmicrohttpd"
-
-RDEPEND="
- ${DEPEND}
- >=net-analyzer/gvmd-9.0.0
- net-analyzer/ospd-openvas"
-
-BDEPEND="
- dev-python/polib
- >=net-libs/nodejs-8.12.0
- >=sys-apps/yarn-1.15.2
- virtual/pkgconfig
- extras? (
- app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- sys-devel/gettext
- )"
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-MY_NODE_DIR="${S}/${MY_PN}/"
-
-PATCHES=(
- # Disable yarn-fetch during compile.
- "${FILESDIR}/${PN}-8.0.1-node.patch"
- # Remove ugly uninstall-snippet that causes failing re-emerge.
- "${FILESDIR}/${P}-uninstall-snippet.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- # We will use pre-generated npm stuff.
- mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
- # Update .yarnrc accordingly.
- echo "--modules-folder ${MY_NODE_DIR}" >> "${S}/${MY_PN}/.yarnrc" || die "echo failed"
- # QA-Fix | Remove !CLANG doxygen warnings for 9.0.0
- if use extras; then
- if ! tc-is-clang; then
- local f
- for f in gsad/doc/*.in
- do
- sed -i \
- -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
- -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
- "${f}" || die "couldn't disable CLANG parsing"
- done
- fi
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DLOCALSTATEDIR=${EPREFIX}/var"
- "-DSYSCONFDIR=${EPREFIX}/etc"
- "-DSBINDIR=${EPREFIX}/usr/bin"
- "-DGSAD_PID_DIR=${EPREFIX}/run/"
- "-DDEFAULT_CONFIG_DIR=${EPREFIX}/etc/default"
- "-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d"
- )
- cmake_src_configure
-}
-
-src_compile() {
- # setting correct PATH for finding react-js
- NODE_ENV=production PATH="$PATH:${S}/gsa/node_modules/.bin/" cmake_src_compile
- if use extras; then
- cmake_build -C "${BUILD_DIR}" doc
- cmake_build doc-full -C "${BUILD_DIR}" doc
- fi
- cmake_build rebuild_cache
-}
-
-src_install() {
- if use extras; then
- local HTML_DOCS=( "${BUILD_DIR}/${MY_DN}/doc/generated/html/." )
- fi
- cmake_src_install
-
- insinto /etc/gvm/sysconfig
- doins "${FILESDIR}/${MY_DN}-daemon.conf"
-
- insinto /etc/gvm/reverse-proxy
- doins "${FILESDIR}/${MY_PN}.nginx.reverse.proxy.example"
- fowners -R gvm:gvm /etc/gvm
-
- newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}"
- newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
- systemd_dounit "${FILESDIR}/${MY_DN}.service"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/greenbone-security-assistant/, ...
@ 2021-01-21 7:14 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2021-01-21 7:14 UTC (permalink / raw
To: gentoo-commits
commit: af523bd5ffe58b8dbdd2e977356a5152eac06c21
Author: Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Thu Jan 7 17:13:29 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 07:08:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af523bd5
net-analyzer/greenbone-security-assistant: drop old broken version 8.0.1
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-analyzer/greenbone-security-assistant/Manifest | 2 -
...enbone-security-assistant-8.0.1-cmakelist.patch | 30 -----
.../greenbone-security-assistant-8.0.1-pid.patch | 11 --
...reenbone-security-assistant-8.0.1-reactjs.patch | 20 ----
.../greenbone-security-assistant-8.0.1-sbin.patch | 12 --
...ecurity-assistant-8.0.1-uninstall-snippet.patch | 12 --
.../greenbone-security-assistant-8.0.1-r1.ebuild | 125 ---------------------
7 files changed, 212 deletions(-)
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index 16c11eb444d..d46d8a5a635 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1,4 +1,2 @@
-DIST greenbone-security-assistant-8.0.1-node_modules.tar.gz 34084175 BLAKE2B 17c9e24961b63b957f932e4c5970113499ad65655b42e624284fb22a495d50c12e5f8289da4e17db717885b65909a6e18213fa312052c9c06c9bdc37816204f1 SHA512 552ea55fe218ae2345fa45b43af349825f255ccd86137dd245679efe6abc805d16c4ced3599f644d9b9f2686047b486d5e0c8aa4eaa0cbbf13157b9e2dbc8cc2
-DIST greenbone-security-assistant-8.0.1.tar.gz 1558918 BLAKE2B 75287784ed215300cfb30101d39b06b134092ca2d4311bcca976be23cc289529c6a8d661b99cb28e890c68f27e93a9259681add067749a772b7e3aea28761f3b SHA512 b91c1c4b8073c3ad3d3d636abbaa7881393f1448eae7366636ff618391c199c240e6bc4c848740a4267b4142aa872fb91c0798b8034d152d16016e650fbda2b8
DIST greenbone-security-assistant-9.0.1-node_modules.tar.gz 44176347 BLAKE2B c8d1195ddc8167ff7a228a4e013c6139524e8527310c65529d37de8fe5e984379ba783e10544caf81ac801ceb1199ad7249c96a0e6032ade8a519068e6cefb42 SHA512 1718f97d330f7868afe34bf172699b8aa8ce795dc2e4a6f20b28135434623a68022c36310e381bd55bacbb621fd9bf5c8595c8030f5d3dc32bb427cc2febd028
DIST greenbone-security-assistant-9.0.1.tar.gz 1936391 BLAKE2B 22b9020a97e79b31555d66826740ca49d1eba5d55324f0e80349dc571a7b45bcf2c6403ac311e78f742c51900921f3e61ef0740f11fd794069242e2ab21b1c3e SHA512 688bde97722f31416406e43230253c05dc8d05eb9fea6d8fd084ec4e748b67bab238f78cc11534e4fc948d911e468d43b5be0b224f17959db5e59faae7f5d086
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch
deleted file mode 100644
index d0fc7963a50..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/gsad/config/CMakeLists.txt 2019-07-18 20:39:10.331949702 +0300
-+++ b/gsad/config/CMakeLists.txt 2019-07-18 20:40:18.946830294 +0300
-@@ -16,27 +16,3 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
--if (NOT SYSTEMD_SERVICE_DIR)
-- set (SYSTEMD_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system")
--endif (NOT SYSTEMD_SERVICE_DIR)
--
--if (NOT DEFAULT_CONFIG_DIR)
-- set (DEFAULT_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc/default")
--endif (NOT DEFAULT_CONFIG_DIR)
--
--if (NOT LOGROTATE_DIR)
-- set (LOGROTATE_DIR "${CMAKE_INSTALL_PREFIX}/etc/logrotate.d")
--endif (NOT LOGROTATE_DIR)
--
--configure_file (gsad.service.in gsad.service)
--configure_file (gsad.logrotate.in gsad.logrotate)
--
--install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gsad.service
-- DESTINATION ${SYSTEMD_SERVICE_DIR}/)
--
--install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/gsad.default
-- DESTINATION ${DEFAULT_CONFIG_DIR}/ RENAME gsad)
--
--install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gsad.logrotate
-- DESTINATION ${LOGROTATE_DIR}/ RENAME gsad)
--
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch
deleted file mode 100644
index a318c87225e..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -222,7 +222,7 @@ if (NOT DATADIR)
- endif (NOT DATADIR)
-
- if (NOT GSAD_PID_DIR)
-- set (GSAD_PID_DIR "${LOCALSTATEDIR}/run")
-+ set (GSAD_PID_DIR "/run")
- endif (NOT GSAD_PID_DIR)
-
- set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas")
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch
deleted file mode 100644
index 19a4731db75..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/gsa/package.json 2019-07-17 16:45:39.000000000 +0300
-+++ b/gsa/package.json 2019-07-17 22:40:31.371899489 +0300
-@@ -66,12 +66,12 @@
- "x2js": "^3.2.6"
- },
- "scripts": {
-- "test": "react-scripts test",
-- "test:coverage": "react-scripts test --coverage --maxWorkers 2",
-+ "test": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js test",
-+ "test:coverage": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js test --coverage --maxWorkers 2",
- "lint": "eslint --max-warnings 0 src",
-- "start": "react-scripts start",
-- "build": "react-scripts build",
-- "eject": "react-scripts eject"
-+ "start": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js start",
-+ "build": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js build",
-+ "eject": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js eject"
- },
- "devDependencies": {
- "@types/jest": "^24.0.12",
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch
deleted file mode 100644
index c1825ba3f5d..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/gsad/src/CMakeLists.txt 2019-07-21 23:07:38.375683800 +0300
-+++ a/gsad/src/CMakeLists.txt 2019-07-21 23:08:17.301651451 +0300
-@@ -175,7 +175,7 @@
- ## Install
-
- install (TARGETS gsad
-- RUNTIME DESTINATION ${SBINDIR}
-+ RUNTIME DESTINATION ${BINDIR}
- LIBRARY DESTINATION ${LIBDIR}
- ARCHIVE DESTINATION ${LIBDIR}/static)
-
-
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch
deleted file mode 100644
index 3b075951aba..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/gsa/CMakeLists.txt 2019-07-18 23:14:04.639202986 +0300
-+++ b/gsa/CMakeLists.txt 2019-07-18 23:21:54.568052589 +0300
-@@ -1116,9 +1116,6 @@
- install (FILES public/robots.txt
- DESTINATION ${GSA_DEST_DIR})
-
--# remove old generated files
--install (CODE "file(REMOVE_RECURSE ${GSA_DEST_DIR}/static)")
--
- install (DIRECTORY
- ${GSA_BUILD_DIR}/static
- ${GSA_BUILD_DIR}/img
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
deleted file mode 100644
index d616891de50..00000000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake flag-o-matic systemd toolchain-funcs
-
-MY_PN="gsa"
-MY_DN="gsad"
-MY_NODE_N="node_modules"
-
-DESCRIPTION="Greenbone Security Assistant"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/greenbone/gsa/releases/download/v8.0.1/gsa-node-modules-8.0.1.tar.gz -> ${P}-${MY_NODE_N}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras"
-
-DEPEND="
- dev-libs/libgcrypt:0=
- dev-libs/libxslt
- >=net-analyzer/gvm-libs-10.0.1
- net-libs/gnutls:=
- net-libs/libmicrohttpd"
-
-RDEPEND="
- ${DEPEND}
- ~net-analyzer/openvas-scanner-6.0.1
- >=net-analyzer/gvmd-8.0.1"
-
-BDEPEND="
- >=net-libs/nodejs-8.12.0
- >=sys-apps/yarn-1.15.2
- virtual/pkgconfig
- extras? ( app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- dev-python/polib
- sys-devel/gettext
- )"
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-MY_NODE_DIR="${S}/${MY_PN}/"
-
-PATCHES=(
- # QA fix for 8.0.0.
- "${FILESDIR}/${P}-pid.patch"
- # Disable yarn-fetch during compile.
- "${FILESDIR}/${P}-node.patch"
- # Fix react-env path for react.js.
- "${FILESDIR}/${P}-reactjs.patch"
- # Remove ugly uninstall-snippet that causes failing re-emerge.
- "${FILESDIR}/${P}-uninstall-snippet.patch"
- # Remove unnecessary install paths/files.
- "${FILESDIR}/${P}-cmakelist.patch"
- # Install exec. to /usr/bin instead of /usr/sbin
- "${FILESDIR}/${P}-sbin.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- # We will use pre-generated npm stuff.
- mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
- # Update .yarnrc accordingly.
- echo "--modules-folder ${MY_NODE_DIR}" >> "${S}/${MY_PN}/.yarnrc" || die "echo failed"
- # QA-Fix | Remove !CLANG doxygen warnings for 8.0.1
- if use extras; then
- if ! tc-is-clang; then
- local f
- for f in gsad/doc/*.in
- do
- sed -i \
- -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
- -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
- "${f}" || die "couldn't disable CLANG parsing"
- done
- fi
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DLOCALSTATEDIR=${EPREFIX}/var"
- "-DSYSCONFDIR=${EPREFIX}/etc"
- )
- # Add release hardening flags for 8.0.1
- append-cflags -D_FORTIFY_SOURCE=2 -fstack-protector
- append-ldflags -Wl,-z,relro -Wl,-z,now
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use extras; then
- cmake_build -C "${BUILD_DIR}" doc
- cmake_build doc-full -C "${BUILD_DIR}" doc
- HTML_DOCS=( "${BUILD_DIR}/${MY_DN}/doc/generated/html/." )
- fi
- cmake_build rebuild_cache
-}
-
-src_install() {
- cmake_src_install
-
- insinto /etc/gvm/sysconfig
- doins "${FILESDIR}/${MY_DN}-daemon.conf"
-
- dodir /etc/gvm/reverse-proxy
- insinto /etc/gvm/reverse-proxy
- doins "${FILESDIR}/${MY_PN}.nginx.reverse.proxy.example"
- fowners -R gvm:gvm /etc/gvm
-
- newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}"
- newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
- systemd_dounit "${FILESDIR}/${MY_DN}.service"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-21 7:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-13 14:59 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/greenbone-security-assistant/, Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2019-03-22 23:59 Patrice Clement
2019-08-12 4:54 Joonas Niilola
2020-07-14 12:57 Joonas Niilola
2021-01-21 7:14 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox