Version bump

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x1E0CA85F!

4 files changed, 95 insertions, 18 deletions

diff --git a/www-misc/nx_util/ChangeLog b/www-misc/nx_util/ChangeLog
index e94f71f82738..8147b3c75737 100644
--- a/www-misc/nx_util/ChangeLog
+++ b/www-misc/nx_util/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-misc/nx_util
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/nx_util/ChangeLog,v 1.2 2013/05/14 21:57:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/nx_util/ChangeLog,v 1.3 2013/09/27 13:42:25 dev-zero Exp $
+
+*nx_util-0.52.1 (27 Sep 2013)
+
+  27 Sep 2013; Tiziano Müller <dev-zero@gentoo.org>
+  +files/0.52.1-fix-install-paths.patch, +nx_util-0.52.1.ebuild:
+  Version bump
 
   14 May 2013; Tiziano Müller <dev-zero@gentoo.org> nx_util-0.3.ebuild:
   Fix licenses (thanks to jbergstroem).
diff --git a/www-misc/nx_util/Manifest b/www-misc/nx_util/Manifest
index 57f43bc8e3b9..ea986d76acd6 100644
--- a/www-misc/nx_util/Manifest
+++ b/www-misc/nx_util/Manifest
@@ -1,21 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 0.3-fix-install-paths.patch 1839 SHA256 f257964851420aa909c912a345d475bd87a3d922d62ddb89dd4da6dc5806978c SHA512 0cb33c0820e61f8e64622f8c1f760932f5ffc92774db99f8375f7030b26c62480caf77fc1b109e8ce1593c9a79398bf4e4cca550d734e33d1f9108eff12fda54 WHIRLPOOL 33f08581358afa4520758b0ba29c2cd5cec3ced9d14bcaf3e6d8bd2c2c42cfb5e83fb631eaed721ce2a221c0451129539f1cd40b45312095823fa2e3147b17f5
+AUX 0.52.1-fix-install-paths.patch 1931 SHA256 e37f1418e8f5cc2cfe078b57e3f23450cdd3783afb4b86dd53587f4169c73846 SHA512 151c71732de120f3ff982097de084f2096e1592f8317a87c95b8cc4af66b7705f25f120b6ba972f0e296c9fa5528b5450bcb7f6b6fa67a33e149be3223964dca WHIRLPOOL 428bbc228c445ae22bd48c21e1cb5de59474ceeee6c6e1d6e65d54066f6b9d7bac4b1d119e7cd882ec38ea2280c33f23b14f9a6ca149ffd75f7b26ecba7b85e8
+DIST ngx_http_naxsi-0.52-1.tar.gz 162044 SHA256 0f23b0f17f03591775e95294a115d609ad47e2874e5f01c4fed1ebb680ea07bc SHA512 e1d3b4b3284d5b3f44ec5888023e6853c06519f99f3de768d8420d50a8bd50ae4d77c2413e441caa5dedc420f28ab3413d79fe56fc9aee8636a9b20adea7be74 WHIRLPOOL b42c4dc99c2a0b670b4e06ee9b5a0eb1b38b96f670c04c56fa30f13b8d3263836b54ff641dc1effd0e461f0fb3e0b935f945c2467b27c83f80b8407a3b42f739
 DIST nx_util-0.3.tgz 117551 SHA256 9259f18ecfd8f4a9521ba8c842b878236416fd9ba81d91c2a19746fbeba94386 SHA512 139860a54d597b53d6695eb032583d9d2fa3621f25e16e97c06cd3612e18a2b2d0faa0df649828e70d090615b53e559828880038818b387103e00688f2308157 WHIRLPOOL 411b21c97b1f70fb79a1e444fbf1d9888168b0232e8a37d3529d018a62718750fa7fc4c9dcb4d4414af5c80a53578c4fd61ec217bd1b81d395948f4f0d3fdd7d
 EBUILD nx_util-0.3.ebuild 825 SHA256 741babbba5d1a1a332d5d63449aae178dc0377bd764eea0fbfc04ab9ed2e31b8 SHA512 e38edb080dc610cbde5039031f8e113171251cbe5d4ca836ef447b4c5ad9c489f677a07d09b5bd196d9ba590da1d5e6b4d5d05d2acb094dcb92ff4e5da822657 WHIRLPOOL d822cf1b95f418f03187445750fa7fd04047067cb7230b010e2235c0ab0c4689248a7a2bfdd2015bc98f6ef63ab14d80c276c9cd61fbc107805171aa3bea3a17
