[Pkg-samba-maint] [Git][samba-team/samba][master] 5 commits: Use the same arches for librados-dev than libcephfs-dev
Mathieu Parent
gitlab at salsa.debian.org
Sun Sep 29 08:35:37 BST 2019
Mathieu Parent pushed to branch master at Debian Samba Team / samba
Commits:
2dd19429 by Mathieu Parent at 2019-09-28T20:22:59Z
Use the same arches for librados-dev than libcephfs-dev
- - - - -
f47b7c17 by Mathieu Parent at 2019-09-29T06:04:48Z
Split vfsmods:Recommends substvar into {vfsceph,vfsglusterfs,vfssnapper}:Recommends
To make the code more readable and fix FTBFS on linux platforms without ceph
- - - - -
30367b99 by Mathieu Parent at 2019-09-29T07:25:47Z
build: Remove tests for _readdir() and __readdir()
These date back to pre-git e19196110cc9d29c3fb330737507adc364f3bd9a in 1998.
More of these should be removed but the _readdir() 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()"
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
- - - - -
cb24ec6a by Mathieu Parent at 2019-09-29T07:28:30Z
Add patch for build: Remove tests for _readdir() and _readdir()
- - - - -
2091e9b6 by Mathieu Parent at 2019-09-29T07:32:46Z
Release 2:4.11.0+dfsg-4 to experimental
- - - - -
9 changed files:
- debian/changelog
- debian/control
- − debian/patches/.build-Remove-tests-for-getdents-and-getdirentries.patch.swp
- debian/patches/build-Remove-tests-for-_pwrite-and-__pwrite.patch
- + debian/patches/build-Remove-tests-for-_readdir-and-__readdir.patch
- debian/patches/build-Remove-tests-for-rdchk.patch
- debian/patches/series
- debian/rules
- source3/wscript
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+samba (2:4.11.0+dfsg-4) experimental; urgency=medium
+
+ * Use the same arches for librados-dev than libcephfs-dev (Fix missing
+ build-depends on alpha and sh4)
+ * Split vfsmods:Recommends substvar into
+ {vfsceph,vfsglusterfs,vfssnapper}:Recommends to make the code more readable
+ and fix FTBFS on linux platforms without ceph (hppa and sparc64, and also
+ alpha and sh4)
+ * Add patch for "build: Remove tests for _readdir() and _readdir()", to
+ hopefully fix FTBFS on armel
+
+ -- Mathieu Parent <sathieu at debian.org> Sun, 29 Sep 2019 09:29:03 +0200
+
samba (2:4.11.0+dfsg-3) experimental; urgency=medium
* Try to fix FTBFS on armel (armhf is fixed):
=====================================
debian/control
=====================================
@@ -38,7 +38,7 @@ Build-Depends: bison,
libparse-yapp-perl,
libpcap-dev [hurd-i386 kfreebsd-any],
libpopt-dev,
- librados-dev [linux-any],
+ librados-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el ppc64 s390x x32],
libreadline-dev,
libsystemd-dev [linux-any],
libtalloc-dev (>= 2.2.0~),
@@ -280,7 +280,7 @@ Multi-Arch: same
Breaks: samba (<< 2:4.3.2+dfsg-1), samba-libs (<< 2:4.3.2+dfsg-1)
Replaces: samba (<< 2:4.3.2+dfsg-1), samba-libs (<< 2:4.3.2+dfsg-1)
Depends: samba-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Recommends: ${vfsmods:Recommends}
+Recommends: ${vfsceph:Recommends}, ${vfsglusterfs:Recommends}, ${vfssnapper:Recommends}
Enhances: samba
Description: Samba Virtual FileSystem plugins
Samba is an implementation of the SMB/CIFS protocol for Unix systems,
=====================================
debian/patches/.build-Remove-tests-for-getdents-and-getdirentries.patch.swp deleted
=====================================
Binary files a/debian/patches/.build-Remove-tests-for-getdents-and-getdirentries.patch.swp and /dev/null differ
=====================================
debian/patches/build-Remove-tests-for-_pwrite-and-__pwrite.patch
=====================================
@@ -13,7 +13,7 @@ pointless regardless.
See also 16eb80058ca4a34df96388c26736590247b6a3f4 "build: Remove tests for
getdents() and getdirentries()"
-Forwarded: https://gitlab.com/samba-team/samba/merge_requests/820
+Forwarded: https://gitlab.com/samba-team/samba/merge_requests/821
---
source3/wscript | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
=====================================
debian/patches/build-Remove-tests-for-_readdir-and-__readdir.patch
=====================================
@@ -0,0 +1,36 @@
+From 56ed7395164c46866f96c510398876e70687c47a 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 _readdir() and __readdir()
+
+These date back to pre-git e19196110cc9d29c3fb330737507adc364f3bd9a in 1998.
+
+More of these should be removed but the _readdir() 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()"
+
+Signed-off-by: Mathieu Parent <math.parent at gmail.com>
+Forwarded: https://gitlab.com/samba-team/samba/merge_requests/821
+---
+ source3/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/wscript b/source3/wscript
+index e22cb16f3fb..6e759e8caec 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -403,7 +403,7 @@ _open __open _opendir __opendir
+ pathconf poll
+ posix_memalign pread _pread __pread
+ pwrite
+-_read __read _readdir __readdir
++_read __read
+ _seekdir __seekdir
+ select setenv setgidx setgroups setlocale setluid
+ setmntent setpgid setpriv setsid setuidx
+--
+2.20.1
+
=====================================
debian/patches/build-Remove-tests-for-rdchk.patch
=====================================
@@ -13,6 +13,7 @@ See also 16eb80058ca4a34df96388c26736590247b6a3f4 "build: Remove tests for
getdents() and getdirentries()"
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
+Forwarded: https://gitlab.com/samba-team/samba/merge_requests/821
---
source3/wscript | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
=====================================
debian/patches/series
=====================================
@@ -11,3 +11,4 @@ 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
build-Remove-tests-for-rdchk.patch
+build-Remove-tests-for-_readdir-and-__readdir.patch
=====================================
debian/rules
=====================================
@@ -267,20 +267,22 @@ override_dh_makeshlibs:
override_dh_shlibdeps:
LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH \
dh_shlibdeps -a -Xceph.so -Xglusterfs.so -Xsnapper.so -Xctdb_mutex_ceph_rados_helper
-ifeq ($(DEB_HOST_ARCH_OS), linux)
+ifneq (,$(filter amd64 arm64 armel armhf i386 mips64el mipsel ppc64el ppc64 s390x x32, $(DEB_HOST_ARCH)))
LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH \
- dh_shlibdeps -a -- -pvfsmods -dRecommends \
- -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/ceph.so \
- -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/glusterfs.so \
- -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/snapper.so
+ dh_shlibdeps -a -- -pvfsceph -dRecommends \
+ -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/ceph.so
LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH \
dh_shlibdeps -a -- -prados -dRecommends \
-e debian/ctdb/usr/lib/*/ctdb/ctdb_mutex_ceph_rados_helper
-else
+endif
+ifeq ($(DEB_HOST_ARCH_OS), linux)
LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH \
- dh_shlibdeps -a -- -pvfsmods -dRecommends \
- -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/snapper.so
+ dh_shlibdeps -a -- -pvfsglusterfs -dRecommends \
+ -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/glusterfs.so
endif
+ LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH \
+ dh_shlibdeps -a -- -pvfssnapper -dRecommends \
+ -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/snapper.so
override_dh_gencontrol:
dh_gencontrol -- -Vldb:Depends=$(LDB_DEPENDS)
=====================================
source3/wscript
=====================================
@@ -403,7 +403,7 @@ _open __open _opendir __opendir
pathconf poll
posix_memalign pread _pread __pread
pwrite
-_read __read _readdir __readdir
+_read __read
_seekdir __seekdir
select setenv setgidx setgroups setlocale setluid
setmntent setpgid setpriv setsid setuidx
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/e1421d9486b7965ed5ec4973e918e97d4a941046...2091e9b68ecbd4831b1c49311b516d10c9554955
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/e1421d9486b7965ed5ec4973e918e97d4a941046...2091e9b68ecbd4831b1c49311b516d10c9554955
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/20190929/300eeb75/attachment-0001.html>
More information about the Pkg-samba-maint
mailing list