Attachment 181239 Details for Bug 218171 – port patch

[patch] port patch

ufdbguard-1.33.1.patch (text/plain), 5.73 KB, created by Pavel Timofeev on 2017-03-27 18:50:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2017-03-27 18:50:17 UTC

Size: 5.73 KB

patch

obsolete

>diff -ruN /home/timp/ufdbguard.orig/Makefile ufdbguard/Makefile
>--- /home/timp/ufdbguard.orig/Makefile	2017-03-26 20:57:14.926227000 +0300
>+++ ufdbguard/Makefile	2017-03-27 21:47:10.421349000 +0300
>@@ -2,9 +2,9 @@
> # $FreeBSD: head/www/ufdbguard/Makefile 432897 2017-01-31 03:40:46Z linimon $
> 
> PORTNAME=	ufdbGuard
>-PORTVERSION=	1.32.4
>+PORTVERSION=	1.33.1
> CATEGORIES=	www
>-MASTER_SITES=	SF/ufdbguard/1.32
>+MASTER_SITES=	SF/ufdbguard/1.33
> 
> MAINTAINER=	timp87@gmail.com
> COMMENT=	URL filter for the Squid web proxy
>@@ -64,6 +64,16 @@
> 
> UNIXSOCKETS_DESC=	Unix sockets support
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${SSL_DEFAULT:Mopenssl-devel}
>+BROKEN=		Does not build with openssl-devel
>+.endif
>+
>+.if ${SSL_DEFAULT:Mlibressl-devel}		
>+BROKEN=		Does not build with libressl-devel
>+.endif
>+
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ufdbguardd \
> 		${STAGEDIR}${PREFIX}/bin/ufdbgclient \
>@@ -72,4 +82,4 @@
> 		${STAGEDIR}${PREFIX}/bin/ufdbAnalyse \
> 		${STAGEDIR}${PREFIX}/bin/ufdbhttpd
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN /home/timp/ufdbguard.orig/distinfo ufdbguard/distinfo
>--- /home/timp/ufdbguard.orig/distinfo	2017-03-26 20:57:14.926837000 +0300
>+++ ufdbguard/distinfo	2017-03-26 21:00:54.328847000 +0300
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1480157749
>-SHA256 (ufdbGuard-1.32.4.tar.gz) = 037d2652087a544e4bfa10fefcb9e155e730536baf39331b3e9dca26c605e3df
>-SIZE (ufdbGuard-1.32.4.tar.gz) = 2499206
>+SHA256 (ufdbGuard-1.33.1.tar.gz) = f927410049e0ba8d1757daf3de67bb1bb1bf1e5caa1d51f19ed052b52f135a92
>+SIZE (ufdbGuard-1.33.1.tar.gz) = 2481303
>diff -ruN /home/timp/ufdbguard.orig/files/patch-src_Makefile.in ufdbguard/files/patch-src_Makefile.in
>--- /home/timp/ufdbguard.orig/files/patch-src_Makefile.in	2017-03-26 20:57:14.928383000 +0300
>+++ ufdbguard/files/patch-src_Makefile.in	2017-03-26 21:56:06.481768000 +0300
>@@ -1,4 +1,4 @@
>---- src/Makefile.in.orig	2016-10-19 19:37:29 UTC
>+--- src/Makefile.in.orig	2017-03-14 18:52:13 UTC
> +++ src/Makefile.in
> @@ -224,7 +224,7 @@ install.bin: ufdbGenTable ufdbAnalyse uf
>  	$(INSTALL_PROGRAM) ufdb_top_urls.pl $(DESTDIR)$(bindir)/ufdb_top_urls
>diff -ruN /home/timp/ufdbguard.orig/files/patch-src_check__config__file ufdbguard/files/patch-src_check__config__file
>--- /home/timp/ufdbguard.orig/files/patch-src_check__config__file	2017-03-26 20:57:14.928967000 +0300
>+++ ufdbguard/files/patch-src_check__config__file	2017-03-26 21:56:06.488360000 +0300
>@@ -1,15 +1,15 @@
>---- src/check_config_file.orig	2015-06-09 01:03:32 UTC
>+--- src/check_config_file.orig	2017-03-01 14:25:22 UTC
> +++ src/check_config_file
> @@ -32,16 +32,6 @@ then
>     exit 1
>  fi
>  
>--if [ ! -f $CONFIG.pre-v1.32 ]
>+-if [ ! -f $CONFIG.pre-v1.33 ]
> -then
>--   cp $CONFIG $CONFIG.pre-v1.32
>--   if [ ! -f $CONFIG.pre-v1.32 ]
>+-   cp $CONFIG $CONFIG.pre-v1.33
>+-   if [ ! -f $CONFIG.pre-v1.33 ]
> -   then
>--      echo "cannot copy configuration file to $CONFIG.pre-v1.32"
>+-      echo "cannot copy configuration file to $CONFIG.pre-v1.33"
> -      exit 1
> -   fi
> -fi
>@@ -17,11 +17,11 @@
>  if [ ! -w $CONFIG ]
>  then
>     chmod u+w $CONFIG
>-@@ -340,7 +330,6 @@ then
>+@@ -496,7 +486,6 @@ then
>     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.32"
>+-echo "The original configuration file is saved in $CONFIG.pre-v1.33"
>  echo
>  
>  exit 0
>diff -ruN /home/timp/ufdbguard.orig/files/patch-src_install__etcfiles.sh.in ufdbguard/files/patch-src_install__etcfiles.sh.in
>--- /home/timp/ufdbguard.orig/files/patch-src_install__etcfiles.sh.in	2017-03-26 20:57:14.929711000 +0300
>+++ ufdbguard/files/patch-src_install__etcfiles.sh.in	2017-03-26 21:56:06.497526000 +0300
>@@ -1,4 +1,4 @@
>---- src/install_etcfiles.sh.in.orig	2016-08-02 02:36:07 UTC
>+--- src/install_etcfiles.sh.in.orig	2017-02-27 13:27:26 UTC
> +++ src/install_etcfiles.sh.in
> @@ -25,15 +25,6 @@ then
>     DESTDIR=${RPM_BUILD_ROOT:-}
>@@ -29,18 +29,20 @@
>  esac
>  
>  
>-@@ -395,14 +384,3 @@ fi
>+@@ -395,16 +384,3 @@ fi
>  # TODO: copy parameters from ufdbUpdate to $SYSCFGFILE ************************************************************ 
>  
>  fix_piddir_permissions
> -
>--SERVICE=`grep -E -e ufdbguardd /etc/services`
>--if [ "$SERVICE" = "" ]
>--then
>--   (
>--      echo ""
>--      echo "# for URLfilterDB daemon : "
>--      echo "ufdbguardd      3977/tcp"
>--   ) >> /etc/services
>--fi
>+-# the addition of the ufdbguardd service to /etc/services is deiabled since
>+-# ufdbguardd uses by default a named socket.
>+-# SERVICE=`grep -E -e ufdbguardd $DESTDIR/etc/services`
>+-# if [ "$SERVICE" = "" ]
>+-# then
>+-#    (
>+-#       echo ""
>+-#       echo "# for URLfilterDB daemon : "
>+-#       echo "ufdbguardd      3977/tcp"
>+-#    ) >> $DESTDIR/etc/services
>+-# fi
> -
>diff -ruN /home/timp/ufdbguard.orig/files/patch-src_sg.h.in ufdbguard/files/patch-src_sg.h.in
>--- /home/timp/ufdbguard.orig/files/patch-src_sg.h.in	1970-01-01 03:00:00.000000000 +0300
>+++ ufdbguard/files/patch-src_sg.h.in	2017-03-26 21:56:06.502944000 +0300
>@@ -0,0 +1,11 @@
>+--- src/sg.h.in.orig	2017-03-26 18:55:50 UTC
>++++ src/sg.h.in
>+@@ -56,6 +56,8 @@ extern "C" {
>+ 
>+ #define YY_NEVER_INTERACTIVE 1
>+ 
>++#include <netinet/in.h>
>++#include <sys/socket.h>
>+ #include <stdio.h>
>+ #include <unistd.h>
>+ #include <stdlib.h>
>diff -ruN /home/timp/ufdbguard.orig/files/patch-src_ufdbGuard.conf.in ufdbguard/files/patch-src_ufdbGuard.conf.in
>--- /home/timp/ufdbguard.orig/files/patch-src_ufdbGuard.conf.in	2017-03-26 20:57:14.930466000 +0300
>+++ ufdbguard/files/patch-src_ufdbGuard.conf.in	2017-03-26 21:56:06.510525000 +0300
>@@ -1,4 +1,4 @@
>---- src/ufdbGuard.conf.in.orig	2016-10-16 22:05:14 UTC
>+--- 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

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 218171: 181239