Attachment 200949 Details for Bug 233964 – port patch with fix

[patch] port patch with fix

ufdbguard.patch2 (text/plain), 3.83 KB, created by Pavel Timofeev on 2019-01-09 08:54:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2019-01-09 08:54:16 UTC

Size: 3.83 KB

patch

obsolete

>diff -ruN /root/ufdbguard.orig/Makefile ufdbguard/Makefile
>--- /root/ufdbguard.orig/Makefile	2019-01-09 10:38:01.435097000 +0300
>+++ ufdbguard/Makefile	2019-01-09 11:48:39.367549000 +0300
>@@ -13,7 +13,7 @@
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> BROKEN_aarch64=		fails to compile: error: regparm is not valid on this platform
>-BROKEN_SSL=	openssl111 libressl libressl-devel
>+BROKEN_SSL=	openssl111
> 
> USES=		perl5 shebangfix ssl
> SHEBANG_FILES=	samples/URLblocked.cgi
>@@ -62,6 +62,12 @@
> UNIXSOCKETS_CONFIGURE_WITH=	unix-sockets
> 
> UNIXSOCKETS_DESC=	Unix sockets support
>+
>+.include <bsd.port.options.mk>
>+
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base
>+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
>+.endif
> 
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ufdbguardd \
>diff -ruN /root/ufdbguard.orig/files/patch-src_Makefile.in ufdbguard/files/patch-src_Makefile.in
>--- /root/ufdbguard.orig/files/patch-src_Makefile.in	2019-01-09 10:38:01.436528000 +0300
>+++ ufdbguard/files/patch-src_Makefile.in	2019-01-09 11:44:20.086549000 +0300
>@@ -1,6 +1,6 @@
>---- src/Makefile.in.orig	2017-03-14 18:52:13 UTC
>+--- src/Makefile.in.orig	2018-07-24 14:02:34 UTC
> +++ src/Makefile.in
>-@@ -224,7 +224,7 @@ install.bin: ufdbGenTable ufdbAnalyse uf
>+@@ -236,7 +236,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::
>+@@ -247,10 +247,10 @@ install.update::
>  
>  install.security::
>  	echo "Installing SSL root certificates"
>diff -ruN /root/ufdbguard.orig/files/patch-src_sg.h.in ufdbguard/files/patch-src_sg.h.in
>--- /root/ufdbguard.orig/files/patch-src_sg.h.in	2019-01-09 10:38:01.437207000 +0300
>+++ ufdbguard/files/patch-src_sg.h.in	2019-01-09 11:44:20.095724000 +0300
>@@ -1,6 +1,6 @@
>---- src/sg.h.in.orig	2017-03-26 18:55:50 UTC
>+--- src/sg.h.in.orig	2018-07-25 13:44:12 UTC
> +++ src/sg.h.in
>-@@ -56,6 +56,8 @@ extern "C" {
>+@@ -60,6 +60,8 @@ extern "C" {
>  
>  #define YY_NEVER_INTERACTIVE 1
>  
>diff -ruN /root/ufdbguard.orig/files/patch-src_ufdbGuard.conf.in ufdbguard/files/patch-src_ufdbGuard.conf.in
>--- /root/ufdbguard.orig/files/patch-src_ufdbGuard.conf.in	2019-01-09 10:38:01.437417000 +0300
>+++ ufdbguard/files/patch-src_ufdbGuard.conf.in	2019-01-09 11:44:20.100075000 +0300
>@@ -1,4 +1,4 @@
>---- src/ufdbGuard.conf.in.orig	2017-03-08 20:47:38 UTC
>+--- src/ufdbGuard.conf.in.orig	2018-05-25 13:11:08 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
>@@ -7,5 +7,5 @@
> -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
>+ # When Squid uses ssl-bump in peek+bump mode, squid-uses-active-bumping
>+ # must be on.
>diff -ruN /root/ufdbguard.orig/files/patch-src_ufdbchkport.c ufdbguard/files/patch-src_ufdbchkport.c
>--- /root/ufdbguard.orig/files/patch-src_ufdbchkport.c	1970-01-01 03:00:00.000000000 +0300
>+++ ufdbguard/files/patch-src_ufdbchkport.c	2019-01-09 11:44:20.102619000 +0300
>@@ -0,0 +1,11 @@
>+--- src/ufdbchkport.c.orig	2019-01-09 08:43:56 UTC
>++++ src/ufdbchkport.c
>+@@ -2392,7 +2392,7 @@ int UFDBopenssl_connect( 
>+    errno = 0;
>+    ret = SSL_connect( *ssl );
>+    saved_errno = errno;
>+-   state = (*ssl)->state;
>++   state = SSL_get_state(ssl);
>+    if (ret > 0  &&  state == SSL_ST_OK)
>+    {
>+       if ((*ssl)->version == SSL2_VERSION  &&  UFDBglobalHttpsNoSSLv2)

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 233964: 200062 | 200237 | 200274 | 200949