contrib: fix gnutls build errors

This patch partially reverts GnuTLS commit 516f48bfbf33d111e4fcd310541baa8f160067ae, which prevents the daemon from building on some old Linux distributions due to increasing the minimum required version of autoconf from 2.64 to 2.71.

The patch also removes the AM_GNU_GETTEXT macros from the configure.ac file. When these macros are present, autoreconf calls autopoint, which overwrites some m4 files in the GnuTLS repository with the version found on the system. This causes the Ubuntu 20.04 and snap builds to fail with "possibly undefined macro" errors.

GitLab: #1111
Change-Id: I45b8225bff148b3cf01aa2ce14adc639de823a8f
This commit is contained in:
François-Simon Fauteux-Chapleau
2025-03-05 16:59:30 -05:00
parent 48c2497ba5
commit 597cde8d30
2 changed files with 53 additions and 1 deletions

View File

@ -0,0 +1,50 @@
From 1e092f5d294630607f7962f7a6c4d0f8dfc99605 Mon Sep 17 00:00:00 2001
From: fsimonfc <francois-simon_f-c@hotmail.com>
Date: Wed, 5 Mar 2025 23:04:54 -0500
Subject: [PATCH] fix autotools build errors
---
configure.ac | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4838ce2c8..af27b9112 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl Process this file with autoconf to produce a configure script.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-AC_PREREQ([2.71])
+AC_PREREQ([2.64])
dnl when updating version also update LT_REVISION in m4/hooks.m4
AC_INIT([GnuTLS],[3.8.9],[bugs@gnutls.org])
@@ -136,11 +136,6 @@ AC_SUBST(NUMBER_VERSION, `printf "0x%02x%02x%02x" $MAJOR_VERSION $MINOR_VERSION
dnl C and C++ capabilities
AC_C_INLINE
-# Autoupdate added the next two lines to ensure that your configure
-# script's behavior did not change. They are probably safe to remove.
-AC_CHECK_INCLUDES_DEFAULT
-AC_PROG_EGREP
-
# For the C++ code
AC_ARG_ENABLE(cxx,
@@ -408,12 +403,6 @@ dnl check for gtk-doc
dnl
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19])
-m4_ifdef([AM_GNU_GETTEXT_REQUIRE_VERSION],[
-AM_GNU_GETTEXT_REQUIRE_VERSION([0.19])
-])
-
AC_C_BIGENDIAN
dnl No fork on MinGW, disable some self-tests until we fix them.
--
2.47.0

View File

@ -19,7 +19,9 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.xz:
gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
$(UNPACK) $(UNPACK)
# $(APPLY) $(SRC)/gnutls/0001-m4-remove-malloc-realloc.patch ifdef HAVE_LINUX
$(APPLY) $(SRC)/gnutls/0001-fix-autotools-build-errors.patch
endif
ifndef HAVE_IOS ifndef HAVE_IOS
$(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch $(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch
endif endif