gentoo resync : 28.04.2021

2 files changed, 0 insertions, 100 deletions

diff --git a/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch b/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch
deleted file mode 100644
index 7c3694a776ee..000000000000
--- a/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c
-index a65b9c4..e011c51 100644
---- a/src/libs/zbxdb/db.c
-+++ b/src/libs/zbxdb/db.c
-@@ -285,7 +285,11 @@ int	zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d
- #if defined(HAVE_IBM_DB2)
- 	char		*connect = NULL;
- #elif defined(HAVE_MYSQL)
--	my_bool		mysql_reconnect = 1;
-+#if LIBMYSQL_VERSION_ID >= 80000        /* my_bool type is removed in MySQL 8.0 */
-+	bool            mysql_reconnect = 1;
-+#else
-+	my_bool         mysql_reconnect = 1;
-+#endif
- #elif defined(HAVE_ORACLE)
- 	char		*connect = NULL;
- 	sword		err = OCI_SUCCESS;
diff --git a/net-analyzer/zabbix/files/zabbix-3.0.31-fix-cve-2020-15803.patch b/net-analyzer/zabbix/files/zabbix-3.0.31-fix-cve-2020-15803.patch
deleted file mode 100644
index 0cca60315581..000000000000
--- a/net-analyzer/zabbix/files/zabbix-3.0.31-fix-cve-2020-15803.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/frontends/php/include/classes/screens/CScreenUrl.php b/frontends/php/include/classes/screens/CScreenUrl.php
-index e35c5f1..1df396e 100644
---- a/frontends/php/include/classes/screens/CScreenUrl.php
-+++ b/frontends/php/include/classes/screens/CScreenUrl.php
-@@ -29,18 +29,10 @@ class CScreenUrl extends CScreenBase {
- 	public function get() {
- 		// prevent from resolving macros in configuration page
- 		if ($this->mode != SCREEN_MODE_PREVIEW && $this->mode != SCREEN_MODE_SLIDESHOW) {
--			return $this->getOutput(
--				CHtmlUrlValidator::validate($this->screenitem['url'], false)
--					? new CIFrame($this->screenitem['url'], $this->screenitem['width'], $this->screenitem['height'],
--							'auto')
--					: makeMessageBox(false, [[
--								'type' => 'error',
--								'message' => _s('Provided URL "%1$s" is invalid.', $this->screenitem['url'])
--							]]
--						)
--			);
-+			return $this->getOutput($this->prepareElement());
- 		}
--		elseif ($this->screenitem['dynamic'] == SCREEN_DYNAMIC_ITEM && $this->hostid == 0) {
-+
-+		if ($this->screenitem['dynamic'] == SCREEN_DYNAMIC_ITEM && $this->hostid == 0) {
- 			return $this->getOutput((new CTableInfo())->setNoDataMessage(_('No host selected.')));
- 		}
- 
-@@ -54,14 +46,28 @@ class CScreenUrl extends CScreenBase {
- 
- 		$this->screenitem['url'] = $url ? $url : $this->screenitem['url'];
- 
--		return $this->getOutput(
--			CHtmlUrlValidator::validate($this->screenitem['url'], false)
--				? new CIFrame($this->screenitem['url'], $this->screenitem['width'], $this->screenitem['height'], 'auto')
--				: makeMessageBox(false, [[
--							'type' => 'error',
--							'message' => _s('Provided URL "%1$s" is invalid.', $this->screenitem['url'])
--						]]
--					)
--		);
-+		return $this->getOutput($this->prepareElement());
-+	}
-+
-+	/**
-+	 * @return CTag
-+	 */
-+	public function prepareElement() {
-+		if (CHtmlUrlValidator::validate($this->screenitem['url'], false)) {
-+			$item = new CIFrame($this->screenitem['url'], $this->screenitem['width'], $this->screenitem['height'],
-+				'auto'
-+			);
-+
-+			if (ZBX_IFRAME_SANDBOX !== false) {
-+				$item->setAttribute('sandbox', ZBX_IFRAME_SANDBOX);
-+			}
-+
-+			return $item;
-+		}
-+
-+		return makeMessageBox(false, [[
-+			'type' => 'error',
-+			'message' => _s('Provided URL "%1$s" is invalid.', $this->screenitem['url'])
-+		]]);
- 	}
- }
-diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
-index a67a625..c6a437c 100644
---- a/frontends/php/include/defines.inc.php
-+++ b/frontends/php/include/defines.inc.php
-@@ -1284,6 +1284,14 @@ if (function_exists('bcscale')) {
- 	bcscale(7);
- }
- 
-+/**
-+ * The sandbox attribute enables an extra set of restrictions for the content in the iframe. Default is set to empty
-+ * string, which means all restrictions are applied. To disable, set to FALSE. To set a specific set of restrictions,
-+ * write a custom string.
-+ * https://www.w3.org/TR/2010/WD-html5-20100624/the-iframe-element.html#attr-iframe-sandbox
-+ */
-+define('ZBX_IFRAME_SANDBOX', '');
-+
- // HTTP headers
- /*
-  * Value of HTTP X-Frame-options header.