added patch to fix undefined references to gnutls symbols [release 6.0.2-2mamba;Mon Aug 25 2025]

This commit is contained in:
2025-08-25 22:48:35 +02:00
parent 276a5d174d
commit a9cce451af
2 changed files with 53 additions and 4 deletions

View File

@@ -0,0 +1,46 @@
From d205297a10bf8d7f8846bf42f0ed618543a561a9 Mon Sep 17 00:00:00 2001
From: fundawang <fundawang@yeah.net>
Date: Sun, 26 Jan 2025 16:39:03 +0800
Subject: [PATCH 1/2] move link against gnutls into main library, as it is
referenced by tls/libtls.la
---
lib/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 82376cb3..33be5e41 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -48,5 +48,5 @@ libnfs_la_LIBADD = \
if HAVE_TLS
libnfs_la_CPPFLAGS += -I$(abs_top_srcdir)/tls
-libnfs_la_LIBADD += ../tls/libtls.la
+libnfs_la_LIBADD += ../tls/libtls.la -lgnutls
endif
From 546c9ed8624403078ef993138b56dce4c3558523 Mon Sep 17 00:00:00 2001
From: fundawang <fundawang@yeah.net>
Date: Sun, 26 Jan 2025 16:39:59 +0800
Subject: [PATCH 2/2] move link against gnutls into main library, as it is
referenced by tls/libtls.la
---
utils/Makefile.am | 3 ---
1 file changed, 3 deletions(-)
diff --git a/utils/Makefile.am b/utils/Makefile.am
index bd584b8d..2ae7636f 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -16,9 +16,6 @@ AM_CPPFLAGS = \
"-D_U_=__attribute__((unused))"
COMMON_LIBS = ../lib/libnfs.la $(LIBSOCKET)
-if HAVE_TLS
-COMMON_LIBS += -lgnutls
-endif
nfs_cat_LDADD = $(COMMON_LIBS)
nfs_ls_LDADD = $(COMMON_LIBS)

View File

@@ -1,6 +1,6 @@
Name: libnfs
Version: 6.0.2
Release: 1mamba
Release: 2mamba
Summary: NFS client library
Group: System/Libraries
Vendor: openmamba
@@ -8,6 +8,7 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://github.com/sahlberg/libnfs/
Source: https://github.com/sahlberg/libnfs/archive/libnfs-%{version}.tar.gz
Patch0: libnfs-6.0.2-fix_gnutls_undefined_symbols.patch
License: LGPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@@ -37,10 +38,10 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description tools
This package contains utility applications for %{name}.
%debug_package
%prep
%setup -q -n %{name}-libnfs-%{version}
%patch 0 -p1 -b .fix_gnutls_undefined_symbols
./bootstrap
%build
@@ -54,7 +55,6 @@ This package contains utility applications for %{name}.
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%files
%defattr(-,root,root)
%{_libdir}/libnfs.so.*
@@ -74,6 +74,9 @@ This package contains utility applications for %{name}.
%{_mandir}/man1/nfs-*.1*
%changelog
* Mon Aug 25 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.2-2mamba
- added patch to fix undefined references to gnutls symbols
* Sun Dec 15 2024 Automatic Build System <autodist@openmamba.org> 6.0.2-1mamba
- automatic version update by autodist