Skip to contentSkip to conversation

Samba4 package

PATCH Superseded Gustavo Zacarias 5 participants 15 messages Feb 7, 2014 – Feb 11, 2014

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover Samba4 package

This patchset adds a samba 4.1.x package to buildroot.

Samba 4.1.x uses the waf build system which isn't very cross-compile friendly, and also some tests are formulated in a way that isn't cross-build friendly either by needing to run them.

For this reason the samba4 build system includes a way to define answers for many of the tests, but this support isn't complete and some tests still want to be executed.

Samba 3.6.x is being kept because 4.1.x has a bigger footprint, changes usage in some tools (swat has been dropped for example), has more toolchain dependencies and there may be validation issues for users as well.
Samba 4.1.x also requires a proper answers file for each architecture, and at the moment i've only tested for ARM and PowerPC so only those architectures are supported to begin with. To add support for another architecture basically copy one of the cache files to the proper name, enable it in Config.in and adjust endianess and all of the "size of" answers. I'm in the process of automating the sizeof and endianess answers within the samba build system to make them cross friendly to simplify the answers file to just one generic linux variant. The 3.6.x branch is still security supported for the forseeable future.

I'm currently working with samba upstream to solve many of these issues but this will probably happen with the yet unreleased 4.2 branch only.

The python patch is a backport from the 3.4 branch to avoid using a runtime python for python-config (a pure shell implementation).

Heimdal patches are all upstream.

Gustavo Zacarias (4):
python: fixup python-config script
heimdal: new package
samba: convert to choice package
samba4: new package

 .../heimdal/heimdal-0001-add-roken-h-process.patch | 195 ++++++++++++++
 package/heimdal/heimdal-0002-use-Getopt-Std.patch  |  30 +++
 package/heimdal/heimdal-0003-vendor.patch          |  19 ++
 package/heimdal/heimdal-0004-compile_et.patch      |  28 ++
 package/heimdal/heimdal.mk                         |  30 +++
 .../python/python-2.7-017-fix-python-config.patch  | 205 +++++++++++++++
 package/samba/Config.in                            | 285 +++------------------
 package/samba/samba.mk                             | 179 +------------
 package/samba/{ => samba3}/Config.in               |  99 +++----
 package/samba/{ => samba3}/S91smb                  |   0
 .../samba3-0001-fix-smbd-libs-avahi.patch}         |   0
 .../samba3-0002-getaddrinfo.patch}                 |   0
 package/samba/samba3/samba3.mk                     | 181 +++++++++++++
 package/samba/{ => samba3}/simple.conf             |   0
 package/samba/{ => samba4}/S91smb                  |  42 +--
 package/samba/samba4/arm-cache.txt                 |  65 +++++
 package/samba/samba4/powerpc-cache.txt             |  65 +++++
 ...-0001-build-don-t-execute-tests-summary.c.patch |  67 +++++
 ...ld-don-t-execute-statfs-and-f_fsid-checks.patch |  31 +++
 ...003-build-find-FILE_OFFSET_BITS-via-array.patch |  54 ++++
 ...uild-allow-some-python-variable-overrides.patch |  45 ++++
 ...amba4-0005-builtin-heimdal-external-tools.patch |  42 +++
 package/samba/samba4/samba4.mk                     | 111 ++++++++
 23 files changed, 1251 insertions(+), 522 deletions(-)
 create mode 100644 package/heimdal/heimdal-0001-add-roken-h-process.patch
 create mode 100644 package/heimdal/heimdal-0002-use-Getopt-Std.patch
 create mode 100644 package/heimdal/heimdal-0003-vendor.patch
 create mode 100644 package/heimdal/heimdal-0004-compile_et.patch
 create mode 100644 package/heimdal/heimdal.mk
 create mode 100644 package/python/python-2.7-017-fix-python-config.patch
 copy package/samba/{ => samba3}/Config.in (67%)
 copy package/samba/{ => samba3}/S91smb (100%)
 rename package/samba/{samba-fix-smbd-libs-avahi.patch => samba3/samba3-0001-fix-smbd-libs-avahi.patch} (100%)
 rename package/samba/{samba-getaddrinfo.patch => samba3/samba3-0002-getaddrinfo.patch} (100%)
 create mode 100644 package/samba/samba3/samba3.mk
 rename package/samba/{ => samba3}/simple.conf (100%)
 rename package/samba/{ => samba4}/S91smb (52%)
 mode change 100755 => 100644
 create mode 100644 package/samba/samba4/arm-cache.txt
 create mode 100644 package/samba/samba4/powerpc-cache.txt
 create mode 100644 package/samba/samba4/samba4-0001-build-don-t-execute-tests-summary.c.patch
 create mode 100644 package/samba/samba4/samba4-0002-build-don-t-execute-statfs-and-f_fsid-checks.patch
 create mode 100644 package/samba/samba4/samba4-0003-build-find-FILE_OFFSET_BITS-via-array.patch
 create mode 100644 package/samba/samba4/samba4-0004-build-allow-some-python-variable-overrides.patch
 create mode 100644 package/samba/samba4/samba4-0005-builtin-heimdal-external-tools.patch
 create mode 100644 package/samba/samba4/samba4.mk
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/4 python: fixup python-config script

From: Gustavo Zacarias <[email protected]>

The original version uses sysconfig from the python interpreter (normally host-python) which isn't really suited to provide information of the target python.
Use the pure shell preprocessed backport from the upcoming python 3.4

---
 .../python/python-2.7-017-fix-python-config.patch  | 205 +++++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 package/python/python-2.7-017-fix-python-config.patch
package/python/python-2.7-017-fix-python-config.patch new file +205 -0
new file mode 100644
index 0000000..7f923b9
@@ -0,0 +1,205 @@
+Add a backport of http://bugs.python.org/issue16235 so we can use
+python-config for cross builds.
+This basically replaces the python version of python-config with a pure-shell
+version that's already preprocessed when installed and doesn't depend
+on the sysconfig import that usually leads to bad data/results.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura Python-2.7.3.orig/configure.in Python-2.7.3/configure.in
+--- Python-2.7.3.orig/configure.in	2013-12-13 14:43:39.793541435 -0300
++++ Python-2.7.3/configure.in	2013-12-13 17:52:54.759489901 -0300
+@@ -764,6 +764,7 @@
+ 
+ # Other platforms follow
+ if test $enable_shared = "yes"; then
++  PY_ENABLE_SHARED=1
+   AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
+   case $ac_sys_system in
+     BeOS*)
+@@ -824,6 +825,7 @@
+ 
+   esac
+ else # shared is disabled
++  PY_ENABLE_SHARED=0
+   case $ac_sys_system in
+     CYGWIN*)
+           BLDLIBRARY='$(LIBRARY)'
+@@ -1747,6 +1749,9 @@
+ AC_SUBST(BLDSHARED)
+ AC_SUBST(CCSHARED)
+ AC_SUBST(LINKFORSHARED)
++AC_SUBST(PY_ENABLE_SHARED)
++LIBPL="${prefix}/lib/python${VERSION}/config"
++AC_SUBST(LIBPL)
+ # SO is the extension of shared libraries `(including the dot!)
+ # -- usually .so, .sl on HP-UX, .dll on Cygwin
+ AC_MSG_CHECKING(SO)
+@@ -4320,7 +4325,7 @@
+ AC_MSG_RESULT(done)
+ 
+ # generate output files
+-AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
++AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh)
+ AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
+ AC_OUTPUT
+ 
+diff -Nura Python-2.7.3.orig/Makefile.pre.in Python-2.7.3/Makefile.pre.in
+--- Python-2.7.3.orig/Makefile.pre.in	2013-12-13 14:43:39.401528527 -0300
++++ Python-2.7.3/Makefile.pre.in	2013-12-12 15:15:34.828640321 -0300
+@@ -152,7 +152,7 @@
+ SUBDIRSTOO=	Include Lib Misc Demo
+ 
+ # Files and directories to be distributed
+-CONFIGFILES=	configure configure.in acconfig.h pyconfig.h.in Makefile.pre.in
++CONFIGFILES=	configure configure.in acconfig.h pyconfig.h.in Makefile.pre.in Misc/python-config.sh
+ DISTFILES=	README ChangeLog $(CONFIGFILES)
+ DISTDIRS=	$(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
+ DIST=		$(DISTFILES) $(DISTDIRS)
+@@ -366,7 +366,7 @@
+ 
+ # Default target
+ all:		build_all
+-build_all:	$(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
++build_all:	$(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config
+ 
+ # Compile a binary with gcc profile guided optimization.
+ profile-opt:
+@@ -969,10 +969,12 @@
+ 	export EXE; EXE="$(BUILDEXE)"; \
+ 	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
+ 
+-python-config: $(srcdir)/Misc/python-config.in
++python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
+ 	# Substitution happens here, as the completely-expanded BINDIR
+ 	# is not available in configure
+-	sed -e "s, at EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
++	sed -e "s, at EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py
++	# Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
++	sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' Misc/python-config.sh >python-config
+ 
+ # Install the include files
+ INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
+@@ -1031,7 +1033,7 @@
+ 	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
+ 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
+ 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
+-	rm python-config
++	$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
+ 	@if [ -s Modules/python.exp -a \
+ 		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
+ 		echo; echo "Installing support files for building shared extension modules on AIX:"; \
+@@ -1206,6 +1208,7 @@
+ 		config.cache config.log pyconfig.h Modules/config.c
+ 	-rm -rf build platform
+ 	-rm -rf $(PYTHONFRAMEWORKDIR)
++	-rm -f python-config.py python-config
+ 
+ # Make things extra clean, before making a distribution:
+ # remove all generated files, even Makefile[.pre]
+diff -Nura Python-2.7.3.orig/Misc/python-config.sh.in Python-2.7.3/Misc/python-config.sh.in
+--- Python-2.7.3.orig/Misc/python-config.sh.in	1969-12-31 21:00:00.000000000 -0300
++++ Python-2.7.3/Misc/python-config.sh.in	2013-12-13 17:53:07.752918023 -0300
+@@ -0,0 +1,102 @@
++#!/bin/sh
++
++exit_with_usage ()
++{
++	echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--configdir"
++	exit $1
++}
++
++if [ "$1" = "" ] ; then
++	exit_with_usage 1
++fi
++
++# Returns the actual prefix where this script was installed to.
++installed_prefix ()
++{
++	RESULT=$(dirname $(cd $(dirname "$1") && pwd -P))
++	if which readlink >/dev/null 2>&1 ; then
++	RESULT=$(readlink -f "$RESULT")
++	fi
++	echo $RESULT
++}
++
++prefix_build="@prefix@"
++prefix_real=$(installed_prefix "$0")
++
++# Use sed to fix paths from their built to locations to their installed to locations.
++prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#")
++exec_prefix_build="@exec_prefix@"
++exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#")
++includedir=$(echo "@includedir@")
++libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#")
++CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#")
++VERSION="@VERSION@"
++LIBM="@LIBM@"
++LIBC="@LIBC@"
++SYSLIBS="$LIBM $LIBC"
++LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}"
++BASECFLAGS="@BASECFLAGS@"
++LDLIBRARY="@LDLIBRARY@"
++LINKFORSHARED="@LINKFORSHARED@"
++OPT="@OPT@"
++PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
++LDVERSION="@LDVERSION@"
++LIBDEST=${prefix}/lib/python${VERSION}
++LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
++SO="@SO@"
++PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
++INCDIR="-I$includedir/python${VERSION}"
++PLATINCDIR="-I$includedir/python${VERSION}"
++
++# Scan for --help or unknown argument.
++for ARG in $*
++do
++	case $ARG in
++	--help)
++		exit_with_usage 0
++	;;
++	--prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--abiflags|--configdir)
++	;;
++	*)
++		exit_with_usage 1
++	;;
++esac
++done
++
++for ARG in "$@"
++do
++	case "$ARG" in
++	--prefix)
++		echo "$prefix"
++	;;
++	--exec-prefix)
++		echo "$exec_prefix"
++	;;
++	--includes)
++		 echo "$INCDIR $PLATINCDIR"
++	;;
++	--cflags)
++		echo "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT"
++	;;
++	--libs)
++		echo "$LIBS"
++	;;
++	--ldflags)
++		LINKFORSHAREDUSED=
++		if [ -z "$PYTHONFRAMEWORK" ] ; then
++			LINKFORSHAREDUSED=$LINKFORSHARED
++		fi
++		LIBPLUSED=
++		if [ "$PY_ENABLE_SHARED" = "0" ] ; then
++			LIBPLUSED="-L$LIBPL"
++		fi
++		echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED"
++	;;
++	--extension-suffix)
++		echo "$SO"
++	;;
++	--configdir)
++		echo "$LIBPL"
++	;;
++esac
++done
Signature · 1 line
1.8.3.2
#2 lore raw

PATCH 2/4 heimdal: new package

