[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/
commit: 30ebac49283d0a29d53396e31cf0adc68aed9cfd
Author: Sam James gentoo org>
AuthorDate: Wed Mar 23 00:23:55 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Mar 23 00:44:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30ebac49
net-analyzer/sarg: add subslot dep on OpenLDAP
New OpenLDAP breaks ABI (changes SONAME)
Signed-off-by: Sam James gentoo.org>
net-analyzer/sarg/{sarg-2.4.0.ebuild => sarg-2.4.0-r1.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/sarg/sarg-2.4.0.ebuild
b/net-analyzer/sarg/sarg-2.4.0-r1.ebuild
similarity index 94%
rename from net-analyzer/sarg/sarg-2.4.0.ebuild
rename to net-analyzer/sarg/sarg-2.4.0-r1.ebuild
index c2da09b5fa35..083cbcb27245 100644
--- a/net-analyzer/sarg/sarg-2.4.0.ebuild
+++ b/net-analyzer/sarg/sarg-2.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ IUSE="bzip2 doublecheck +gd +glob ldap lzma pcre zlib"
RDEPEND="
bzip2? ( app-arch/bzip2 )
gd? ( media-libs/gd[png,truetype] )
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
lzma? ( app-arch/xz-utils )
pcre? ( dev-libs/libpcre )
zlib? ( sys-libs/zlib )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/files/
commit: 2e6eafb5f2a41bf7a38dd273398bd9c06a6d31df
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Jun 21 07:45:19 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Thu Jun 25 07:30:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6eafb5
net-analyzer/sarg: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/16358
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Conrad Kostecki gentoo.org>
net-analyzer/sarg/files/sarg-2.3.10-config.patch | 94 --
net-analyzer/sarg/files/sarg-2.3.11-Werror.patch | 25 --
.../sarg/files/sarg-2.3.11-configure.patch | 31 ---
net-analyzer/sarg/files/sarg-2.3.11-format.patch | 36 -
4 files changed, 186 deletions(-)
diff --git a/net-analyzer/sarg/files/sarg-2.3.10-config.patch
b/net-analyzer/sarg/files/sarg-2.3.10-config.patch
deleted file mode 100644
index cfbf103d5b2..000
--- a/net-analyzer/sarg/files/sarg-2.3.10-config.patch
+++ /dev/null
@@ -1,94 +0,0 @@
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
-
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.11-Werror.patch
b/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch
deleted file mode 100644
index 03557879393..000
--- a/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch
+++ /dev/null
@@ -1,25 +0,0 @@
a/configure.ac
-+++ b/configure.ac
-@@ -46,18 +46,18 @@
- CFLAGS="${saved_CFLAGS}"
- fi
-
--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)
- if test "$have_implicit_function_declaration" = "no" ; then
- CFLAGS="${saved_CFLAGS}"
- fi
-
--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"
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/
commit: 22a7680ab28c28d7b7f100c83500c4630c848f12
Author: Aaron Bauman gentoo org>
AuthorDate: Sat Jun 20 01:19:54 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sat Jun 20 01:19:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a7680a
net-analyzer/sarg: drop vulnerable
Bug: https://bugs.gentoo.org/701842
Signed-off-by: Aaron Bauman gentoo.org>
net-analyzer/sarg/Manifest | 1 -
net-analyzer/sarg/sarg-2.3.11-r1.ebuild | 43
net-analyzer/sarg/sarg-2.3.11-r2.ebuild | 44 -
3 files changed, 88 deletions(-)
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 2594fe485a8..46ce89cb052 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,2 +1 @@
-DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B
f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9
SHA512
a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6
DIST sarg-2.4.0.tar.gz 1371812 BLAKE2B
4a07e97f5bdf36dc9ea867517f511dff4e2b501c01231c523778b283000bcf8e6eeb26e219c3d710551ad31f939a47453341b6a8a5575df1d8f3957461326675
SHA512
cb314c15379b01c1ad874e473fcc41664ed5a0dd492b8537d5f375e2c00d9e083679a01da5e3506775b7d66f2d43ba698864ffbd36f5e5e512ef58882148739b
diff --git a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
deleted file mode 100644
index 88f7c507e91..000
--- a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
- "${FILESDIR}"/${PN}-2.3.11-format.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.11-r2.ebuild
b/net-analyzer/sarg/sarg-2.3.11-r2.ebuild
deleted file mode 100644
index c8afb3c48d4..000
--- a/net-analyzer/sarg/sarg-2.3.11-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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="+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
- "${FILESDIR}"/${PN}-2.3.11-format.patch
- "${FILESDIR}"/${PN}-2.3.11-Werror.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with gd) \
- $(use_with ldap) \
- $(use_with pcre) \
- --sysconfdir="${EPREFIX}/etc/sarg/"
-}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/
commit: c13403f99e205b964dcd1ce6733702b9ab2cde59
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Jun 4 06:34:54 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Jun 4 06:35:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13403f9
net-analyzer/sarg: x86 stable wrt bug #706748
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-analyzer/sarg/sarg-2.4.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/sarg/sarg-2.4.0.ebuild
b/net-analyzer/sarg/sarg-2.4.0.ebuild
index b74ab98fe0b..c2da09b5fa3 100644
--- a/net-analyzer/sarg/sarg-2.4.0.ebuild
+++ b/net-analyzer/sarg/sarg-2.4.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://sourceforge.net/projects/sarg/;
SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
SLOT="0"
IUSE="bzip2 doublecheck +gd +glob ldap lzma pcre zlib"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/
commit: eb150fdba7946a0d001a086974fd3619a7908e4a
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon May 25 09:31:30 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon May 25 09:31:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb150fdb
net-analyzer/sarg: stable 2.4.0 for ppc, bug #706748
Package-Manager: Portage-2.3.100, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich gentoo.org>
net-analyzer/sarg/sarg-2.4.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/sarg/sarg-2.4.0.ebuild
b/net-analyzer/sarg/sarg-2.4.0.ebuild
index e43d5055db4..b74ab98fe0b 100644
--- a/net-analyzer/sarg/sarg-2.4.0.ebuild
+++ b/net-analyzer/sarg/sarg-2.4.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://sourceforge.net/projects/sarg/;
SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
SLOT="0"
IUSE="bzip2 doublecheck +gd +glob ldap lzma pcre zlib"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/
commit: 0840c6fe4c4199788200ca31d3a315d9ae2f5b39
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 25 06:28:12 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 25 06:28:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0840c6fe
net-analyzer/sarg: amd64 stable wrt bug #706748
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-analyzer/sarg/sarg-2.4.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/sarg/sarg-2.4.0.ebuild
b/net-analyzer/sarg/sarg-2.4.0.ebuild
index 6fbc48405af..e43d5055db4 100644
--- a/net-analyzer/sarg/sarg-2.4.0.ebuild
+++ b/net-analyzer/sarg/sarg-2.4.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://sourceforge.net/projects/sarg/;
SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
SLOT="0"
IUSE="bzip2 doublecheck +gd +glob ldap lzma pcre zlib"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/
commit: b96fc2056805458fe3c6f1fa9ba51c227321b348
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Jan 28 15:49:34 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Jan 28 17:30:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b96fc205
net-analyzer/sarg: Old
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Jeroen Roovers gentoo.org>
net-analyzer/sarg/Manifest | 1 -
net-analyzer/sarg/sarg-2.4.0_pre3.ebuild | 59
2 files changed, 60 deletions(-)
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 6fde8f0b34e..2594fe485a8 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,3 +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
DIST sarg-2.4.0.tar.gz 1371812 BLAKE2B
4a07e97f5bdf36dc9ea867517f511dff4e2b501c01231c523778b283000bcf8e6eeb26e219c3d710551ad31f939a47453341b6a8a5575df1d8f3957461326675
SHA512
cb314c15379b01c1ad874e473fcc41664ed5a0dd492b8537d5f375e2c00d9e083679a01da5e3506775b7d66f2d43ba698864ffbd36f5e5e512ef58882148739b
diff --git a/net-analyzer/sarg/sarg-2.4.0_pre3.ebuild
b/net-analyzer/sarg/sarg-2.4.0_pre3.ebuild
deleted file mode 100644
index 992488f78a3..000
--- a/net-analyzer/sarg/sarg-2.4.0_pre3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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/*
-}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/
commit: f3ca4afb08ee300c6d4202717844f82533db9ed3
Author: Jeroen Roovers gentoo org>
AuthorDate: Mon Jan 27 20:20:37 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Mon Jan 27 20:21:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3ca4afb
net-analyzer/sarg: Version 2.4.0
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Bug: https://bugs.gentoo.org/706748
Signed-off-by: Jeroen Roovers gentoo.org>
net-analyzer/sarg/Manifest | 1 +
net-analyzer/sarg/sarg-2.4.0.ebuild | 60 +
2 files changed, 61 insertions(+)
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 50e335d06b7..6fde8f0b34e 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,2 +1,3 @@
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
+DIST sarg-2.4.0.tar.gz 1371812 BLAKE2B
4a07e97f5bdf36dc9ea867517f511dff4e2b501c01231c523778b283000bcf8e6eeb26e219c3d710551ad31f939a47453341b6a8a5575df1d8f3957461326675
SHA512
cb314c15379b01c1ad874e473fcc41664ed5a0dd492b8537d5f375e2c00d9e083679a01da5e3506775b7d66f2d43ba698864ffbd36f5e5e512ef58882148739b
diff --git a/net-analyzer/sarg/sarg-2.4.0.ebuild
b/net-analyzer/sarg/sarg-2.4.0.ebuild
new file mode 100644
index 000..6fbc48405af
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.4.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+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() {
+ append-cflags -fcommon
+ 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/*
+}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/, net-analyzer/sarg/files/
commit: 9819a200cbbba1409b10d07b383da91d0cc74202
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu Dec 26 12:11:25 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Thu Dec 26 12:11:40 2019 +
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 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 000..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
+
+--- 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 @@
+
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 000..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"
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/files/, net-analyzer/sarg/
commit: c3b12d43db7c008cfa82b80b7ea40e7ebc6a98bd
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 1 07:50:33 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 1 07:50:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b12d43
net-analyzer/sarg: Update HOMEPAGE, disable -Werror
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Jeroen Roovers gentoo.org>
net-analyzer/sarg/files/sarg-2.3.11-Werror.patch | 25 ++
net-analyzer/sarg/sarg-2.3.11-r2.ebuild | 44
2 files changed, 69 insertions(+)
diff --git a/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch
b/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch
new file mode 100644
index 000..03557879393
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch
@@ -0,0 +1,25 @@
+--- a/configure.ac
b/configure.ac
+@@ -46,18 +46,18 @@
+ CFLAGS="${saved_CFLAGS}"
+ fi
+
+-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)
+ if test "$have_implicit_function_declaration" = "no" ; then
+ CFLAGS="${saved_CFLAGS}"
+ fi
+
+-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)
+ if test "$have_error_format" = "no" ; then
diff --git a/net-analyzer/sarg/sarg-2.3.11-r2.ebuild
b/net-analyzer/sarg/sarg-2.3.11-r2.ebuild
new file mode 100644
index 000..c8afb3c48d4
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.11-r2.ebuild
@@ -0,0 +1,44 @@
+# 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="+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
+ "${FILESDIR}"/${PN}-2.3.11-format.patch
+ "${FILESDIR}"/${PN}-2.3.11-Werror.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with gd) \
+ $(use_with ldap) \
+ $(use_with pcre) \
+ --sysconfdir="${EPREFIX}/etc/sarg/"
+}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/, net-analyzer/sarg/files/
commit: 0de00149228c53476818c121c2da14800fbdd5dc
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Jul 8 10:52:57 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Jul 8 10:53:12 2018 +
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..000
--- 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..000
--- 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..000
--- 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" ;
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/
commit: 3be5bb1062a48e5f2a40e285ab7e5348257275a3
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Jul 7 10:07:54 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Jul 7 10:07:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3be5bb10
net-analyzer/sarg: stable 2.3.11-r1 for ppc, bug #653220
Tested-by: ernsteiswuerfel
Bug: https://bugs.gentoo.org/653220
Package-Manager: Portage-2.3.41, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc"
net-analyzer/sarg/sarg-2.3.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
index 10cc09c45d5..88f7c507e91 100644
--- a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
+++ b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://sarg.sourceforge.net/;
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
SLOT="0"
IUSE="+gd ldap pcre"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/
commit: e538ef44a01af8dd68582344f682b179a81d08bd
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun May 27 20:03:56 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun May 27 20:04:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e538ef44
net-analyzer/sarg: amd64 stable wrt bug #653220
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-analyzer/sarg/sarg-2.3.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
index 904a6011019..10cc09c45d5 100644
--- a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
+++ b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://sarg.sourceforge.net/;
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
SLOT="0"
IUSE="+gd ldap pcre"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/
commit: 396c506a2a645b7483531f701f9481023393690f
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri May 25 22:50:28 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri May 25 23:58:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=396c506a
net-analyzer/sarg: x86 stable (bug #653220)
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-analyzer/sarg/sarg-2.3.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
index 82677c35481..904a6011019 100644
--- a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
+++ b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://sarg.sourceforge.net/;
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
SLOT="0"
IUSE="+gd ldap pcre"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/
commit: dc241b7f41b36ed9af1c0df692938a76d370c18c
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Jan 20 14:00:44 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Jan 20 14:00:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc241b7f
net-analyzer/sarg: Revision bump (bug #645006).
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-analyzer/sarg/{sarg-2.3.11.ebuild => sarg-2.3.11-r1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-analyzer/sarg/sarg-2.3.11.ebuild
b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
similarity index 100%
rename from net-analyzer/sarg/sarg-2.3.11.ebuild
rename to net-analyzer/sarg/sarg-2.3.11-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/files/, net-analyzer/sarg/
commit: 4ef0978b8027944c43e35138a608f553c5f71946
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Jan 20 13:58:42 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Jan 20 13:59:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef0978b
net-analyzer/sarg: Fix more compiler warnings (bug #645006).
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-analyzer/sarg/files/sarg-2.3.11-format.patch | 36
net-analyzer/sarg/sarg-2.3.11.ebuild | 1 +
2 files changed, 37 insertions(+)
diff --git a/net-analyzer/sarg/files/sarg-2.3.11-format.patch
b/net-analyzer/sarg/files/sarg-2.3.11-format.patch
new file mode 100644
index 000..f2dc7d39b1e
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.11-format.patch
@@ -0,0 +1,36 @@
+--- 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/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.11.ebuild
b/net-analyzer/sarg/sarg-2.3.11.ebuild
index 33a65ab49a9..82677c35481 100644
--- a/net-analyzer/sarg/sarg-2.3.11.ebuild
+++ b/net-analyzer/sarg/sarg-2.3.11.ebuild
@@ -25,6 +25,7 @@ DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog
htaccess )
PATCHES=(
"${FILESDIR}"/${PN}-2.3.10-config.patch
"${FILESDIR}"/${PN}-2.3.11-configure.patch
+ "${FILESDIR}"/${PN}-2.3.11-format.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/, net-analyzer/sarg/files/
commit: 47167bd6764afc1ca3a2110bb131ab43a36f6cae
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Jan 16 11:25:30 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Jan 16 11:25:30 2018 +
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 000..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 000..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/"
+}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sarg/, net-analyzer/sarg/files/
commit: e56c78f34f5aecdc2a3825c95d56d3cda03fb2df
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Dec 17 16:06:43 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Dec 17 16:07:08 2017 +
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 000..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 000..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
+
+--- 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 000..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;
+-
