Attachment #200949 for bug #233964

Lines 13-19 Link Here

(-)ufdbguard/Makefile (-1 / +7 lines)
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	15	BROKEN_aarch64= fails to compile: error: regparm is not valid on this platform
16	BROKEN_SSL= openssl111 libressl libressl-devel	16	BROKEN_SSL= openssl111
17		17
18	USES= perl5 shebangfix ssl	18	USES= perl5 shebangfix ssl
19	SHEBANG_FILES= samples/URLblocked.cgi	19	SHEBANG_FILES= samples/URLblocked.cgi
Lines 62-67 Link Here
62	UNIXSOCKETS_CONFIGURE_WITH= unix-sockets	62	UNIXSOCKETS_CONFIGURE_WITH= unix-sockets
63		63
64	UNIXSOCKETS_DESC= Unix sockets support	64	UNIXSOCKETS_DESC= Unix sockets support
		65
		66	.include <bsd.port.options.mk>
		67
		68	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base
		69	BROKEN= Does not build on FreeBSD 12 with OpenSSL 1.1. You may add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf as a workaround
		70	.endif
65		71
66	post-install:	72	post-install:
67	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ufdbguardd \	73	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ufdbguardd \

Lines 1-6 Link Here

(-)ufdbguard/files/patch-src_Makefile.in (-3 / +3 lines)
1	--- src/Makefile.in.orig 2017-03-14 18:52:13 UTC	1	--- src/Makefile.in.orig 2018-07-24 14:02:34 UTC
2	+++ src/Makefile.in	2	+++ src/Makefile.in
3	@@ -224,7 +224,7 @@ install.bin: ufdbGenTable ufdbAnalyse uf	3	@@ -236,7 +236,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	@@ -247,10 +247,10 @@ install.update::
13		13
14	install.security::	14	install.security::
15	echo "Installing SSL root certificates"	15	echo "Installing SSL root certificates"

Lines 1-6 Link Here

(-)ufdbguard/files/patch-src_sg.h.in (-2 / +2 lines)
1	--- src/sg.h.in.orig 2017-03-26 18:55:50 UTC	1	--- src/sg.h.in.orig 2018-07-25 13:44:12 UTC
2	+++ src/sg.h.in	2	+++ src/sg.h.in
3	@@ -56,6 +56,8 @@ extern "C" {	3	@@ -60,6 +60,8 @@ extern "C" {
4		4
5	#define YY_NEVER_INTERACTIVE 1	5	#define YY_NEVER_INTERACTIVE 1
6		6

Lines 1-4 Link Here

(-)ufdbguard/files/patch-src_ufdbGuard.conf.in (-3 / +3 lines)
1	--- src/ufdbGuard.conf.in.orig 2017-03-08 20:47:38 UTC	1	--- src/ufdbGuard.conf.in.orig 2018-05-25 13:11:08 UTC
2	+++ src/ufdbGuard.conf.in	2	+++ src/ufdbGuard.conf.in
3	@@ -33,7 +33,7 @@ logall off	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	4	# valid version numbers are: 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5 and 4.0
Lines 7-11 Link Here
7	-squid-version "3.3"	7	-squid-version "3.3"
8	+squid-version "3.5"	8	+squid-version "3.5"
9		9
10	# When a URL database is reloaded/updated, it is not possible to	10	# When Squid uses ssl-bump in peek+bump mode, squid-uses-active-bumping
11	# perform URL lookups. The next parameters defines what to respond	11	# must be on.

Line 0 Link Here

(-)ufdbguard/files/patch-src_ufdbchkport.c (+11 lines)
	1	--- src/ufdbchkport.c.orig 2019-01-09 08:43:56 UTC
	2	+++ src/ufdbchkport.c
	3	@@ -2392,7 +2392,7 @@ int UFDBopenssl_connect(
	4	errno = 0;
	5	ret = SSL_connect( *ssl );
	6	saved_errno = errno;
	7	- state = (*ssl)->state;
	8	+ state = SSL_get_state(ssl);
	9	if (ret > 0 && state == SSL_ST_OK)
	10	{
	11	if ((*ssl)->version == SSL2_VERSION && UFDBglobalHttpsNoSSLv2)

Return to bug 233964