Attachment 243420 Details for Bug 272517 – patch

[patch] patch

0001-net-mgmt-collectd5-Fix-crash-caused-by-gettext-0.22.patch (text/plain), 3.25 KB, created by Tijl Coosemans on 2023-07-16 14:06:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2023-07-16 14:06:06 UTC

Size: 3.25 KB

patch

obsolete

>From 6a053d1fffe2c5e166f30b68185fba790baa780f Mon Sep 17 00:00:00 2001
>From: Tijl Coosemans <tijl@FreeBSD.org>
>Date: Sun, 16 Jul 2023 15:48:11 +0200
>Subject: [PATCH] net-mgmt/collectd5: Fix crash caused by gettext 0.22
>
>Patch configure to link the threading library using -pthread instead of
>-lpthread so it is linked after libgpg-error (and libgcrypt, which also
>links to libgpg-error).  This way the threading library is initialised
>before libgpg-error.  The initialisation function of libgpg-error calls
>gettext functions that call threading functions (mutex locking).
>
>While here, eliminate -lgcrypt from LIBS so it isn't linked into every
>executable and library.
>
>PR:		272517
>---
> net-mgmt/collectd5/Makefile                 |  5 ++---
> net-mgmt/collectd5/files/patch-configure.ac | 17 +++++++++++++----
> 2 files changed, 15 insertions(+), 7 deletions(-)
>
>diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
>index a9db572e6fc0..049f6fdebb9a 100644
>--- a/net-mgmt/collectd5/Makefile
>+++ b/net-mgmt/collectd5/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	collectd
> PORTVERSION=	5.12.0
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	net-mgmt
> MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
> PKGNAMESUFFIX=	5
>@@ -130,8 +130,7 @@ DBI_CFLAGS=		-Wno-deprecated-declarations
> 
> GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
> 			libgpg-error.so:security/libgpg-error
>-GCRYPT_CONFIGURE_WITH=	libgcrypt=${LOCALBASE}
>-GCRYPT_LIBS=		-lgcrypt
>+GCRYPT_CONFIGURE_WITH=	libgcrypt=${LOCALBASE}/bin/libgcrypt-config
> 
> INFLUXDB_CONFIGURE_ENABLE=	write_influxdb_udp
> 
>diff --git a/net-mgmt/collectd5/files/patch-configure.ac b/net-mgmt/collectd5/files/patch-configure.ac
>index a0a08e537d02..9a1cfdf602e6 100644
>--- a/net-mgmt/collectd5/files/patch-configure.ac
>+++ b/net-mgmt/collectd5/files/patch-configure.ac
>@@ -9,7 +9,7 @@
>    [AC_MSG_ERROR([No compiler found that supports C99])]
>  )
>  
>-@@ -725,7 +725,7 @@ AC_C_CONST
>+@@ -725,7 +725,7 @@ AC_TYPE_UID_T
>  AC_TYPE_PID_T
>  AC_TYPE_SIZE_T
>  AC_TYPE_UID_T
>@@ -18,7 +18,7 @@
>  
>  test_cxx_flags() {
>    AC_LANG_PUSH([C++])
>-@@ -757,7 +757,7 @@ AC_FUNC_STRERROR_R
>+@@ -757,7 +757,7 @@ if test "x$GCC" = "xyes"; then
>  
>  if test "x$GCC" = "xyes"; then
>    SAVE_CFLAGS="$CFLAGS"
>@@ -27,7 +27,7 @@
>  fi
>  SAVE_LDFLAGS="$LDFLAGS"
>  LDFLAGS=""
>-@@ -929,7 +929,7 @@ AC_CHECK_FUNCS([thread_info], [have_thread_info="yes"]
>+@@ -929,7 +929,7 @@ if test "x$GCC" = "xyes"; then
>  # Check for strptime {{{
>  if test "x$GCC" = "xyes"; then
>    SAVE_CFLAGS="$CFLAGS"
>@@ -49,6 +49,15 @@
>  
>  AC_CACHE_CHECK([for timegm],
>    [c_cv_have_timegm],
>+@@ -1924,7 +1924,7 @@ AC_CHECK_LIB([pthread],
>+   [AC_MSG_ERROR([Symbol 'pthread_create' not found in libpthread])],
>+   []
>+ )
>+-PTHREAD_LIBS="$LIBS"
>++PTHREAD_LIBS="-pthread"
>+ LIBS="$SAVE_LIBS"
>+ AC_SUBST([PTHREAD_LIBS])
>+ 
> @@ -3454,7 +3454,7 @@ if test "x$with_libmongoc" = "xyes"; then
>    SAVE_LDFLAGS="$LDFLAGS"
>  
>@@ -93,7 +102,7 @@
>        with_libslurm="yes"
>      fi; fi; fi
>    ],
>-@@ -6579,7 +6580,7 @@ collectd features:])
>+@@ -6579,7 +6580,7 @@ AC_COLLECTD([getifaddrs],[enable],  [feature], [getifa
>  AC_COLLECTD([debug],     [enable],  [feature], [debugging])
>  AC_COLLECTD([daemon],    [disable], [feature], [daemon mode])
>  AC_COLLECTD([getifaddrs],[enable],  [feature], [getifaddrs under Linux])
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 272517: 243420 | 243431