commit: 233113890bf9d581fa05932f209107347c76a57b Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Sep 2 08:14:38 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Sep 2 08:14:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23311389
www-misc/nx_util: Remove last-rited pkg Closes: https://bugs.gentoo.org/735524 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/package.mask | 5 --- www-misc/nx_util/Manifest | 2 - .../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, 133 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 5b6c21a34b6..752564e75ef 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -662,11 +662,6 @@ net-wireless/cpyrit-cuda net-wireless/cpyrit-opencl net-wireless/pyrit -# Aaron Bauman <b...@gentoo.org> (2020-08-02) -# Py2 only. m-n. Bug #735524 -# Removal in 30 days -www-misc/nx_util - # Mikle Kolyada <zlog...@gentoo.org> (2020-08-02) # consolekit is abandoned upstream. # People are encouraged to switch to any logind diff --git a/www-misc/nx_util/Manifest b/www-misc/nx_util/Manifest deleted file mode 100644 index 2dc8656ebbe..00000000000 --- a/www-misc/nx_util/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -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 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 1a2752e3b20..00000000000 --- 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.koech...@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 57bdd9e71c0..00000000000 --- a/www-misc/nx_util/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="google-code">naxsi</remote-id> - <remote-id type="github">nbs-system/naxsi</remote-id> - </upstream> -</pkgmetadata> 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 f0f2265043c..00000000000 --- 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 3ea7c4f0c8a..00000000000 --- 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" -}
