| 1 |
commit: 233113890bf9d581fa05932f209107347c76a57b |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 2 08:14:38 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 2 08:14:38 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23311389 |
| 7 |
|
| 8 |
www-misc/nx_util: Remove last-rited pkg |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/735524 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
profiles/package.mask | 5 --- |
| 14 |
www-misc/nx_util/Manifest | 2 - |
| 15 |
.../nx_util/files/0.52.1-fix-install-paths.patch | 49 ---------------------- |
| 16 |
www-misc/nx_util/metadata.xml | 9 ---- |
| 17 |
www-misc/nx_util/nx_util-0.52.1.ebuild | 34 --------------- |
| 18 |
www-misc/nx_util/nx_util-0.53.1.ebuild | 34 --------------- |
| 19 |
6 files changed, 133 deletions(-) |
| 20 |
|
| 21 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 22 |
index 5b6c21a34b6..752564e75ef 100644 |
| 23 |
--- a/profiles/package.mask |
| 24 |
+++ b/profiles/package.mask |
| 25 |
@@ -662,11 +662,6 @@ net-wireless/cpyrit-cuda |
| 26 |
net-wireless/cpyrit-opencl |
| 27 |
net-wireless/pyrit |
| 28 |
|
| 29 |
-# Aaron Bauman <bman@g.o> (2020-08-02) |
| 30 |
-# Py2 only. m-n. Bug #735524 |
| 31 |
-# Removal in 30 days |
| 32 |
-www-misc/nx_util |
| 33 |
- |
| 34 |
# Mikle Kolyada <zlogene@g.o> (2020-08-02) |
| 35 |
# consolekit is abandoned upstream. |
| 36 |
# People are encouraged to switch to any logind |
| 37 |
|
| 38 |
diff --git a/www-misc/nx_util/Manifest b/www-misc/nx_util/Manifest |
| 39 |
deleted file mode 100644 |
| 40 |
index 2dc8656ebbe..00000000000 |
| 41 |
--- a/www-misc/nx_util/Manifest |
| 42 |
+++ /dev/null |
| 43 |
@@ -1,2 +0,0 @@ |
| 44 |
-DIST ngx_http_naxsi-0.52-1.tar.gz 162044 BLAKE2B 59944e8aff454f8b2b7eb5d548a7c4a43c3009dc3637dd90feea28d3ec28fec127ba47c323142aa9c2f4cff7ecf34f7afd8cd7b17444bf976bbe0ab2a9fdcde8 SHA512 e1d3b4b3284d5b3f44ec5888023e6853c06519f99f3de768d8420d50a8bd50ae4d77c2413e441caa5dedc420f28ab3413d79fe56fc9aee8636a9b20adea7be74 |
| 45 |
-DIST ngx_http_naxsi-0.53-1.tar.gz 165627 BLAKE2B faef43290a629e3e7b05b0135d50eeb6ad44edfef330b81a7655ad416066aa86e00f75713108d22d874a10a069ac8962c3182bb6647dfa35673857c331e99747 SHA512 33e3a92242304f4e5900cb66915651f1c5ba78f40b27f41c1d81353390ef6baef5a6a03042441c200d4e489e70f251d782efe0644b916a2ff34833be8a8fd385 |
| 46 |
|
| 47 |
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 |
| 48 |
deleted file mode 100644 |
| 49 |
index 1a2752e3b20..00000000000 |
| 50 |
--- a/www-misc/nx_util/files/0.52.1-fix-install-paths.patch |
| 51 |
+++ /dev/null |
| 52 |
@@ -1,49 +0,0 @@ |
| 53 |
-diff --git a/nx_util/nx_util.conf b/nx_util/nx_util.conf |
| 54 |
-index cd2a591..818daaf 100644 |
| 55 |
---- a/nx_util/nx_util.conf |
| 56 |
-+++ b/nx_util/nx_util.conf |
| 57 |
-@@ -1,4 +1,4 @@ |
| 58 |
- [nx_util] |
| 59 |
--data_dir=/usr/local/nx_datas |
| 60 |
-+data_dir=/usr/share/nx_datas |
| 61 |
- database_dir= |
| 62 |
- naxsi_core_rules=/etc/nginx/naxsi_core.rules |
| 63 |
-diff --git a/nx_util/nx_util.py b/nx_util/nx_util.py |
| 64 |
-old mode 100644 |
| 65 |
-new mode 100755 |
| 66 |
-index 0509b51..38be37e |
| 67 |
---- a/nx_util/nx_util.py |
| 68 |
-+++ b/nx_util/nx_util.py |
| 69 |
-@@ -62,8 +62,8 @@ if __name__ == "__main__": |
| 70 |
- |
| 71 |
- # Configuration |
| 72 |
- parser.add_option("-c", "--config", dest="conf_path", |
| 73 |
-- help="Path to configuration (defaults to /usr/local/etc/nx_util.conf)", |
| 74 |
-- type="string", default="/usr/local/etc/nx_util.conf") |
| 75 |
-+ help="Path to configuration (defaults to /etc/nx_util.conf)", |
| 76 |
-+ type="string", default="/etc/nx_util.conf") |
| 77 |
- |
| 78 |
- # Filtering options should go here :) |
| 79 |
- parser.add_option("-f", "--filters", dest="usr_filter", |
| 80 |
-diff --git a/nx_util/setup.py b/nx_util/setup.py |
| 81 |
-index cc48a5c..b855459 100644 |
| 82 |
---- a/nx_util/setup.py |
| 83 |
-+++ b/nx_util/setup.py |
| 84 |
-@@ -8,14 +8,14 @@ setup(name='nx_util', |
| 85 |
- author='Naxsi Dev Team', |
| 86 |
- author_email='thibault.koechlin@××××××××××.com', |
| 87 |
- url='naxsi.googlecode.com', |
| 88 |
-- scripts=['nx_util.py'], |
| 89 |
-+ scripts=['nx_util'], |
| 90 |
- packages=['nx_lib'], |
| 91 |
-- data_files=[('nx_datas', ['nx_datas/bootstrap.min.css', |
| 92 |
-+ data_files=[('/usr/share/nx_datas', ['nx_datas/bootstrap.min.css', |
| 93 |
- 'nx_datas/bootstrap-responsive.min.css', |
| 94 |
- 'nx_datas/highcharts.js', |
| 95 |
- 'nx_datas/map.tpl', |
| 96 |
- 'nx_datas/bootstrap.min.js', |
| 97 |
- 'nx_datas/country2coords.txt']), |
| 98 |
- ('/usr/share/man/man1', ['nx_util.1.gz']), |
| 99 |
-- ('/usr/local/etc/', ['nx_util.conf'])] |
| 100 |
-+ ('/etc/', ['nx_util.conf'])] |
| 101 |
- ) |
| 102 |
|
| 103 |
diff --git a/www-misc/nx_util/metadata.xml b/www-misc/nx_util/metadata.xml |
| 104 |
deleted file mode 100644 |
| 105 |
index 57bdd9e71c0..00000000000 |
| 106 |
--- a/www-misc/nx_util/metadata.xml |
| 107 |
+++ /dev/null |
| 108 |
@@ -1,9 +0,0 @@ |
| 109 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 110 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 111 |
-<pkgmetadata> |
| 112 |
- <!-- maintainer-needed --> |
| 113 |
- <upstream> |
| 114 |
- <remote-id type="google-code">naxsi</remote-id> |
| 115 |
- <remote-id type="github">nbs-system/naxsi</remote-id> |
| 116 |
- </upstream> |
| 117 |
-</pkgmetadata> |
| 118 |
|
| 119 |
diff --git a/www-misc/nx_util/nx_util-0.52.1.ebuild b/www-misc/nx_util/nx_util-0.52.1.ebuild |
| 120 |
deleted file mode 100644 |
| 121 |
index f0f2265043c..00000000000 |
| 122 |
--- a/www-misc/nx_util/nx_util-0.52.1.ebuild |
| 123 |
+++ /dev/null |
| 124 |
@@ -1,34 +0,0 @@ |
| 125 |
-# Copyright 1999-2014 Gentoo Foundation |
| 126 |
-# Distributed under the terms of the GNU General Public License v2 |
| 127 |
- |
| 128 |
-EAPI=5 |
| 129 |
- |
| 130 |
-PYTHON_COMPAT=( python2_7 ) |
| 131 |
-PYTHON_REQ_USE="sqlite" |
| 132 |
-DISTUTILS_SINGLE_IMPL=true |
| 133 |
- |
| 134 |
-inherit distutils-r1 versionator |
| 135 |
- |
| 136 |
-MY_PV="$(replace_version_separator 2 '-')" |
| 137 |
- |
| 138 |
-DESCRIPTION="Whitelist & Reports generation for Naxsi (Web App Firewall module for Nginx)" |
| 139 |
-HOMEPAGE="https://github.com/nbs-system/naxsi" |
| 140 |
-# keep the name in sync with what's in the nginx ebuild to avoid duplication |
| 141 |
-SRC_URI="https://github.com/nbs-system/naxsi/archive/${MY_PV}.tar.gz -> ngx_http_naxsi-${MY_PV}.tar.gz" |
| 142 |
- |
| 143 |
-LICENSE="GPL-2+ Apache-2.0 CC-BY-NC-SA-3.0" |
| 144 |
-SLOT="0" |
| 145 |
-KEYWORDS="~amd64" |
| 146 |
-IUSE="" |
| 147 |
- |
| 148 |
-DEPEND="" |
| 149 |
-RDEPEND="www-servers/nginx[nginx_modules_http_naxsi]" |
| 150 |
- |
| 151 |
-PATCHES=( "${FILESDIR}/${PV}-fix-install-paths.patch" ) |
| 152 |
- |
| 153 |
-S="${WORKDIR}/naxsi-${MY_PV}/nx_util" |
| 154 |
- |
| 155 |
-src_prepare() { |
| 156 |
- distutils-r1_src_prepare |
| 157 |
- mv nx_util{.py,} || die "renaming script failed" |
| 158 |
-} |
| 159 |
|
| 160 |
diff --git a/www-misc/nx_util/nx_util-0.53.1.ebuild b/www-misc/nx_util/nx_util-0.53.1.ebuild |
| 161 |
deleted file mode 100644 |
| 162 |
index 3ea7c4f0c8a..00000000000 |
| 163 |
--- a/www-misc/nx_util/nx_util-0.53.1.ebuild |
| 164 |
+++ /dev/null |
| 165 |
@@ -1,34 +0,0 @@ |
| 166 |
-# Copyright 1999-2014 Gentoo Foundation |
| 167 |
-# Distributed under the terms of the GNU General Public License v2 |
| 168 |
- |
| 169 |
-EAPI=5 |
| 170 |
- |
| 171 |
-PYTHON_COMPAT=( python2_7 ) |
| 172 |
-PYTHON_REQ_USE="sqlite" |
| 173 |
-DISTUTILS_SINGLE_IMPL=true |
| 174 |
- |
| 175 |
-inherit distutils-r1 versionator |
| 176 |
- |
| 177 |
-MY_PV="$(replace_version_separator 2 '-')" |
| 178 |
- |
| 179 |
-DESCRIPTION="Whitelist & Reports generation for Naxsi (Web App Firewall module for Nginx)" |
| 180 |
-HOMEPAGE="https://github.com/nbs-system/naxsi" |
| 181 |
-# keep the name in sync with what's in the nginx ebuild to avoid duplication |
| 182 |
-SRC_URI="https://github.com/nbs-system/naxsi/archive/${MY_PV}.tar.gz -> ngx_http_naxsi-${MY_PV}.tar.gz" |
| 183 |
- |
| 184 |
-LICENSE="GPL-2+ Apache-2.0 CC-BY-NC-SA-3.0" |
| 185 |
-SLOT="0" |
| 186 |
-KEYWORDS="~amd64" |
| 187 |
-IUSE="" |
| 188 |
- |
| 189 |
-DEPEND="" |
| 190 |
-RDEPEND="www-servers/nginx[nginx_modules_http_naxsi]" |
| 191 |
- |
| 192 |
-PATCHES=( "${FILESDIR}/0.52.1-fix-install-paths.patch" ) |
| 193 |
- |
| 194 |
-S="${WORKDIR}/naxsi-${MY_PV}/nx_util" |
| 195 |
- |
| 196 |
-src_prepare() { |
| 197 |
- distutils-r1_src_prepare |
| 198 |
- mv nx_util{.py,} || die "renaming script failed" |
| 199 |
-} |
Archives