Attachment #203166 for bug #236222

Lines 2-8 Link Here

(-)ufdbguard/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/www/ufdbguard/Makefile 492650 2019-02-10 21:21:21Z swills $	2	# $FreeBSD: head/www/ufdbguard/Makefile 492650 2019-02-10 21:21:21Z swills $
3		3
4	PORTNAME= ufdbGuard	4	PORTNAME= ufdbGuard
5	PORTVERSION= 1.34.1	5	PORTVERSION= 1.34.2
6	CATEGORIES= www	6	CATEGORIES= www
7	MASTER_SITES= SF/${PORTNAME:tl}/1.34	7	MASTER_SITES= SF/${PORTNAME:tl}/1.34
8		8
Lines 51-57 Link Here
51	--with-ufdb-samplesdir=${EXAMPLESDIR} \	51	--with-ufdb-samplesdir=${EXAMPLESDIR} \
52	--with-ufdb-config=${ETCDIR} \	52	--with-ufdb-config=${ETCDIR} \
53	--with-ufdb-dbhome=${DBDIR} \	53	--with-ufdb-dbhome=${DBDIR} \
54	--with-ufdb-images_dir=${EXAMPLESDIR}/images	54	--with-ufdb-imagesdir=${EXAMPLESDIR}/images
55		55
56	MAKE_JOBS_UNSAFE= yes	56	MAKE_JOBS_UNSAFE= yes
57		57

Lines 1-3 Link Here

(-)ufdbguard/distinfo (-2 / +2 lines)
1	TIMESTAMP = 1524648364	1	TIMESTAMP = 1524648364
2	SHA256 (ufdbGuard-1.34.1.tar.gz) = 14718ae4e809d0210db3bcd5f3ca3885362c4d0ad61ecedb602ce541caedeea7	2	SHA256 (ufdbGuard-1.34.2.tar.gz) = 84a31675e698c628cf3172ee0a541cac7178c7029ee49edac80df131008564ba
3	SIZE (ufdbGuard-1.34.1.tar.gz) = 1390870	3	SIZE (ufdbGuard-1.34.2.tar.gz) = 1477412




 
 install.debug::
 	-if [ -x /usr/bin/debuginfo-install ] ; then /usr/bin/debuginfo-install glibc ; fi
@@ -281,12 +281,12 @@ uninstall.bin::
 
 install.mt::
 	cd mtserver ; $(MAKE)
-	$(INSTALL_PROGRAM) mtserver/ufdbguardd  $(DESTDIR)$(bindir)/ufdbguardd
-	$(INSTALL_PROGRAM) mtserver/ufdbgclient $(DESTDIR)$(bindir)/ufdbgclient
-	$(INSTALL_PROGRAM) mtserver/ufdb-pstack $(DESTDIR)$(bindir)/ufdb-pstack
+	$(INSTALL_PROGRAM) ufdbguardd  $(DESTDIR)$(bindir)/ufdbguardd
+	$(INSTALL_PROGRAM) ufdbgclient $(DESTDIR)$(bindir)/ufdbgclient
+	$(INSTALL_PROGRAM) ufdb-pstack $(DESTDIR)$(bindir)/ufdb-pstack
 	-@echo "ignore the next error from chown when building a package as non-root user"
 	-$(RM) $(DESTDIR)$(bindir)/ufdbsignal ; \
-		$(INSTALL_PROGRAM) mtserver/ufdbsignal  $(DESTDIR)$(bindir)/ufdbsignal  ; \
+		$(INSTALL_PROGRAM) ufdbsignal  $(DESTDIR)$(bindir)/ufdbsignal  ; \
 		chown root $(DESTDIR)$(bindir)/ufdbsignal  ;  \
 		chmod +s $(DESTDIR)$(bindir)/ufdbsignal
 




--- src/install_etcfiles.sh.in.orig	2019-03-05 12:11:09.638856000 +0300
+++ src/install_etcfiles.sh.in	2019-03-05 12:12:58.777490000 +0300
@@ -22,19 +22,6 @@
    DESTDIR=""
 fi
 
-# the installer must be root to install files under /etc and we check for this
-# but the exception is rpmbuild.  When a package is made using rpmbuild,
-# it is comon practise to _NOT_ run the install as root.
-ID=`id -un`
-if [ "$ID" != root  -a  $PKGNAME != ufdbGuard ]
-then
-   echo

