From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Sep 2020 14:09:07 +0100 Subject: gentoo resync : 02.09.2020 --- www-misc/Manifest.gz | Bin 3248 -> 3079 bytes www-misc/nx_util/Manifest | 6 --- .../nx_util/files/0.52.1-fix-install-paths.patch | 49 --------------------- www-misc/nx_util/metadata.xml | 9 ---- www-misc/nx_util/nx_util-0.52.1.ebuild | 34 -------------- www-misc/nx_util/nx_util-0.53.1.ebuild | 34 -------------- 6 files changed, 132 deletions(-) delete mode 100644 www-misc/nx_util/Manifest delete mode 100644 www-misc/nx_util/files/0.52.1-fix-install-paths.patch delete mode 100644 www-misc/nx_util/metadata.xml delete mode 100644 www-misc/nx_util/nx_util-0.52.1.ebuild delete mode 100644 www-misc/nx_util/nx_util-0.53.1.ebuild (limited to 'www-misc') diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz index ffbc43dd54cf..d9e8fecbaab0 100644 Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ diff --git a/www-misc/nx_util/Manifest b/www-misc/nx_util/Manifest deleted file mode 100644 index 40eac1a1d3f5..000000000000 --- a/www-misc/nx_util/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX 0.52.1-fix-install-paths.patch 1931 BLAKE2B 05fd20433f9ec335928c70bc76f098a67e839f0fa35dbbf42cbfbac22943f0592bba36653b9a4d8ef4d33c83e400748d389b681ea29fc271621673e83dfc8ab8 SHA512 151c71732de120f3ff982097de084f2096e1592f8317a87c95b8cc4af66b7705f25f120b6ba972f0e296c9fa5528b5450bcb7f6b6fa67a33e149be3223964dca -DIST ngx_http_naxsi-0.52-1.tar.gz 162044 BLAKE2B 59944e8aff454f8b2b7eb5d548a7c4a43c3009dc3637dd90feea28d3ec28fec127ba47c323142aa9c2f4cff7ecf34f7afd8cd7b17444bf976bbe0ab2a9fdcde8 SHA512 e1d3b4b3284d5b3f44ec5888023e6853c06519f99f3de768d8420d50a8bd50ae4d77c2413e441caa5dedc420f28ab3413d79fe56fc9aee8636a9b20adea7be74 -DIST ngx_http_naxsi-0.53-1.tar.gz 165627 BLAKE2B faef43290a629e3e7b05b0135d50eeb6ad44edfef330b81a7655ad416066aa86e00f75713108d22d874a10a069ac8962c3182bb6647dfa35673857c331e99747 SHA512 33e3a92242304f4e5900cb66915651f1c5ba78f40b27f41c1d81353390ef6baef5a6a03042441c200d4e489e70f251d782efe0644b916a2ff34833be8a8fd385 -EBUILD nx_util-0.52.1.ebuild 929 BLAKE2B 2fe9540db4037a9e4b89bd32a5ed7e55ed1940240eb233f714fd1f7081046f857c086586ef7254a5eccf506547834b28ef0101d329176f259a41da9a298098a4 SHA512 fe52b5b0989304dce76cf3b617fa2107d104adad72f12cd1b724447e2ab8edd7244a709f63218ce7d86ad65d00a1e54759b85af7b04850766a3a529dbeb399b0 -EBUILD nx_util-0.53.1.ebuild 930 BLAKE2B c18a1b6ee2dcbfe7f62c9cc295d64255cc96b5b94702ef1fd2252419d58a9b9854b517b9e89c6f407cefabe5ec48ad677ce7aa9d60c284b283564dfb89bfb5f4 SHA512 b788feea8d7f795c96fcac71198421017e6a3f4a81b19e08de80385bea9bff66659a69371ca59a40a0918c817c92bf0ec6e1bc78b0d4a2cc83155cc77c20d7a0 -MISC metadata.xml 298 BLAKE2B d3c6dc34d4282606472964558199b03b43d8ef3cdff4eeff99763a82360e424fcc8b288f491684ef6e5ca07de103fe313e67d91038f89d1c8af5cafda3a229b2 SHA512 8443ac0b92ff6aa0e3cfa64b3c880539ef35eb54672dc6cf0b9b51d75b6ecd357701850350d6a102786cf8ed98cae84fe76e296def40bcd4aea22113a945d74f diff --git a/www-misc/nx_util/files/0.52.1-fix-install-paths.patch b/www-misc/nx_util/files/0.52.1-fix-install-paths.patch deleted file mode 100644 index 1a2752e3b20b..000000000000 --- a/www-misc/nx_util/files/0.52.1-fix-install-paths.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/nx_util/nx_util.conf b/nx_util/nx_util.conf -index cd2a591..818daaf 100644 ---- a/nx_util/nx_util.conf -+++ b/nx_util/nx_util.conf -@@ -1,4 +1,4 @@ - [nx_util] --data_dir=/usr/local/nx_datas -+data_dir=/usr/share/nx_datas - database_dir= - naxsi_core_rules=/etc/nginx/naxsi_core.rules -diff --git a/nx_util/nx_util.py b/nx_util/nx_util.py -old mode 100644 -new mode 100755 -index 0509b51..38be37e ---- a/nx_util/nx_util.py -+++ b/nx_util/nx_util.py -@@ -62,8 +62,8 @@ if __name__ == "__main__": - - # Configuration - parser.add_option("-c", "--config", dest="conf_path", -- help="Path to configuration (defaults to /usr/local/etc/nx_util.conf)", -- type="string", default="/usr/local/etc/nx_util.conf") -+ help="Path to configuration (defaults to /etc/nx_util.conf)", -+ type="string", default="/etc/nx_util.conf") - - # Filtering options should go here :) - parser.add_option("-f", "--filters", dest="usr_filter", -diff --git a/nx_util/setup.py b/nx_util/setup.py -index cc48a5c..b855459 100644 ---- a/nx_util/setup.py -+++ b/nx_util/setup.py -@@ -8,14 +8,14 @@ setup(name='nx_util', - author='Naxsi Dev Team', - author_email='thibault.koechlin@nbs-system.com', - url='naxsi.googlecode.com', -- scripts=['nx_util.py'], -+ scripts=['nx_util'], - packages=['nx_lib'], -- data_files=[('nx_datas', ['nx_datas/bootstrap.min.css', -+ data_files=[('/usr/share/nx_datas', ['nx_datas/bootstrap.min.css', - 'nx_datas/bootstrap-responsive.min.css', - 'nx_datas/highcharts.js', - 'nx_datas/map.tpl', - 'nx_datas/bootstrap.min.js', - 'nx_datas/country2coords.txt']), - ('/usr/share/man/man1', ['nx_util.1.gz']), -- ('/usr/local/etc/', ['nx_util.conf'])] -+ ('/etc/', ['nx_util.conf'])] - ) diff --git a/www-misc/nx_util/metadata.xml b/www-misc/nx_util/metadata.xml deleted file mode 100644 index 57bdd9e71c0d..000000000000 --- a/www-misc/nx_util/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - naxsi - nbs-system/naxsi - - diff --git a/www-misc/nx_util/nx_util-0.52.1.ebuild b/www-misc/nx_util/nx_util-0.52.1.ebuild deleted file mode 100644 index f0f2265043c8..000000000000 --- a/www-misc/nx_util/nx_util-0.52.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" -DISTUTILS_SINGLE_IMPL=true - -inherit distutils-r1 versionator - -MY_PV="$(replace_version_separator 2 '-')" - -DESCRIPTION="Whitelist & Reports generation for Naxsi (Web App Firewall module for Nginx)" -HOMEPAGE="https://github.com/nbs-system/naxsi" -# keep the name in sync with what's in the nginx ebuild to avoid duplication -SRC_URI="https://github.com/nbs-system/naxsi/archive/${MY_PV}.tar.gz -> ngx_http_naxsi-${MY_PV}.tar.gz" - -LICENSE="GPL-2+ Apache-2.0 CC-BY-NC-SA-3.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="www-servers/nginx[nginx_modules_http_naxsi]" - -PATCHES=( "${FILESDIR}/${PV}-fix-install-paths.patch" ) - -S="${WORKDIR}/naxsi-${MY_PV}/nx_util" - -src_prepare() { - distutils-r1_src_prepare - mv nx_util{.py,} || die "renaming script failed" -} diff --git a/www-misc/nx_util/nx_util-0.53.1.ebuild b/www-misc/nx_util/nx_util-0.53.1.ebuild deleted file mode 100644 index 3ea7c4f0c8a4..000000000000 --- a/www-misc/nx_util/nx_util-0.53.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" -DISTUTILS_SINGLE_IMPL=true - -inherit distutils-r1 versionator - -MY_PV="$(replace_version_separator 2 '-')" - -DESCRIPTION="Whitelist & Reports generation for Naxsi (Web App Firewall module for Nginx)" -HOMEPAGE="https://github.com/nbs-system/naxsi" -# keep the name in sync with what's in the nginx ebuild to avoid duplication -SRC_URI="https://github.com/nbs-system/naxsi/archive/${MY_PV}.tar.gz -> ngx_http_naxsi-${MY_PV}.tar.gz" - -LICENSE="GPL-2+ Apache-2.0 CC-BY-NC-SA-3.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="www-servers/nginx[nginx_modules_http_naxsi]" - -PATCHES=( "${FILESDIR}/0.52.1-fix-install-paths.patch" ) - -S="${WORKDIR}/naxsi-${MY_PV}/nx_util" - -src_prepare() { - distutils-r1_src_prepare - mv nx_util{.py,} || die "renaming script failed" -} -- cgit v1.2.3