reinit the tree, so we can have metadata

5 files changed, 227 insertions, 0 deletions

diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
new file mode 100644
index 000000000000..3b1bde394c64
--- /dev/null
+++ b/net-analyzer/sarg/Manifest
@@ -0,0 +1,7 @@
+AUX sarg-2.3.9-configure-bash.patch 4033 SHA256 363678ba575691e37e589d920895d8454864c45c3785cc106f50ed31aaa7519c SHA512 42f40db8b2d378888ce73aab0ab03e05f3bbad516d4db025fe6ce1377e1b1d97db2a857b99fb350c8e92a80de75a4c2c4012403546c3f4e5261972060be60b68 WHIRLPOOL 7cf87c7ef154201765d065a023bbbb942ec74957bc93b8eb3b4cec2e4fd7f4d7edaef73f1f0aca801c558f805a943fbe19c8833325bc0d15f029918b4648fb21
+AUX sarg-2.3.9-configure.patch 641 SHA256 f9ee6b9d69a4a360cca028922f33d9ff609708004d569d24c4dedbcb680b9885 SHA512 0da589199b6ea13589bc8cdc8504f6b4260a03bf1d8ab48093ada01e3be3a82961a2fad6f0abe301ed004bd9c642f0789ebb745d52044214e98211124c66f6ae WHIRLPOOL f185d436bab58ca0b3b2ac362c86807930aba07f6293d28c74d249305ff84e8dee0fe15faeedb660ffd82f7e13970d4f8f4aa796cea05a0179dd80314fa2e51b
+DIST sarg-2.3.10.tar.gz 1278071 SHA256 40f4408a6180516bbc8762a05ce90e06274639d7e8d74b5c142781dac751e3e7 SHA512 d0a61ac6d455feb8fff024c21f1b7547471ef8cf847fd54d9042881cac3ee14a41fe2a8ea9e0fc2bd2ea0448714ba457e9070282c31e4f3c879e4d83d00ecb2d WHIRLPOOL 6550231d7e7479360857cd1908601963364990ab0f83417aed56ddc2d2bce289fcafd5c5f55a185dd0e15a3d16f6662e23a1901fe65658ab6df04fa9c143f1e0
+EBUILD sarg-2.3.10.ebuild 1757 SHA256 2877b254cc5aafd328e28f251d70da9479e249fa283bb410153a94160dd47dd5 SHA512 ceef1daa6e382ffa0095733f6747ad7480aab5dd39edbeef15812aa64ce44c87e56a475c5a29dc4878b0581ac1414b569361349e1446684f8aa7533a6405c182 WHIRLPOOL 6f058aefc6592011b2d4ab50d9ebced58b6cb4939238b31db61348db8c8333825dbfe7c4cfd70a915adec9e360d9e87f50c6ce21faf1126d2f77c87435ed2aa4
+MISC ChangeLog 2501 SHA256 61c2378ea6c8f50acfc55ec7ed31f0e3d2bd79411587e51d905df295337c6574 SHA512 c94977b42c78ae6674d7928051ddf7293db89c9a1fd9f1ddd766b56b8cff26d9feb3a20a44859fd52d1d2b1adfb09a3ef212f3da637bf0640f014f4a7b1c7dcb WHIRLPOOL a34346bd72a20a5bf0db201a2603d60c41e38da90de46b4cecc8efb5dc8e47484827b8124638588ed6662ea252aa509dd1fee047ec68139f2df4d088eb391d7f
+MISC ChangeLog-2015 12801 SHA256 5d42e3e19d050471bf98d1fa88a867432883d16e2a0afe33023717ce967dcb41 SHA512 6482976c4177418c3c361e501dc92e43052570192bf7ef2ff83aa8139278719e83bcd1857aed6e3affe381a914e7f9800563ed801386dbda3c2ed634832b70d3 WHIRLPOOL b4fd883414acdb6f754e6953a251cd0935d40b03b7ed209b7652b2610d51c6fb37ad2c0efef1bf62f94d584c9e398ae6955002367741d87cf78ea12a12d54c37
+MISC metadata.xml 856 SHA256 18a7b0edfdedacf9e387b520a1ebd0f42b7e032c16e3fc976ec4ffe015b7dd0f SHA512 3571bb6b4562fa58e9736ce48c4b3930bb33a3b38dec15b79b22b3cbd457ea7751819a2b45a7e728b02e641c187c085e813eb29d8644dc57e40b682f061b115a WHIRLPOOL 570d6661a44be89a89ae6a4f5517cb73704d89a19fef9bb4a885ae66c74f4e67e1b627def3ce20c0a9f2081ec6c46c3775aebaac4bc63b82db3e4d5e43da3ac6
diff --git a/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch b/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch
new file mode 100644
index 000000000000..ddc0ca8ec4eb
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch
@@ -0,0 +1,102 @@
+--- a/configure.in
++++ b/configure.in
+@@ -41,7 +41,7 @@
+ CFLAGS="${CFLAGS} -Wextra -Wno-unused-parameter"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_extra_warnings="yes"],[have_extra_warnings="no"])
+ AC_MSG_RESULT($have_extra_warnings)
+-if test "$have_extra_warnings" == "no" ; then
++if test "$have_extra_warnings" = "no" ; then
+     CFLAGS="${saved_CFLAGS}"
+ fi
+ 
+@@ -50,7 +50,7 @@
+ CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"])
+ AC_MSG_RESULT($have_implicit_function_declaration)
+-if test "$have_implicit_function_declaration" == "no" ; then
++if test "$have_implicit_function_declaration" = "no" ; then
+     CFLAGS="${saved_CFLAGS}"
+ fi
+ 
+@@ -59,7 +59,7 @@
+ CFLAGS="${CFLAGS} -Werror=format"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"])
+ AC_MSG_RESULT($have_error_format)
+-if test "$have_error_format" == "no" ; then
++if test "$have_error_format" = "no" ; then
+     CFLAGS="${saved_CFLAGS}"
+ fi
+ 
+@@ -93,7 +93,7 @@
+ [],[with_gd=check])
+ if ( test "x$with_gd" != "xno" ) ; then
+ 	AC_CHECK_HEADERS(gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h)
+-	if ( test "x$ac_cv_header_gd_h" == "xyes" ) ; then
++	if ( test "x$ac_cv_header_gd_h" = "xyes" ) ; then
+ 		AC_CHECK_LIB(gd, gdImagePng,LIBS="-lgd ${LIBS}"; HAVE_GD_LIB="yes", HAVE_GD_LIB="")
+ 		if ( test "x$HAVE_GD_LIB" != "xyes" ) ; then
+ 			AC_MSG_ERROR([ligbd is required to compile sarg with gd])
+@@ -137,7 +137,7 @@
+ [],[with_pcre=check])
+ if ( test "x$with_pcre" != "xno" ) ; then
+ 	AC_CHECK_HEADERS(pcre.h)
+-	if ( test "x$ac_cv_header_pcre_h" == "xyes" ) ; then
++	if ( test "x$ac_cv_header_pcre_h" = "xyes" ) ; then
+ 		LIBS="$LIBS $(pcre-config --libs)"
+ 		CFLAGS="$CFLAGS $(pcre-config --cflags)"
+ 	else
+@@ -243,7 +243,7 @@
+     fi
+ ],[FONTDIR="${datarootdir}/sarg/fonts"])
+ if test "$FONTDIR" ; then
+-   if test "x$prefix" == "xNONE" ; then
++   if test "x$prefix" = "xNONE" ; then
+       tempfullpath=`prefix=$ac_default_prefix ; eval "echo $FONTDIR"`
+    else
+       tempfullpath=`eval "echo $FONTDIR"`
+@@ -261,7 +261,7 @@
+         IMAGEDIR=$enableval
+     fi
+ ],[IMAGEDIR="${datarootdir}/sarg/images"])
+-if test "x$prefix" == "xNONE" ; then
++if test "x$prefix" = "xNONE" ; then
+    tempfullpath=`prefix=$ac_default_prefix ; eval "echo $IMAGEDIR"`
+ else
+    tempfullpath=`eval "echo $IMAGEDIR"`
+@@ -286,7 +286,7 @@
+        CFLAGS="${CFLAGS} -Wformat -Werror=format-security"
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_format_security="yes"],[have_format_security="no"])
+        AC_MSG_RESULT($have_format_security)
+-       if test "$have_format_security" == "no" ; then
++       if test "$have_format_security" = "no" ; then
+           CFLAGS="${saved_CFLAGS}"
+        fi
+ 
+@@ -295,7 +295,7 @@
+        CFLAGS="${CFLAGS} -Wempty-body"
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_empty_body="yes"],[have_empty_body="no"])
+        AC_MSG_RESULT($have_empty_body)
+-       if test "$have_empty_body" == "no" ; then
++       if test "$have_empty_body" = "no" ; then
+           CFLAGS="${saved_CFLAGS}"
+        fi
+     fi
+@@ -367,14 +367,14 @@
+ AC_CONFIG_FILES([Makefile po/Makefile.in])
+ AC_OUTPUT
+ 
+-if ( test "x$gd_status" == "xdisabled" ) ; then
++if ( test "x$gd_status" = "xdisabled" ) ; then
+ 	AC_MSG_NOTICE([Not building with gd as requested on the configuration command line])
+-elif ( test "x$gd_status" == "xnot found" ) ; then
++elif ( test "x$gd_status" = "xnot found" ) ; then
+ 	AC_MSG_NOTICE([gd.h was not found so the graphs won't be available in the report])
+ fi
+ 
+-if ( test "x$pcre_status" == "xdisabled" ) ; then
++if ( test "x$pcre_status" = "xdisabled" ) ; then
+ 	AC_MSG_NOTICE([Not building with pcre as requested on the configuration command line])
+-elif ( test "x$pcre_status" == "xnot found" ) ; then
++elif ( test "x$pcre_status" = "xnot found" ) ; then
+ 	AC_MSG_NOTICE([pcre.h was not found so the regexp won't be available in the hostalias])
+ fi
diff --git a/net-analyzer/sarg/files/sarg-2.3.9-configure.patch b/net-analyzer/sarg/files/sarg-2.3.9-configure.patch
new file mode 100644
index 000000000000..630e944f7534
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.9-configure.patch
@@ -0,0 +1,31 @@
+--- a/configure.in
++++ b/configure.in
+@@ -2,6 +2,7 @@
+ AC_INIT([sarg],[2.3.9])
+ AC_CONFIG_SRCDIR([log.c])
+ AC_CONFIG_AUX_DIR(cfgaux)
++AC_CONFIG_MACRO_DIR(m4)
+ 
+ AC_CANONICAL_HOST
+ 
+@@ -26,6 +27,11 @@
+ dnl C99 support is required to define LLONG_MAX (at least on CentOS 5.7)
+ AC_PROG_CC_C99
+ 
++dnl mkdir_p / MKDIR_P
++AC_PROG_MKDIR_P
++mkdir_p="$MKDIR_P"
++AC_SUBST(mkdir_p)
++
+ # Report more warnings to improve code quality.
+ CFLAGS="${CFLAGS} -Wall -Wno-sign-compare"
+ 
+@@ -60,7 +66,7 @@
+ 
+ case "$host" in
+    *-solaris*)
+-   LDFLAGS="${LDFLAGS} -lsocket -lnsl"
++   LIBS="${LIBS} -lsocket -lnsl"
+    CFLAGS="-DSOLARIS ${CFLAGS}"
+    ;;
+ esac
diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
new file mode 100644
index 000000000000..deaa23376cb0
--- /dev/null
+++ b/net-analyzer/sarg/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <longdescription>Sarg - Squid Analysis Report Generator is a tool that allow
+ you to view "where" your users are going to on the Internet. Sarg provides many
+ informations about Squid users activities: times, bytes, sites, etc...
+ </longdescription>
+  <use>
+    <flag name="pcre">Enable support for regular expressions in the hostalias file through <pkg>dev-libs/libpcre</pkg></flag>
+    <flag name="gd">Enable support for graphs in reports through <pkg>media-libs/gd</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">sarg</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/sarg/sarg-2.3.10.ebuild b/net-analyzer/sarg/sarg-2.3.10.ebuild
new file mode 100644
index 000000000000..870baa2e64d8
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.10.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Squid Analysis Report Generator"
+HOMEPAGE="http://sarg.sourceforge.net/"
+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}"/${PN}-2.3.9-configure.patch \
+		"${FILESDIR}"/${PN}-2.3.9-configure-bash.patch
+
+	sed -i \
+		-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:' \
+		sarg.conf || die
+
+	sed -i \
+		-e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
+		log.c || die #43132
+
+	sed	-i \
+		-e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \
+		htaccess || die
+
+	sed -i \
+		-e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
+		-e 's:/usr/local/squid/etc/passwd:/etc/squid/passwd:' \
+		user_limit_block || die
+
+	sed -i \
+		-e 's:/usr/local/squid/etc/block.txt:/etc/squid/etc/block.txt:' \
+		sarg-php/sarg-block-it.php || die
+
+	sed -i \
+		-e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
+		-e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
+		sarg.1 sarg-php/sarg-squidguard-block.php || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gd) \
+		$(use_with ldap) \
+		$(use_with pcre) \
+		--sysconfdir="${EPREFIX}/etc/sarg/"
+}