-   exit 1
-fi
-
 OS="@ufdb_os_type@"
 INITDIR="@ufdb_initdir@"
 then
@@ -373,12 +364,10 @@ fix_piddir_permissions () {
 
@@ -281,12 +268,10 @@
 
 
 case $OS in
-   freebsd)       install_freebsd ;;
    openbsd)       install_openbsd ;;

 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
-




--- src/ufdbchkport.c.orig	2019-02-08 07:02:37 UTC
+++ src/ufdbchkport.c
@@ -84,7 +84,7 @@ static volatile int tls_inited = 0;
 static pthread_mutex_t init_mutex = UFDB_STATIC_MUTEX_INIT;
 static SSL_CTX * ssl_ctx = NULL;
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
 static int num_static_ssl_locks = 0;
 static pthread_mutex_t * crypto_mutexes = NULL;
 #endif
@@ -895,7 +895,7 @@ void UFDBsetTunnelCheckMethod( int method )
 }
 
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
 static void ufdb_pthread_locking_callback( 
    int          mode, 
    int          type, 
@@ -945,7 +945,7 @@ static void ufdb_pthread_locking_callback( 
 #endif
 
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
 static unsigned long ufdb_pthread_id_callback( void )
 {
    unsigned long id = (unsigned long) pthread_self();
@@ -955,7 +955,7 @@ static unsigned long ufdb_pthread_id_callback( void )
 #endif
 
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
 
 typedef struct CRYPTO_dynlock_value {
    pthread_mutex_t lock;
@@ -1245,7 +1245,7 @@ int UFDBinitHTTPSchecker( void )
       ENGINE_load_builtin_engines();
       CONF_modules_load( NULL, NULL, 0 );
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
       {
          int    i;
          CRYPTO_set_id_callback( ufdb_pthread_id_callback );	
@@ -2444,7 +2444,7 @@ GCC_NO_INLINE int UFDBopenssl_connect( 
    saved_errno = errno;
    state = SSL_get_state( *ssl );
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
    if (ret > 0  &&  state == SSL_ST_OK)
 #else
    if (ret > 0  &&  state == TLS_ST_OK)

Return to bug 236222

Lines 22-41 Link Here

(-)ufdbguard/files/patch-src_Makefile.in (-17 lines)
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	@@ -281,12 +281,12 @@ uninstall.bin::
26
27	install.mt::
28	cd mtserver ; $(MAKE)
29	- $(INSTALL_PROGRAM) mtserver/ufdbguardd $(DESTDIR)$(bindir)/ufdbguardd
30	- $(INSTALL_PROGRAM) mtserver/ufdbgclient $(DESTDIR)$(bindir)/ufdbgclient
31	- $(INSTALL_PROGRAM) mtserver/ufdb-pstack $(DESTDIR)$(bindir)/ufdb-pstack
32	+ $(INSTALL_PROGRAM) ufdbguardd $(DESTDIR)$(bindir)/ufdbguardd
33	+ $(INSTALL_PROGRAM) ufdbgclient $(DESTDIR)$(bindir)/ufdbgclient
34	+ $(INSTALL_PROGRAM) ufdb-pstack $(DESTDIR)$(bindir)/ufdb-pstack
35	-@echo "ignore the next error from chown when building a package as non-root user"
36	-$(RM) $(DESTDIR)$(bindir)/ufdbsignal ; \
37	- $(INSTALL_PROGRAM) mtserver/ufdbsignal $(DESTDIR)$(bindir)/ufdbsignal ; \
38	+ $(INSTALL_PROGRAM) ufdbsignal $(DESTDIR)$(bindir)/ufdbsignal ; \
39	chown root $(DESTDIR)$(bindir)/ufdbsignal ; \
40	chmod +s $(DESTDIR)$(bindir)/ufdbsignal
41

Lines 1-9 Link Here

(-)ufdbguard/files/patch-src_install__etcfiles.sh.in (-25 / +12 lines)
1	--- src/install_etcfiles.sh.in.orig 2017-02-27 13:27:26 UTC	1	--- src/install_etcfiles.sh.in.orig 2019-03-05 12:11:09.638856000 +0300
2	+++ src/install_etcfiles.sh.in	2	+++ src/install_etcfiles.sh.in 2019-03-05 12:12:58.777490000 +0300
3	@@ -25,15 +25,6 @@ then	3	@@ -22,19 +22,6 @@
4	DESTDIR=${RPM_BUILD_ROOT:-}	4	DESTDIR=""
5	fi	5	fi
6		6
		7	-# the installer must be root to install files under /etc and we check for this
		8	-# but the exception is rpmbuild. When a package is made using rpmbuild,
		9	-# it is comon practise to _NOT_ run the install as root.
		10	-ID=`id -un`
7	-if [ "$ID" != root -a $PKGNAME != ufdbGuard ]	11	-if [ "$ID" != root -a $PKGNAME != ufdbGuard ]
8	-then	12	-then
9	- echo	13	- echo
Lines 13-24 Link Here
13	- exit 1	17	- exit 1
14	-fi	18	-fi
15	-	19	-
16	CFGDIR="$1"	20	OS="@ufdb_os_type@"
17	if [ ! -d "$CFGDIR" ]	21	INITDIR="@ufdb_initdir@"
18	then
19	@@ -373,12 +364,10 @@ fix_piddir_permissions () {
20		22
		23	@@ -281,12 +268,10 @@
21		24
		25
22	case $OS in	26	case $OS in
23	- freebsd) install_freebsd ;;	27	- freebsd) install_freebsd ;;
24	openbsd) install_openbsd ;;	28	openbsd) install_openbsd ;;
Lines 29-48 Link Here
29	esac	33	esac
30		34
31		35
32	@@ -395,16 +384,3 @@ fi
33	# TODO: copy parameters from ufdbUpdate to $SYSCFGFILE ************************************************************
34
35	fix_piddir_permissions
36	-
37	-# the addition of the ufdbguardd service to /etc/services is deiabled since
38	-# ufdbguardd uses by default a named socket.
39	-# SERVICE=`grep -E -e ufdbguardd $DESTDIR/etc/services`
40	-# if [ "$SERVICE" = "" ]
41	-# then
42	-# (
43	-# echo ""
44	-# echo "# for URLfilterDB daemon : "
45	-# echo "ufdbguardd 3977/tcp"
46	-# ) >> $DESTDIR/etc/services
47	-# fi
48	-

Lines 1-56 Link Here

(-)ufdbguard/files/patch-src_ufdbchkport.c (-56 lines)
1	--- src/ufdbchkport.c.orig 2019-02-08 07:02:37 UTC
2	+++ src/ufdbchkport.c
3	@@ -84,7 +84,7 @@ static volatile int tls_inited = 0;
4	static pthread_mutex_t init_mutex = UFDB_STATIC_MUTEX_INIT;
5	static SSL_CTX * ssl_ctx = NULL;
6
7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined LIBRESSL_VERSION_NUMBER
9	static int num_static_ssl_locks = 0;
10	static pthread_mutex_t * crypto_mutexes = NULL;
11	#endif
12	@@ -895,7 +895,7 @@ void UFDBsetTunnelCheckMethod( int method )
13	}
14
15
16	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
17	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined LIBRESSL_VERSION_NUMBER
18	static void ufdb_pthread_locking_callback(
19	int mode,
20	int type,
21	@@ -945,7 +945,7 @@ static void ufdb_pthread_locking_callback(
22	#endif
23
24
25	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
26	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined LIBRESSL_VERSION_NUMBER
27	static unsigned long ufdb_pthread_id_callback( void )
28	{
29	unsigned long id = (unsigned long) pthread_self();
30	@@ -955,7 +955,7 @@ static unsigned long ufdb_pthread_id_callback( void )
31	#endif
32
33
34	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
35	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined LIBRESSL_VERSION_NUMBER
36
37	typedef struct CRYPTO_dynlock_value {
38	pthread_mutex_t lock;
39	@@ -1245,7 +1245,7 @@ int UFDBinitHTTPSchecker( void )
40	ENGINE_load_builtin_engines();
41	CONF_modules_load( NULL, NULL, 0 );
42
43	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
44	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined LIBRESSL_VERSION_NUMBER
45	{
46	int i;
47	CRYPTO_set_id_callback( ufdb_pthread_id_callback );
48	@@ -2444,7 +2444,7 @@ GCC_NO_INLINE int UFDBopenssl_connect(
49	saved_errno = errno;
50	state = SSL_get_state( *ssl );
51
52	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
53	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined LIBRESSL_VERSION_NUMBER
54	if (ret > 0 && state == SSL_ST_OK)
55	#else
56	if (ret > 0 && state == TLS_ST_OK)