Attachment #250306 for bug #278258

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




PORTNAME=	ufdbGuard
PORTVERSION=	1.35.7
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=	SF/${PORTNAME:tl}/1.35


		DBDIR=${DBDIR} \
		LOGDIR=${LOGDIR}

OPTIONS_DEFINE=	EXAMPLES

UNIXSOCKETS_DESC=	Unix sockets support
UNIXSOCKETS_CONFIGURE_WITH=	unix-sockets

DBDIR=		/var/db/${PORTNAME}
LOGDIR=		/var/log/${PORTNAME}

Lines 1-3 Link Here

(-)b/www/ufdbguard/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1604849332	1	TIMESTAMP = 1712588046
2	SHA256 (ufdbGuard-1.35.3.tar.gz) = eb6134b2b5430da3006cd28a0977034f3ff8df9d5a72058e2e9d956f2d57c449	2	SHA256 (ufdbGuard-1.35.7.tar.gz) = 2707c6786fe3cf0b1199f0f970883838e8dd529741db7c4a728788824fcec8a4
3	SIZE (ufdbGuard-1.35.3.tar.gz) = 1738159	3	SIZE (ufdbGuard-1.35.7.tar.gz) = 1711624




--- configure.orig	2024-03-20 15:31:17 UTC
+++ configure
@@ -7847,7 +7847,6 @@ then
    echo "   The bash package is most likely on your UNIX distribution media."
    echo "   It is required to install the bash package and rerun configure."
    echo
-   exit 1
 fi
 
 # Extract the first word of "wget", so it can be a program name with args.
@@ -7905,7 +7904,6 @@ then
    echo "   The wget package is most likely on your UNIX distribution media."
    echo "   It is required to install the wget package and rerun configure."
    echo
-   exit 1
 fi
 
 # Extract the first word of "curl", so it can be a program name with args.




--- src/Makefile.in.orig	2024-03-21 13:58:11 UTC
+++ src/Makefile.in
@@ -237,7 +237,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

 
 install.pid::
 	if [ $(piddir) != /var/tmp ] ; then $(INSTALL) -d $(DESTDIR)$(piddir) ; fi
@@ -249,10 +249,10 @@ install.update::
 
 install.security::
 	echo "Installing SSL root certificates"

 
 install.debug::
 	-if [ -x /usr/bin/debuginfo-install ] ; then /usr/bin/debuginfo-install glibc ; fi
@@ -269,7 +269,6 @@ install.log::
 
 createdirs::
 	echo "Creating directories ..."
-	$(INSTALL) -d $(DESTDIR)/usr/lib/systemd/system
 	$(INSTALL) -d $(DESTDIR)$(bindir) 
 	$(INSTALL) -o $(RUNAS) -d $(DESTDIR)$(logdir) 
 	$(INSTALL) -d $(DESTDIR)$(cfgdir)

Lines 1-4 Link Here

