Version bump (bug #506334 by Nikoli).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 112 insertions, 7 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 3ea2e47eb344..6b7cf4dd7d39 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/sarg
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.79 2013/02/16 12:47:02 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.80 2014/04/01 11:48:36 jer Exp $
+
+*sarg-2.3.8 (01 Apr 2014)
+
+  01 Apr 2014; Jeroen Roovers <jer@gentoo.org> +sarg-2.3.8.ebuild,
+  +files/sarg-2.3.8-long-long-int.patch:
+  Version bump (bug #506334 by Nikoli).
 
   16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #96436
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 0980ae1d4377..30d66053004d 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX sarg-2.3.8-long-long-int.patch 1009 SHA256 adc45aa8972318e79c18ebdc092130b4f724d8d6473c9aae4aaf75c53ecbbd86 SHA512 b6ed7ae9e93837159cc247efbaf282491ad10d93ca1d5dad6c0ce426862fb57531309ba09026fbac8a7e45154a24cb109a214b3288c99337425d8255e51b9c4f WHIRLPOOL 7069526bc609def4be6ddb0505f5c39f3b7f5217aa742e5154821916eab15bb86a3ada4a118949b133eae9aa05f4d46813bf2db717d998565850173c24e25d4e
 DIST sarg-2.3.2.tar.gz 1180411 SHA256 b117f417da577e73e8d6b44d8f63c99ceb8cd34b72bc0c4a5af889bfacb5c8a5 SHA512 d20a18b4e5856385685a11e45fcb04a6d56618a08330496117cd010cc27cf722e98b069bd5ee54661363e0e70f0c86578e68ea82f1a8bcab3536352141d94227 WHIRLPOOL ad357233f6719c62b04a3cc757834ac18a619ed32bc008457390595d0d56785dccd01064683f96614d74752d8bba9b072d193460984699a970e36a8740e23381
 DIST sarg-2.3.3.tar.gz 1281405 SHA256 7747c468ccd72bd2aa1f826dffe5e2f68fe1e3b64748e5916c3918c67e46dcab SHA512 7d1d3f19c4cd948536b12de92d39cdc42c57ef247239b16b276b3f0604256f50d45ae41a20b0b655bae1653e3e5c7fb8cb32ed6fc8eed4a4a71e847a7e578e5f WHIRLPOOL d2c10082fc802a259cf923f693215134033d9bf6f77914b9ca660cc926877c2e6c672ee506f50764ec801ff42c35ab27a163c4effc4ed031dabf43e849930c34
 DIST sarg-2.3.4.tar.gz 1282009 SHA256 9448de524bd91dbf0eaa8ebd393bc34c716dfb98e4595c8f0166062b8fac9f76 SHA512 279b6bfa87502973d82d25369098a8875d76440ddf845d99160865ecbd99a9ab63dbcb8a7ca94d0cf9807f46ce5dfbcec321592294c3d2763b4038b658280011 WHIRLPOOL 97edeb5a1bb3aaca355df2c2760b62bd01f6b43a47a5886ad84fa5c4e5f99126b9e2a8220bd3821b46df065376c3527bbe82c03b126d30744a89401b5f4be69a
+DIST sarg-2.3.8.tar.gz 1282735 SHA256 c7071526e44500e6401adc4383a6cb00c00c3110399aac26cd52ea65240eb21d SHA512 8bda850548cdbc0f0a657cbeafe09edce28d588a02563031aec59c7b18c8ae85efcda99d1aef78cff5f0ac4f8305dad4689cfd27e26710399ea2463a088a95c7 WHIRLPOOL 05fe326743acfc05e2696a71b4caec2c691b6237f9354b1a92436fff24011712e58d151fcceddece466fe7fa1521fd4bf6ad422f1b0d55ee64ee300df5782246
 EBUILD sarg-2.3.2.ebuild 1785 SHA256 2748e3a7c69691b62a718fce04d7dfcaf85cdff8e4d12431442c3c562131e13a SHA512 5d2bcf365b620fc55c77e230d4f285bd187d53d426bda4e7d4b0c239a74361cad57692b22a7a97bf8d60c773e3d798f29a8087bdfa3d36fba3ca7997738ed077 WHIRLPOOL 55a8c2cb881093d45b98e32b7674cd91c9415ca94de428fe37617887d0c441ae13081acabc7e27c36209a5ad167d651d779cf998c40fdf8d2cc0431e78c36660
 EBUILD sarg-2.3.3-r1.ebuild 1800 SHA256 59a8418a3624dec5d556c74b57897d68e4046267ea3a12c00eea961dbdc7a9fb SHA512 d2067def66b63a16376e5d4a0886ee5ed00b6c6ebd8c9e6cf42ec4e658eba0de1b8c57b208cd55ba620b6c16a1f057293f7b91909bcec00ea04c29111b60f252 WHIRLPOOL 444c5e595bcada9bd698e1c494dde3903cdc33ce7e3ffcfd7b04d4e592e502fe436b91aea97027f7d660bac3e02f55ed8603ffb1d7192d680a8fca4f4aa88c4b
 EBUILD sarg-2.3.4.ebuild 1931 SHA256 607483612d6b692c6b63a5eca7e1048607f6b93b25ed59f9349f98ec799df80c SHA512 3f0f94e26f70538b3dd3b869dd7f87eb8392fa5fe39914ea0477781330c372ea767b7c27aff70241570b412139f97ef90e69ef7d42708f0ea51234dfd18c355b WHIRLPOOL 7bb14a8e0e8e1cd1865173e5b83c3d3e3c46670530a87e53a7b3110b311cc0b4188b27253f85dd46f3797af79df229bdda074bba9d28ad9d46be0fb5121f8418
-MISC ChangeLog 11012 SHA256 4db104d64343b8f5f9be64ee5c6a4e4bdb7e6b52c33f15872bb2a16bf915340a SHA512 b326b71bd4dea9641a8d2c4d448eadb2cbfa49d37c803ac6b0a0e662237ad2664443d8957ca6df70aa8423553b8722391a7df66f8fbe608c7f74fc6c3a1127ae WHIRLPOOL c2b2ed777b87937241c88c7f4c5ef67a2c2ce05e6d4af15ffed9665cc442c53bac24074a68d1f6d4127bed9128c35409208e6cf04bad898b3ad76733800b4d98
+EBUILD sarg-2.3.8.ebuild 1859 SHA256 7a18370a6a8673b06eba70129ef4695b2c2ab60b59f87fe32a656662b3a1f0f1 SHA512 99e8e95616e63ec7685511b97b205a582abfc181c5cc7500c4f2d2d4d55d735761119dba318bde206dab7939cf3238a2356def197517bc298d6197db53d36e00 WHIRLPOOL f9c8d95d100751d4003cb45a8f6ee210794b0c47ec1eac711ac7958540fe4fcb23d019a6c1fae9502515b7cd6f6e3b43bccc2c9d86d2c28c70da502bc78321bd
+MISC ChangeLog 11186 SHA256 6136885860cfccbd257f3b9b7867c5e9f867779e5480b4fd58b88ca9dfb8163c SHA512 9bca26b54454ec2cc56bd01f7f26aa24fe8d975c40b5744641098d1833808decda5a7e74e0c6c4ce78d557c45159622a9bdeac16bcaf800c4cad90fd66b50b6d WHIRLPOOL 5c7800e834798b41a3593b1ed582372d161dd56e56cb58f2f1480dd0070e5e0c6f0344b5bcb2b1904a203f5faf392c780db44cbf6cee6244e6c5a44bec5551ce
 MISC metadata.xml 644 SHA256 bc0d7ece98611468509045bafb0563f5601a7db8eb5abafd6fc78c78ae57e63a SHA512 eb27d3ce8d94c7223814391a1e26aee69df8aa290a66cfbef0d61865419d6ac88c8d99d16d74f9ef5ce3261ac1f507304679ecb31edf44ef6495f03df86d29f4 WHIRLPOOL 7fc840f9056f1f9d2cdf1f2c2720c4ca718d31be16005a9ad05944eda06101af905d9e690e637c7859566000b13a15160c29c1f6885dc2d2706afbaff9a5f43b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlEff8cACgkQCaWpQKGI+9RUdgCgglsDpZmdvtfOLfbmPdjDG3qV
-IesAnAgvmVpEjZKtVAKE+V/XK8u8mSkz
-=EcYY
+iEYEAREIAAYFAlM6p5YACgkQVWmRsqeSphOV4gCeJWNk2xaBB3HCAUFUJA1YBo1J
+x1YAni7HyB82in3R+L6snC+As1u1geUU
+=PTQT
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/sarg/files/sarg-2.3.8-long-long-int.patch b/net-analyzer/sarg/files/sarg-2.3.8-long-long-int.patch
new file mode 100644
index 000000000000..85b3ec907b55
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.8-long-long-int.patch
@@ -0,0 +1,31 @@
+log.c:128: nbytes is defined as a long long int
+
+
+--- a/log.c
++++ b/log.c
+@@ -1503,14 +1503,14 @@
+ 				}
+ 			}
+ 
+-			if (fprintf(ufile->file, "%s\t%s\t%s\t%s\t%"PRIi64"\t%s\t%ld\t%s\n",dia,hora,ip,url,nbytes,code,elap_time,smartfilter)<=0) {
++			if (fprintf(ufile->file, "%s\t%s\t%s\t%s\t%lld\t%s\t%ld\t%s\n",dia,hora,ip,url,nbytes,code,elap_time,smartfilter)<=0) {
+ 				debuga(_("Write error in the log file of user %s\n"),user);
+ 				exit(EXIT_FAILURE);
+ 			}
+ 			records_kept++;
+ 
+ 			if(fp_log && ilf!=ILF_Sarg)
+-				fprintf(fp_log, "%s\t%s\t%s\t%s\t%s\t%"PRIi64"\t%s\t%ld\t%s\n",dia,hora,user,ip,url,nbytes,code,elap_time,smartfilter);
++				fprintf(fp_log, "%s\t%s\t%s\t%s\t%s\t%lld\t%s\t%ld\t%s\n",dia,hora,user,ip,url,nbytes,code,elap_time,smartfilter);
+ 
+ 			totregsg++;
+ 
+@@ -1561,7 +1561,7 @@
+ 				printf("FUNC=\t%s\n",fun);
+ 				printf("URL=\t%s\n",url);
+ 				printf("CODE=\t%s\n",code);
+-				printf("LEN=\t%"PRIi64"\n",nbytes);
++				printf("LEN=\t%lld\n",nbytes);
+ 			}
+ 		}
+ 		if (!from_stdin) {
diff --git a/net-analyzer/sarg/sarg-2.3.8.ebuild b/net-analyzer/sarg/sarg-2.3.8.ebuild
new file mode 100644
index 000000000000..790349ba12c1
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.8.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.3.8.ebuild,v 1.1 2014/04/01 11:48:36 jer Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Squid Analysis Report Generator"
+HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="+gd ldap pcre"
+
+DEPEND="
+	gd? ( media-libs/gd[png,truetype] )
+	ldap? ( net-nds/openldap )
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-long-long-int.patch
+
+	sed -i configure.in -e '/LDFLAGS=/s:LDFLAGS:LIBS:g' || die
+
+	sed \
+		-e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \
+		-e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
+		-e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \
+		-e 's:/usr/local/sarg/exclude_codes:/etc/sarg/exclude_codes:' \
+		-i sarg.conf || die
+
+	sed -e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
+			-i log.c || die #43132
+
+	sed	-e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \
+		-i htaccess || die
+
+	sed -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
+		-e 's:/usr/local/squid/etc/passwd:/etc/squid/passwd:' \
+		-i user_limit_block || die
+
+	sed -e 's:/usr/local/squid/etc/block.txt:/etc/squid/etc/block.txt:' \
+		-i sarg-php/sarg-block-it.php || die
+
+	sed -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
+		-e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
+			-i sarg.1 sarg-php/sarg-squidguard-block.php || die
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gd) \
+		$(use_with ldap) \
+		$(use_with pcre) \
+		--sysconfdir="${EPREFIX}/etc/sarg/"
+}