Attachment #181239 for bug #218171

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




# $FreeBSD: head/www/ufdbguard/Makefile 432897 2017-01-31 03:40:46Z linimon $

PORTNAME=	ufdbGuard
PORTVERSION=	1.33.1
CATEGORIES=	www
MASTER_SITES=	SF/ufdbguard/1.33

MAINTAINER=	timp87@gmail.com
COMMENT=	URL filter for the Squid web proxy


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 \

		${STAGEDIR}${PREFIX}/bin/ufdbAnalyse \
		${STAGEDIR}${PREFIX}/bin/ufdbhttpd

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)ufdbguard/distinfo (-2 / +2 lines)
1	TIMESTAMP = 1480157749	1	TIMESTAMP = 1480157749
2	SHA256 (ufdbGuard-1.32.4.tar.gz) = 037d2652087a544e4bfa10fefcb9e155e730536baf39331b3e9dca26c605e3df	2	SHA256 (ufdbGuard-1.33.1.tar.gz) = f927410049e0ba8d1757daf3de67bb1bb1bf1e5caa1d51f19ed052b52f135a92
3	SIZE (ufdbGuard-1.32.4.tar.gz) = 2499206	3	SIZE (ufdbGuard-1.33.1.tar.gz) = 2481303

Lines 1-4 Link Here

(-)ufdbguard/files/patch-src_Makefile.in (-1 / +1 lines)
1	--- src/Makefile.in.orig 2016-10-19 19:37:29 UTC	1	--- src/Makefile.in.orig 2017-03-14 18:52:13 UTC
2	+++ src/Makefile.in	2	+++ src/Makefile.in
3	@@ -224,7 +224,7 @@ install.bin: ufdbGenTable ufdbAnalyse uf	3	@@ -224,7 +224,7 @@ install.bin: ufdbGenTable ufdbAnalyse uf
4	$(INSTALL_PROGRAM) ufdb_top_urls.pl $(DESTDIR)$(bindir)/ufdb_top_urls	4	$(INSTALL_PROGRAM) ufdb_top_urls.pl $(DESTDIR)$(bindir)/ufdb_top_urls




--- 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.33 ]
-then
-   cp $CONFIG $CONFIG.pre-v1.33
-   if [ ! -f $CONFIG.pre-v1.33 ]
-   then
-      echo "cannot copy configuration file to $CONFIG.pre-v1.33"
-      exit 1
-   fi
-fi

 if [ ! -w $CONFIG ]
 then
    chmod u+w $CONFIG
@@ -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.33"
 echo
 
 exit 0




--- 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:-}

 esac
 
 
@@ -395,16 +384,3 @@ fi
 # TODO: copy parameters from ufdbUpdate to $SYSCFGFILE ************************************************************ 
 
 fix_piddir_permissions
-
-# 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
-

Line 0 Link Here

