summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-03-02 12:41:27 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-03-02 15:43:55 +0100
commit93fce3eef4fc5ed7fa987cdaeefc83b1afb224bd (patch)
tree4fb2d20f48851f8f9fd4a295057181d2739c7a99 /patches
parent10e3605477abfabab01fa60c320fff7e6d5776e8 (diff)
downloadptxdist-93fce3eef4fc5ed7fa987cdaeefc83b1afb224bd.tar.gz
ptxdist-93fce3eef4fc5ed7fa987cdaeefc83b1afb224bd.tar.xz
samba: version bump 3.0.37 -> 4.9.4
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch37
-rw-r--r--patches/samba-3.0.37/0002-configure.in-make-getgrouplist_ok-test-cross-compile.patch42
-rw-r--r--patches/samba-3.0.37/0003-configure.in-make-LINUX_LFS_SUPPORT-cacheable.patch45
-rw-r--r--patches/samba-3.0.37/0004-configure.in-fix-test-for-negative-enum-values.patch62
-rw-r--r--patches/samba-3.0.37/0005-configure.in-fix-time_t-detection.patch34
-rw-r--r--patches/samba-3.0.37/0006-configure.in-fix-off_t-test.patch37
-rw-r--r--patches/samba-3.0.37/0007-configure.in-fix-dev_t-test.patch39
-rwxr-xr-xpatches/samba-3.0.37/autogen.sh4
-rw-r--r--patches/samba-3.0.37/series7
9 files changed, 0 insertions, 307 deletions
diff --git a/patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch b/patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch
deleted file mode 100644
index 0cee2ecfa..000000000
--- a/patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [samba] make oplock support conditional
-
-Linux oplock support is conditional on HAVE_KERNEL_OPLOCKS_LINUX, not
-plain old LINUX.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- source/modules/vfs_default.c | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-# 20100428 rsc: This patch was already applied in the samba upstream, see
-# http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23962
-# and d8d84cd7082a95e673a7efc285879dd412b78b4c in samba git.
-
-diff --git a/source/modules/vfs_default.c b/source/modules/vfs_default.c
-index 4cc6e88..1f8fb63 100644
---- a/source/modules/vfs_default.c
-+++ b/source/modules/vfs_default.c
-@@ -813,10 +813,11 @@ static int vfswrap_linux_setlease(vfs_handle_struct *handle, files_struct *fsp,
-
- START_PROFILE(syscall_linux_setlease);
-
--#ifdef LINUX
-+#ifdef HAVE_KERNEL_OPLOCKS_LINUX
- /* first set the signal handler */
-- if(linux_set_lease_sighandler(fd) == -1)
-+ if(linux_set_lease_sighandler(fd) == -1) {
- return -1;
-+ }
-
- result = linux_setlease(fd, leasetype);
- #else
---
-1.6.3.3
-
diff --git a/patches/samba-3.0.37/0002-configure.in-make-getgrouplist_ok-test-cross-compile.patch b/patches/samba-3.0.37/0002-configure.in-make-getgrouplist_ok-test-cross-compile.patch
deleted file mode 100644
index 0043cee20..000000000
--- a/patches/samba-3.0.37/0002-configure.in-make-getgrouplist_ok-test-cross-compile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9130b57a196e2cf316230409b7e1d4a4eab56fed Mon Sep 17 00:00:00 2001
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Tue, 7 Jul 2009 15:56:55 +0200
-Subject: [PATCH 2/8] [configure.in] make getgrouplist_ok test cross compile save
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- source/configure.in | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/source/configure.in b/source/configure.in
-index 1e4ea0f..192a9d9 100644
---- a/source/configure.in
-+++ b/source/configure.in
-@@ -1389,7 +1389,7 @@ AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[])
- case "$host_os" in
- *linux*)
- # glibc <= 2.3.2 has a broken getgrouplist
-- AC_TRY_RUN([
-+ AC_RUN_IFELSE([
- #include <unistd.h>
- #include <sys/utsname.h>
- main() {
-@@ -1405,10 +1405,14 @@ main() {
- #endif
- exit(0);
- }
--], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
-+], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no], [linux_getgrouplist_ok=maybe])
-+
- if test x"$linux_getgrouplist_ok" = x"yes"; then
- AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
- fi
-+ if test x"$linux_getgrouplist_ok" = x"maybe"; then
-+ AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist - guessed while crosscompiling])
-+ fi
- ;;
- *)
- AC_CHECK_FUNCS(getgrouplist)
---
-1.6.3.3
-
diff --git a/patches/samba-3.0.37/0003-configure.in-make-LINUX_LFS_SUPPORT-cacheable.patch b/patches/samba-3.0.37/0003-configure.in-make-LINUX_LFS_SUPPORT-cacheable.patch
deleted file mode 100644
index fb8f7e00e..000000000
--- a/patches/samba-3.0.37/0003-configure.in-make-LINUX_LFS_SUPPORT-cacheable.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 793f69e2c8a23e202e0155e5341a3c756e573c6e Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Tue, 7 Jul 2009 17:09:09 +0200
-Subject: [PATCH 3/8] [configure.in] make LINUX_LFS_SUPPORT cacheable
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- source/configure.in | 9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/source/configure.in b/source/configure.in
-index 192a9d9..701622d 100644
---- a/source/configure.in
-+++ b/source/configure.in
-@@ -768,7 +768,7 @@ exit(1);
- # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
- #
- *linux*)
-- AC_MSG_CHECKING([for LFS support])
-+ AC_CACHE_CHECK([for LFS support], [samba_cv_LINUX_LFS_SUPPORT],[
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
- AC_TRY_RUN([
-@@ -807,15 +807,14 @@ main() {
- exit(1);
- #endif
- }
--], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross])
-- CPPFLAGS="$old_CPPFLAGS"
-- if test x$LINUX_LFS_SUPPORT = xyes ; then
-+], [samba_cv_LINUX_LFS_SUPPORT=yes], [samba_cv_LINUX_LFS_SUPPORT=no], [samba_cv_LINUX_LFS_SUPPORT=cross])
-+ CPPFLAGS="$old_CPPFLAGS"])
-+ if test x$samba_cv_LINUX_LFS_SUPPORT = xyes ; then
- CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
- AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
- AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
- AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions])
- fi
-- AC_MSG_RESULT([$LINUX_LFS_SUPPORT])
- ;;
-
- #
---
-1.6.3.3
-
diff --git a/patches/samba-3.0.37/0004-configure.in-fix-test-for-negative-enum-values.patch b/patches/samba-3.0.37/0004-configure.in-fix-test-for-negative-enum-values.patch
deleted file mode 100644
index aa599aaff..000000000
--- a/patches/samba-3.0.37/0004-configure.in-fix-test-for-negative-enum-values.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 6d2c30e32e551ba84bb9967d6fd48e21c7ad714c Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Tue, 7 Jul 2009 18:21:00 +0200
-Subject: [PATCH 4/8] [configure.in] fix test for negative enum values
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- source/configure.in | 28 ++++++++--------------------
- 1 files changed, 8 insertions(+), 20 deletions(-)
-
-diff --git a/source/configure.in b/source/configure.in
-index 701622d..85b0bd7 100644
---- a/source/configure.in
-+++ b/source/configure.in
-@@ -493,6 +493,8 @@ else
- fi
- AC_SUBST(BROKEN_CC)
-
-+AC_TRY_COMPILE([],[(void)sizeof(char[-1])],AC_MSG_ERROR([configure's compilation assert doesn't work with $CC]))
-+
- dnl Check if the C compiler understands -Werror
- AC_CACHE_CHECK([that the C compiler understands -Werror],samba_cv_HAVE_Werror, [
- AC_TRY_RUN_STRICT([
-@@ -530,29 +532,15 @@ fi
- # and don't truncate the values to INT_MAX
- # a runtime test is needed here
- AC_SUBST(PIDL_ARGS)
--AC_CACHE_CHECK([that the C compiler understands negative enum values],SMB_BUILD_CC_NEGATIVE_ENUM_VALUES, [
-- AC_TRY_RUN(
-+AC_CACHE_CHECK([that the C compiler understands negative enum values], [samba_cv_BUILD_CC_NEGATIVE_ENUM_VALUES], [
-+ AC_TRY_COMPILE([],
- [
-- #include <stdio.h>
- enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
-- int main(void) {
-- enum negative_values v1 = NEGATIVE_VALUE;
-- unsigned v2 = NEGATIVE_VALUE;
--
-- if (v1 != 0xFFFFFFFF) {
-- printf("%u != 0xFFFFFFFF\n", v1);
-- return 1;
-- }
-- if (v2 != 0xFFFFFFFF) {
-- printf("%u != 0xFFFFFFFF\n", v2);
-- return 1;
-- }
--
-- return 0;
-- }
-+ (void)sizeof(char[1-2*( (unsigned)NEGATIVE_VALUE != 0xFFFFFFFF)]);
-+ (void)sizeof(char[1-2*((enum negative_values)NEGATIVE_VALUE != 0xFFFFFFFF)]);
- ],
-- SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes,SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=no)])
--if test x"$SMB_BUILD_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
-+ samba_cv_BUILD_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv_BUILD_CC_NEGATIVE_ENUM_VALUES=no)])
-+if test x"$samba_cv_BUILD_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
- AC_MSG_WARN([using --unit-enums for pidl])
- PIDL_ARGS="$PIDL_ARGS --uint-enums"
- fi
---
-1.6.3.3
-
diff --git a/patches/samba-3.0.37/0005-configure.in-fix-time_t-detection.patch b/patches/samba-3.0.37/0005-configure.in-fix-time_t-detection.patch
deleted file mode 100644
index 6e01f6780..000000000
--- a/patches/samba-3.0.37/0005-configure.in-fix-time_t-detection.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6f48413916d3575a1f12bc14e0990f40606e894a Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Tue, 7 Jul 2009 18:57:16 +0200
-Subject: [PATCH 5/8] [configure.in] fix time_t detection
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- source/configure.in | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/source/configure.in b/source/configure.in
-index 85b0bd7..164dbcb 100644
---- a/source/configure.in
-+++ b/source/configure.in
-@@ -1951,10 +1951,13 @@ if test x"$samba_cv_compiler_supports_ll" = x"yes"; then
- fi
-
-
-+AC_CHECK_SIZEOF(time_t)
- AC_CACHE_CHECK([for 64 bit time_t],samba_cv_SIZEOF_TIME_T,[
--AC_TRY_RUN([#include <time.h>
--main() { exit((sizeof(time_t) == 8) ? 0 : 1); }],
--samba_cv_SIZEOF_TIME_T=yes,samba_cv_SIZEOF_TIME_T=no,samba_cv_SIZEOF_TIME_T=cross)])
-+if test $ac_cv_sizeof_time_t -eq 8; then
-+ samba_cv_SIZEOF_TIME_T=yes
-+else
-+ samba_cv_SIZEOF_TIME_T=no
-+fi])
- if test x"$samba_cv_SIZEOF_TIME_T" = x"yes"; then
- AC_DEFINE(SIZEOF_TIME_T,8,[The size of the 'time_t' type])
- fi
---
-1.6.3.3
-
diff --git a/patches/samba-3.0.37/0006-configure.in-fix-off_t-test.patch b/patches/samba-3.0.37/0006-configure.in-fix-off_t-test.patch
deleted file mode 100644
index 9777d64c8..000000000
--- a/patches/samba-3.0.37/0006-configure.in-fix-off_t-test.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6daf3aad32f86549e2c5033e67d8541a20b89b2f Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Tue, 7 Jul 2009 19:17:40 +0200
-Subject: [PATCH 6/8] [configure.in] fix off_t test
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- source/configure.in | 12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/source/configure.in b/source/configure.in
-index 164dbcb..6094b87 100644
---- a/source/configure.in
-+++ b/source/configure.in
-@@ -1962,11 +1962,15 @@ if test x"$samba_cv_SIZEOF_TIME_T" = x"yes"; then
- AC_DEFINE(SIZEOF_TIME_T,8,[The size of the 'time_t' type])
- fi
-
-+
-+AC_CHECK_SIZEOF(off_t)
- AC_CACHE_CHECK([for 64 bit off_t],samba_cv_SIZEOF_OFF_T,[
--AC_TRY_RUN([#include <stdio.h>
--#include <sys/stat.h>
--main() { exit((sizeof(off_t) == 8) ? 0 : 1); }],
--samba_cv_SIZEOF_OFF_T=yes,samba_cv_SIZEOF_OFF_T=no,samba_cv_SIZEOF_OFF_T=cross)])
-+if test $ac_cv_sizeof_off_t -eq 8; then
-+ samba_cv_SIZEOF_OFF_T=yes
-+else
-+ samba_cv_SIZEOF_OFF_T=no
-+fi
-+])
- if test x"$samba_cv_SIZEOF_OFF_T" = x"yes"; then
- AC_DEFINE(SIZEOF_OFF_T,8,[The size of the 'off_t' type])
- fi
---
-1.6.3.3
-
diff --git a/patches/samba-3.0.37/0007-configure.in-fix-dev_t-test.patch b/patches/samba-3.0.37/0007-configure.in-fix-dev_t-test.patch
deleted file mode 100644
index 875a89beb..000000000
--- a/patches/samba-3.0.37/0007-configure.in-fix-dev_t-test.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 803cbd7cf45052396ef929167bfa15ad6e8fc7bc Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Tue, 7 Jul 2009 19:17:52 +0200
-Subject: [PATCH 7/8] [configure.in] fix dev_t test
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- source/configure.in | 14 ++++++--------
- 1 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/source/configure.in b/source/configure.in
-index 6094b87..8b01ed4 100644
---- a/source/configure.in
-+++ b/source/configure.in
-@@ -2014,15 +2014,13 @@ if test x"$samba_cv_HAVE_INO64_T" = x"yes"; then
- AC_DEFINE(HAVE_INO64_T,1,[Whether the 'ino64_t' type is available])
- fi
-
-+AC_CHECK_SIZEOF(dev_t)
- AC_CACHE_CHECK([for 64 bit dev_t],samba_cv_SIZEOF_DEV_T,[
--AC_TRY_RUN([
--#if defined(HAVE_UNISTD_H)
--#include <unistd.h>
--#endif
--#include <stdio.h>
--#include <sys/stat.h>
--main() { exit((sizeof(dev_t) == 8) ? 0 : 1); }],
--samba_cv_SIZEOF_DEV_T=yes,samba_cv_SIZEOF_DEV_T=no,samba_cv_SIZEOF_DEV_T=cross)])
-+if test $ac_cv_sizeof_dev_t -eq 8; then
-+ samba_cv_SIZEOF_DEV_T=yes
-+else
-+ samba_cv_SIZEOF_DEV_T=no
-+fi])
- if test x"$samba_cv_SIZEOF_DEV_T" = x"yes"; then
- AC_DEFINE(SIZEOF_DEV_T,8,[The size of the 'dev_t' type])
- fi
---
-1.6.3.3
-
diff --git a/patches/samba-3.0.37/autogen.sh b/patches/samba-3.0.37/autogen.sh
deleted file mode 100755
index a1333120a..000000000
--- a/patches/samba-3.0.37/autogen.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd source && ./autogen.sh
-
diff --git a/patches/samba-3.0.37/series b/patches/samba-3.0.37/series
deleted file mode 100644
index 5eb490721..000000000
--- a/patches/samba-3.0.37/series
+++ /dev/null
@@ -1,7 +0,0 @@
-0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch
-0002-configure.in-make-getgrouplist_ok-test-cross-compile.patch
-0003-configure.in-make-LINUX_LFS_SUPPORT-cacheable.patch
-0004-configure.in-fix-test-for-negative-enum-values.patch
-0005-configure.in-fix-time_t-detection.patch
-0006-configure.in-fix-off_t-test.patch
-0007-configure.in-fix-dev_t-test.patch