[Pkg-samba-maint] [Git][samba-team/samba][master] 3 commits: d/rules: add libwbclient0 to the list of krb5-versioned packages (thanks to Andrew Kornilov)

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
87817c81 by Michael Tokarev at 2023-06-20T10:18:21+03:00
d/rules: add libwbclient0 to the list of krb5-versioned packages (thanks to Andrew Kornilov)

- - - - -
338dccf8 by Michael Tokarev at 2023-06-20T11:30:25+03:00
d/rules: include -latomic gcc issue workaround for select arches

- - - - -
d2e68579 by Michael Tokarev at 2023-06-20T11:37:18+03:00
update changelog; upload version 4.18.3+dfsg-2 to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+samba (2:4.18.3+dfsg-2) unstable; urgency=medium
+
+  * d/rules: include -latomic gcc issue workaround for select arches
+    apparently due to a gcc issue, some architectures (armel, mipsel, ...)
+    fail to link samba due to not finidng __atomic_load_8 etc symbols
+    after using atomic_load etc from stdatomic.h (part of gcc).
+    Add -latomic explicitly to the list of libraries we link with.
+  * d/rules: add libwbclient0 to the list of krb5-versioned packages
+   (thanks to Andrew Kornilov)
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Tue, 20 Jun 2023 11:35:13 +0300
+
 samba (2:4.18.3+dfsg-1) unstable; urgency=medium
 
   * new upstream stable/bugfix release:


=====================================
debian/rules
=====================================
@@ -104,6 +104,18 @@ with-ceph =
 with-glusterfs =
 endif
 
+ifneq (,$(filter armel mipsel m68k powerpc sh4,${DEB_HOST_ARCH_CPU}))
+# for some reason these platforms fail to find __atomic_{load,store}_8
+#   third_party/heimdal/lib/krb5/krcache.c.55.o: in function `krcc_get_principal':
+#   third_party/heimdal/lib/krb5/krcache.c:1395: undefined reference to `__atomic_load_8'
+#     ids.krcu_cache_and_princ_id = heim_base_atomic_load(&data->krc_cache_and_principal_id);
+#   third_party/heimdal/lib/base/heimbase-atomics.h:
+#     #include <stdatomic.h>
+#     #define heim_base_atomic_load(x)        atomic_load((x))
+# include a rough workaround for now (-latomic and <stdatomic.h> comes from gcc)
+LDFLAGS := ${LDFLAGS} -Wl,--as-needed -latomic
+endif
+
 config-args += $(if ${with-ceph},\
 	  --enable-cephfs --enable-ceph-reclock,\
 	  --disable-cephfs)
@@ -121,7 +133,7 @@ mitkrb5-dep-pkgs += samba samba-common-bin python3-samba
 mitkrb5-dep-pkgs += samba-dsdb-modules samba-vfs-modules
 mitkrb5-dep-pkgs += libsmbclient smbclient
 mitkrb5-dep-pkgs += libnss-winbind libpam-winbind
-mitkrb5-dep-pkgs += winbind
+mitkrb5-dep-pkgs += winbind libwbclient0
 mitkrb5-dep-pkgs += samba-testsuite
 mitkrb5-dep-pkgs += ctdb
 else



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/752a70b1bf460baaf86596e42eb04fdc3715a54a...d2e68579e5e70c2cbb9a34d6ec098256bd3d6dc1

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/752a70b1bf460baaf86596e42eb04fdc3715a54a...d2e68579e5e70c2cbb9a34d6ec098256bd3d6dc1
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20230620/447d62fb/attachment-0001.htm>