Index: head/www/ufdbguard/Makefile =================================================================== --- head/www/ufdbguard/Makefile (revision 492649) +++ head/www/ufdbguard/Makefile (revision 492650) @@ -1,74 +1,72 @@ # Created by: Pavel Timofeev # $FreeBSD$ PORTNAME= ufdbGuard -PORTVERSION= 1.33.7 +PORTVERSION= 1.34.1 CATEGORIES= www -MASTER_SITES= SF/${PORTNAME:tl}/1.33 +MASTER_SITES= SF/${PORTNAME:tl}/1.34 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 -BROKEN_SSL= openssl111 libressl libressl-devel - 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 EXAMPLES UNIXSOCKETS_CONFIGURE_WITH= unix-sockets UNIXSOCKETS_DESC= Unix sockets support 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 Index: head/www/ufdbguard/distinfo =================================================================== --- head/www/ufdbguard/distinfo (revision 492649) +++ head/www/ufdbguard/distinfo (revision 492650) @@ -1,3 +1,3 @@ TIMESTAMP = 1524648364 -SHA256 (ufdbGuard-1.33.7.tar.gz) = 1812fc7cb9256d454a8eaad3ed8506be240087ee9e162d53969512c947ab2811 -SIZE (ufdbGuard-1.33.7.tar.gz) = 2695164 +SHA256 (ufdbGuard-1.34.1.tar.gz) = 14718ae4e809d0210db3bcd5f3ca3885362c4d0ad61ecedb602ce541caedeea7 +SIZE (ufdbGuard-1.34.1.tar.gz) = 1390870 Index: head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in =================================================================== --- head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in (revision 492649) +++ head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in (nonexistent) @@ -1,11 +0,0 @@ ---- 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 Property changes on: head/www/ufdbguard/files/patch-src_ufdbGuard.conf.in ___________________________________________________________________ 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/ufdbguard/files/patch-src_Makefile.in =================================================================== --- head/www/ufdbguard/files/patch-src_Makefile.in (revision 492649) +++ head/www/ufdbguard/files/patch-src_Makefile.in (revision 492650) @@ -1,24 +1,41 @@ ---- src/Makefile.in.orig 2017-03-14 18:52:13 UTC +--- src/Makefile.in.orig 2019-02-04 19:45:45 UTC +++ src/Makefile.in -@@ -224,7 +224,7 @@ install.bin: ufdbGenTable ufdbAnalyse uf +@@ -227,7 +227,7 @@ install.bin: ufdbGenTable ufdbAnalyse ufdbhttpd create $(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:: +@@ -239,10 +239,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 + install.debug:: + -if [ -x /usr/bin/debuginfo-install ] ; then /usr/bin/debuginfo-install glibc ; fi +@@ -281,12 +281,12 @@ uninstall.bin:: + + install.mt:: + cd mtserver ; $(MAKE) +- $(INSTALL_PROGRAM) mtserver/ufdbguardd $(DESTDIR)$(bindir)/ufdbguardd +- $(INSTALL_PROGRAM) mtserver/ufdbgclient $(DESTDIR)$(bindir)/ufdbgclient +- $(INSTALL_PROGRAM) mtserver/ufdb-pstack $(DESTDIR)$(bindir)/ufdb-pstack ++ $(INSTALL_PROGRAM) ufdbguardd $(DESTDIR)$(bindir)/ufdbguardd ++ $(INSTALL_PROGRAM) ufdbgclient $(DESTDIR)$(bindir)/ufdbgclient ++ $(INSTALL_PROGRAM) ufdb-pstack $(DESTDIR)$(bindir)/ufdb-pstack + -@echo "ignore the next error from chown when building a package as non-root user" + -$(RM) $(DESTDIR)$(bindir)/ufdbsignal ; \ +- $(INSTALL_PROGRAM) mtserver/ufdbsignal $(DESTDIR)$(bindir)/ufdbsignal ; \ ++ $(INSTALL_PROGRAM) ufdbsignal $(DESTDIR)$(bindir)/ufdbsignal ; \ + chown root $(DESTDIR)$(bindir)/ufdbsignal ; \ + chmod +s $(DESTDIR)$(bindir)/ufdbsignal + Index: head/www/ufdbguard/files/patch-src_check__config__file =================================================================== --- head/www/ufdbguard/files/patch-src_check__config__file (revision 492649) +++ head/www/ufdbguard/files/patch-src_check__config__file (revision 492650) @@ -1,27 +1,27 @@ --- 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.33 ] +-if [ ! -f $CONFIG.pre-v1.34 ] -then -- cp $CONFIG $CONFIG.pre-v1.33 -- if [ ! -f $CONFIG.pre-v1.33 ] +- cp $CONFIG $CONFIG.pre-v1.34 +- if [ ! -f $CONFIG.pre-v1.34 ] - then -- echo "cannot copy configuration file to $CONFIG.pre-v1.33" +- echo "cannot copy configuration file to $CONFIG.pre-v1.34" - exit 1 - fi -fi - if [ ! -w $CONFIG ] then chmod u+w $CONFIG @@ -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.33" +-echo "The original configuration file is saved in $CONFIG.pre-v1.34" echo exit 0 Index: head/www/ufdbguard/files/patch-src_ufdbchkport.c =================================================================== --- head/www/ufdbguard/files/patch-src_ufdbchkport.c (nonexistent) +++ head/www/ufdbguard/files/patch-src_ufdbchkport.c (revision 492650) @@ -0,0 +1,56 @@ +--- src/ufdbchkport.c.orig 2019-02-08 07:02:37 UTC ++++ src/ufdbchkport.c +@@ -84,7 +84,7 @@ static volatile int tls_inited = 0; + static pthread_mutex_t init_mutex = UFDB_STATIC_MUTEX_INIT; + static SSL_CTX * ssl_ctx = NULL; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER + static int num_static_ssl_locks = 0; + static pthread_mutex_t * crypto_mutexes = NULL; + #endif +@@ -895,7 +895,7 @@ void UFDBsetTunnelCheckMethod( int method ) + } + + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER + static void ufdb_pthread_locking_callback( + int mode, + int type, +@@ -945,7 +945,7 @@ static void ufdb_pthread_locking_callback( + #endif + + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER + static unsigned long ufdb_pthread_id_callback( void ) + { + unsigned long id = (unsigned long) pthread_self(); +@@ -955,7 +955,7 @@ static unsigned long ufdb_pthread_id_callback( void ) + #endif + + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER + + typedef struct CRYPTO_dynlock_value { + pthread_mutex_t lock; +@@ -1245,7 +1245,7 @@ int UFDBinitHTTPSchecker( void ) + ENGINE_load_builtin_engines(); + CONF_modules_load( NULL, NULL, 0 ); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER + { + int i; + CRYPTO_set_id_callback( ufdb_pthread_id_callback ); +@@ -2444,7 +2444,7 @@ GCC_NO_INLINE int UFDBopenssl_connect( + saved_errno = errno; + state = SSL_get_state( *ssl ); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER + if (ret > 0 && state == SSL_ST_OK) + #else + if (ret > 0 && state == TLS_ST_OK) Property changes on: head/www/ufdbguard/files/patch-src_ufdbchkport.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 492649) +++ head/www/ufdbguard/pkg-plist (revision 492650) @@ -1,49 +1,50 @@ bin/ufdb-pstack bin/ufdbAnalyse +bin/ufdbDLstatus 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%%