-MISC ChangeLog 516 SHA256 e9cbac883ca9c395e5ee1a942224340631e062a17f18f8fba417e58681aa8657 SHA512 e945cd3ffc9834169f88ddcd7bb7f1e49b1cc8f7395aaded506afa5d2e1f017b7127faf089e8613d3b8f578cd86c291017167a6adf59f8773416b6d9a1a52c53 WHIRLPOOL 662324f97ba867ebc7a3ec94e0a79db4981da0dcc8ca35104abdfde500317f0a560bc98f724cbcb94632d60f196f66e9eac6bbbe30c936adcdff35919bfd0330
+EBUILD nx_util-0.52.1.ebuild 1053 SHA256 644c2e818404cda995fd808c6feece4a7b2f71333f731dbb7039e167d2c094e8 SHA512 5d404d935b8a55961ecf021ba95eeafe5c419d5b76cab9691c12cb52e3c285aed2201077dd72e90efffd988b236b07c6d27b4f0001acbf4af04f556a3b8d37e8 WHIRLPOOL a6af2856a3acf271764974aa0e3f28867d0493ba8e856b21f115581bf95172c4f9508ab3be84c50abcd89cf6c6ab77bbec3c50e1a5d874aaccb5443d4b211fb5
+MISC ChangeLog 681 SHA256 947150a1359622fdb6fe6abc2bc678fce85b0a85af804f8328341bc87c39ba49 SHA512 7575280ffac18395194939f054af7354e361a5ad67a83541a15feb2beb35829c4121ad8f2ef25e43d1801694c5f22c20bc58072b353994f70ac82a00916a9461 WHIRLPOOL a830f8b7e1e5f978e16b8ff688a653937295f2b9e4eb1b973eee98fa29ddf57faeba11288da9c040e707ac98ec5928805ca7abd0f6906d137cdc1fe8b1987271
 MISC metadata.xml 311 SHA256 c7b239c60e40439398894df82eafb76672ffe6b6ecc279f9b5aa0c91da6b2448 SHA512 20599c48752b0ec170f588b7dd71a211ec06e5676cd32db7ac5cc81248b85a1c5d2b3f8a7b822440679982b9bcd2aa190505bf2cf3616aae3e27d8a3859356f5 WHIRLPOOL c42c6d66e83176a61afc7f19c73cb70e06654df0250bf58dfbe9ed5cd37b1713bcc14cfef9968160bf82b4b18d83e7a9ac3574261352b5ba38c00658a2faa6b1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQF8BAEBCABmBQJRkrNNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RjI0QTQ0MjI1OURBNzI4MEIyREExRkQx
-RTdDRkM3NzFFMENBODVGAAoJEB58/HceDKhf9PIH/RNGN3kazdwVLvSiEoel071X
-5jpQviNXsssPq9F8HNcalf61qYAR4TtbrT/Oze6txmtQGluN7DHqDo4mRfZcqbRd
-oiwvAKj+p6gh1NfrBTW+hWekUYnYcVbiykqIoFvaQtzx7EVffG4Zmgpr9YOBeKj+
-7NCOjYJqsOximdGgOZxz9mhHSk60S2VwpE+OIH4p38tFpZ3QMeMSsAYwVg01I5X2
-mbW2Tv/6D7XUex/IniI0PZvaMPZkZZf5SLhZxIwr2zAdU7BZM4uZJDVoBG2sJjLA
-so1IaCZPJ7mM5nR/nTKzBqAxj5luCcB5RyR2y+8jV6SwKZbdAwsSkGeRMlUvSic=
-=7Gyk
------END PGP SIGNATURE-----
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/nx_util-0.52.1.ebuild b/www-misc/nx_util/nx_util-0.52.1.ebuild
new file mode 100644
index 000000000000..5e29ed06a471
--- /dev/null
+++ b/www-misc/nx_util/nx_util-0.52.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/nx_util/nx_util-0.52.1.ebuild,v 1.1 2013/09/27 13:42:25 dev-zero Exp $
+
+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"
+}