+++ /dev/null
---- 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) {
+++ /dev/null
---- 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
+++ /dev/null
-# 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/"
-}
+++ /dev/null
-# 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/"
-}
projects / gentoo.git / commitdiff