(-)ufdbguard/files/patch-src_sg.h.in (+11 lines)
	1	--- src/sg.h.in.orig 2017-03-26 18:55:50 UTC
	2	+++ src/sg.h.in
	3	@@ -56,6 +56,8 @@ extern "C" {
	4
	5	#define YY_NEVER_INTERACTIVE 1
	6
	7	+#include <netinet/in.h>
	8	+#include <sys/socket.h>
	9	#include <stdio.h>
	10	#include <unistd.h>
	11	#include <stdlib.h>

Lines 1-4 Link Here

(-)ufdbguard/files/patch-src_ufdbGuard.conf.in (-1 / +1 lines)
1	--- src/ufdbGuard.conf.in.orig 2016-10-16 22:05:14 UTC	1	--- src/ufdbGuard.conf.in.orig 2017-03-08 20:47:38 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

Return to bug 218171

Lines 2-10 Link Here

(-)ufdbguard/Makefile (-3 / +13 lines)
2	# $FreeBSD: head/www/ufdbguard/Makefile 432897 2017-01-31 03:40:46Z linimon $	2	# $FreeBSD: head/www/ufdbguard/Makefile 432897 2017-01-31 03:40:46Z linimon $
3		3
4	PORTNAME= ufdbGuard	4	PORTNAME= ufdbGuard
5	PORTVERSION= 1.32.4	5	PORTVERSION= 1.33.1
6	CATEGORIES= www	6	CATEGORIES= www
7	MASTER_SITES= SF/ufdbguard/1.32	7	MASTER_SITES= SF/ufdbguard/1.33
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 64-69 Link Here
64		64
65	UNIXSOCKETS_DESC= Unix sockets support	65	UNIXSOCKETS_DESC= Unix sockets support
66		66
		67	.include <bsd.port.pre.mk>
		68
		69	.if ${SSL_DEFAULT:Mopenssl-devel}
		70	BROKEN= Does not build with openssl-devel
		71	.endif
		72
		73	.if ${SSL_DEFAULT:Mlibressl-devel}
		74	BROKEN= Does not build with libressl-devel
		75	.endif
		76
67	post-install:	77	post-install:
68	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ufdbguardd \	78	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ufdbguardd \
69	${STAGEDIR}${PREFIX}/bin/ufdbgclient \	79	${STAGEDIR}${PREFIX}/bin/ufdbgclient \
Lines 72-75 Link Here
72	${STAGEDIR}${PREFIX}/bin/ufdbAnalyse \	82	${STAGEDIR}${PREFIX}/bin/ufdbAnalyse \
73	${STAGEDIR}${PREFIX}/bin/ufdbhttpd	83	${STAGEDIR}${PREFIX}/bin/ufdbhttpd
74		84
75	.include <bsd.port.mk>	85	.include <bsd.port.post.mk>

Lines 1-15 Link Here

(-)ufdbguard/files/patch-src_check__config__file (-7 / +7 lines)
1	--- src/check_config_file.orig 2015-06-09 01:03:32 UTC	1	--- src/check_config_file.orig 2017-03-01 14:25:22 UTC
2	+++ src/check_config_file	2	+++ src/check_config_file
3	@@ -32,16 +32,6 @@ then	3	@@ -32,16 +32,6 @@ then
4	exit 1	4	exit 1
5	fi	5	fi
6		6
7	-if [ ! -f $CONFIG.pre-v1.32 ]	7	-if [ ! -f $CONFIG.pre-v1.33 ]
8	-then	8	-then
9	- cp $CONFIG $CONFIG.pre-v1.32	9	- cp $CONFIG $CONFIG.pre-v1.33
10	- if [ ! -f $CONFIG.pre-v1.32 ]	10	- if [ ! -f $CONFIG.pre-v1.33 ]
11	- then	11	- then
12	- echo "cannot copy configuration file to $CONFIG.pre-v1.32"	12	- echo "cannot copy configuration file to $CONFIG.pre-v1.33"
13	- exit 1	13	- exit 1
14	- fi	14	- fi
15	-fi	15	-fi
Lines 17-27 Link Here
17	if [ ! -w $CONFIG ]	17	if [ ! -w $CONFIG ]
18	then	18	then
19	chmod u+w $CONFIG	19	chmod u+w $CONFIG
20	@@ -340,7 +330,6 @@ then	20	@@ -496,7 +486,6 @@ then
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.32"	24	-echo "The original configuration file is saved in $CONFIG.pre-v1.33"
25	echo	25	echo
26		26
27	exit 0	27	exit 0

Lines 1-4 Link Here

(-)ufdbguard/files/patch-src_install__etcfiles.sh.in (-11 / +13 lines)
1	--- src/install_etcfiles.sh.in.orig 2016-08-02 02:36:07 UTC	1	--- src/install_etcfiles.sh.in.orig 2017-02-27 13:27:26 UTC
2	+++ src/install_etcfiles.sh.in	2	+++ src/install_etcfiles.sh.in
3	@@ -25,15 +25,6 @@ then	3	@@ -25,15 +25,6 @@ then
4	DESTDIR=${RPM_BUILD_ROOT:-}	4	DESTDIR=${RPM_BUILD_ROOT:-}
Lines 29-46 Link Here
29	esac	29	esac
30		30
31		31
32	@@ -395,14 +384,3 @@ fi	32	@@ -395,16 +384,3 @@ fi
33	# TODO: copy parameters from ufdbUpdate to $SYSCFGFILE ************************************************************	33	# TODO: copy parameters from ufdbUpdate to $SYSCFGFILE ************************************************************
34		34
35	fix_piddir_permissions	35	fix_piddir_permissions
36	-	36	-
37	-SERVICE=`grep -E -e ufdbguardd /etc/services`	37	-# the addition of the ufdbguardd service to /etc/services is deiabled since
38	-if [ "$SERVICE" = "" ]	38	-# ufdbguardd uses by default a named socket.
39	-then	39	-# SERVICE=`grep -E -e ufdbguardd $DESTDIR/etc/services`
40	- (	40	-# if [ "$SERVICE" = "" ]
41	- echo ""	41	-# then
42	- echo "# for URLfilterDB daemon : "	42	-# (
43	- echo "ufdbguardd 3977/tcp"	43	-# echo ""
44	- ) >> /etc/services	44	-# echo "# for URLfilterDB daemon : "
45	-fi	45	-# echo "ufdbguardd 3977/tcp"
		46	-# ) >> $DESTDIR/etc/services
		47	-# fi
46	-	48	-