svn commit: r427301 - in head/www/ufdbguard: . files
Guido Falsi
madpilot at FreeBSD.org
Mon Nov 28 12:41:19 UTC 2016
Author: madpilot
Date: Mon Nov 28 12:41:17 2016
New Revision: 427301
URL: https://svnweb.freebsd.org/changeset/ports/427301
Log:
- Update ufdbGuard to 1.32.3
PR: 213677
Submitted by: timp87 at gmail.com (maintainer)
Added:
head/www/ufdbguard/files/patch-src_ufdbHostnames.c (contents, props changed)
Modified:
head/www/ufdbguard/Makefile
head/www/ufdbguard/distinfo
head/www/ufdbguard/files/patch-src_Makefile.in
head/www/ufdbguard/files/patch-src_check__config__file
head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in
head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in
head/www/ufdbguard/pkg-plist
Modified: head/www/ufdbguard/Makefile
==============================================================================
--- head/www/ufdbguard/Makefile Mon Nov 28 12:26:25 2016 (r427300)
+++ head/www/ufdbguard/Makefile Mon Nov 28 12:41:17 2016 (r427301)
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= ufdbGuard
-PORTVERSION= 1.31
-DISTVERSIONSUFFIX= -16
+PORTVERSION= 1.32.3
CATEGORIES= www
-MASTER_SITES= SF/ufdbguard/${PORTVERSION}
+MASTER_SITES= SF/ufdbguard/1.32
MAINTAINER= timp87 at gmail.com
COMMENT= URL filter for the Squid web proxy
@@ -13,12 +12,8 @@ COMMENT= URL filter for the Squid web pr
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
USES= perl5 shebangfix ssl
-SHEBANG_FILES= samples/URLblocked.cgi src/ufdb_analyse_urls.pl \
- src/ufdb_top_urls.pl src/ufdb_analyse_users.pl \
- src/ufdb_top_users.pl
+SHEBANG_FILES= samples/URLblocked.cgi
GNU_CONFIGURE= yes
USE_RC_SUBR= ufdbguardd
@@ -65,6 +60,14 @@ UNIXSOCKETS_CONFIGURE_OFF= --without-uni
UNIXSOCKETS_DESC= Unix sockets support
+.include <bsd.port.options.mk>
+
+.if ${OSVERSION} < 1002000
+USES+= gmake
+.endif
+
+.include <bsd.port.pre.mk>
+
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ufdbguardd \
${STAGEDIR}${PREFIX}/bin/ufdbgclient \
@@ -73,4 +76,4 @@ post-install:
${STAGEDIR}${PREFIX}/bin/ufdbAnalyse \
${STAGEDIR}${PREFIX}/bin/ufdbhttpd
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/www/ufdbguard/distinfo
==============================================================================
--- head/www/ufdbguard/distinfo Mon Nov 28 12:26:25 2016 (r427300)
+++ head/www/ufdbguard/distinfo Mon Nov 28 12:41:17 2016 (r427301)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472011754
-SHA256 (ufdbGuard-1.31-16.tar.gz) = 98f491a19a806760374bf2e8441a1cd6a5fb38d168d7ffd576faa81c86db2c83
-SIZE (ufdbGuard-1.31-16.tar.gz) = 1916237
+TIMESTAMP = 1480157749
+SHA256 (ufdbGuard-1.32.3.tar.gz) = 9f35e63ce8efd0025efa54e59e87aa3051467e1fc76d9e1d446265683bb813ad
+SIZE (ufdbGuard-1.32.3.tar.gz) = 2495730
Modified: head/www/ufdbguard/files/patch-src_Makefile.in
==============================================================================
--- head/www/ufdbguard/files/patch-src_Makefile.in Mon Nov 28 12:26:25 2016 (r427300)
+++ head/www/ufdbguard/files/patch-src_Makefile.in Mon Nov 28 12:41:17 2016 (r427301)
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig 2016-02-18 17:47:07 UTC
+--- src/Makefile.in.orig 2016-10-19 19:37:29 UTC
+++ src/Makefile.in
-@@ -210,7 +210,7 @@ install.bin: ufdbGenTable ufdbAnalyse uf
+@@ -224,7 +224,7 @@ install.bin: ufdbGenTable ufdbAnalyse uf
$(INSTALL_PROGRAM) ufdb_top_urls.pl $(DESTDIR)$(bindir)/ufdb_top_urls
$(INSTALL_PROGRAM) ufdb_top_users.pl $(DESTDIR)$(bindir)/ufdb_top_users
@if [ -f ufdbpeek ] ; then $(INSTALL_PROGRAM) ufdbpeek $(DESTDIR)$(bindir)/ufdbpeek ; fi
@@ -9,7 +9,7 @@
install.pid::
if [ $(piddir) != /var/tmp ] ; then $(INSTALL) -d $(DESTDIR)$(piddir) ; fi
-@@ -221,10 +221,10 @@ install.update::
+@@ -235,10 +235,10 @@ install.update::
install.security::
echo "Installing SSL root certificates"
Modified: head/www/ufdbguard/files/patch-src_check__config__file
==============================================================================
--- head/www/ufdbguard/files/patch-src_check__config__file Mon Nov 28 12:26:25 2016 (r427300)
+++ head/www/ufdbguard/files/patch-src_check__config__file Mon Nov 28 12:41:17 2016 (r427301)
@@ -1,15 +1,15 @@
---- src/check_config_file.orig 2015-06-09 01:03:38 UTC
+--- src/check_config_file.orig 2015-06-09 01:03:32 UTC
+++ src/check_config_file
@@ -32,16 +32,6 @@ then
exit 1
fi
--if [ ! -f $CONFIG.pre-v1.31 ]
+-if [ ! -f $CONFIG.pre-v1.32 ]
-then
-- cp $CONFIG $CONFIG.pre-v1.31
-- if [ ! -f $CONFIG.pre-v1.31 ]
+- cp $CONFIG $CONFIG.pre-v1.32
+- if [ ! -f $CONFIG.pre-v1.32 ]
- then
-- echo "cannot copy configuration file to $CONFIG.pre-v1.31"
+- echo "cannot copy configuration file to $CONFIG.pre-v1.32"
- exit 1
- fi
-fi
@@ -17,11 +17,11 @@
if [ ! -w $CONFIG ]
then
chmod u+w $CONFIG
-@@ -301,7 +291,6 @@ then
- echo "It is recommended to verify all ACLs for the inclusion of these URL categories *****"
+@@ -340,7 +330,6 @@ then
+ echo "It is recommended to verify all ACLs for the inclusion of these URL categories ******"
fi
--echo "The original configuration file is saved in $CONFIG.pre-v1.31"
+-echo "The original configuration file is saved in $CONFIG.pre-v1.32"
echo
exit 0
Modified: head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in
==============================================================================
--- head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in Mon Nov 28 12:26:25 2016 (r427300)
+++ head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in Mon Nov 28 12:41:17 2016 (r427301)
@@ -1,4 +1,4 @@
---- src/install_etcfiles.sh.in.orig 2015-06-09 01:25:36 UTC
+--- src/install_etcfiles.sh.in.orig 2016-08-02 02:36:07 UTC
+++ src/install_etcfiles.sh.in
@@ -25,15 +25,6 @@ then
DESTDIR=${RPM_BUILD_ROOT:-}
@@ -16,18 +16,20 @@
CFGDIR="$1"
if [ ! -d "$CFGDIR" ]
then
-@@ -335,10 +326,8 @@ fix_piddir_permissions () {
+@@ -373,12 +364,10 @@ fix_piddir_permissions () {
case $OS in
-- freebsd) install_freebsd ;;
- solaris_smf) install_solaris_smf ;;
- linux_systemd) install_linux_systemd ;;
-- *) install_unix ;;
+- freebsd) install_freebsd ;;
+ openbsd) install_openbsd ;;
+ linux_systemd) install_linux_systemd ;;
+ smoothwall) install_smoothwall ;;
+ solaris_smf) install_solaris_smf ;;
+- *) install_unix ;;
esac
-@@ -355,14 +344,3 @@ fi
+@@ -395,14 +384,3 @@ fi
# TODO: copy parameters from ufdbUpdate to $SYSCFGFILE ************************************************************
fix_piddir_permissions
Modified: head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in
==============================================================================
--- head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in Mon Nov 28 12:26:25 2016 (r427300)
+++ head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in Mon Nov 28 12:41:17 2016 (r427301)
@@ -1,8 +1,8 @@
---- src/ufdbGuard.conf.in.orig 2016-02-22 21:37:07 UTC
+--- src/ufdbGuard.conf.in.orig 2016-10-16 22:05:14 UTC
+++ src/ufdbGuard.conf.in
-@@ -28,7 +28,7 @@ logall off
- # communicates with Squid using the version-dependent protocol.
- # valid version numbers are: 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4 and 3.5
+@@ -33,7 +33,7 @@ logall off
+ # valid version numbers are: 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 and 4.0
+ # Contact the helpdesk of URLfilterDB for newer versions of Squid.
## EDIT THE NEXT LINE FOR LOCAL CONFIGURATION:
-squid-version "3.3"
+squid-version "3.5"
Added: head/www/ufdbguard/files/patch-src_ufdbHostnames.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/ufdbguard/files/patch-src_ufdbHostnames.c Mon Nov 28 12:41:17 2016 (r427301)
@@ -0,0 +1,10 @@
+--- src/ufdbHostnames.c.orig 2016-10-21 06:25:59 UTC
++++ src/ufdbHostnames.c
+@@ -17,6 +17,7 @@
+ #include "ufdbHashtable.h"
+
+ #include <time.h>
++#include <netinet/in.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include <arpa/inet.h>
Modified: head/www/ufdbguard/pkg-plist
==============================================================================
--- head/www/ufdbguard/pkg-plist Mon Nov 28 12:26:25 2016 (r427300)
+++ head/www/ufdbguard/pkg-plist Mon Nov 28 12:41:17 2016 (r427301)
@@ -12,6 +12,7 @@ bin/ufdbguardd
bin/ufdbhttpd
bin/ufdbsignal
@sample %%ETCDIR%%/ufdbGuard.conf.sample
+man/man1/ufdbAnalyse.1.gz
man/man1/ufdb_analyse_urls.1.gz
man/man1/ufdb_analyse_users.1.gz
man/man1/ufdb_top_urls.1.gz
More information about the svn-ports-all
mailing list