[Pkg-samba-maint] [Git][samba-team/samba][master] 9 commits: d/gitlabracadabra.yml: only_allow_merge_if_pipeline_succeeds: false
Mathieu Parent
gitlab at salsa.debian.org
Mon Sep 30 12:42:43 BST 2019
Mathieu Parent pushed to branch master at Debian Samba Team / samba
Commits:
9b811623 by Mathieu Parent at 2019-09-30T09:03:59Z
d/gitlabracadabra.yml: only_allow_merge_if_pipeline_succeeds: false
There as too many failures (FTBR, sid/experimental,mismatch, ...)
- - - - -
27e65008 by Mathieu Parent at 2019-09-30T11:33:42Z
Revert "build: Remove tests for _readdir() and __readdir()"
This reverts commit 30367b999a900af030ce877d961aef368eeea6f3.
- - - - -
c55c6df8 by Mathieu Parent at 2019-09-30T11:33:45Z
Revert "build: Remove tests for rdchk()"
This reverts commit 4fb9c1dd89981f9202ce085750d202997d014e99.
- - - - -
943dd803 by Mathieu Parent at 2019-09-30T11:33:46Z
Revert "build: Remove tests for _pwrite() and __pwrite()"
This reverts commit cb8c9e6b7173eb5ffd3aea40257de7355483a3fb.
- - - - -
1c7456a2 by Mathieu Parent at 2019-09-30T11:34:01Z
Remove patches for previous reverted commits
- - - - -
041fbbc0 by Ralph Boehme at 2019-09-30T11:35:58Z
wscript: remove all checks for _FUNC and __FUNC
Those where historic artifacts not needed anymore.
Signed-off-by: Ralph Boehme <slow at samba.org>
(cherry picked from commit c5239c6505545c4e686cf09f02c7f1fb4a39401f)
- - - - -
d9650826 by Ralph Boehme at 2019-09-30T11:35:58Z
wscript: split function check to one per line and sort alphabetically
Signed-off-by: Ralph Boehme <slow at samba.org>
(cherry picked from commit 3761ccecbb081eec439d2327a5978d98a03e131c)
- - - - -
e5f7e0a6 by Mathieu Parent at 2019-09-30T11:37:37Z
Add patches for previous commits
- - - - -
ced8f498 by Mathieu Parent at 2019-09-30T11:39:53Z
Release 2:4.11.0+dfsg-5 to experimental
- - - - -
9 changed files:
- debian/changelog
- debian/gitlabracadabra.yml
- − 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/patches/wscript-remove-all-checks-for-_FUNC-and-__FUNC.patch
- + debian/patches/wscript-split-function-check-to-one-per-line-and-sor.patch
- source3/wscript
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+samba (2:4.11.0+dfsg-5) experimental; urgency=medium
+
+ * d/gitlabracadabra.yml: only_allow_merge_if_pipeline_succeeds: false
+ * Remove patches:
+ - "build: Remove tests for _readdir() and __readdir()"
+ - "build: Remove tests for rdchk()"
+ - "build: Remove tests for _pwrite() and __pwrite()"
+ * Add patches by Ralph Boehme:
+ - "wscript: remove all checks for _FUNC and __FUNC"
+ - "wscript: split function check to one per line and sort alphabetically"
+
+ -- Mathieu Parent <sathieu at debian.org> Mon, 30 Sep 2019 13:37:50 +0200
+
samba (2:4.11.0+dfsg-4) experimental; urgency=medium
* Use the same arches for librados-dev than libcephfs-dev (Fix missing
=====================================
debian/gitlabracadabra.yml
=====================================
@@ -39,7 +39,7 @@ samba-team/:
shared_runners_enabled: true
visibility: public
public_builds:
- only_allow_merge_if_pipeline_succeeds: true
+ only_allow_merge_if_pipeline_succeeds: false
only_allow_merge_if_all_discussions_are_resolved: true
merge_method: merge
lfs_enabled: false
=====================================
debian/patches/build-Remove-tests-for-_pwrite-and-__pwrite.patch deleted
=====================================
@@ -1,36 +0,0 @@
-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/821
----
- 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/build-Remove-tests-for-_readdir-and-__readdir.patch deleted
=====================================
@@ -1,36 +0,0 @@
-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 deleted
=====================================
@@ -1,45 +0,0 @@
-From 5cea51f60c9971b55c08605b3813a2bdf03585c8 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 rdchk()
-
-These date back to pre-git e19196110cc9d29c3fb330737507adc364f3bd9a in 1998.
-
-More of these should be removed but the rdchk() 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 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/source3/wscript b/source3/wscript
-index 4910ed71d74..e22cb16f3fb 100644
---- a/source3/wscript
-+++ b/source3/wscript
-@@ -108,7 +108,7 @@ def configure(conf):
- conf.CHECK_FUNCS('getrlimit fsync fdatasync setpgid')
- conf.CHECK_FUNCS('setsid glob strpbrk crypt16 getauthuid')
- conf.CHECK_FUNCS('innetgr')
-- conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf')
-+ conf.CHECK_FUNCS('initgroups select poll getgrnam getgrent pathconf')
- conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups syscall sysconf')
- conf.CHECK_FUNCS('atexit grantpt posix_openpt fallocate')
- conf.CHECK_FUNCS('fseeko setluid')
-@@ -403,7 +403,7 @@ _open __open _opendir __opendir
- pathconf poll
- posix_memalign pread _pread __pread
- pwrite
--rdchk _read __read _readdir __readdir
-+_read __read _readdir __readdir
- _seekdir __seekdir
- select setenv setgidx setgroups setlocale setluid
- setmntent setpgid setpriv setsid setuidx
---
-2.20.1
-
=====================================
debian/patches/series
=====================================
@@ -9,6 +9,5 @@ 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
-build-Remove-tests-for-rdchk.patch
-build-Remove-tests-for-_readdir-and-__readdir.patch
+wscript-remove-all-checks-for-_FUNC-and-__FUNC.patch
+wscript-split-function-check-to-one-per-line-and-sor.patch
=====================================
debian/patches/wscript-remove-all-checks-for-_FUNC-and-__FUNC.patch
=====================================
@@ -0,0 +1,72 @@
+From c5239c6505545c4e686cf09f02c7f1fb4a39401f Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <slow at samba.org>
+Date: Mon, 30 Sep 2019 11:49:28 +0200
+Subject: [PATCH 1/2] wscript: remove all checks for _FUNC and __FUNC
+
+Those where historic artifacts not needed anymore.
+
+Signed-off-by: Ralph Boehme <slow at samba.org>
+---
+ source3/wscript | 39 ++++++++++++++++++---------------------
+ 1 file changed, 18 insertions(+), 21 deletions(-)
+
+diff --git a/source3/wscript b/source3/wscript
+index d45222625c4..8d499704c62 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -383,34 +383,31 @@ int main(int argc, char **argv) {
+ msg="Checking for LL suffix on long long integers")
+
+ conf.CHECK_FUNCS('''
+-_acl __acl atexit
+- _chdir __chdir chflags chmod _close __close _closedir
+-__closedir crypt16 devnm dirfd
+-DNSServiceRegister _dup __dup _dup2 __dup2 endmntent execl
+-_facl __facl _fchdir
+-__fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync
+-_fork __fork fseeko
+-_fstat __fstat fsync
+-futimens futimes __fxstat getauthuid
+-getcwd _getcwd __getcwd
++atexit
++chflags chmod
++crypt16 devnm dirfd
++DNSServiceRegister endmntent execl
++fchmod fchown fcvt fcvtl fdatasync
++fseeko
++fsync
++futimens futimes getauthuid
++getcwd
+ getgrent getgrnam getgrouplist getgrset getmntent getpagesize
+ getpwanam getpwent_r getrlimit
+ glob grantpt hstrerror initgroups innetgr
+-llseek _llseek __llseek _lseek __lseek
+-_lstat __lstat lutimes
+-__lxstat memalign mknod mlock mlockall munlock munlockall
+-_open __open _opendir __opendir
++llseek
++lutimes
++memalign mknod mlock mlockall munlock munlockall
+ pathconf poll
+-posix_memalign pread _pread __pread
+-pwrite _pwrite __pwrite
+-rdchk _read __read _readdir __readdir
+-_seekdir __seekdir
++posix_memalign pread
++pwrite
++rdchk
+ select setenv setgidx setgroups setlocale setluid
+ setmntent setpgid setpriv setsid setuidx
+-_stat __stat statvfs
++statvfs
+ strcasecmp strchr strpbrk strsignal strtol strupr sysconf sysctl sysctlbyname
+-__sys_llseek syslog _telldir __telldir timegm
+-utimensat vsyslog _write __write __xstat
++syslog timegm
++utimensat vsyslog
+ ''')
+
+ conf.CHECK_SAMBA3_CHARSET() # see build/charset.py
+--
+2.20.1
+
=====================================
debian/patches/wscript-split-function-check-to-one-per-line-and-sor.patch
=====================================
@@ -0,0 +1,112 @@
+From 3761ccecbb081eec439d2327a5978d98a03e131c Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <slow at samba.org>
+Date: Mon, 30 Sep 2019 11:52:06 +0200
+Subject: [PATCH 2/2] wscript: split function check to one per line and sort
+ alphabetically
+
+Signed-off-by: Ralph Boehme <slow at samba.org>
+---
+ source3/wscript | 77 +++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 62 insertions(+), 15 deletions(-)
+
+diff --git a/source3/wscript b/source3/wscript
+index 8d499704c62..9580c3b552a 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -383,31 +383,78 @@ int main(int argc, char **argv) {
+ msg="Checking for LL suffix on long long integers")
+
+ conf.CHECK_FUNCS('''
++DNSServiceRegister
+ atexit
+-chflags chmod
+-crypt16 devnm dirfd
+-DNSServiceRegister endmntent execl
+-fchmod fchown fcvt fcvtl fdatasync
++chflags
++chmod
++crypt16
++devnm
++dirfd
++endmntent
++execl
++fchmod
++fchown
++fcvt
++fcvtl
++fdatasync
+ fseeko
+ fsync
+-futimens futimes getauthuid
++futimens
++futimes
++getauthuid
+ getcwd
+-getgrent getgrnam getgrouplist getgrset getmntent getpagesize
+-getpwanam getpwent_r getrlimit
+-glob grantpt hstrerror initgroups innetgr
++getgrent
++getgrnam
++getgrouplist
++getgrset
++getmntent
++getpagesize
++getpwanam
++getpwent_r
++getrlimit
++glob
++grantpt
++hstrerror
++initgroups
++innetgr
+ llseek
+ lutimes
+-memalign mknod mlock mlockall munlock munlockall
++memalign
++mknod
++mlock
++mlockall
++munlock
++munlockall
+ pathconf poll
+-posix_memalign pread
++posix_memalign
++pread
+ pwrite
+ rdchk
+-select setenv setgidx setgroups setlocale setluid
+-setmntent setpgid setpriv setsid setuidx
++select
++setenv
++setgidx
++setgroups
++setlocale
++setluid
++setmntent
++setpgid
++setpriv
++setsid
++setuidx
+ statvfs
+-strcasecmp strchr strpbrk strsignal strtol strupr sysconf sysctl sysctlbyname
+-syslog timegm
+-utimensat vsyslog
++strcasecmp
++strchr
++strpbrk
++strsignal
++strtol
++strupr
++sysconf
++sysctl
++sysctlbyname
++syslog
++timegm
++utimensat
++vsyslog
+ ''')
+
+ conf.CHECK_SAMBA3_CHARSET() # see build/charset.py
+--
+2.20.1
+
=====================================
source3/wscript
=====================================
@@ -107,7 +107,7 @@ def configure(conf):
conf.CHECK_FUNCS('getrlimit fsync fdatasync setpgid')
conf.CHECK_FUNCS('setsid glob strpbrk crypt16 getauthuid')
conf.CHECK_FUNCS('innetgr')
- conf.CHECK_FUNCS('initgroups select poll getgrnam getgrent pathconf')
+ conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf')
conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups syscall sysconf')
conf.CHECK_FUNCS('atexit grantpt posix_openpt fallocate')
conf.CHECK_FUNCS('fseeko setluid')
@@ -383,34 +383,78 @@ int main(int argc, char **argv) {
msg="Checking for LL suffix on long long integers")
conf.CHECK_FUNCS('''
-_acl __acl atexit
- _chdir __chdir chflags chmod _close __close _closedir
-__closedir crypt16 devnm dirfd
-DNSServiceRegister _dup __dup _dup2 __dup2 endmntent execl
-_facl __facl _fchdir
-__fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync
-_fork __fork fseeko
-_fstat __fstat fsync
-futimens futimes __fxstat getauthuid
-getcwd _getcwd __getcwd
-getgrent getgrnam getgrouplist getgrset getmntent getpagesize
-getpwanam getpwent_r getrlimit
-glob grantpt hstrerror initgroups innetgr
-llseek _llseek __llseek _lseek __lseek
-_lstat __lstat lutimes
-__lxstat memalign mknod mlock mlockall munlock munlockall
-_open __open _opendir __opendir
+DNSServiceRegister
+atexit
+chflags
+chmod
+crypt16
+devnm
+dirfd
+endmntent
+execl
+fchmod
+fchown
+fcvt
+fcvtl
+fdatasync
+fseeko
+fsync
+futimens
+futimes
+getauthuid
+getcwd
+getgrent
+getgrnam
+getgrouplist
+getgrset
+getmntent
+getpagesize
+getpwanam
+getpwent_r
+getrlimit
+glob
+grantpt
+hstrerror
+initgroups
+innetgr
+llseek
+lutimes
+memalign
+mknod
+mlock
+mlockall
+munlock
+munlockall
pathconf poll
-posix_memalign pread _pread __pread
+posix_memalign
+pread
pwrite
-_read __read
-_seekdir __seekdir
-select setenv setgidx setgroups setlocale setluid
-setmntent setpgid setpriv setsid setuidx
-_stat __stat statvfs
-strcasecmp strchr strpbrk strsignal strtol strupr sysconf sysctl sysctlbyname
-__sys_llseek syslog _telldir __telldir timegm
-utimensat vsyslog _write __write __xstat
+rdchk
+select
+setenv
+setgidx
+setgroups
+setlocale
+setluid
+setmntent
+setpgid
+setpriv
+setsid
+setuidx
+statvfs
+strcasecmp
+strchr
+strpbrk
+strsignal
+strtol
+strupr
+sysconf
+sysctl
+sysctlbyname
+syslog
+timegm
+utimensat
+vsyslog
''')
conf.CHECK_SAMBA3_CHARSET() # see build/charset.py
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/2091e9b68ecbd4831b1c49311b516d10c9554955...ced8f498f20947873536553fdd9e390b97e048cf
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/2091e9b68ecbd4831b1c49311b516d10c9554955...ced8f498f20947873536553fdd9e390b97e048cf
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/20190930/74d50018/attachment-0001.html>
More information about the Pkg-samba-maint
mailing list