mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

www/ufdbguard: update to 1.34.1

Browse Source 
PR:		235591
Submitted by:	timp87@gmail.com (maintainer)
This commit is contained in:
Steve Wills 2019-02-10 21:21:21 +00:00
parent 6b06f791f3
commit 0b0b3aaa99
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=492650
7 changed files with 89 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/ufdbguard/Makefile
View File

@ -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

4
www/ufdbguard/distinfo
View File

@ -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

27
www/ufdbguard/files/patch-src_Makefile.in
View File

@ -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

10
www/ufdbguard/files/patch-src_check__config__file
View 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

11
www/ufdbguard/files/patch-src_ufdbGuard.conf.in
View File

@ -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

56
www/ufdbguard/files/patch-src_ufdbchkport.c Normal file
View File

@ -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)

1
www/ufdbguard/pkg-plist
View File

@ -1,5 +1,6 @@
bin/ufdb-pstack
bin/ufdbAnalyse
bin/ufdbDLstatus
bin/ufdbConvertDB
bin/ufdbGenTable
bin/ufdbUpdate