Date: Tue, 11 Feb 2020 12:57:42 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525812 - in head/www/sarg: . files Message-ID: <202002111257.01BCvgQd073363@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Tue Feb 11 12:57:42 2020 New Revision: 525812 URL: https://svnweb.freebsd.org/changeset/ports/525812 Log: www/sarg: Update to 2.4.0 Sponsored by: Rubicon Communications, LLC (Netgate) Added: head/www/sarg/files/patch-decomp.c (contents, props changed) head/www/sarg/files/patch-util.c (contents, props changed) Deleted: head/www/sarg/files/patch-configure.ac Modified: head/www/sarg/Makefile head/www/sarg/distinfo head/www/sarg/files/patch-Makefile.in head/www/sarg/pkg-plist Modified: head/www/sarg/Makefile ============================================================================== --- head/www/sarg/Makefile Tue Feb 11 12:24:06 2020 (r525811) +++ head/www/sarg/Makefile Tue Feb 11 12:57:42 2020 (r525812) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sarg -PORTVERSION= 2.3.11 +PORTVERSION= 2.4.0 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} Modified: head/www/sarg/distinfo ============================================================================== --- head/www/sarg/distinfo Tue Feb 11 12:24:06 2020 (r525811) +++ head/www/sarg/distinfo Tue Feb 11 12:57:42 2020 (r525812) @@ -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 Modified: head/www/sarg/files/patch-Makefile.in ============================================================================== --- head/www/sarg/files/patch-Makefile.in Tue Feb 11 12:24:06 2020 (r525811) +++ head/www/sarg/files/patch-Makefile.in Tue Feb 11 12:57:42 2020 (r525812) @@ -1,24 +1,25 @@ ---- 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 Added: head/www/sarg/files/patch-decomp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/sarg/files/patch-decomp.c Tue Feb 11 12:57:42 2020 (r525812) @@ -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); Added: head/www/sarg/files/patch-util.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/sarg/files/patch-util.c Tue Feb 11 12:57:42 2020 (r525812) @@ -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 <sys/param.h> ++#include <sys/stat.h> ++ + #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; Modified: head/www/sarg/pkg-plist ============================================================================== --- head/www/sarg/pkg-plist Tue Feb 11 12:24:06 2020 (r525811) +++ head/www/sarg/pkg-plist Tue Feb 11 12:57:42 2020 (r525812) @@ -14,9 +14,11 @@ 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 @@ -29,6 +31,9 @@ man/man1/sarg.1.gz %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002111257.01BCvgQd073363>