(-)b/www/ufdbguard/files/patch-src_install__etcfiles.sh.in (-2 / +2 lines)
1	--- src/install_etcfiles.sh.in.orig 2019-02-27 23:03:09 UTC	1	--- src/install_etcfiles.sh.in.orig 2024-03-22 12:30:31 UTC
2	+++ src/install_etcfiles.sh.in	2	+++ src/install_etcfiles.sh.in
3	@@ -22,19 +22,6 @@ else	3	@@ -22,19 +22,6 @@ else
4	DESTDIR=""	4	DESTDIR=""
Lines 20-26 Link Here
20	OS="@ufdb_os_type@"	20	OS="@ufdb_os_type@"
21	INITDIR="@ufdb_initdir@"	21	INITDIR="@ufdb_initdir@"
22		22
23	@@ -281,12 +268,10 @@ fix_piddir_permissions () {	23	@@ -293,12 +280,10 @@ fix_piddir_permissions () {
24		24
25		25
26	case $OS in	26	case $OS in

Lines 1-11 Link Here

(-)b/www/ufdbguard/files/patch-src_mtserver_Makefile.in (-5 / +5 lines)
1	--- src/mtserver/Makefile.in.orig 2020-11-01 13:42:44 UTC	1	--- src/mtserver/Makefile.in.orig 2024-03-21 13:58:11 UTC
2	+++ src/mtserver/Makefile.in	2	+++ src/mtserver/Makefile.in
3	@@ -16,7 +16,7 @@	3	@@ -16,7 +16,7 @@
4		4
5	CC = @CC@	5	CC = @CC@
6	CXX = @CXX@	6	CXX = @CXX@
7	-CFLAGS = @CFLAGS@ -I. -I.. # -DUFDB_TEST_PROXY	7	-CFLAGS = @CFLAGS@ -I. -I.. -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wold-style-definition
8	+CFLAGS = @CFLAGS@ -D__BSD_VISIBLE=1 -I. -I..	8	+CFLAGS = @CFLAGS@ -D__BSD_VISIBLE=1 -I. -I.. -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wold-style-definition
9	CXXFLAGS= @CXXFLAGS@ -I. -I..	9	CXXFLAGS= @CXXFLAGS@ -I. -I.. -Wall -Wextra -Wmissing-declarations
10	CPPFLAGS= @CPPFLAGS@	10	CPPFLAGS= @CPPFLAGS@
11	LDFLAGS = @LDFLAGS@	11	LDFLAGS = @LDFLAGS@ # -Wl,-z,relro -Wl,-z,now

Lines 3-12 Link Here

(-)b/www/ufdbguard/files/pkg-message.in (-4 lines)
3	message: <<EOM	3	message: <<EOM
4	Please, note the following statements about %%PORTNAME%% port:	4	Please, note the following statements about %%PORTNAME%% port:
5		5
6	o it's decided during compilation if ufdbguardd will work through Unix
7	or TCP socket. It's set to Unix socket by default and if you want it
8	to work via TCP socket unset UNIXSOCKETS port option and rebuild it.
9
10	o ufdbUpdate script is left in non-working state for now.	6	o ufdbUpdate script is left in non-working state for now.
11	The only purpose of this script is to download URLfilterDB updates	7	The only purpose of this script is to download URLfilterDB updates
12	using paid subscription and to run it by cron. The script implies on	8	using paid subscription and to run it by cron. The script implies on




	: ${ufdbguardd_enable:=NO}
	: ${ufdbguardd_user:=%%USERS%%}

	ufdbguardd_unixsocket="/tmp/ufdbguardd-[0-9]*"

	required_dirs="$ufdbguardd_dbdir %%RUNDIR%%"
	required_files="$ufdbguardd_conf"
	pidfile="%%RUNDIR%%/${name}.pid"

	fi
}

ufdbguardd_checksocket()
{
	echo "Checking if $name unix socket exists."
	if test -e $ufdbguardd_unixsocket; then
		echo "Unix socket $ufdbguardd_unixsocket exists. Probably stale file after abnormal shutdown. Removing it."
		rm -f $ufdbguardd_unixsocket
	fi
}

ufdbguardd_prestart()
{
	ufdbguardd_configtest
	ufdbguardd_checksocket
}

ufdbguardd_rotatelog()
- 

Return to bug 278258

Lines 1-6 Link Here

(-)b/www/ufdbguard/Makefile (-6 / +2 lines)
1	PORTNAME= ufdbGuard	1	PORTNAME= ufdbGuard
2	PORTVERSION= 1.35.3	2	PORTVERSION= 1.35.7
3	PORTREVISION= 1
4	CATEGORIES= www	3	CATEGORIES= www
5	MASTER_SITES= SF/${PORTNAME:tl}/1.35	4	MASTER_SITES= SF/${PORTNAME:tl}/1.35
6		5
Lines 50-59 PLIST_SUB= USERS=${USERS} \ Link Here
50	DBDIR=${DBDIR} \	49	DBDIR=${DBDIR} \
51	LOGDIR=${LOGDIR}	50	LOGDIR=${LOGDIR}
52		51
53	OPTIONS_DEFINE= UNIXSOCKETS EXAMPLES	52	OPTIONS_DEFINE= EXAMPLES
54
55	UNIXSOCKETS_DESC= Unix sockets support
56	UNIXSOCKETS_CONFIGURE_WITH= unix-sockets
57		53
58	DBDIR= /var/db/${PORTNAME}	54	DBDIR= /var/db/${PORTNAME}
59	LOGDIR= /var/log/${PORTNAME}	55	LOGDIR= /var/log/${PORTNAME}

Added Link Here

(-)b/www/ufdbguard/files/patch-configure (+18 lines)
1	--- configure.orig 2024-03-20 15:31:17 UTC
2	+++ configure
3	@@ -7847,7 +7847,6 @@ then
4	echo " The bash package is most likely on your UNIX distribution media."
5	echo " It is required to install the bash package and rerun configure."
6	echo
7	- exit 1
8	fi
9
10	# Extract the first word of "wget", so it can be a program name with args.
11	@@ -7905,7 +7904,6 @@ then
12	echo " The wget package is most likely on your UNIX distribution media."
13	echo " It is required to install the wget package and rerun configure."
14	echo
15	- exit 1
16	fi
17
18	# Extract the first word of "curl", so it can be a program name with args.

Lines 1-6 Link Here

(-)b/www/ufdbguard/files/patch-src_Makefile.in (-3 / +11 lines)
1	--- src/Makefile.in.orig 2019-02-04 19:45:45 UTC	1	--- src/Makefile.in.orig 2024-03-21 13:58:11 UTC
2	+++ src/Makefile.in	2	+++ src/Makefile.in
3	@@ -227,7 +227,7 @@ install.bin: ufdbGenTable ufdbAnalyse ufdbhttpd create	3	@@ -237,7 +237,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	@@ -239,10 +239,10 @@ install.update::	12	@@ -249,10 +249,10 @@ install.update::
13		13
14	install.security::	14	install.security::
15	echo "Installing SSL root certificates"	15	echo "Installing SSL root certificates"
Lines 22-24 Link Here
22		22
23	install.debug::	23	install.debug::
24	-if [ -x /usr/bin/debuginfo-install ] ; then /usr/bin/debuginfo-install glibc ; fi	24	-if [ -x /usr/bin/debuginfo-install ] ; then /usr/bin/debuginfo-install glibc ; fi
		25	@@ -269,7 +269,6 @@ install.log::
		26
		27	createdirs::
		28	echo "Creating directories ..."
		29	- $(INSTALL) -d $(DESTDIR)/usr/lib/systemd/system
		30	$(INSTALL) -d $(DESTDIR)$(bindir)
		31	$(INSTALL) -o $(RUNAS) -d $(DESTDIR)$(logdir)
		32	$(INSTALL) -d $(DESTDIR)$(cfgdir)

Lines 49-56 ufdbguardd_load_rc_config() Link Here

(-)b/www/ufdbguard/files/ufdbguardd.in (-14 / +1 lines)
49	: ${ufdbguardd_enable:=NO}	49	: ${ufdbguardd_enable:=NO}
50	: ${ufdbguardd_user:=%%USERS%%}	50	: ${ufdbguardd_user:=%%USERS%%}
51		51
52	ufdbguardd_unixsocket="/tmp/ufdbguardd-[0-9]*"
53
54	required_dirs="$ufdbguardd_dbdir %%RUNDIR%%"	52	required_dirs="$ufdbguardd_dbdir %%RUNDIR%%"
55	required_files="$ufdbguardd_conf"	53	required_files="$ufdbguardd_conf"
56	pidfile="%%RUNDIR%%/${name}.pid"	54	pidfile="%%RUNDIR%%/${name}.pid"
Lines 68-86 ufdbguardd_configtest() Link Here
68	fi	66	fi
69	}	67	}
70		68
71	ufdbguardd_checksocket()
72	{
73	echo "Checking if $name unix socket exists."
74	if test -e $ufdbguardd_unixsocket; then
75	echo "Unix socket $ufdbguardd_unixsocket exists. Probably stale file after abnormal shutdown. Removing it."
76	rm -f $ufdbguardd_unixsocket
77	fi
78	}
79
80	ufdbguardd_prestart()	69	ufdbguardd_prestart()
81	{	70	{
82	ufdbguardd_configtest && \	71	ufdbguardd_configtest
83	ufdbguardd_checksocket
84	}	72	}
85		73
86	ufdbguardd_rotatelog()	74	ufdbguardd_rotatelog()
87	-