public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/, net-analyzer/sarg/files/
@ 2017-12-17 16:07 Jeroen Roovers
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2017-12-17 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e56c78f34f5aecdc2a3825c95d56d3cda03fb2df
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 16:06:43 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 16:07:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e56c78f3

net-analyzer/sarg: Fix some GCC 7 strictness issues (bug #641250).

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-analyzer/sarg/files/sarg-2.3.10-bool.patch   | 11 +++
 net-analyzer/sarg/files/sarg-2.3.10-config.patch | 94 ++++++++++++++++++++++++
 net-analyzer/sarg/files/sarg-2.3.10-format.patch | 77 +++++++++++++++++++
 net-analyzer/sarg/sarg-2.3.10-r1.ebuild          | 44 +++++++++++
 4 files changed, 226 insertions(+)

diff --git a/net-analyzer/sarg/files/sarg-2.3.10-bool.patch b/net-analyzer/sarg/files/sarg-2.3.10-bool.patch
new file mode 100644
index 00000000000..188b6dd3732
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.10-bool.patch
@@ -0,0 +1,11 @@
+--- 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-config.patch b/net-analyzer/sarg/files/sarg-2.3.10-config.patch
new file mode 100644
index 00000000000..cfbf103d5b2
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.10-config.patch
@@ -0,0 +1,94 @@
+--- a/log.c
++++ b/log.c
+@@ -241,7 +241,7 @@
+ 	strcpy(LogoTextColor,"#006699");
+ 	strcpy(FontSize,"9px");
+ 	strcpy(TempDir,"/tmp");
+-	strcpy(OutputDir,"/var/www/html/squid-reports");
++	strcpy(OutputDir,"/var/www/localhost/htdocs/squid-reports");
+ 	AnonymousOutputFiles=false;
+ 	Ip2Name=false;
+ 	strcpy(DateFormat,"u");
+--- a/sarg-php/sarg-squidguard-block.php
++++ b/sarg-php/sarg-squidguard-block.php
+@@ -26,8 +26,8 @@
+  */
+ 
+ // Change to squidGuard and sarg config file paths
+-$SargConf = "/usr/local/sarg/sarg.conf";
+-$squidGuardConf = "/usr/local/squidGuard/squidGuard.conf";
++$SargConf = "/etc/sarg/sarg.conf";
++$squidGuardConf = "/etc/squidGuard/squidGuard.conf";
+ 
+ global $SargConf;
+ global $dbhome;
+@@ -37,7 +37,7 @@
+ include_once("style.php");
+ 
+ $url = $_GET['url'];
+-$squidGuard_conf = '/usr/local/squidGuard/squidGuard.conf';
++$squidGuard_conf = '/etc/squidGuard/squidGuard.conf';
+ 
+ function parse_config($line,$clave) {
+    if (preg_match("/dbhome/i", $line)) {
+--- a/sarg-php/sarg-block-it.php
++++ b/sarg-php/sarg-block-it.php
+@@ -25,7 +25,7 @@
+  *
+  */
+ 
+-$filename = "/usr/local/squid/etc/block.txt";
++$filename = "/etc/squid/etc/block.txt";
+ 
+ $url = $_GET['url'];
+ $url = $url."\n";
+--- a/htaccess
++++ b/htaccess
+@@ -1,4 +1,4 @@
+-AuthUserFile /usr/local/sarg/passwd
++AuthUserFile /etc/sarg/passwd
+ AuthName "SARG, Squid Analysis Report Generator"
+ AuthType Basic
+ <Limit GET POST>
+--- a/sarg.conf
++++ b/sarg.conf
+@@ -4,7 +4,7 @@
+ #       Where is the access.log file
+ #       sarg -l file
+ #
+-#access_log /usr/local/squid/var/logs/access.log
++#access_log /var/log/squid/access.log
+ 
+ # TAG: graphs yes|no
+ #	Use graphics where is possible.
+@@ -117,7 +117,7 @@
+ #       The reports will be saved in that directory
+ #       sarg -o dir
+ #
+-#output_dir /var/www/html/squid-reports
++#output_dir /var/www/localhost/htdocs/squid-reports
+ 
+ # TAG:  anonymous_output_files yes/no
+ #       Use anonymous file and directory names in the report. If it is set to
+@@ -545,7 +545,7 @@
+ #      Generate reports from SquidGuard logs.
+ #      Use 'none' to disable.
+ #      You can use sarg -L filename to use an alternate squidGuard log.
+-#      squidguard_conf /usr/local/squidGuard/squidGuard.conf
++#      squidguard_conf /etc/squidGuard/squidGuard.conf
+ #
+ #squidguard_conf none
+ 
+--- a/user_limit_block
++++ b/user_limit_block
+@@ -24,8 +24,8 @@
+ #
+ #
+ 
+-conf="/usr/local/sarg/sarg.conf"
+-squid_password_file="/usr/local/squid/etc/passwd"
++conf="/etc/sarg/sarg.conf"
++squid_password_file="/etc/squid/passwd"
+ tmp="/tmp/sarg_limit.$$"
+ 
+ limit_file=`grep "per_user_limit" $conf|grep -v "#"|awk '{print $2}'`

diff --git a/net-analyzer/sarg/files/sarg-2.3.10-format.patch b/net-analyzer/sarg/files/sarg-2.3.10-format.patch
new file mode 100644
index 00000000000..926fdc8c672
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.10-format.patch
@@ -0,0 +1,77 @@
+--- 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/sarg-2.3.10-r1.ebuild b/net-analyzer/sarg/sarg-2.3.10-r1.ebuild
new file mode 100644
index 00000000000..72e6e4dbb97
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.10-r1.ebuild
@@ -0,0 +1,44 @@
+# 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/"
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/, net-analyzer/sarg/files/
@ 2018-01-16 11:25 Jeroen Roovers
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2018-01-16 11:25 UTC (permalink / raw
  To: gentoo-commits

commit:     47167bd6764afc1ca3a2110bb131ab43a36f6cae
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 11:25:30 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 11:25:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47167bd6

net-analyzer/sarg: Version 2.3.11.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-analyzer/sarg/Manifest                         |  1 +
 .../sarg/files/sarg-2.3.11-configure.patch         | 31 ++++++++++++++++
 net-analyzer/sarg/sarg-2.3.11.ebuild               | 42 ++++++++++++++++++++++
 3 files changed, 74 insertions(+)

diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 402130e2849..37b5e2df53e 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1 +1,2 @@
 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.11-configure.patch b/net-analyzer/sarg/files/sarg-2.3.11-configure.patch
new file mode 100644
index 00000000000..583bfeb0e8e
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.11-configure.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -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.11.ebuild b/net-analyzer/sarg/sarg-2.3.11.ebuild
new file mode 100644
index 00000000000..33a65ab49a9
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.11.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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.10-config.patch
+	"${FILESDIR}"/${PN}-2.3.11-configure.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gd) \
+		$(use_with ldap) \
+		$(use_with pcre) \
+		--sysconfdir="${EPREFIX}/etc/sarg/"
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/, net-analyzer/sarg/files/
@ 2018-07-08 10:53 Jeroen Roovers
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2018-07-08 10:53 UTC (permalink / raw
  To: gentoo-commits

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/"
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/, net-analyzer/sarg/files/
@ 2019-12-26 12:11 Jeroen Roovers
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2019-12-26 12:11 UTC (permalink / raw
  To: gentoo-commits

commit:     9819a200cbbba1409b10d07b383da91d0cc74202
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 12:11:25 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 12:11:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9819a200

net-analyzer/sarg: Version 2.4.0_pre3

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/sarg/Manifest                         |  1 +
 net-analyzer/sarg/files/sarg-2.4.0-config.patch    | 81 ++++++++++++++++++++++
 net-analyzer/sarg/files/sarg-2.4.0-configure.patch | 43 ++++++++++++
 net-analyzer/sarg/files/sarg-2.4.0-fabs.patch      | 11 +++
 net-analyzer/sarg/files/sarg-2.4.0-format.patch    | 22 ++++++
 net-analyzer/sarg/metadata.xml                     | 29 ++++----
 net-analyzer/sarg/sarg-2.4.0_pre3.ebuild           | 59 ++++++++++++++++
 7 files changed, 231 insertions(+), 15 deletions(-)

diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index d1303f0db42..50e335d06b7 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1 +1,2 @@
 DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9 SHA512 a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6
+DIST sarg-2.4.0-pre3.tar.gz 1364547 BLAKE2B 94729294de60ded125abd346d38833c64b3f0b320b0e07fc8153e287ce84b09ff83259fe2189afa087a46e6617d47628c162e3bda209563e3f7618d71ffd0cd5 SHA512 136313e36a8107f1ba84f7653aa3a0972beea05b89d77d8bd02a564c62881696f87bd2ed6cd0069624fe2ed013042cd604932220c8476d62702d27e68e8fd655

diff --git a/net-analyzer/sarg/files/sarg-2.4.0-config.patch b/net-analyzer/sarg/files/sarg-2.4.0-config.patch
new file mode 100644
index 00000000000..1168f98337d
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.4.0-config.patch
@@ -0,0 +1,81 @@
+--- a/log.c
++++ b/log.c
+@@ -151,7 +151,7 @@
+ 	strcpy(FontSize,"9px");
+ 	strcpy(TempDir,"/tmp");
+ 	TempDirPath[0] = '\0';
+-	strcpy(OutputDir,"/var/www/html/squid-reports");
++	strcpy(OutputDir,"/var/www/localhost/htdocs/squid-reports");
+ 	AnonymousOutputFiles=false;
+ 	Ip2Name=false;
+ 	DateFormat='u';
+--- a/htaccess
++++ b/htaccess
+@@ -1,4 +1,4 @@
+-AuthUserFile /usr/local/sarg/passwd
++AuthUserFile /etc/sarg/passwd
+ AuthName "SARG, Squid Analysis Report Generator"
+ AuthType Basic
+ <Limit GET POST>
+--- a/sarg.conf
++++ b/sarg.conf
+@@ -17,7 +17,7 @@
+ #       If some files are passed on the command line with "sarg -l file" or
+ #       "sarg file", the files listed here are ignored.
+ #
+-#access_log /usr/local/squid/var/logs/access.log
++#access_log /var/log/squid/access.log
+ 
+ # TAG: graphs yes|no
+ #	Use graphics where is possible.
+@@ -147,7 +147,7 @@
+ #       The reports will be saved in that directory
+ #       sarg -o dir
+ #
+-#output_dir /var/www/html/squid-reports
++#output_dir /var/www/localhost/htdocs/squid-reports
+ 
+ # TAG:  anonymous_output_files yes/no
+ #       Use anonymous file and directory names in the report. If it is set to
+@@ -632,7 +632,7 @@
+ #      Generate reports from SquidGuard logs.
+ #      Use 'none' to disable.
+ #      You can use sarg -L filename to use an alternate squidGuard log.
+-#      squidguard_conf /usr/local/squidGuard/squidGuard.conf
++#      squidguard_conf /etc/squidGuard/squidGuard.conf
+ #
+ #squidguard_conf none
+ 
+--- a/user_limit_block
++++ b/user_limit_block
+@@ -24,8 +24,8 @@
+ #
+ #
+ 
+-conf="/usr/local/sarg/sarg.conf"
+-squid_password_file="/usr/local/squid/etc/passwd"
++conf="/etc/sarg/sarg.conf"
++squid_password_file="/etc/squid/passwd"
+ tmp="/tmp/sarg_limit.$$"
+ 
+ limit_file=`grep "per_user_limit" $conf|grep -v "#"|awk '{print $2}'`
+--- a/sarg-php/config.php.inc
++++ b/sarg-php/config.php.inc
+@@ -1,13 +1,13 @@
+ <?php
+ 
+ // Change to squidGuard and sarg config file paths
+-$SargConf = "/usr/local/sarg/sarg.conf";
+-$squidGuardConf = "/usr/local/squidGuard/squidGuard.conf";
++$SargConf = "/etc/sarg/sarg.conf";
++$squidGuardConf = "/etc/squidGuard/squidGuard.conf";
+ 
+ // File where URL to block will be appended
+-$DefaultSquidBlock = "/usr/local/squid/etc/block.txt";
++$DefaultSquidBlock = "/etc/squid/etc/block.txt";
+ 
+ // Choose the locale you want to use to display messages (it must exist on your system)
+-$language = "fr_BE.utf-8";
++$language = "POSIX";
+ 
+ ?>

diff --git a/net-analyzer/sarg/files/sarg-2.4.0-configure.patch b/net-analyzer/sarg/files/sarg-2.4.0-configure.patch
new file mode 100644
index 00000000000..7ca44a6901f
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.4.0-configure.patch
@@ -0,0 +1,43 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,6 +35,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"
+ 
+@@ -50,23 +55,23 @@
+ # Don't compare signs as it is a mess
+ CFLAGS="${CFLAGS} -Wno-sign-compare"
+ 
+-AC_MSG_CHECKING([for implicit-function-declaration error flag in $CC])
++AC_MSG_CHECKING([for implicit-function-declaration warning flag in $CC])
+ saved_CFLAGS="${CFLAGS}"
+-CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
++CFLAGS="${CFLAGS} -Wimplicit-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)
+ AS_IF([test "$have_implicit_function_declaration" = "no"],[CFLAGS="${saved_CFLAGS}"])
+ 
+-AC_MSG_CHECKING([for format error flag in $CC])
++AC_MSG_CHECKING([for format warning flag in $CC])
+ saved_CFLAGS="${CFLAGS}"
+-CFLAGS="${CFLAGS} -Werror=format"
++CFLAGS="${CFLAGS} -Wformat"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"])
+ AC_MSG_RESULT($have_error_format)
+ AS_IF([test "$have_error_format" = "no"],[CFLAGS="${saved_CFLAGS}"])
+ 
+ case "$host" in
+    *-solaris*)
+-   LDFLAGS="${LDFLAGS} -lsocket -lnsl"
++   LIBS="${LIBS} -lsocket -lnsl"
+    CFLAGS="-DSOLARIS ${CFLAGS}"
+    ;;
+ esac

diff --git a/net-analyzer/sarg/files/sarg-2.4.0-fabs.patch b/net-analyzer/sarg/files/sarg-2.4.0-fabs.patch
new file mode 100644
index 00000000000..e9b73d88fb4
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.4.0-fabs.patch
@@ -0,0 +1,11 @@
+--- a/btree_cache.c
++++ b/btree_cache.c
+@@ -268,7 +268,7 @@
+ static struct bt *get_disbalanced_node(struct bt *node)
+ {
+ 	struct bt *rdn;
+-	if (fabs(node->balanceinfo) > 1)
++	if (abs(node->balanceinfo) > 1)
+ 		return node;
+ 	if (node->left)
+ 	{

diff --git a/net-analyzer/sarg/files/sarg-2.4.0-format.patch b/net-analyzer/sarg/files/sarg-2.4.0-format.patch
new file mode 100644
index 00000000000..686f659c130
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.4.0-format.patch
@@ -0,0 +1,22 @@
+--- a/userinfo.c
++++ b/userinfo.c
+@@ -78,7 +78,7 @@
+ 	int skip;
+ 	int flen;
+ 	int count, clen;
+-	char cstr[9];
++	char cstr[10];
+ 	char filename[MAX_USER_FNAME_LEN];
+ 
+ 	if (!UserStrings) {
+--- a/index.c
++++ b/index.c
+@@ -535,7 +535,7 @@
+ 	struct dirent *direntp;
+ 	char yearindex[MAXLEN];
+ 	char yeardir[MAXLEN];
+-	char yearnum[10];
++	char yearnum[15];
+ 	int yearsort[150];
+ 	int nyears;
+ 	int year;

diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
index deaa23376cb..774ea9db656 100644
--- a/net-analyzer/sarg/metadata.xml
+++ b/net-analyzer/sarg/metadata.xml
@@ -1,19 +1,18 @@
 <?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>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>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="doublecheck">Make sarg double check the data it manipulates and output a warning if an error is found</flag>
+<flag name="gd">Enable support for graphs in reports through <pkg>media-libs/gd</pkg></flag>
+<flag name="glob">Disable to ignore wildcards in file names</flag>
+<flag name="pcre">Enable support for regular expressions in the hostalias file through <pkg>dev-libs/libpcre</pkg></flag>
+</use>
+<upstream>
+<remote-id type="sourceforge">sarg</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/net-analyzer/sarg/sarg-2.4.0_pre3.ebuild b/net-analyzer/sarg/sarg-2.4.0_pre3.ebuild
new file mode 100644
index 00000000000..992488f78a3
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.4.0_pre3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Squid Analysis Report Generator"
+HOMEPAGE="https://sourceforge.net/projects/sarg/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="bzip2 doublecheck +gd +glob ldap lzma pcre zlib"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	gd? ( media-libs/gd[png,truetype] )
+	ldap? ( net-nds/openldap )
+	lzma? ( app-arch/xz-utils )
+	pcre? ( dev-libs/libpcre )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.0-config.patch
+	"${FILESDIR}"/${PN}-2.4.0-configure.patch
+	"${FILESDIR}"/${PN}-2.4.0-fabs.patch
+	"${FILESDIR}"/${PN}-2.4.0-format.patch
+)
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable doublecheck) \
+		$(use_with bzip2 bzlib) \
+		$(use_with gd) \
+		$(use_with glob) \
+		$(use_with ldap) \
+		$(use_with lzma liblzma) \
+		$(use_with pcre) \
+		$(use_with zlib) \
+		--sysconfdir="${EPREFIX}/etc/sarg/"
+}
+
+src_install() {
+	default
+
+	dodoc documentation/*
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-12-26 12:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-26 12:11 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/, net-analyzer/sarg/files/ Jeroen Roovers
  -- strict thread matches above, loose matches on Subject: below --
2018-07-08 10:53 Jeroen Roovers
2018-01-16 11:25 Jeroen Roovers
2017-12-17 16:07 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox