[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: re-enable libsmbclient-ensure-lfs-221618.patch using a different construct

[Michael Tokarev (@mjt)]

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


Commits:
d0d8db5c by Michael Tokarev at 2022-04-09T17:30:37+03:00
re-enable libsmbclient-ensure-lfs-221618.patch using a different construct

- - - - -
0c7516d3 by Michael Tokarev at 2022-04-09T17:43:51+03:00
Upload 4.16.0+dfsg-6 to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/patches/libsmbclient-ensure-lfs-221618.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+samba (2:4.16.0+dfsg-6) unstable; urgency=medium
+
+  * another attempt to fix/work around #221618. Re-enable
+    libsmbclient-ensure-lfs-221618.patch and change it to just define
+    an extra type array int[sizeof(off_t)-7]. If off_t is small it will
+    become a compile error.  It is an ugly way to do it, but it should
+    actually work, unlike various static_assert/_Static_assert which are
+    language (C/C++) and standard-dependent.  Closes: #221618.
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Sat, 09 Apr 2022 17:27:09 +0300
+
 samba (2:4.16.0+dfsg-5) unstable; urgency=medium
 
   * disable libsmbclient-ensure-lfs-221618.patch for now.


=====================================
debian/patches/libsmbclient-ensure-lfs-221618.patch
=====================================
@@ -41,12 +41,10 @@ diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
 index 84c98089251..1a6ea599cfa 100644
 --- a/source3/include/libsmbclient.h
 +++ b/source3/include/libsmbclient.h
-@@ -82,4 +82,8 @@ extern "C" {
+@@ -82,4 +82,6 @@ extern "C" {
  #include <utime.h>
  
-+#include <assert.h>
-+static_assert(sizeof(off_t) >= 8,
-+ "libsmbclient.h needs LFS (-D_FILE_OFFSET_BITS=64) on this platform please report to pkg-samba-maint at lists.alioth.debian.org");
++typedef int smbc_off_t_should_be_at_least_64bits_use_LFS_CFLAGS[sizeof(off_t)-7];
 +
  #define SMBC_BASE_FD        10000 /* smallest file descriptor returned */
  


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,4 @@
-#libsmbclient-ensure-lfs-221618.patch
+libsmbclient-ensure-lfs-221618.patch
 README_nosmbldap-tools.patch
 smbclient-pager.patch
 usershare.patch



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/cac3da83118a54207906e34d6d172f97a6f04638...0c7516d3403cc8957e71ce7849e16c7c8d25f8a5

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/cac3da83118a54207906e34d6d172f97a6f04638...0c7516d3403cc8957e71ce7849e16c7c8d25f8a5
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/20220409/9810871d/attachment-0001.htm>