[packages/libsmb2] - updated to 6.2 (new soname)
qboosh
qboosh at pld-linux.org
Wed Jun 4 21:40:07 CEST 2025
commit d952eb71ebb45f4ed07e38ccd3fc0d1e964c8b23
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Jun 4 21:34:28 2025 +0200
- updated to 6.2 (new soname)
libsmb2-heimdal.patch | 43 ++++++++++++-------------------------------
libsmb2.spec | 21 ++++++++++++++-------
2 files changed, 26 insertions(+), 38 deletions(-)
---
diff --git a/libsmb2.spec b/libsmb2.spec
index 8ccf8a0..e956f3e 100644
--- a/libsmb2.spec
+++ b/libsmb2.spec
@@ -8,18 +8,25 @@
Summary: Client library for accessing SMB shares over a network
Summary(pl.UTF-8): Biblioteka kliencka do dostępu do udziałów SMB w sieci
Name: libsmb2
-Version: 4.0.0
+Version: 6.2
Release: 1
License: LGPL v2.1+
Group: Libraries
#Source0Download: https://github.com/sahlberg/libsmb2/tags
-Source0: https://github.com/sahlberg/libsmb2/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 318313b3b60aa1d04e37de0174d810ec
+Source0: https://github.com/sahlberg/libsmb2/archive/libsmb2-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: c416d9f74bf4a96560fa7f29c7e2b062
Patch0: %{name}-heimdal.patch
URL: https://github.com/sahlberg/libsmb2
-BuildRequires: autoconf >= 2.58
+BuildRequires: autoconf >= 2.71
BuildRequires: automake >= 1:1.11
-BuildRequires: libtool
+%if %{with kerberos5}
+%if %{with krb5}
+BuildRequires: krb5-devel
+%else
+BuildRequires: heimdal-devel
+%endif
+%endif
+BuildRequires: libtool >= 2:2
BuildRequires: pkgconfig
BuildRequires: popt-devel
Suggests: gssntlmssp
@@ -56,7 +63,7 @@ Static libsmb2 library.
Statyczna biblioteka libsmb2.
%prep
-%setup -q
+%setup -q -n %{name}-libsmb2-%{version}
%if %{without krb5}
%patch -P0 -p1
%endif
@@ -92,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc COPYING README
%attr(755,root,root) %{_libdir}/libsmb2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsmb2.so.4
+%attr(755,root,root) %ghost %{_libdir}/libsmb2.so.6
%files devel
%defattr(644,root,root,755)
diff --git a/libsmb2-heimdal.patch b/libsmb2-heimdal.patch
index 24421da..6fd80ab 100644
--- a/libsmb2-heimdal.patch
+++ b/libsmb2-heimdal.patch
@@ -1,42 +1,23 @@
---- libsmb2-2.0.0/lib/krb5-wrapper.c.orig 2018-07-07 09:58:21.000000000 +0200
-+++ libsmb2-2.0.0/lib/krb5-wrapper.c 2019-03-15 21:44:42.462181391 +0100
-@@ -53,7 +53,7 @@
- #include <unistd.h>
+--- libsmb2-libsmb2-6.2/lib/krb5-wrapper.c.orig 2024-12-23 04:38:55.000000000 +0100
++++ libsmb2-libsmb2-6.2/lib/krb5-wrapper.c 2025-06-04 21:29:14.953938736 +0200
+@@ -57,7 +57,7 @@
+ #include <sys/unistd.h>
#endif
-#include <krb5/krb5.h>
+#include <krb5.h>
- #include <gssapi/gssapi_krb5.h>
- #include <gssapi/gssapi.h>
- #include <stdio.h>
-@@ -154,7 +154,6 @@
- char *nc_password = NULL;
- gss_buffer_desc passwd;
- gss_OID_set_desc mechOidSet;
-- gss_OID_set_desc wantMech;
-
- if (smb2->use_cached_creds) {
- /* Validate the parameters */
-@@ -268,6 +267,8 @@
+ #if __APPLE__
+ #include <GSS/GSS.h>
+ #else
+@@ -283,7 +283,7 @@ krb5_negotiate_reply(struct smb2_context
+ return NULL;
}
+- #ifndef __APPLE__ /* gss_set_neg_mechs is not defined on macOS/iOS. */
++ #if !defined(__APPLE__) && 0 /* gss_set_neg_mechs is not defined on macOS/iOS/heimdal. */
if (smb2->sec != SMB2_SEC_UNDEFINED) {
-+#if 0 /* FIXME: heimdal */
-+ gss_OID_set_desc wantMech;
- wantMech.count = 1;
- if (smb2->sec == SMB2_SEC_KRB5) {
- wantMech.elements = discard_const(&spnego_mech_krb5);
-@@ -280,6 +281,10 @@
- krb5_set_gss_error(smb2, "gss_set_neg_mechs", maj, min);
- return NULL;
- }
-+#else
-+ krb5_set_gss_error(smb2, "gss_set_neg_mechs not supported for heimdal", maj, min);
-+ return NULL;
-+#endif
- }
+ gss_OID_set_desc wantMech;
- if (nc_password) {
--- libsmb2-4.0.0/configure.ac.orig 2022-01-30 20:20:16.801567540 +0100
+++ libsmb2-4.0.0/configure.ac 2022-01-30 20:26:18.902939202 +0100
@@ -31,7 +31,7 @@ AC_ARG_WITH([libkrb5],
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libsmb2.git/commitdiff/d952eb71ebb45f4ed07e38ccd3fc0d1e964c8b23
More information about the pld-cvs-commit
mailing list