[Pkg-samba-maint] [Git][samba-team/samba][master] 4 commits: d/gitlabracadabra.yml: Add samba-team/libsmb2

[Mathieu Parent]

Mathieu Parent pushed to branch master at Debian Samba Team / samba


Commits:
7bd49763 by Mathieu Parent at 2019-09-26T18:43:45Z
d/gitlabracadabra.yml: Add samba-team/libsmb2

- - - - -
cb8c9e6b by Mathieu Parent at 2019-09-28T09:32:50Z
build: Remove tests for _pwrite() and __pwrite()

These date back to e19196110cc9d29c3fb330737507adc364f3bd9a "s3-waf: more
configure tests and minor fixes" in 2010 and were not used at that time and now.

More of these should be removed but the __pwrite() test caused a timeout
on an ARM builder in Debian. It might just be a fluke but the tests are
pointless regardless.

See also 16eb80058ca4a34df96388c26736590247b6a3f4 "build: Remove tests for
getdents() and getdirentries()"

- - - - -
6e434063 by Mathieu Parent at 2019-09-28T09:47:15Z
Add patch for build: Remove tests for _pwrite() and __pwrite()

- - - - -
1c820dc3 by Mathieu Parent at 2019-09-28T09:48:34Z
Release 2:4.11.0+dfsg-2

- - - - -


6 changed files:

- debian/changelog
- debian/gitlabracadabra.yml
- + debian/patches/.build-Remove-tests-for-getdents-and-getdirentries.patch.swp
- + debian/patches/build-Remove-tests-for-_pwrite-and-__pwrite.patch
- debian/patches/series
- source3/wscript


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+samba (2:4.11.0+dfsg-2) experimental; urgency=medium
+
+  * d/gitlabracadabra.yml: Add samba-team/libsmb2
+  * Try to fix FTBFS on armel and armhf:
+    - Add patch for build: Remove tests for _pwrite() and __pwrite()
+
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 28 Sep 2019 11:47:56 +0200
+
 samba (2:4.11.0+dfsg-1) experimental; urgency=medium
 
   [ Mathieu Parent ]


=====================================
debian/gitlabracadabra.yml
=====================================
@@ -102,6 +102,12 @@ samba-team/ldb:
   description: |-
     ldb packaging
 
+samba-team/libsmb2:
+  extends: .samba-project
+  name: libsmb2
+  description: |-
+    libsmb2 packaging
+
 samba-team/samba:
   extends: .samba-project
   name: samba


=====================================
debian/patches/.build-Remove-tests-for-getdents-and-getdirentries.patch.swp
=====================================
Binary files /dev/null and b/debian/patches/.build-Remove-tests-for-getdents-and-getdirentries.patch.swp differ


=====================================
debian/patches/build-Remove-tests-for-_pwrite-and-__pwrite.patch
=====================================
@@ -0,0 +1,36 @@
+From cb8c9e6b7173eb5ffd3aea40257de7355483a3fb Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Sat, 28 Sep 2019 11:32:50 +0200
+Subject: [PATCH] build: Remove tests for _pwrite() and __pwrite()
+
+These date back to e19196110cc9d29c3fb330737507adc364f3bd9a "s3-waf: more
+configure tests and minor fixes" in 2010 and were not used at that time and now.
+
+More of these should be removed but the __pwrite() test caused a timeout
+on an ARM builder in Debian. It might just be a fluke but the tests are
+pointless regardless.
+
+See also 16eb80058ca4a34df96388c26736590247b6a3f4 "build: Remove tests for
+getdents() and getdirentries()"
+
+Forwarded: https://gitlab.com/samba-team/samba/merge_requests/820
+---
+ source3/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/wscript b/source3/wscript
+index 8fd759707ee..e73f2818773 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -402,7 +402,7 @@ __lxstat memalign mknod mlock mlockall munlock munlockall
+ _open __open _opendir __opendir
+ pathconf poll
+ posix_memalign pread _pread __pread
+-pwrite _pwrite __pwrite
++pwrite
+ rdchk _read __read _readdir __readdir
+ _seekdir __seekdir
+ select setenv setgidx setgroups setlocale setluid
+-- 
+2.20.1
+


=====================================
debian/patches/series
=====================================
@@ -9,3 +9,4 @@ heimdal-rfc3454.txt
 smbd.service-Run-update-apparmor-samba-profile-befor.patch
 fix-nfs-service-name-to-nfs-kernel-server.patch
 build-Remove-tests-for-getdents-and-getdirentries.patch
+build-Remove-tests-for-_pwrite-and-__pwrite.patch


=====================================
source3/wscript
=====================================
@@ -402,7 +402,7 @@ __lxstat memalign mknod mlock mlockall munlock munlockall
 _open __open _opendir __opendir
 pathconf poll
 posix_memalign pread _pread __pread
-pwrite _pwrite __pwrite
+pwrite
 rdchk _read __read _readdir __readdir
 _seekdir __seekdir
 select setenv setgidx setgroups setlocale setluid



View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/fef9fff3786adfd35e8bbb246617184d8f125adb...1c820dc394bf946a590c8f5e4363fd422680f9a6

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/fef9fff3786adfd35e8bbb246617184d8f125adb...1c820dc394bf946a590c8f5e4363fd422680f9a6
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/20190928/63a394dc/attachment-0001.html>