View | Details | Raw Unified | Return to bug 235591
Collapse All | Expand All

(-)ufdbguard/Makefile (-5 / +3 lines)
Lines 2-10 Link Here
2
# $FreeBSD: head/www/ufdbguard/Makefile 484599 2018-11-10 10:09:48Z mat $
2
# $FreeBSD: head/www/ufdbguard/Makefile 484599 2018-11-10 10:09:48Z mat $
3
3
4
PORTNAME=	ufdbGuard
4
PORTNAME=	ufdbGuard
5
PORTVERSION=	1.33.7
5
PORTVERSION=	1.34.1
6
CATEGORIES=	www
6
CATEGORIES=	www
7
MASTER_SITES=	SF/${PORTNAME:tl}/1.33
7
MASTER_SITES=	SF/${PORTNAME:tl}/1.34
8
8
9
MAINTAINER=	timp87@gmail.com
9
MAINTAINER=	timp87@gmail.com
10
COMMENT=	URL filter for the Squid web proxy
10
COMMENT=	URL filter for the Squid web proxy
Lines 12-21 Link Here
12
LICENSE=	GPLv2
12
LICENSE=	GPLv2
13
LICENSE_FILE=	${WRKSRC}/COPYING
13
LICENSE_FILE=	${WRKSRC}/COPYING
14
14
15
BROKEN_aarch64=		fails to compile: error: regparm is not valid on this platform
16
BROKEN_SSL=	openssl111 libressl libressl-devel
17
18
USES=		perl5 shebangfix ssl
15
USES=		perl5 shebangfix ssl
16
19
SHEBANG_FILES=	samples/URLblocked.cgi
17
SHEBANG_FILES=	samples/URLblocked.cgi
20
GNU_CONFIGURE=	yes
18
GNU_CONFIGURE=	yes
21
USE_RC_SUBR=	ufdbguardd
19
USE_RC_SUBR=	ufdbguardd
(-)ufdbguard/distinfo (-2 / +2 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1524648364
1
TIMESTAMP = 1524648364
2
SHA256 (ufdbGuard-1.33.7.tar.gz) = 1812fc7cb9256d454a8eaad3ed8506be240087ee9e162d53969512c947ab2811
2
SHA256 (ufdbGuard-1.34.1.tar.gz) = 14718ae4e809d0210db3bcd5f3ca3885362c4d0ad61ecedb602ce541caedeea7
3
SIZE (ufdbGuard-1.33.7.tar.gz) = 2695164
3
SIZE (ufdbGuard-1.34.1.tar.gz) = 1390870
(-)ufdbguard/files/patch-src_Makefile.in (-5 / +22 lines)
Lines 1-6 Link Here
1
--- src/Makefile.in.orig	2017-03-14 18:52:13 UTC
1
--- src/Makefile.in.orig	2019-02-04 19:45:45 UTC
2
+++ src/Makefile.in
2
+++ src/Makefile.in
3
@@ -224,7 +224,7 @@ install.bin: ufdbGenTable ufdbAnalyse uf
3
@@ -227,7 +227,7 @@ install.bin: ufdbGenTable ufdbAnalyse ufdbhttpd create
4
 	$(INSTALL_PROGRAM) ufdb_top_urls.pl $(DESTDIR)$(bindir)/ufdb_top_urls
4
 	$(INSTALL_PROGRAM) ufdb_top_urls.pl $(DESTDIR)$(bindir)/ufdb_top_urls
5
 	$(INSTALL_PROGRAM) ufdb_top_users.pl $(DESTDIR)$(bindir)/ufdb_top_users
5
 	$(INSTALL_PROGRAM) ufdb_top_users.pl $(DESTDIR)$(bindir)/ufdb_top_users
6
 	@if [ -f ufdbpeek ] ; then $(INSTALL_PROGRAM) ufdbpeek $(DESTDIR)$(bindir)/ufdbpeek ; fi
6
 	@if [ -f ufdbpeek ] ; then $(INSTALL_PROGRAM) ufdbpeek $(DESTDIR)$(bindir)/ufdbpeek ; fi
Lines 9-15 Link Here
9
 
9
 
10
 install.pid::
10
 install.pid::
11
 	if [ $(piddir) != /var/tmp ] ; then $(INSTALL) -d $(DESTDIR)$(piddir) ; fi
11
 	if [ $(piddir) != /var/tmp ] ; then $(INSTALL) -d $(DESTDIR)$(piddir) ; fi
12
@@ -235,10 +235,10 @@ install.update::
12
@@ -239,10 +239,10 @@ install.update::
13
 
13
 
14
 install.security::
14
 install.security::
15
 	echo "Installing SSL root certificates"
15
 	echo "Installing SSL root certificates"
Lines 20-24 Link Here
20
-	sh ./install_etcfiles.sh $(DESTDIR)$(cfgdir) $(DESTDIR)$(bindir) $(DESTDIR)$(syscfgfile)
20
-	sh ./install_etcfiles.sh $(DESTDIR)$(cfgdir) $(DESTDIR)$(bindir) $(DESTDIR)$(syscfgfile)
21
+	sh ./install_etcfiles.sh $(DESTDIR)$(cfgdir) $(DESTDIR)$(bindir)
21
+	sh ./install_etcfiles.sh $(DESTDIR)$(cfgdir) $(DESTDIR)$(bindir)
22
 
22
 
23
 install.webmin::
23
 install.debug::
24
 	@echo
24
 	-if [ -x /usr/bin/debuginfo-install ] ; then /usr/bin/debuginfo-install glibc ; fi
25
@@ -281,12 +281,12 @@ uninstall.bin::
26
 
27
 install.mt::
28
 	cd mtserver ; $(MAKE)
29
-	$(INSTALL_PROGRAM) mtserver/ufdbguardd  $(DESTDIR)$(bindir)/ufdbguardd
30
-	$(INSTALL_PROGRAM) mtserver/ufdbgclient $(DESTDIR)$(bindir)/ufdbgclient
31
-	$(INSTALL_PROGRAM) mtserver/ufdb-pstack $(DESTDIR)$(bindir)/ufdb-pstack
32
+	$(INSTALL_PROGRAM) ufdbguardd  $(DESTDIR)$(bindir)/ufdbguardd
33
+	$(INSTALL_PROGRAM) ufdbgclient $(DESTDIR)$(bindir)/ufdbgclient
34
+	$(INSTALL_PROGRAM) ufdb-pstack $(DESTDIR)$(bindir)/ufdb-pstack
35
 	-@echo "ignore the next error from chown when building a package as non-root user"
36
 	-$(RM) $(DESTDIR)$(bindir)/ufdbsignal ; \
37
-		$(INSTALL_PROGRAM) mtserver/ufdbsignal  $(DESTDIR)$(bindir)/ufdbsignal  ; \
38
+		$(INSTALL_PROGRAM) ufdbsignal  $(DESTDIR)$(bindir)/ufdbsignal  ; \
39
 		chown root $(DESTDIR)$(bindir)/ufdbsignal  ;  \
40
 		chmod +s $(DESTDIR)$(bindir)/ufdbsignal
41
 
(-)ufdbguard/files/patch-src_check__config__file (-5 / +5 lines)
Lines 4-15 Link Here
4
    exit 1
4
    exit 1
5
 fi
5
 fi
6
 
6
 
7
-if [ ! -f $CONFIG.pre-v1.33 ]
7
-if [ ! -f $CONFIG.pre-v1.34 ]
8
-then
8
-then
9
-   cp $CONFIG $CONFIG.pre-v1.33
9
-   cp $CONFIG $CONFIG.pre-v1.34
10
-   if [ ! -f $CONFIG.pre-v1.33 ]
10
-   if [ ! -f $CONFIG.pre-v1.34 ]
11
-   then
11
-   then
12
-      echo "cannot copy configuration file to $CONFIG.pre-v1.33"
12
-      echo "cannot copy configuration file to $CONFIG.pre-v1.34"
13
-      exit 1
13
-      exit 1
14
-   fi
14
-   fi
15
-fi
15
-fi
Lines 21-27 Link Here
21
    echo "It is recommended to verify all ACLs for the inclusion of these URL categories ******"
21
    echo "It is recommended to verify all ACLs for the inclusion of these URL categories ******"
22
 fi
22
 fi
23
 
23
 
24
-echo "The original configuration file is saved in $CONFIG.pre-v1.33"
24
-echo "The original configuration file is saved in $CONFIG.pre-v1.34"
25
 echo
25
 echo
26
 
26
 
27
 exit 0
27
 exit 0
(-)ufdbguard/files/patch-src_ufdbGuard.conf.in (-11 lines)
Lines 1-11 Link Here
1
--- src/ufdbGuard.conf.in.orig	2017-03-08 20:47:38 UTC
2
+++ src/ufdbGuard.conf.in
3
@@ -33,7 +33,7 @@ logall off
4
 # valid version numbers are: 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 and 4.0
5
 # Contact the helpdesk of URLfilterDB for newer versions of Squid.
6
 ## EDIT THE NEXT LINE FOR LOCAL CONFIGURATION:
7
-squid-version "3.3"
8
+squid-version "3.5"
9
 
10
 # When a URL database is reloaded/updated, it is not possible to 
11
 # perform URL lookups.  The next parameters defines what to respond
(-)ufdbguard/files/patch-src_ufdbchkport.c (+56 lines)
Line 0 Link Here
1
--- src/ufdbchkport.c.orig	2019-02-08 07:02:37 UTC
2
+++ src/ufdbchkport.c
3
@@ -84,7 +84,7 @@ static volatile int tls_inited = 0;
4
 static pthread_mutex_t init_mutex = UFDB_STATIC_MUTEX_INIT;
5
 static SSL_CTX * ssl_ctx = NULL;
6
 
7
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
9
 static int num_static_ssl_locks = 0;
10
 static pthread_mutex_t * crypto_mutexes = NULL;
11
 #endif
12
@@ -895,7 +895,7 @@ void UFDBsetTunnelCheckMethod( int method )
13
 }
