Index: head/www/sarg/Makefile =================================================================== --- head/www/sarg/Makefile (revision 525811) +++ head/www/sarg/Makefile (revision 525812) @@ -1,45 +1,45 @@ # Created by: mt@primats.org.ua # $FreeBSD$ PORTNAME= sarg -PORTVERSION= 2.3.11 +PORTVERSION= 2.4.0 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= garga@FreeBSD.org COMMENT= Squid log analyzer and HTML report generator LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS_DEFINE= GD PHP NLS PCRE LDAP ICONV OPTIONS_DEFAULT=GD PHP PCRE LDAP ICONV OPTIONS_SUB= yes PHP_DESC= Install PHP for reporting generating USES= autoreconf gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir="${ETCDIR}" \ --enable-fontdir="${ETCDIR}/fonts" \ --enable-imagedir="${ETCDIR}/images" CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib NLS_USES= gettext NLS_USES_OFF= gettext-tools NLS_CONFIGURE_ENABLE= nls NLS_LIBS= -lintl GD_CONFIGURE_WITH= gd GD_LIB_DEPENDS= libgd.so:graphics/gd PHP_CONFIGURE_ON= --enable-sargphp="${ETCDIR}" PHP_CONFIGURE_OFF= --disable-sargphp PCRE_CONFIGURE_WITH= pcre PCRE_LIB_DEPENDS= libpcre.so:devel/pcre LDAP_USE= USE_OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap ICONV_USES= iconv ICONV_CONFIGURE_WITH= iconv ICONV_LDFLAGS= ${ICONV_LIB} .include Index: head/www/sarg/distinfo =================================================================== --- head/www/sarg/distinfo (revision 525811) +++ head/www/sarg/distinfo (revision 525812) @@ -1,3 +1,3 @@ -TIMESTAMP = 1528577696 -SHA256 (sarg-2.3.11.tar.gz) = d0f8fbefb5fdc716e75c778525d96ac9eef622d3de94da8d70e2bdc7ab81daa2 -SIZE (sarg-2.3.11.tar.gz) = 1346884 +TIMESTAMP = 1581420984 +SHA256 (sarg-2.4.0.tar.gz) = b4ca0f41f6467673b4c65c6798b44a8886f08180c055eb11c37a96dfc28cb5c3 +SIZE (sarg-2.4.0.tar.gz) = 1371812 Index: head/www/sarg/files/patch-configure.ac =================================================================== --- head/www/sarg/files/patch-configure.ac (revision 525811) +++ head/www/sarg/files/patch-configure.ac (nonexistent) @@ -1,10 +0,0 @@ ---- configure.ac.orig 2018-01-14 19:01:22 UTC -+++ configure.ac -@@ -2,6 +2,7 @@ dnl Process this file with autoconf or autoreconf to p - AC_INIT([sarg],[2.3.11]) - AC_CONFIG_SRCDIR([log.c]) - AC_CONFIG_AUX_DIR(cfgaux) -+AC_CONFIG_MACRO_DIR([m4]) - - AC_CANONICAL_HOST - Property changes on: head/www/sarg/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/sarg/files/patch-Makefile.in =================================================================== --- head/www/sarg/files/patch-Makefile.in (revision 525811) +++ head/www/sarg/files/patch-Makefile.in (revision 525812) @@ -1,33 +1,34 @@ ---- Makefile.in.orig 2015-04-12 14:38:36 UTC +--- Makefile.in.orig 2017-01-30 12:56:22 UTC +++ Makefile.in -@@ -27,11 +27,11 @@ DEFS = $(IBINDIR) $(ISYSCONFDIR) - LIBS = @LIBS@ -lm +@@ -27,12 +27,12 @@ DEFS = $(IBINDIR) $(ISYSCONFDIR) $(IFONTDIR) $( + LIBS = @LIBS@ @LIBINTL@ -lm SRCDIR = . VPATH = . -INSTALL = cp +INSTALL = @INSTALL@ -m 644 -S XSL_MAN_STYLESHEET=@XSL_MAN_STYLESHEET@ XSL_HTML_STYLESHEET=@XSL_HTML_STYLESHEET@ + EXEEXT = @EXEEXT@ -INSTALL_PROGRAM = $(INSTALL) +INSTALL_PROGRAM = @INSTALL@ -m 755 -S -s SRCS = util.c log.c report.c topuser.c email.c sort.c html.c \ - index.c getconf.c usage.c decomp.c ip2name.c ip2name_dns.c \ -@@ -93,14 +93,11 @@ install: all install-po + index.c getconf.c usage.c decomp.c ip2name.c ip2name_dns.c \ +@@ -111,14 +111,11 @@ install: all install-po mkdir -p $(DESTDIR)$(IMAGEDIR); \ fi - $(INSTALL_PROGRAM) sarg $(DESTDIR)$(bindir)/sarg -- chmod 755 $(DESTDIR)$(bindir)/sarg + $(INSTALL_PROGRAM) sarg$(EXEEXT) $(DESTDIR)$(bindir)/sarg$(EXEEXT); +- chmod 755 $(DESTDIR)$(bindir)/sarg$(EXEEXT); - $(INSTALL_PROGRAM) sarg.1 $(DESTDIR)$(man1dir)/sarg.1 - chmod 755 $(DESTDIR)$(man1dir)/sarg.1 + $(INSTALL) sarg.1 $(DESTDIR)$(man1dir)/sarg.1 + cp sarg.conf $(DESTDIR)$(sysconfdir)/sarg.conf.sample @if test ! -f $(DESTDIR)$(sysconfdir)/sarg.conf; then \ echo "cp $(DESTDIR)$(sysconfdir)/sarg.conf"; \ cp sarg.conf $(DESTDIR)$(sysconfdir)/sarg.conf; \ - else \ - cp sarg.conf $(DESTDIR)$(sysconfdir)/sarg.conf.default; \ fi cp ./exclude_codes $(DESTDIR)$(sysconfdir); cp ./user_limit_block $(DESTDIR)$(sysconfdir); Index: head/www/sarg/files/patch-decomp.c =================================================================== --- head/www/sarg/files/patch-decomp.c (nonexistent) +++ head/www/sarg/files/patch-decomp.c (revision 525812) @@ -0,0 +1,11 @@ +--- decomp.c.orig 2020-02-11 12:34:30 UTC ++++ decomp.c +@@ -486,7 +486,7 @@ FileObject *decomp(const char *arq) + ssize_t nread; + + // guess file type +- fd=open(arq,O_RDONLY | O_LARGEFILE); ++ fd=open(arq,O_RDONLY); + if (fd==-1) { + debuga(__FILE__,__LINE__,_("Cannot open file \"%s\": %s\n"),arq,strerror(errno)); + exit(EXIT_FAILURE); Property changes on: head/www/sarg/files/patch-decomp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/sarg/files/patch-util.c =================================================================== --- head/www/sarg/files/patch-util.c (nonexistent) +++ head/www/sarg/files/patch-util.c (revision 525812) @@ -0,0 +1,21 @@ +--- util.c.orig 2020-02-11 12:29:43 UTC ++++ util.c +@@ -27,6 +27,9 @@ + // #define LEGACY_MY_ATOLL + // #define LEGACY_TESTVALIDUSERCHAR + ++#include ++#include ++ + #include "include/conf.h" + #include "include/defs.h" + +@@ -402,7 +405,7 @@ int is_absolute(const char *path) + + int PortableMkDir(const char *path,int mode) + { +-#if defined(__linux__) ++#if defined(__linux__) || defined(__FreeBSD__) + int mkerror=mkdir(path,mode); + #else //mingw + (void)mode; Property changes on: head/www/sarg/files/patch-util.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/sarg/pkg-plist =================================================================== --- head/www/sarg/pkg-plist (revision 525811) +++ head/www/sarg/pkg-plist (revision 525812) @@ -1,56 +1,61 @@ bin/sarg @sample etc/sarg/sarg.conf.sample etc/sarg/css.tpl etc/sarg/exclude_codes etc/sarg/fonts/DejaVuSans.ttf etc/sarg/fonts/FreeSans.ttf etc/sarg/fonts/README etc/sarg/fonts/license etc/sarg/images/datetime.png etc/sarg/images/graph.png etc/sarg/images/sarg-squidguard-block.png etc/sarg/images/sarg.png man/man1/sarg.1.gz %%PHP%%etc/sarg/sarg-php/COPYING %%PHP%%etc/sarg/sarg-php/INSTALL %%PHP%%etc/sarg/sarg-php/LANGUAGES -%%PHP%%etc/sarg/sarg-php/language.php +%%PHP%%etc/sarg/sarg-php/config.php.inc %%PHP%%etc/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.mo %%PHP%%etc/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.po +%%PHP%%etc/sarg/sarg-php/locale/es/LC_MESSAGES/messages.mo +%%PHP%%etc/sarg/sarg-php/locale/es/LC_MESSAGES/messages.po %%PHP%%etc/sarg/sarg-php/locale/fr/LC_MESSAGES/messages.mo %%PHP%%etc/sarg/sarg-php/locale/fr/LC_MESSAGES/messages.po %%PHP%%etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.mo %%PHP%%etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.po %%PHP%%etc/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.mo %%PHP%%etc/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.po %%PHP%%etc/sarg/sarg-php/sarg-block-it.php %%PHP%%etc/sarg/sarg-php/sarg-realtime.php %%PHP%%etc/sarg/sarg-php/sarg-squidguard-block.php %%PHP%%etc/sarg/sarg-php/sarg-squidguard-block2.php %%PHP%%etc/sarg/sarg-php/style.php %%PHP%%etc/sarg/sarg-php/translate.this +%%PHP%%etc/sarg/sarg-php/update-mo.sh +%%PHP%%etc/sarg/sarg-php/update-po.sh +%%PHP%%etc/sarg/sarg-php/url_validator.php.inc etc/sarg/user_limit_block %%NLS%%share/locale/bg/LC_MESSAGES/sarg.mo %%NLS%%share/locale/ca/LC_MESSAGES/sarg.mo %%NLS%%share/locale/cs/LC_MESSAGES/sarg.mo %%NLS%%share/locale/da/LC_MESSAGES/sarg.mo %%NLS%%share/locale/de/LC_MESSAGES/sarg.mo %%NLS%%share/locale/el/LC_MESSAGES/sarg.mo %%NLS%%share/locale/es/LC_MESSAGES/sarg.mo %%NLS%%share/locale/fr/LC_MESSAGES/sarg.mo %%NLS%%share/locale/hu/LC_MESSAGES/sarg.mo %%NLS%%share/locale/id/LC_MESSAGES/sarg.mo %%NLS%%share/locale/it/LC_MESSAGES/sarg.mo %%NLS%%share/locale/ja/LC_MESSAGES/sarg.mo %%NLS%%share/locale/lv/LC_MESSAGES/sarg.mo %%NLS%%share/locale/nl/LC_MESSAGES/sarg.mo %%NLS%%share/locale/pl/LC_MESSAGES/sarg.mo %%NLS%%share/locale/pt/LC_MESSAGES/sarg.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/sarg.mo %%NLS%%share/locale/ro/LC_MESSAGES/sarg.mo %%NLS%%share/locale/ru/LC_MESSAGES/sarg.mo %%NLS%%share/locale/sk/LC_MESSAGES/sarg.mo %%NLS%%share/locale/sr/LC_MESSAGES/sarg.mo %%NLS%%share/locale/tr/LC_MESSAGES/sarg.mo %%NLS%%share/locale/uk/LC_MESSAGES/sarg.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/sarg.mo