Index: head/www/ufdbguard/Makefile =================================================================== --- head/www/ufdbguard/Makefile (revision 427300) +++ head/www/ufdbguard/Makefile (revision 427301) @@ -1,76 +1,79 @@ # Created by: Pavel Timofeev # $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@gmail.com COMMENT= URL filter for the Squid web proxy 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 USERS= ufdb GROUPS= ${USERS} RUNDIR= /var/run/${PORTNAME} DBDIR= /var/db/${PORTNAME} LOGDIR= /var/log/${PORTNAME} PLIST_SUB= USERS=${USERS} \ GROUPS=${GROUPS} \ RUNDIR=${RUNDIR} \ DBDIR=${DBDIR} \ LOGDIR=${LOGDIR} SUB_LIST= PORTNAME=${PORTNAME} \ USERS=${USERS} \ RUNDIR=${RUNDIR} \ DBDIR=${DBDIR} SUB_FILES= pkg-message CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} \ --with-ssl-lib=${OPENSSLLIB} \ --with-ssl-inc=${OPENSSLINC} \ --with-bz2=/usr \ --with-bz2-lib=/usr/lib \ --with-bz2-inc=/usr/include \ --with-ufdb-user=root \ --with-ufdb-mandir=${MANPREFIX}/man \ --with-ufdb-logdir=${LOGDIR} \ --with-ufdb-piddir=${RUNDIR} \ --with-ufdb-samplesdir=${EXAMPLESDIR} \ --with-ufdb-config=${ETCDIR} \ --with-ufdb-dbhome=${DBDIR} \ --with-ufdb-images_dir=${EXAMPLESDIR}/images OPTIONS_DEFINE= UNIXSOCKETS OPTIONS_DEFAULT= UNIXSOCKETS UNIXSOCKETS_CONFIGURE_ON= --with-unix-sockets UNIXSOCKETS_CONFIGURE_OFF= --without-unix-sockets UNIXSOCKETS_DESC= Unix sockets support +.include + +.if ${OSVERSION} < 1002000 +USES+= gmake +.endif + +.include + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ufdbguardd \ ${STAGEDIR}${PREFIX}/bin/ufdbgclient \ ${STAGEDIR}${PREFIX}/bin/ufdbsignal \ ${STAGEDIR}${PREFIX}/bin/ufdbGenTable \ ${STAGEDIR}${PREFIX}/bin/ufdbAnalyse \ ${STAGEDIR}${PREFIX}/bin/ufdbhttpd -.include +.include Index: head/www/ufdbguard/distinfo =================================================================== --- head/www/ufdbguard/distinfo (revision 427300) +++ head/www/ufdbguard/distinfo (revision 427301) @@ -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 Index: head/www/ufdbguard/files/patch-src_Makefile.in =================================================================== --- head/www/ufdbguard/files/patch-src_Makefile.in (revision 427300) +++ head/www/ufdbguard/files/patch-src_Makefile.in (revision 427301) @@ -1,24 +1,24 @@ ---- 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 - @if [ -f $(DESTDIR)$(cfgdir)/ufdbGuard.conf ] ; then echo "$(DESTDIR)$(cfgdir)/ufdbGuard.conf already exists." ; else $(INSTALL_DATA) ufdbGuard.conf $(DESTDIR)$(cfgdir)/ufdbGuard.conf ; fi + @if [ -f $(DESTDIR)$(cfgdir)/ufdbGuard.conf ] ; then echo "$(DESTDIR)$(cfgdir)/ufdbGuard.conf already exists." ; else $(INSTALL_DATA) ufdbGuard.conf $(DESTDIR)$(cfgdir)/ufdbGuard.conf.sample ; fi 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" - $(INSTALL_DATA) security/cacerts $(DESTDIR)$(dbhome)/security/cacerts + $(INSTALL_DATA) security/cacerts $(DESTDIR)$(dbhome)/security/cacerts.sample install.etc:: - sh ./install_etcfiles.sh $(DESTDIR)$(cfgdir) $(DESTDIR)$(bindir) $(DESTDIR)$(syscfgfile) + sh ./install_etcfiles.sh $(DESTDIR)$(cfgdir) $(DESTDIR)$(bindir) install.webmin:: @echo Index: head/www/ufdbguard/files/patch-src_check__config__file =================================================================== --- head/www/ufdbguard/files/patch-src_check__config__file (revision 427300) +++ head/www/ufdbguard/files/patch-src_check__config__file (revision 427301) @@ -1,27 +1,27 @@ ---- 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 - 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 Index: head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in =================================================================== --- head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in (revision 427300) +++ head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in (revision 427301) @@ -1,44 +1,46 @@ ---- 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:-} fi -if [ "$ID" != root -a $PKGNAME != ufdbGuard ] -then - echo - echo "*** You must be root but you appear to be $ID. ***" - echo "The ufdb startup script cannot be installed..." - echo - exit 1 -fi - 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 - -SERVICE=`grep -E -e ufdbguardd /etc/services` -if [ "$SERVICE" = "" ] -then - ( - echo "" - echo "# for URLfilterDB daemon : " - echo "ufdbguardd 3977/tcp" - ) >> /etc/services -fi - Index: head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in =================================================================== --- head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in (revision 427300) +++ head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in (revision 427301) @@ -1,11 +1,11 @@ ---- 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" # When a URL database is reloaded/updated, it is not possible to # perform URL lookups. The next parameters defines what to respond Index: head/www/ufdbguard/files/patch-src_ufdbHostnames.c =================================================================== --- head/www/ufdbguard/files/patch-src_ufdbHostnames.c (nonexistent) +++ head/www/ufdbguard/files/patch-src_ufdbHostnames.c (revision 427301) @@ -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 ++#include + #include + #include + #include Property changes on: head/www/ufdbguard/files/patch-src_ufdbHostnames.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/ufdbguard/pkg-plist =================================================================== --- head/www/ufdbguard/pkg-plist (revision 427300) +++ head/www/ufdbguard/pkg-plist (revision 427301) @@ -1,48 +1,49 @@ bin/ufdb-pstack bin/ufdbAnalyse bin/ufdbConvertDB bin/ufdbGenTable bin/ufdbUpdate bin/ufdb_analyse_urls bin/ufdb_analyse_users bin/ufdb_top_urls bin/ufdb_top_users bin/ufdbgclient 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 man/man1/ufdb_top_users.1.gz man/man8/ufdbgclient.8.gz man/man8/ufdbguardd.8.gz man/man8/ufdbhttpd.8.gz man/man8/ufdbupdate.8.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/URLblocked.cgi %%PORTEXAMPLES%%%%EXAMPLESDIR%%/execdomainlist.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/execuserlist.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/default.flv %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/default.mp3 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/default.mpeg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/default.wmv %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/forbidden-normal-de.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/forbidden-normal-en.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/forbidden-normal-es.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/forbidden-normal-fr.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/forbidden-normal-it.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/forbidden-normal-nl.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/forbidden-normal-pl.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/forbidden-normal-pt.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/forbidden-normal-sv.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/forbidden-normal-tr.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/no-ads.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/smallcross.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/square.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/transparent.png @sample %%DBDIR%%/security/cacerts.sample @dir(%%USERS%%,%%GROUPS%%,750) %%DBDIR%%/security @dir(%%USERS%%,%%GROUPS%%,750) %%DBDIR%% @dir(%%USERS%%,%%GROUPS%%,750) %%LOGDIR%% @dir(%%USERS%%,%%GROUPS%%,750) %%RUNDIR%%