Attachment 203166 Details for Bug 236222 – port patch

[patch] port patch

ufdbguard-1.34.2.patch (text/plain), 6.47 KB, created by Pavel Timofeev on 2019-03-26 16:01:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2019-03-26 16:01:37 UTC

Size: 6.47 KB

patch

obsolete

>diff -ruN /root/ufdbguard.orig/Makefile ufdbguard/Makefile
>--- /root/ufdbguard.orig/Makefile	2019-03-05 11:57:43.397708000 +0300
>+++ ufdbguard/Makefile	2019-03-26 18:57:29.655257000 +0300
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/www/ufdbguard/Makefile 492650 2019-02-10 21:21:21Z swills $
> 
> PORTNAME=	ufdbGuard
>-PORTVERSION=	1.34.1
>+PORTVERSION=	1.34.2
> CATEGORIES=	www
> MASTER_SITES=	SF/${PORTNAME:tl}/1.34
> 
>@@ -51,7 +51,7 @@
> 		--with-ufdb-samplesdir=${EXAMPLESDIR} \
> 		--with-ufdb-config=${ETCDIR} \
> 		--with-ufdb-dbhome=${DBDIR} \
>-		--with-ufdb-images_dir=${EXAMPLESDIR}/images
>+		--with-ufdb-imagesdir=${EXAMPLESDIR}/images
> 
> MAKE_JOBS_UNSAFE=	yes
> 
>diff -ruN /root/ufdbguard.orig/distinfo ufdbguard/distinfo
>--- /root/ufdbguard.orig/distinfo	2019-03-05 11:57:43.397643000 +0300
>+++ ufdbguard/distinfo	2019-03-05 12:04:56.189975000 +0300
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1524648364
>-SHA256 (ufdbGuard-1.34.1.tar.gz) = 14718ae4e809d0210db3bcd5f3ca3885362c4d0ad61ecedb602ce541caedeea7
>-SIZE (ufdbGuard-1.34.1.tar.gz) = 1390870
>+SHA256 (ufdbGuard-1.34.2.tar.gz) = 84a31675e698c628cf3172ee0a541cac7178c7029ee49edac80df131008564ba
>+SIZE (ufdbGuard-1.34.2.tar.gz) = 1477412
>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-03-05 11:57:43.397174000 +0300
>+++ ufdbguard/files/patch-src_Makefile.in	2019-03-05 12:07:12.497405000 +0300
>@@ -22,20 +22,3 @@
>  
>  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
>- 
>diff -ruN /root/ufdbguard.orig/files/patch-src_install__etcfiles.sh.in ufdbguard/files/patch-src_install__etcfiles.sh.in
>--- /root/ufdbguard.orig/files/patch-src_install__etcfiles.sh.in	2019-03-05 11:57:43.397445000 +0300
>+++ ufdbguard/files/patch-src_install__etcfiles.sh.in	2019-03-05 12:14:16.482016000 +0300
>@@ -1,9 +1,13 @@
>---- 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:-}
>+--- 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
>@@ -13,12 +17,12 @@
> -   exit 1
> -fi
> -
>- CFGDIR="$1"
>- if [ ! -d "$CFGDIR" ]
>- then
>-@@ -373,12 +364,10 @@ fix_piddir_permissions () {
>+ OS="@ufdb_os_type@"
>+ INITDIR="@ufdb_initdir@"
>  
>+@@ -281,12 +268,10 @@
>  
>+ 
>  case $OS in
> -   freebsd)       install_freebsd ;;
>     openbsd)       install_openbsd ;;
>@@ -29,20 +33,3 @@
>  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
>--
>diff -ruN /root/ufdbguard.orig/files/patch-src_ufdbchkport.c ufdbguard/files/patch-src_ufdbchkport.c
>--- /root/ufdbguard.orig/files/patch-src_ufdbchkport.c	2019-03-05 11:57:43.397103000 +0300
>+++ ufdbguard/files/patch-src_ufdbchkport.c	1970-01-01 03:00:00.000000000 +0300
>@@ -1,56 +0,0 @@
>---- 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)

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 236222: 203166 | 204349