In reply to Gustavo Zacarias

host-heimdal is required for samba 4.1.x since it can't (yet) link with an external heimdal implementation and can't cross-compile the internal tools.

---
 .../heimdal/heimdal-0001-add-roken-h-process.patch | 195 +++++++++++++++++++++
 package/heimdal/heimdal-0002-use-Getopt-Std.patch  |  30 ++++
 package/heimdal/heimdal-0003-vendor.patch          |  19 ++
 package/heimdal/heimdal-0004-compile_et.patch      |  28 +++
 package/heimdal/heimdal.mk                         |  30 ++++
 5 files changed, 302 insertions(+)
 create mode 100644 package/heimdal/heimdal-0001-add-roken-h-process.patch
 create mode 100644 package/heimdal/heimdal-0002-use-Getopt-Std.patch
 create mode 100644 package/heimdal/heimdal-0003-vendor.patch
 create mode 100644 package/heimdal/heimdal-0004-compile_et.patch
 create mode 100644 package/heimdal/heimdal.mk
package/heimdal/heimdal-0001-add-roken-h-process.patch new file +195 -0
new file mode 100644
index 0000000..b8fbd2a
@@ -0,0 +1,195 @@
+Add roken-h-process.pl from:
+https://raw.github.com/heimdal/heimdal/master/cf/roken-h-process.pl
+It's required for cross-compiling and missing from release tarballs:
+http://kerberos.996246.n3.nabble.com/Missing-roken-h-process-pl-when-cross-compiling-v1-5-2-td38806.html
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura heimdal-1.5.3.orig/cf/roken-h-process.pl heimdal-1.5.3/cf/roken-h-process.pl
+--- heimdal-1.5.3.orig/cf/roken-h-process.pl	1969-12-31 21:00:00.000000000 -0300
++++ heimdal-1.5.3/cf/roken-h-process.pl	2013-12-18 11:32:38.157625167 -0300
+@@ -0,0 +1,184 @@
++#!/usr/bin/perl
++
++require 'getopts.pl';
++
++my $debug = 0;
++
++Getopts('dc:p:o:') || die "foo";
++
++if ($opt_d) {
++    $debug = 1;
++}
++
++die "missing arg" if (!defined $opt_c || !defined $opt_p || !defined $opt_o);
++
++my %defines;
++my $IN;
++my $OUT;
++
++print "parse config.h\n" if ($debug);
++
++open IN, $opt_c || die "failed open ${opt_c}";
++
++my @nesting;
++
++push @nesting, 1;
++
++while (<IN>) {
++    if (m/\s*#ifdef\s+(.*)/) {
++	my $var = $1;
++	if (defined $defines{$var}) {
++	    push @nesting, 1;
++	} else {
++	    push @nesting, 0;
++	}
++	next;
++    } elsif (m/\s*#ifndef\s+(.*)/) {
++	my $var = $1;
++	if (defined $defines{$var}) {
++	    push @nesting, 0;
++	} else {
++	    push @nesting, 1;
++	}
++	next;
++    } elsif (m/\s*#else/) {
++	my $var = pop @nesting;
++	$var = !$var;
++	push @nesting, $var;
++	next;
++    } elsif ($nesting[$#nesting] and m/\s*#define\s+(\w+)\s+(\S+)/) {
++	my $res = $2;
++	$res = 1 if (!defined $res);
++	$defines{$1} = $res;
++    }
++}
++
++close IN;
++
++if ($debug) {
++    foreach my $i (keys %defines) {
++	print "k: $i v: $defines{$i}\n";
++    }
++}
++
++open IN, "$opt_p" || die "failed open ${opt_p}";
++open OUT, ">$opt_o" || die "failed open ${opt_o}";
++
++print "parse roken.h.in\n" if ($debug);
++
++print OUT "/* This is an OS dependent, generated file */\n";
++print OUT "\n";
++print OUT "\n";
++print OUT "#ifndef __ROKEN_H__\n";
++print OUT "#define __ROKEN_H__\n";
++print OUT "\n";
++
++ at nesting = (1);
++
++while (<IN>) {
++    if (m/\s*#ifdef\s+(.*)/) {
++	my $var = $1;
++	if (defined $defines{$var}) {
++	    push @nesting, 1;
++	} else {
++	    push @nesting, 0;
++	}
++	next;
++    } elsif (m/\s*#ifndef\s+(.*)/) {
++	my $var = $1;
++	if (defined $defines{$var}) {
++	    push @nesting, 0;
++	} else {
++	    push @nesting, 1;
++	}
++	next;
++    } elsif (m/\s*#if\s+(.*)/) {
++	my $res = parse_if($1);
++	print "line = $res: $1\n" if ($debug);
++	push @nesting, $res;
++	next;
++    } elsif (m/\s*#elif\s+(.*)/) {
++	my $res = pop @nesting;
++	if ($res gt 0) {
++	    $res = -1;
++	} else {
++	    my $res = parse_if($1);
++	}
++	push @nesting, $res;
++	next;
++    } elsif (m/\s*#else/) {
++	my $var = pop @nesting;
++	$var = !$var;
++	push @nesting, $var;
++	next;
++    } elsif (m/\s*#endif/) {
++	pop @nesting;
++	next;
++    }
++    print "line: $_\n"  if ($debug);
++    print "nesting dep $#{nesting}\n"  if ($debug);
++    my $i = 0, $t = 1;
++    while ($i le $#nesting) {
++	$t = 0 if ($nesting[$i] le 0);
++	print "nesting $i val $nesting[$i] -> $t\n" if ($debug);
++	$i++;
++    }
++    if ($t) {
++	print OUT;
++    }
++}
++
++print OUT "\n";
++print OUT "#endif /* __ROKEN_H__ */\n";
++
++
++close IN;
++
++exit 0;
++
++sub parse_if
++{
++    my ($neg, $var);
++
++    $_ = shift;
++
++    if (m/^\s*$/) {
++	print "end $_\n" if ($debug);
++	return 1;
++    } elsif (m/^([^&]+)\&\&(.*)$/) {
++	print "$1 and $2\n" if ($debug);
++	return parse_if($1) and parse_if($2);
++    } elsif (m/^\(([^&]+)\&\&(.*)$/) {
++	print "$1 and $2\n" if ($debug);
++	return parse_if($1) and parse_if($2);
++    } elsif (m/^([^\|]+)\|\|(.*)$/) {
++	print "$1 or $2\n" if ($debug);
++	return parse_if($1) or parse_if($2);
++    } elsif (m/^\s*(\!)?\s*defined\((\w+)\)/) {
++	($neg, $var) = ($1, $2);
++	print "def: ${neg}-defined(${var})\n" if ($debug);
++	my $res = defined $defines{$var};
++	if ($neg eq "!") {
++	    if ($res) {
++		$res = 0;
++	    } else {
++		$res = 1;
++	    }
++	}
++	print "res: $res\n" if ($debug);
++	return $res;
++    } elsif (m/^\s*(\!)?(\w+)/) {
++	($neg, $var) = ($1, $2);
++	print "var: $neg $var\n" if ($debug);
++	my $res;
++	if (defined $defines{$var}) {
++	    $res = $defines{$var};
++	} else {
++	    $res = 0;
++	}
++	$res = ! $res if ($neg =~ m/!/);
++	print "res: $res\n" if ($debug);
++	return $res;
++    }
++    die "failed parse: $_\n";
++}
package/heimdal/heimdal-0002-use-Getopt-Std.patch new file +30 -0
new file mode 100644
index 0000000..134b888
@@ -0,0 +1,30 @@
+From 6080c0b229c6e332d7dd609d9435ac9baeeea443 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <[email protected]>
+Date: Thu, 30 Jan 2014 16:33:02 -0300
+Subject: [PATCH] roken-h-process: use Getopt::Std, getopts.pl is deprecated
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+---
+ cf/roken-h-process.pl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cf/roken-h-process.pl b/cf/roken-h-process.pl
+index 153a35c..72d3bd3 100644
+--- a/cf/roken-h-process.pl
++++ b/cf/roken-h-process.pl
+@@ -1,10 +1,10 @@
+ #!/usr/bin/perl
+ 
+-require 'getopts.pl';
++use Getopt::Std;
+ 
+ my $debug = 0;
+ 
+-Getopts('dc:p:o:') || die "foo";
++getopts('dc:p:o:') || die "foo";
+ 
+ if ($opt_d) {
+     $debug = 1;
+-- 
+1.8.3.2
+
package/heimdal/heimdal-0003-vendor.patch new file +19 -0
new file mode 100644
index 0000000..1ccd629
@@ -0,0 +1,19 @@
+Add --vendor option to krb5-config, required by samba 4.
+Status: Backport from upstream git.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura heimdal-1.5.3.orig/tools/krb5-config.in heimdal-1.5.3.vendor/tools/krb5-config.in
+--- heimdal-1.5.3.orig/tools/krb5-config.in	2012-12-09 19:06:44.000000000 -0300
++++ heimdal-1.5.3.vendor/tools/krb5-config.in	2013-12-18 15:49:45.283986300 -0300
+@@ -50,6 +50,10 @@
+     do_usage=yes
+     usage_exit=0
+     ;;
++  --vendor)
++    echo "Heimdal";
++    exit 0
++    ;;
+   --version)
+     echo "@PACKAGE@ @VERSION@"
+     exit 0
package/heimdal/heimdal-0004-compile_et.patch new file +28 -0
new file mode 100644
index 0000000..6bdec6f
@@ -0,0 +1,28 @@
+Use compile_et from e2fsprogs rather than building the native and useless one
+from heimdal.
+
+Idea from:
+http://comments.gmane.org/gmane.comp.encryption.kerberos.heimdal.general/6572
+
+Status: Backport from upstream git.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura heimdal-1.5.3.orig/cf/check-compile-et.m4 heimdal-1.5.3.et/cf/check-compile-et.m4
+--- heimdal-1.5.3.orig/cf/check-compile-et.m4	2012-12-09 19:06:44.000000000 -0300
++++ heimdal-1.5.3.et/cf/check-compile-et.m4	2013-12-18 14:20:04.025925879 -0300
+@@ -3,12 +3,12 @@
+ dnl CHECK_COMPILE_ET
+ AC_DEFUN([CHECK_COMPILE_ET], [
+ 
+-AC_CHECK_PROG(COMPILE_ET, compile_et, [compile_et])
++AC_CHECK_PROG(COMPILE_ET, compile_et, [compile_et], [no])
+ 
+ krb_cv_compile_et="no"
+ krb_cv_com_err_need_r=""
+ krb_cv_compile_et_cross=no
+-if test "${COMPILE_ET}" = "compile_et"; then
++if test "$COMPILE_ET" != "no"; then
+ 
+ dnl We have compile_et.  Now let's see if it supports `prefix' and `index'.
+ AC_MSG_CHECKING(whether compile_et has the features we need)
package/heimdal/heimdal.mk new file +30 -0
new file mode 100644
index 0000000..c73b33e
@@ -0,0 +1,30 @@
+################################################################################
+#
+# heimdal
+#
+################################################################################
+
+HEIMDAL_VERSION = 1.5.3
+HEIMDAL_SITE = http://www.h5l.org/dist/src
+HEIMDAL_DEPENDENCIES = host-e2fsprogs host-pkgconf
+HEIMDAL_INSTALL_STAGING = YES
+# static because of -fPIC issues with e2fsprogs on x86_64 host
+HOST_HEIMDAL_CONF_OPT = --with-x=no --disable-shared --enable-static
+HOST_HEIMDAL_CONF_ENV = MAKEINFO=true
+HEIMDAL_MAKE = $(MAKE1)
+# For heimdal-0004-compile_et.patch
+HEIMDAL_AUTORECONF = YES
+HEIMDAL_LICENSE = BSD-3c
+HEIMDAL_LICENSE_FILES = LICENSE
+
+# We need asn1_compile in the PATH for samba4
+define HOST_HEIMDAL_MAKE_SYMLINK
+	ln -sf $(HOST_DIR)/usr/libexec/heimdal/asn1_compile \
+		$(HOST_DIR)/usr/bin/asn1_compile
+	ln -sf $(HOST_DIR)/usr/bin/compile_et \
+		$(HOST_DIR)/usr/libexec/heimdal/compile_et
+endef
+
+HOST_HEIMDAL_POST_INSTALL_HOOKS += HOST_HEIMDAL_MAKE_SYMLINK
+
+$(eval $(host-autotools-package))
Signature · 1 line
1.8.3.2
#3 lore raw

PATCH 3/4 samba: convert to choice package

In reply to Gustavo Zacarias

Convert the classic samba package to a choice and move it to samba3 in preparation for the samba4 package.

---
 package/samba/Config.in                            | 274 ++-------------------
 package/samba/samba.mk                             | 179 +-------------
 package/samba/{ => samba3}/Config.in               |  99 +++-----
 package/samba/{ => samba3}/S91smb                  |   0
 .../samba3-0001-fix-smbd-libs-avahi.patch}         |   0
 .../samba3-0002-getaddrinfo.patch}                 |   0
 package/samba/samba3/samba3.mk                     | 181 ++++++++++++++
 package/samba/{ => samba3}/simple.conf             |   0
 8 files changed, 240 insertions(+), 493 deletions(-)
 copy package/samba/{ => samba3}/Config.in (67%)
 rename package/samba/{ => samba3}/S91smb (100%)
 rename package/samba/{samba-fix-smbd-libs-avahi.patch => samba3/samba3-0001-fix-smbd-libs-avahi.patch} (100%)
 rename package/samba/{samba-getaddrinfo.patch => samba3/samba3-0002-getaddrinfo.patch} (100%)
 create mode 100644 package/samba/samba3/samba3.mk
 rename package/samba/{ => samba3}/simple.conf (100%)
package/samba/Config.in +18 -256
index 1469075..d11401f 100644
@@ -1,270 +1,32 @@
+comment "samba needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_SAMBA
 	bool "samba"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_POPT
 	help
-	  Provides print services to all manner of SMB/CIFS clients,
-	  including the numerous versions of Microsoft Windows
-	  operating systems.
-
-	  http://www.samba.org/
-
-	  NOTE: A complete Samba install takes over 50MB of space,
-		so choose only the components you need.
-
-comment "samba needs a toolchain w/ threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	  Provides secure, stable and fast file and print services
+	  for all clients using the SMB/CIFS protocol, such as all versions
+	  of DOS and Windows, OS/2, Linux and many others.
 
 if BR2_PACKAGE_SAMBA
 
-config BR2_PACKAGE_SAMBA_MAX_DEBUGLEVEL
-	int "Maximum level of compiled-in debug messages"
-	range -1 10000
-	default -1
-	help
-	  Define the level of compiled-in debug messages.
-	  This allows for big space savings, -1 being the lowest (none).
-
-config BR2_PACKAGE_SAMBA_LIBICONV
-	bool "extended encodings (libiconv)"
-	depends on !BR2_ENABLE_LOCALE
-	select BR2_PACKAGE_LIBICONV
-	help
-	  Include libiconv support for extended conversion of filename
-	  enconding. Samba has built-in support for UTF-8, ISO-8859-1
-	  and ASCII, so this is only required if you want to support
-	  other encodings.
-
-menu "Samba tools selection"
-
-config BR2_PACKAGE_SAMBA_EVENTLOGADM
-	bool "eventlogadm"
-	default y
-	help
-	  Write Eventlog records to a tdb or perform other eventlog functions
-
-config BR2_PACKAGE_SAMBA_FINDSMB
-	bool "findsmb"
-	default y
-	depends on BR2_PACKAGE_SAMBA_SMBCLIENT
-	depends on BR2_PACKAGE_SAMBA_NMBLOOKUP
-	depends on BR2_PACKAGE_PERL
-	help
-	  Script to browse network
-
-comment "findsmb       - disabled (requires nmblookup, smbclient and perl)"
-	depends on !BR2_PACKAGE_SAMBA_SMBCLIENT || !BR2_PACKAGE_SAMBA_NMBLOOKUP || !BR2_PACKAGE_PERL
-
-config BR2_PACKAGE_SAMBA_NET
-	bool "net"
-	default y
-	help
-	  Distributed SMB/CIFS Server Management Utility
-
-config BR2_PACKAGE_SAMBA_NMBD
-	bool "nmbd"
-	default y
-	help
-	  NetBIOS name server to provide NetBIOS over IP naming services
-	  to clients
-
-config BR2_PACKAGE_SAMBA_NMBLOOKUP
-	bool "nmblookup"
-	default y
-	help
-	  Query NetBIOS names and map them to IP addresses in a network
-	  using NetBIOS over TCP/IP queries
-
-config BR2_PACKAGE_SAMBA_NTLM_AUTH
-	bool "ntlm_auth"
-	default y
-	help
-	  Helper utility that authenticates users using NT/LM authentication
-
-config BR2_PACKAGE_SAMBA_PDBEDIT
-	bool "pdbedit"
-	default y
-	help
-	  Manage the SAM database (Database of Samba Users)
-
-config BR2_PACKAGE_SAMBA_PROFILES
-	bool "profiles"
-	default y
-	help
-	  Utility that reports and changes SIDs in Windows NT registry files
-
-config BR2_PACKAGE_SAMBA_RPCCLIENT
-	bool "rpcclient"
-	select BR2_PACKAGE_READLINE
-	default y
+choice
+	prompt "Samba version"
+	default BR2_PACKAGE_SAMBA3
 	help
-	  Tool for executing client side MS-RPC functions using RPC
-	  calls from a UNIX workstation.
+	  Select the desired samba version.
 
-config BR2_PACKAGE_SAMBA_SMBCACLS
-	bool "smbcacls"
-	default y
-	help
-	  Set or get ACLs on an NT file or directory names
-
-config BR2_PACKAGE_SAMBA_SMBCLIENT
-	bool "smbclient"
-	select BR2_PACKAGE_READLINE
-	default y
-	help
-	  ftp-like client to access SMB/CIFS resources on servers
-
-config BR2_PACKAGE_SAMBA_SMBCONTROL
-	bool "smbcontrol"
-	default y
-	help
-	  Send messages to smbd, nmbd or winbindd processes
-
-config BR2_PACKAGE_SAMBA_SMBCQUOTAS
-	bool "smbcquotas"
-	default y
-	help
-	  Set or get QUOTAs of NTFS 5 shares
-
-config BR2_PACKAGE_SAMBA_SMBD
-	bool "smbd"
-	default y
-	help
-	  The server daemon that provides filesharing and printing services
-
-config BR2_PACKAGE_SAMBA_SMBGET
-	bool "smbget"
-	default y
-	help
-	  wget-like utility for download files over SMB
-
-config BR2_PACKAGE_SAMBA_SMBLDBTOOLS
-	bool "smbldbtools"
-	default y
-	help
-	  ldbadd ldbdel ldbedit ldbmodify ldbrename ldbsearch tools
-
-config BR2_PACKAGE_SAMBA_SMBPASSWD
-	bool "smbpasswd"
-	default y
-	help
-	  Change a user's SMB passwd
-
-config BR2_PACKAGE_SAMBA_SMBSHARESEC
-	bool "smbsharesec"
-	default y
-	help
-	  Manipulate share permissions on SMB file shares
-
-config BR2_PACKAGE_SAMBA_SMBSPOOL
-	bool "smbspool"
-	default y
-	help
-	  Send a print file to an SMB printer
-
-config BR2_PACKAGE_SAMBA_SMBSTATUS
-	bool "smbstatus"
-	default y
-	help
-	  Report on current Samba connections
-
-config BR2_PACKAGE_SAMBA_SMBTREE
-	bool "smbtree"
-	default y
-	help
-	  A text based smb network browser
-
-config BR2_PACKAGE_SAMBA_SWAT
-	bool "swat"
-	default y
-	help
-	  Samba Web Administration Tool
-
-config BR2_PACKAGE_SAMBA_SMBTA_UTIL
-	bool "smbta-util"
-	default y
-	help
-	  Tool to ease the configuration of the vfs_smb_traffic_analyzer
-	  module regarding data encryption.
-
-config BR2_PACKAGE_SAMBA_SMBTAR
-	bool "smbtar"
-	default y
-	depends on BR2_PACKAGE_SAMBA_SMBCLIENT
-	help
-	  tar-like script that wraps smbclient
-
-comment "smbtar        - disabled (requires smbclient)"
-	depends on !BR2_PACKAGE_SAMBA_SMBCLIENT
-
-config BR2_PACKAGE_SAMBA_TDB
-	bool "tdb"
-	default y
-	help
-	  Tools to operate on the .tdb database files
-
-config BR2_PACKAGE_SAMBA_TESTPARM
-	bool "testparm"
-	default y
-	help
-	  Check an smb.conf configuration file for internal correctness
-
-config BR2_PACKAGE_SAMBA_WINBINDD
-	bool "winbindd"
-	default y
-	help
-	  Name Service Switch daemon for resolving names from NT servers
-
-config BR2_PACKAGE_SAMBA_WBINFO
-	bool "wbinfo"
-	default y
-	depends on BR2_PACKAGE_SAMBA_WINBINDD
-	help
-	  Query information from winbind daemon
-
-endmenu
-
-
-menu "Samba libraries selection"
-
-config BR2_PACKAGE_SAMBA_LIBSMBCLIENT
-	bool "libsmbclient"
-	help
-	  libsmbclient is a library toolset that permits applications
-	  to manipulate CIFS/SMB network resources using many of the
-	  standards POSIX functions available for manipulating local
-	  files.
-
-endmenu
-
-
-menu "Samba support selection"
-
-config BR2_PACKAGE_SAMBA_AVAHI
-	bool "support avahi"
-	default y
-	depends on BR2_PACKAGE_AVAHI_DAEMON
-	depends on BR2_USE_MMU # dbus
-	select BR2_PACKAGE_DBUS
-	help
-	  Include support for avahi
-
-comment "support avahi - disabled (requires avahi-daemon)"
-	depends on BR2_USE_MMU
-	depends on !BR2_PACKAGE_AVAHI_DAEMON
-
-config BR2_PACKAGE_SAMBA_GAMIN
-	bool "support gamin"
-	default y
-	depends on BR2_PACKAGE_GAMIN
+	config BR2_PACKAGE_SAMBA3
+	bool "3.6.x"
+	select BR2_PACKAGE_POPT
 	help
-	  Include support for gamin
+	  The well-tested legacy branch.
 
-comment "support gamin - disabled (requires gamin)"
-	depends on !BR2_PACKAGE_GAMIN
-
-endmenu
+endchoice
 
 endif
+
+source "package/samba/samba3/Config.in"
package/samba/samba.mk +1 -178

179 lines not on this page · raw message

package/samba/samba3/Config.in renamed from package/samba/Config.in +40 -59

280 lines not on this page · raw message

package/samba/samba3/S91smb renamed from package/samba/S91smb +0 -0
similarity index 100%
rename from package/samba/S91smb
rename to package/samba/samba3/S91smb
package/samba/samba3/samba3-0001-fix-smbd-libs-avahi.patch renamed from package/samba/samba-fix-smbd-libs-avahi.patch +0 -0
similarity index 100%
rename from package/samba/samba-fix-smbd-libs-avahi.patch
rename to package/samba/samba3/samba3-0001-fix-smbd-libs-avahi.patch
package/samba/samba3/samba3-0002-getaddrinfo.patch renamed from package/samba/samba-getaddrinfo.patch +0 -0
similarity index 100%
rename from package/samba/samba-getaddrinfo.patch
rename to package/samba/samba3/samba3-0002-getaddrinfo.patch
package/samba/samba3/samba3.mk new file +181 -0

181 lines not on this page · raw message

package/samba/samba3/simple.conf renamed from package/samba/simple.conf +0 -0
similarity index 100%
rename from package/samba/simple.conf
rename to package/samba/samba3/simple.conf
Signature · 1 line
1.8.3.2
#4 lore raw

PATCH 3/4 samba: convert to choice package

Hi Gustavo,

On Fri, Feb 7, 2014 at 9:52 PM, Gustavo Zacarias
<[email protected]> wrote:

[...]

Quoted 33 lines
package/samba/Config.in +7 -13
index 1469075..d11401f 100644
@@ -1,270 +1,32 @@
+comment "samba needs a toolchain w/ threads"
+       depends on BR2_USE_MMU
+       depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_SAMBA
        bool "samba"
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # fork()
-       select BR2_PACKAGE_POPT
        help
-         Provides print services to all manner of SMB/CIFS clients,
-         including the numerous versions of Microsoft Windows
-         operating systems.
-
-         http://www.samba.org/
-
-         NOTE: A complete Samba install takes over 50MB of space,
-               so choose only the components you need.
-
-comment "samba needs a toolchain w/ threads"
-       depends on BR2_USE_MMU
-       depends on !BR2_TOOLCHAIN_HAS_THREADS
+         Provides secure, stable and fast file and print services
+         for all clients using the SMB/CIFS protocol, such as all versions
+         of DOS and Windows, OS/2, Linux and many others.
 
 if BR2_PACKAGE_SAMBA
 

[...]

Quoted 8 lines
package/samba/Config.in +4 -2
+choice
+       prompt "Samba version"
+       default BR2_PACKAGE_SAMBA3
        help
-         Tool for executing client side MS-RPC functions using RPC
-         calls from a UNIX workstation.
+         Select the desired samba version.

[...]

package/samba/Config.in line 23

Quoted 2 lines
package/samba/Config.in +2 -0
+       config BR2_PACKAGE_SAMBA3
+       bool "3.6.x"

Indentation is weird here, no?

package/samba/Config.in line 30

Quoted 12 lines
package/samba/Config.in +3 -5
+       select BR2_PACKAGE_POPT
        help
-         Include support for gamin
+         The well-tested legacy branch.
 
-comment "support gamin - disabled (requires gamin)"
-       depends on !BR2_PACKAGE_GAMIN
-
-endmenu
+endchoice
 
 endif

Regards,

Signature · 1 line
Samuel
#5 lore raw

PATCH 3/4 samba: convert to choice package

In reply to Gustavo Zacarias
Quoted 4 lines · Gustavo Zacarias

Convert the classic samba package to a choice and move it to samba3 in preparation for the samba4 package.

I don't like this rename. Why not keep the old samba package and add
samba4 to it? If side-by-side installation is not possible, make samba4 depend on !samba, like is done for qt5.

If you do keep this rename, there are a few things you forgot:

- gvfs has a condition on BR2_PACKAGE_SAMBA_LIBSMBCLIENT;

- you need legacy options for all the samba suboptions.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#6 lore raw

PATCH 3/4 samba: convert to choice package

Arnout, Gustavo,

Quoted 9 lines · Arnout Vandecappelle
Quoted 4 lines · Gustavo Zacarias

Convert the classic samba package to a choice and move it to samba3 in preparation for the samba4 package.

I don't like this rename. Why not keep the old samba package and add
samba4 to it? If side-by-side installation is not possible, make samba4 depend on !samba, like is done for qt5.

Yes, I would also prefer to keep the Samba package named as it is today, and introduce Samba 4.x as a separate package, without touching the existing Samba 3.x support (except maybe changing the short description, and adding the depends on !samba as suggested by Arnout).

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#7 lore raw

PATCH 4/4 samba4: new package

In reply to Gustavo Zacarias
---
 package/samba/Config.in                            |  19 ++++
 package/samba/samba4/S91smb                        |  56 +++++++++++
 package/samba/samba4/arm-cache.txt                 |  65 ++++++++++++
 package/samba/samba4/powerpc-cache.txt             |  65 ++++++++++++
 ...-0001-build-don-t-execute-tests-summary.c.patch |  67 +++++++++++++
 ...ld-don-t-execute-statfs-and-f_fsid-checks.patch |  31 ++++++
 ...003-build-find-FILE_OFFSET_BITS-via-array.patch |  54 ++++++++++
 ...uild-allow-some-python-variable-overrides.patch |  45 +++++++++
 ...amba4-0005-builtin-heimdal-external-tools.patch |  42 ++++++++
 package/samba/samba4/samba4.mk                     | 111 +++++++++++++++++++++
 10 files changed, 555 insertions(+)
 create mode 100644 package/samba/samba4/S91smb
 create mode 100644 package/samba/samba4/arm-cache.txt
 create mode 100644 package/samba/samba4/powerpc-cache.txt
 create mode 100644 package/samba/samba4/samba4-0001-build-don-t-execute-tests-summary.c.patch
 create mode 100644 package/samba/samba4/samba4-0002-build-don-t-execute-statfs-and-f_fsid-checks.patch
 create mode 100644 package/samba/samba4/samba4-0003-build-find-FILE_OFFSET_BITS-via-array.patch
 create mode 100644 package/samba/samba4/samba4-0004-build-allow-some-python-variable-overrides.patch
 create mode 100644 package/samba/samba4/samba4-0005-builtin-heimdal-external-tools.patch
 create mode 100644 package/samba/samba4/samba4.mk
package/samba/Config.in +19 -0
index d11401f..e037dd9 100644
@@ -25,8 +25,27 @@ choice
 	help
 	  The well-tested legacy branch.
 
+	config BR2_PACKAGE_SAMBA4
+	bool "4.1.x"
+	depends on BR2_INET_IPV6
+	depends on BR2_USE_WCHAR # e2fsprogs
+	depends on BR2_LARGEFILE
+	# Supported architectures only limited by the cached answers
+	depends on BR2_arm || BR2_powerpc
+	select BR2_PACKAGE_E2FSPROGS
+	select BR2_PACKAGE_POPT
+	select BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_ZLIB
+	help
+	  The new branch with support for the SMB3 protocol.
+
 endchoice
 
 endif
 
 source "package/samba/samba3/Config.in"
+
+comment "samba4 needs a toolchain w/ IPv6, wchar, largfile, threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || \
+		!BR2_USE_WCHAR || !BR2_INET_IPV6
+	depends on BR2_USE_MMU
package/samba/samba4/S91smb new file +56 -0

56 lines not on this page · raw message

package/samba/samba4/arm-cache.txt new file +65 -0

65 lines not on this page · raw message

package/samba/samba4/powerpc-cache.txt new file +65 -0

65 lines not on this page · raw message

package/samba/samba4/samba4-0001-build-don-t-execute-tests-summary.c.patch new file +67 -0

67 lines not on this page · raw message

package/samba/samba4/samba4-0002-build-don-t-execute-statfs-and-f_fsid-checks.patch new file +31 -0
new file mode 100644
index 0000000..ea8ead8
@@ -0,0 +1,31 @@
+From 3c16a171c008b584ed427988dde73c1d9a9de4ad Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <[email protected]>
+Date: Mon, 20 Jan 2014 10:17:19 -0300
+Subject: [PATCH 2/3] 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 <[email protected]>
+---
+ source3/wscript | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/source3/wscript b/source3/wscript
+index 501707b..2d0a62e 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -468,8 +468,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/samba/samba4/samba4-0003-build-find-FILE_OFFSET_BITS-via-array.patch new file +54 -0

54 lines not on this page · raw message

package/samba/samba4/samba4-0004-build-allow-some-python-variable-overrides.patch new file +45 -0

45 lines not on this page · raw message

package/samba/samba4/samba4-0005-builtin-heimdal-external-tools.patch new file +42 -0

42 lines not on this page · raw message

package/samba/samba4/samba4.mk new file +111 -0

111 lines not on this page · raw message

Signature · 1 line
1.8.3.2
#8 lore raw

PATCH 4/4 samba4: new package

Hi Gustavo,

It would be great if you could repeat here some of the explanations about samba4 given in the cover letter, so they will appear in the commit log.

Quoted 28 lines · Gustavo Zacarias
---
 package/samba/Config.in                            |  19 ++++
 package/samba/samba4/S91smb                        |  56 +++++++++++
 package/samba/samba4/arm-cache.txt                 |  65 ++++++++++++
 package/samba/samba4/powerpc-cache.txt             |  65 ++++++++++++
 ...-0001-build-don-t-execute-tests-summary.c.patch |  67 +++++++++++++
 ...ld-don-t-execute-statfs-and-f_fsid-checks.patch |  31 ++++++
 ...003-build-find-FILE_OFFSET_BITS-via-array.patch |  54 ++++++++++
 ...uild-allow-some-python-variable-overrides.patch |  45 +++++++++
 ...amba4-0005-builtin-heimdal-external-tools.patch |  42 ++++++++
 package/samba/samba4/samba4.mk                     | 111 +++++++++++++++++++++
 10 files changed, 555 insertions(+)
 create mode 100644 package/samba/samba4/S91smb
 create mode 100644 package/samba/samba4/arm-cache.txt
 create mode 100644 package/samba/samba4/powerpc-cache.txt
 create mode 100644 package/samba/samba4/samba4-0001-build-don-t-execute-tests-summary.c.patch
 create mode 100644 package/samba/samba4/samba4-0002-build-don-t-execute-statfs-and-f_fsid-checks.patch
 create mode 100644 package/samba/samba4/samba4-0003-build-find-FILE_OFFSET_BITS-via-array.patch
 create mode 100644 package/samba/samba4/samba4-0004-build-allow-some-python-variable-overrides.patch
 create mode 100644 package/samba/samba4/samba4-0005-builtin-heimdal-external-tools.patch
 create mode 100644 package/samba/samba4/samba4.mk
package/samba/Config.in +0 -0
index d11401f..e037dd9 100644

package/samba/Config.in choice · line 29

Quoted 5 lines
package/samba/Config.in +2 -0
@@ -25,8 +25,27 @@ choice
        help
          The well-tested legacy branch.
 
+       config BR2_PACKAGE_SAMBA4
+       bool "4.1.x"

Indentation is weird here, no?

package/samba/Config.in choice · line 32

Quoted 3 lines
package/samba/Config.in +3 -0
+       depends on BR2_INET_IPV6
+       depends on BR2_USE_WCHAR # e2fsprogs
+       depends on BR2_LARGEFILE

Does not samba4 depend on !BR2_PREFER_STATIC_LIB too?
Last time I try to build/link statically a waf project (libtalloc which is under the
samba umbrella IIRC), it was impossible because of waf build-system. :-/

Quoted 9 lines
package/samba/Config.in +9 -0
+       # Supported architectures only limited by the cached answers
+       depends on BR2_arm || BR2_powerpc
+       select BR2_PACKAGE_E2FSPROGS
+       select BR2_PACKAGE_POPT
+       select BR2_PACKAGE_PYTHON
+       select BR2_PACKAGE_ZLIB
+       help
+         The new branch with support for the SMB3 protocol.
+

package/samba/Config.in choice · line 51

Quoted 10 lines
package/samba/Config.in +5 -0
 endchoice
 
 endif
 
 source "package/samba/samba3/Config.in"
+
+comment "samba4 needs a toolchain w/ IPv6, wchar, largfile, threads"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || \
+               !BR2_USE_WCHAR || !BR2_INET_IPV6
+       depends on BR2_USE_MMU

[...]

Regards,

Signature · 1 line
Samuel
#9 lore raw

PATCH 4/4 samba4: new package

On 02/07/2014 07:29 PM, Samuel Martin wrote:

Hi Samuel.

Quoted 1 line

Indentation is weird here, no?

D'oh, happened when juggling things around to make them look good in the menu itself. I'll fix it for V2.

Quoted 4 lines

Does not samba4 depend on !BR2_PREFER_STATIC_LIB too?
Last time I try to build/link statically a waf project (libtalloc which is under the
samba umbrella IIRC), it was impossible because of waf build-system. :-/

Frankly, i don't know, the build fails before in some of the deps (e2fsprogs like
http://autobuild.buildroot.net/results/284/284f2a161d110d4c561cf89c052ce531b4edc173/build-end.log)
libtalloc can be split out of samba, it's a separate project that both samba3 & 4 can use.
There are other bits that could be split out as well such as tdb and tevent, but since both samba versions can't live side by side and there aren't any other packages that use them it's not very useful at the moment. Regards.

#10 lore raw

cover Samba4 package

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 1 line · Gustavo Zacarias

This patchset adds a samba 4.1.x package to buildroot.

This is really great! Works well on ARM and on x86_64 with the appropriate cross answers file.

Thanks!

Signature · 1 line
Christophe Vu-Brugier
#11 lore raw

cover Samba4 package

Dear Christophe Vu-Brugier,

Quoted 5 lines · Christophe Vu-Brugier
Quoted 1 line · Gustavo Zacarias

This patchset adds a samba 4.1.x package to buildroot.

This is really great! Works well on ARM and on x86_64 with the appropriate cross answers file.

Can you share your cross answers file for x86-64 ? Gustavo patches only support ARM and PowerPC, so it would be great to also support x86-64.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#12 lore raw

cover Samba4 package

Dear Thomas,

Quoted 2 lines · Thomas Petazzoni

Can you share your cross answers file for x86-64 ? Gustavo patches only support ARM and PowerPC, so it would be great to also support x86-64.

I sent the patch to the list, but not as a reply to Gustavo Zacarias' patchset. The subject of the mail that contains the patch is:

[PATCH] samba4: add cross answers for x86_64

Best regards,

Signature · 1 line
Christophe Vu-Brugier
#13 lore raw

cover Samba4 package

Dear Christophe Vu-Brugier,

Quoted 8 lines · Christophe Vu-Brugier
Quoted 2 lines · Thomas Petazzoni

Can you share your cross answers file for x86-64 ? Gustavo patches only support ARM and PowerPC, so it would be great to also support x86-64.

I sent the patch to the list, but not as a reply to Gustavo Zacarias' patchset. The subject of the mail that contains the patch is:

[PATCH] samba4: add cross answers for x86_64

Yep, sorry. Seen your patch after sending mine. As usual, this is a problem with my somewhat FIFO policy when handling the backlog of
e-mail: I might make a comment that has already been fixed or addressed in a future version of the patch series.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#14 lore raw

cover Samba4 package

In reply to Christophe Vu-Brugier
Quoted 2 lines · Christophe Vu-Brugier

This is really great! Works well on ARM and on x86_64 with the appropriate cross answers file.

Thanks, i've sent a v2 patchset with some slight changes based on feedback. Since the samba4 directory moved you'll need to rebase the patch to enable x86_64 support, care to send an updated one?
Thanks!
Regards.