14
 
15
 
16
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
17
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
18
 static void ufdb_pthread_locking_callback( 
19
    int          mode, 
20
    int          type, 
21
@@ -945,7 +945,7 @@ static void ufdb_pthread_locking_callback( 
22
 #endif
23
 
24
 
25
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
26
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
27
 static unsigned long ufdb_pthread_id_callback( void )
28
 {
29
    unsigned long id = (unsigned long) pthread_self();
30
@@ -955,7 +955,7 @@ static unsigned long ufdb_pthread_id_callback( void )
31
 #endif
32
 
33
 
34
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
35
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
36
 
37
 typedef struct CRYPTO_dynlock_value {
38
    pthread_mutex_t lock;
39
@@ -1245,7 +1245,7 @@ int UFDBinitHTTPSchecker( void )
40
       ENGINE_load_builtin_engines();
41
       CONF_modules_load( NULL, NULL, 0 );
42
 
43
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
44
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
45
       {
46
          int    i;
47
          CRYPTO_set_id_callback( ufdb_pthread_id_callback );	
48
@@ -2444,7 +2444,7 @@ GCC_NO_INLINE int UFDBopenssl_connect( 
49
    saved_errno = errno;
50
    state = SSL_get_state( *ssl );
51
 
52
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
53
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
54
    if (ret > 0  &&  state == SSL_ST_OK)
55
 #else
56
    if (ret > 0  &&  state == TLS_ST_OK)
(-)ufdbguard/pkg-plist (+1 lines)
Lines 1-5 Link Here
1
bin/ufdb-pstack
1
bin/ufdb-pstack
2
bin/ufdbAnalyse
2
bin/ufdbAnalyse
3
bin/ufdbDLstatus
3
bin/ufdbConvertDB
4
bin/ufdbConvertDB
4
bin/ufdbGenTable
5
bin/ufdbGenTable
5
bin/ufdbUpdate
6
bin/ufdbUpdate

Return to bug 235591