[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/, net-analyzer/sarg/files/

[Jeroen Roovers]

commit:     0de00149228c53476818c121c2da14800fbdd5dc
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  8 10:52:57 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 10:53:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de00149

net-analyzer/sarg: Old.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-analyzer/sarg/Manifest                         |   1 -
 net-analyzer/sarg/files/sarg-2.3.10-bool.patch     |  11 ---
 net-analyzer/sarg/files/sarg-2.3.10-format.patch   |  77 ----------------
 .../sarg/files/sarg-2.3.9-configure-bash.patch     | 102 ---------------------
 net-analyzer/sarg/files/sarg-2.3.9-configure.patch |  31 -------
 net-analyzer/sarg/sarg-2.3.10-r1.ebuild            |  44 ---------
 net-analyzer/sarg/sarg-2.3.10.ebuild               |  68 --------------
 7 files changed, 334 deletions(-)

diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 37b5e2df53e..d1303f0db42 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,2 +1 @@
-DIST sarg-2.3.10.tar.gz 1278071 BLAKE2B a9412069826328a7828cc3759858160a8e9121fee30697b8c54bc2e6ca948255f297147ff8692e3a62fe6c0a2b596a1a73e1090d03ef1fdacdd692866e6ef27d SHA512 d0a61ac6d455feb8fff024c21f1b7547471ef8cf847fd54d9042881cac3ee14a41fe2a8ea9e0fc2bd2ea0448714ba457e9070282c31e4f3c879e4d83d00ecb2d
 DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9 SHA512 a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6

diff --git a/net-analyzer/sarg/files/sarg-2.3.10-bool.patch b/net-analyzer/sarg/files/sarg-2.3.10-bool.patch
deleted file mode 100644
index 188b6dd3732..00000000000
--- a/net-analyzer/sarg/files/sarg-2.3.10-bool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/util.c
-+++ b/util.c
-@@ -2088,7 +2088,7 @@
- 	int pad_len;
- 	bool bracket=false;
- 	bool port=false;
--	bool port_num=0;
-+	int port_num=0;
- 
- 	// skip leading spaces and tabs
- 	while (*buf && (*buf==' ' || *buf=='\t')) buf++;

diff --git a/net-analyzer/sarg/files/sarg-2.3.10-format.patch b/net-analyzer/sarg/files/sarg-2.3.10-format.patch
deleted file mode 100644
index 926fdc8c672..00000000000
--- a/net-analyzer/sarg/files/sarg-2.3.10-format.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/report.c
-+++ b/report.c
-@@ -54,7 +54,7 @@
- 	char accsmart[MAXLEN];
- 	char crc2[MAXLEN/2 -1];
- 	char siteind[MAX_TRUNCATED_URL];
--	char arqtt[256];
-+	char arqtt[MAX_USER_FNAME_LEN * 2 + MAXLEN + 10];
- 	char *oldurltt=NULL;
- 	char oldaccdiatt[11],oldacchoratt[9];
- 	char tmp3[MAXLEN];
---- a/util.c
-+++ b/util.c
-@@ -671,10 +671,10 @@
- char *buildtime(long long int elap)
- {
- 	int num = elap / 1000;
--	int hor = 0;
--	int min = 0;
--	int sec = 0;
--	static char buf[12];
-+	short int hor = 0;
-+	short int min = 0;
-+	short int sec = 0;
-+	static char buf[15];
- 
- 	buf[0]='\0';
- 
-@@ -1236,10 +1236,10 @@
- char *fixtime(long long int elap)
- {
- 	int num = elap / 1000;
--	int hor = 0;
--	int min = 0;
--	int sec = 0;
--	static char buf[12];
-+	short int hor = 0;
-+	short int min = 0;
-+	short int sec = 0;
-+	static char buf[15];
- 
- 	hor=num / 3600;
- 	min=(num % 3600) / 60;
-@@ -1248,7 +1248,7 @@
- 	if(hor==0 && min==0 && sec==0)
- 		strcpy(buf,"0");
- 	else
--		sprintf(buf,"%d:%02d:%02d",hor,min,sec);
-+		sprintf(buf,"%02d:%02d:%02d",hor,min,sec);
- 
- 	return buf;
- }
---- a/index.c
-+++ b/index.c
-@@ -89,9 +89,9 @@
- 	char monthdir[MAXLEN];
- 	char monthname1[9], monthname2[9];
- 	char nmonth[30];
--	char monthnum[10];
-+	char monthnum[15];
- 	char dayindex[MAXLEN];
--	char daynum[10];
-+	char daynum[15];
- 	char title[80];
- 	int yearsort[150];
- 	int nyears;
---- a/userinfo.c
-+++ b/userinfo.c
-@@ -67,7 +67,7 @@
- 	int skip;
- 	int flen;
- 	int count, clen;
--	char cstr[9];
-+	char cstr[10];
- 
- 	last=NULL;
- 	for (group=first_user_group ; group ; group=group->next) {

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
deleted file mode 100644
index ddc0ca8ec4e..00000000000
--- a/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- 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
deleted file mode 100644
index 630e944f753..00000000000
--- a/net-analyzer/sarg/files/sarg-2.3.9-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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/sarg-2.3.10-r1.ebuild b/net-analyzer/sarg/sarg-2.3.10-r1.ebuild
deleted file mode 100644
index 72e6e4dbb97..00000000000
--- a/net-analyzer/sarg/sarg-2.3.10-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-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 )
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.9-configure.patch
-	"${FILESDIR}"/${PN}-2.3.9-configure-bash.patch
-	"${FILESDIR}"/${PN}-2.3.10-format.patch
-	"${FILESDIR}"/${PN}-2.3.10-bool.patch
-	"${FILESDIR}"/${PN}-2.3.10-config.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gd) \
-		$(use_with ldap) \
-		$(use_with pcre) \
-		--sysconfdir="${EPREFIX}/etc/sarg/"
-}

diff --git a/net-analyzer/sarg/sarg-2.3.10.ebuild b/net-analyzer/sarg/sarg-2.3.10.ebuild
deleted file mode 100644
index 870baa2e64d..00000000000
--- a/net-analyzer/sarg/sarg-2.3.10.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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/"
-}