diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /www-misc/nx_util | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'www-misc/nx_util')
-rw-r--r-- | www-misc/nx_util/Manifest | 2 | ||||
-rw-r--r-- | www-misc/nx_util/files/0.3-fix-install-paths.patch | 47 | ||||
-rw-r--r-- | www-misc/nx_util/files/0.52.1-fix-install-paths.patch | 49 | ||||
-rw-r--r-- | www-misc/nx_util/metadata.xml | 12 | ||||
-rw-r--r-- | www-misc/nx_util/nx_util-0.52.1.ebuild | 35 | ||||
-rw-r--r-- | www-misc/nx_util/nx_util-0.53.1.ebuild | 35 |
6 files changed, 180 insertions, 0 deletions
diff --git a/www-misc/nx_util/Manifest b/www-misc/nx_util/Manifest new file mode 100644 index 000000000000..0e0cbf60dd9f --- /dev/null +++ b/www-misc/nx_util/Manifest @@ -0,0 +1,2 @@ +DIST ngx_http_naxsi-0.52-1.tar.gz 162044 SHA256 0f23b0f17f03591775e95294a115d609ad47e2874e5f01c4fed1ebb680ea07bc SHA512 e1d3b4b3284d5b3f44ec5888023e6853c06519f99f3de768d8420d50a8bd50ae4d77c2413e441caa5dedc420f28ab3413d79fe56fc9aee8636a9b20adea7be74 WHIRLPOOL b42c4dc99c2a0b670b4e06ee9b5a0eb1b38b96f670c04c56fa30f13b8d3263836b54ff641dc1effd0e461f0fb3e0b935f945c2467b27c83f80b8407a3b42f739 +DIST ngx_http_naxsi-0.53-1.tar.gz 165627 SHA256 cde175f940cd2e8c595b95512642cd3f8ae6f3c4a2ee10c2fda214ffeb808274 SHA512 33e3a92242304f4e5900cb66915651f1c5ba78f40b27f41c1d81353390ef6baef5a6a03042441c200d4e489e70f251d782efe0644b916a2ff34833be8a8fd385 WHIRLPOOL 67c5cb73cc04381bf874222f9aa20d8ec063f074d139b8fa882bc9a84526f5d192f066b621a429086f93b1a55ea235e98623dfcb69952451dd870bcf316bd928 diff --git a/www-misc/nx_util/files/0.3-fix-install-paths.patch b/www-misc/nx_util/files/0.3-fix-install-paths.patch new file mode 100644 index 000000000000..919c94ac4ed4 --- /dev/null +++ b/www-misc/nx_util/files/0.3-fix-install-paths.patch @@ -0,0 +1,47 @@ +diff --git a/nx_util.conf b/nx_util.conf +index cd2a591..818daaf 100644 +--- a/nx_util.conf ++++ b/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.py b/nx_util.py +index 81c5030..eb7e888 100755 +--- a/nx_util.py ++++ b/nx_util.py +@@ -61,8 +61,8 @@ nginx/naxsi log parser, whitelist and report generator. + + # 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/setup.py b/setup.py +index c08f4e6..7b15fd8 100644 +--- a/setup.py ++++ b/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/files/0.52.1-fix-install-paths.patch b/www-misc/nx_util/files/0.52.1-fix-install-paths.patch new file mode 100644 index 000000000000..1a2752e3b20b --- /dev/null +++ b/www-misc/nx_util/files/0.52.1-fix-install-paths.patch @@ -0,0 +1,49 @@ +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 new file mode 100644 index 000000000000..8235a31b325b --- /dev/null +++ b/www-misc/nx_util/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>dev-zero@gentoo.org</email> + <name>Tiziano Müller</name> + </maintainer> + <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 new file mode 100644 index 000000000000..158d75287f21 --- /dev/null +++ b/www-misc/nx_util/nx_util-0.52.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 Application 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 new file mode 100644 index 000000000000..3f6c610f4c9a --- /dev/null +++ b/www-misc/nx_util/nx_util-0.53.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 Application 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" +} |