[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: libsmbclient-ensure-lfs-221618.patch: change _Static_assert to make C++ happy (#1009211)

[Michael Tokarev (@mjt)]

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


Commits:
b141e717 by Michael Tokarev at 2022-04-09T00:40:43+03:00
libsmbclient-ensure-lfs-221618.patch: change _Static_assert to make C++ happy (#1009211)

Change _Static_assert() to static_assert() and include <assert.h> to make
both C and C++ compilers happy. What a wonderful mess

- - - - -
d4d185f5 by Michael Tokarev at 2022-04-09T00:48:10+03:00
Upload 4.16.0+dfsg-4 to unstable

- - - - -


2 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,23 @@
+samba (2:4.16.0+dfsg-4) unstable; urgency=medium
+
+  * libsmbclient-ensure-lfs-221618.patch: replace _Static_assert with
+    static_assert (and include <assert.h> to make C++ happy too
+    (Closes: #1009211)
+  * disable-setuid-confchecks.patch: when running configure tests,
+    samba tries to verify setuid/setgid etc calls are actually
+    *working*, not just exists. This is only possible when the
+    configure is running as root. But it turns out in some salsa-ci
+    configuration (namely in the reprotest), the second build is
+    actually running as root, and in that environment, actual
+    setegid call is failing somehow. Just disable the config-time
+    check for correctly working setgid and assume it "just works"
+    if present, exactly like non-root build will do.
+  * d/salsa-ci.yml: do not expect failure in blhc test (the original
+    prob has been fixed long ago), and stop requiring experimental
+  * mention closing of #999876 by 4.16
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Sat, 09 Apr 2022 00:42:38 +0300
+
 samba (2:4.16.0+dfsg-3) unstable; urgency=medium
 
   * d/control: comment out the selftest-mode build deps for now


=====================================
debian/patches/libsmbclient-ensure-lfs-221618.patch
=====================================
@@ -38,13 +38,14 @@ replacing it with #error if sizeof(off_t) < 8.  But this
 requires quite some hackery...
 
 diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
-index 84c98089251..5421b34d57f 100644
+index 84c98089251..1a6ea599cfa 100644
 --- a/source3/include/libsmbclient.h
 +++ b/source3/include/libsmbclient.h
-@@ -82,4 +82,7 @@ extern "C" {
+@@ -82,4 +82,8 @@ extern "C" {
  #include <utime.h>
  
-+_Static_assert(sizeof(off_t) >= 8, /* C11 keyword */
++#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");
 +
  #define SMBC_BASE_FD        10000 /* smallest file descriptor returned */



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/8f797b546a6d68158c38f0abae41da764c2d4fb4...d4d185f51af47947bca1fda91526c1a6d1760ce3

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/8f797b546a6d68158c38f0abae41da764c2d4fb4...d4d185f51af47947bca1fda91526c1a6d1760ce3
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/20220408/f33d8dbd/attachment-0001.htm>