summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/ufdbguard/Makefile8
-rw-r--r--www/ufdbguard/distinfo4
-rw-r--r--www/ufdbguard/files/patch-src_Makefile.in27
-rw-r--r--www/ufdbguard/files/patch-src_check__config__file10
-rw-r--r--www/ufdbguard/files/patch-src_ufdbGuard.conf.in11
-rw-r--r--www/ufdbguard/files/patch-src_ufdbchkport.c56
-rw-r--r--www/ufdbguard/pkg-plist1
7 files changed, 89 insertions, 28 deletions
diff --git a/www/ufdbguard/Makefile b/www/ufdbguard/Makefile
index d7615c460a29..72208f522683 100644
--- a/www/ufdbguard/Makefile
+++ b/www/ufdbguard/Makefile
@@ -2,9 +2,9 @@
# $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
@@ -12,10 +12,8 @@ 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
diff --git a/www/ufdbguard/distinfo b/www/ufdbguard/distinfo
index 127d5e450691..dec06f6ca575 100644
--- a/www/ufdbguard/distinfo
+++ b/www/ufdbguard/distinfo
@@ -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
diff --git a/www/ufdbguard/files/patch-src_Makefile.in b/www/ufdbguard/files/patch-src_Makefile.in
index 9bc380725197..6e28a450e2bb 100644
--- a/www/ufdbguard/files/patch-src_Makefile.in
+++ b/www/ufdbguard/files/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- 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
@@ -9,7 +9,7 @@
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"
@@ -20,5 +20,22 @@
- 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
+
diff --git a/www/ufdbguard/files/patch-src_check__config__file b/www/ufdbguard/files/patch-src_check__config__file
index fbe412e00493..e922ef0919c9 100644
--- a/www/ufdbguard/files/patch-src_check__config__file
+++ b/www/ufdbguard/files/patch-src_check__config__file
@@ -4,12 +4,12 @@
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
@@ -21,7 +21,7 @@
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
diff --git a/www/ufdbguard/files/patch-src_ufdbGuard.conf.in b/www/ufdbguard/files/patch-src_ufdbGuard.conf.in
deleted file mode 100644
index dd471e1c2f9d..000000000000
--- a/www/ufdbguard/files/patch-src_ufdbGuard.conf.in
+++ /dev/null
@@ -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
diff --git a/www/ufdbguard/files/patch-src_ufdbchkport.c b/www/ufdbguard/files/patch-src_ufdbchkport.c
new file mode 100644
index 000000000000..d79f193bd598
--- /dev/null
+++ b/www/ufdbguard/files/patch-src_ufdbchkport.c
@@ -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)
diff --git a/www/ufdbguard/pkg-plist b/www/ufdbguard/pkg-plist
index 91011527804b..67c10405c74b 100644
--- a/www/ufdbguard/pkg-plist
+++ b/www/ufdbguard/pkg-plist
@@ -1,5 +1,6 @@
bin/ufdb-pstack
bin/ufdbAnalyse
+bin/ufdbDLstatus
bin/ufdbConvertDB
bin/ufdbGenTable
bin/ufdbUpdate
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-13 05:49:10 +0000