From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- net-analyzer/sarg/Manifest | 1 + .../sarg/files/sarg-2.3.9-configure-bash.patch | 102 +++++++++++++++++++++ net-analyzer/sarg/files/sarg-2.3.9-configure.patch | 31 +++++++ net-analyzer/sarg/metadata.xml | 16 ++++ net-analyzer/sarg/sarg-2.3.10.ebuild | 69 ++++++++++++++ 5 files changed, 219 insertions(+) create mode 100644 net-analyzer/sarg/Manifest create mode 100644 net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch create mode 100644 net-analyzer/sarg/files/sarg-2.3.9-configure.patch create mode 100644 net-analyzer/sarg/metadata.xml create mode 100644 net-analyzer/sarg/sarg-2.3.10.ebuild (limited to 'net-analyzer/sarg') diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest new file mode 100644 index 000000000000..bf2dca79cfe0 --- /dev/null +++ b/net-analyzer/sarg/Manifest @@ -0,0 +1 @@ +DIST sarg-2.3.10.tar.gz 1278071 SHA256 40f4408a6180516bbc8762a05ce90e06274639d7e8d74b5c142781dac751e3e7 SHA512 d0a61ac6d455feb8fff024c21f1b7547471ef8cf847fd54d9042881cac3ee14a41fe2a8ea9e0fc2bd2ea0448714ba457e9070282c31e4f3c879e4d83d00ecb2d WHIRLPOOL 6550231d7e7479360857cd1908601963364990ab0f83417aed56ddc2d2bce289fcafd5c5f55a185dd0e15a3d16f6662e23a1901fe65658ab6df04fa9c143f1e0 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..b3c471b62d0c --- /dev/null +++ b/net-analyzer/sarg/metadata.xml @@ -0,0 +1,16 @@ + + + + netmon + 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... + + + Enable support for regular expressions in the hostalias file through dev-libs/libpcre + Enable support for graphs in reports through media-libs/gd + + + sarg + + 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..6bf1111656da --- /dev/null +++ b/net-analyzer/sarg/sarg-2.3.10.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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/" +} -- cgit v1.2.3-65-gdbad