Index: head/www/ufdbguard/Makefile =================================================================== --- head/www/ufdbguard/Makefile (revision 437095) +++ head/www/ufdbguard/Makefile (revision 437096) @@ -1,75 +1,85 @@ # Created by: Pavel Timofeev # $FreeBSD$ PORTNAME= ufdbGuard -PORTVERSION= 1.32.4 +PORTVERSION= 1.33.1 CATEGORIES= www -MASTER_SITES= SF/ufdbguard/1.32 +MASTER_SITES= SF/ufdbguard/1.33 MAINTAINER= timp87@gmail.com COMMENT= URL filter for the Squid web proxy LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_aarch64= fails to compile: error: regparm is not valid on this platform USES= perl5 shebangfix ssl 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 MAKE_JOBS_UNSAFE= yes 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 ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.if ${SSL_DEFAULT:Mlibressl-devel} +BROKEN= Does not build with libressl-devel +.endif + 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 437095) +++ head/www/ufdbguard/distinfo (revision 437096) @@ -1,3 +1,3 @@ TIMESTAMP = 1480157749 -SHA256 (ufdbGuard-1.32.4.tar.gz) = 037d2652087a544e4bfa10fefcb9e155e730536baf39331b3e9dca26c605e3df -SIZE (ufdbGuard-1.32.4.tar.gz) = 2499206 +SHA256 (ufdbGuard-1.33.1.tar.gz) = f927410049e0ba8d1757daf3de67bb1bb1bf1e5caa1d51f19ed052b52f135a92 +SIZE (ufdbGuard-1.33.1.tar.gz) = 2481303 Index: head/www/ufdbguard/files/patch-src_Makefile.in =================================================================== --- head/www/ufdbguard/files/patch-src_Makefile.in (revision 437095) +++ head/www/ufdbguard/files/patch-src_Makefile.in (revision 437096) @@ -1,24 +1,24 @@ ---- src/Makefile.in.orig 2016-10-19 19:37:29 UTC +--- src/Makefile.in.orig 2017-03-14 18:52:13 UTC +++ src/Makefile.in @@ -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 @@ -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 437095) +++ head/www/ufdbguard/files/patch-src_check__config__file (revision 437096) @@ -1,27 +1,27 @@ ---- src/check_config_file.orig 2015-06-09 01:03:32 UTC +--- src/check_config_file.orig 2017-03-01 14:25:22 UTC +++ src/check_config_file @@ -32,16 +32,6 @@ then exit 1 fi --if [ ! -f $CONFIG.pre-v1.32 ] +-if [ ! -f $CONFIG.pre-v1.33 ] -then -- cp $CONFIG $CONFIG.pre-v1.32 -- if [ ! -f $CONFIG.pre-v1.32 ] +- cp $CONFIG $CONFIG.pre-v1.33 +- if [ ! -f $CONFIG.pre-v1.33 ] - then -- echo "cannot copy configuration file to $CONFIG.pre-v1.32" +- echo "cannot copy configuration file to $CONFIG.pre-v1.33" - exit 1 - fi -fi - if [ ! -w $CONFIG ] then chmod u+w $CONFIG -@@ -340,7 +330,6 @@ then +@@ -496,7 +486,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.32" +-echo "The original configuration file is saved in $CONFIG.pre-v1.33" 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 437095) +++ head/www/ufdbguard/files/patch-src_install__etcfiles.sh.in (revision 437096) @@ -1,46 +1,48 @@ ---- src/install_etcfiles.sh.in.orig 2016-08-02 02:36:07 UTC +--- src/install_etcfiles.sh.in.orig 2017-02-27 13:27:26 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 @@ -373,12 +364,10 @@ fix_piddir_permissions () { case $OS in - freebsd) install_freebsd ;; openbsd) install_openbsd ;; linux_systemd) install_linux_systemd ;; smoothwall) install_smoothwall ;; solaris_smf) install_solaris_smf ;; - *) install_unix ;; esac -@@ -395,14 +384,3 @@ fi +@@ -395,16 +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 +-# the addition of the ufdbguardd service to /etc/services is deiabled since +-# ufdbguardd uses by default a named socket. +-# SERVICE=`grep -E -e ufdbguardd $DESTDIR/etc/services` +-# if [ "$SERVICE" = "" ] +-# then +-# ( +-# echo "" +-# echo "# for URLfilterDB daemon : " +-# echo "ufdbguardd 3977/tcp" +-# ) >> $DESTDIR/etc/services +-# fi - Index: head/www/ufdbguard/files/patch-src_sg.h.in =================================================================== --- head/www/ufdbguard/files/patch-src_sg.h.in (nonexistent) +++ head/www/ufdbguard/files/patch-src_sg.h.in (revision 437096) @@ -0,0 +1,11 @@ +--- src/sg.h.in.orig 2017-03-26 18:55:50 UTC ++++ src/sg.h.in +@@ -56,6 +56,8 @@ extern "C" { + + #define YY_NEVER_INTERACTIVE 1 + ++#include ++#include + #include + #include + #include Property changes on: head/www/ufdbguard/files/patch-src_sg.h.in ___________________________________________________________________ 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/files/patch-src_ufdbGuard.conf.in =================================================================== --- head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in (revision 437095) +++ head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in (revision 437096) @@ -1,11 +1,11 @@ ---- src/ufdbGuard.conf.in.orig 2016-10-16 22:05:14 UTC +--- src/ufdbGuard.conf.in.orig 2017-03-08 20:47:38 UTC +++ src/ufdbGuard.conf.in @@ -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