Commit c94a5431 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

samba4: update to upstream patches 



Update the package to use patches that have been applied upstream and
update their status comment accordingly.

f_fsid checks have been fixed via upstream patch that allows the cache
to work properly on the result.

Builtin heimdal tools can be worked around via the --bundled-libraries
option to disable those components (even if they are not libraries it
can be done that way).

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 19d02733

package/samba4/samba4-0001-build-don-t-execute-tests-summary.c.patch

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ tests/summary.c will never be able to be executed when cross compiling. 
Use #error and #warning directives to fail or warn accordingly when

compiling it.



Status: upstream for next branch.

Status: Upstream.



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

---

package/samba4/samba4-0002-Minor-typo-fix-in-source3-wscript.patch

0 → 100644
+35 −0
Original line number Diff line number Diff line 
From 8dc24d4006a2e936baf73e116129d2b0a5d71ed7 Mon Sep 17 00:00:00 2001

From: "Jose A. Rivera" <jarrpa@redhat.com>

Date: Mon, 5 May 2014 07:29:57 -0500

Subject: [PATCH] Minor typo fix in source3/wscript.



Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>

Reviewed-by: Volker Lendecke <vl@samba.org>

Reviewed-by: Jeremy Allison <jra@samba.org>



Autobuild-User(master): Jeremy Allison <jra@samba.org>

Autobuild-Date(master): Mon May  5 22:41:19 CEST 2014 on sn-devel-104



Status: Upstream.



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

---

 source3/wscript | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/source3/wscript b/source3/wscript

index 4fe49fa..8cbd9bc 100644

--- a/source3/wscript

+++ b/source3/wscript

@@ -475,7 +475,7 @@ return acl_get_perm_np(permset_d, perm);

 

     conf.CHECK_CODE('struct statfs fsd; fsid_t fsid = fsd.f_fsid; return statfs(".", &fsd);',

                     'HAVE_STATFS_F_FSID',

-                    msg="vfs_fileid: checking for statfs() and struct statfs.f_fsid",

+                    msg="vfs_fileid checking for statfs() and struct statfs.f_fsid",

                     headers='sys/types.h sys/statfs.h',

                     execute=True)

 

-- 

1.8.5.5

package/samba4/samba4-0002-build-don-t-execute-statfs-and-f_fsid-checks.patch

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
From 5e0bafd6504916dd7de5b1ae90e7253d11498435 Mon Sep 17 00:00:00 2001

From: Gustavo Zacarias <gustavo@zacarias.com.ar>

Date: Mon, 20 Jan 2014 10:17:19 -0300

Subject: [PATCH 1/5] build: don't execute statfs and f_fsid checks



There's no need to execute the statfs and statfs.f_fsid checks, the

return value is of no consequence since it's undefined in some

platforms and prevents cross-compiling.



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

---

 source3/wscript | 3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)



diff --git a/source3/wscript b/source3/wscript

index 4fe49fa..e81a47b 100644

--- a/source3/wscript

+++ b/source3/wscript

@@ -476,8 +476,7 @@ return acl_get_perm_np(permset_d, perm);

     conf.CHECK_CODE('struct statfs fsd; fsid_t fsid = fsd.f_fsid; return statfs(".", &fsd);',

                     'HAVE_STATFS_F_FSID',

                     msg="vfs_fileid: checking for statfs() and struct statfs.f_fsid",

-                    headers='sys/types.h sys/statfs.h',

-                    execute=True)

+                    headers='sys/types.h sys/statfs.h')

 

     if conf.CONFIG_SET('HAVE_FALLOCATE'):

         conf.CHECK_CODE('''

-- 

1.8.3.2

package/samba4/samba4-0003-build-find-FILE_OFFSET_BITS-via-array.patch

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ array. 
If it's false it gives array[(-1 * 1)] thus failing with a

negative-sized array.



Status: upstream for next branch.

Status: Upstream.



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

---

package/samba4/samba4-0004-build-allow-some-python-variable-overrides.patch

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Allow some of these variables to be redefined via environment variables 
in order to aid cross-compiling.

According to testing python_LDFLAGS and python_LIBDIR should be enough.



Status: upstream for next branch.

Status: Upstream.



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

---