Patchwork [1/2] samba: Add version 3.6.12

login
register
mail settings
Submitter Jacob Kjaergaard
Date March 19, 2013, 10:26 a.m.
Message ID <e9833226ba2ac984b3aca5df998adec75807f235.1363688761.git.jacob.kjaergaard@prevas.dk>
Download mbox | patch
Permalink /patch/228984/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

Jacob Kjaergaard - March 19, 2013, 10:26 a.m.
From: Jacob Kjaergaard <jacob.kjaergaard@prevas.dk>

---
 .../samba/samba-3.6.12/bug-8410-workaround.patch   |   15 +++++++++++++++
 recipes/samba/samba-3.6.12/config-h.patch          |   12 ++++++++++++
 recipes/samba/samba_3.6.12.oe                      |   13 +++++++++++++
 recipes/samba/samba_3.6.12.oe.sig                  |    1 +
 4 files changed, 41 insertions(+)
 create mode 100644 recipes/samba/samba-3.6.12/bug-8410-workaround.patch
 create mode 100644 recipes/samba/samba-3.6.12/config-h.patch
 create mode 100644 recipes/samba/samba_3.6.12.oe
 create mode 100644 recipes/samba/samba_3.6.12.oe.sig

Patch

diff --git a/recipes/samba/samba-3.6.12/bug-8410-workaround.patch b/recipes/samba/samba-3.6.12/bug-8410-workaround.patch
new file mode 100644
index 0000000..d8a9866
--- /dev/null
+++ b/recipes/samba/samba-3.6.12/bug-8410-workaround.patch
@@ -0,0 +1,15 @@ 
+diff -urN samba-3.6.9~orig/source3/configure samba-3.6.9/source3/configure
+--- samba-3.6.9~orig/source3/configure	2012-10-29 10:24:29.000000000 +0100
++++ samba-3.6.9/source3/configure	2012-11-01 14:53:52.421825646 +0100
+@@ -13270,10 +13270,7 @@
+ 	# see bug 5910, use our replacements if we detect
+ 	# a broken system.
+ 	if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
++$as_echo "assuming valid getaddrinfo without bug 5910" >&2
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
diff --git a/recipes/samba/samba-3.6.12/config-h.patch b/recipes/samba/samba-3.6.12/config-h.patch
new file mode 100644
index 0000000..eeb2268
--- /dev/null
+++ b/recipes/samba/samba-3.6.12/config-h.patch
@@ -0,0 +1,12 @@ 
+diff -urN source.old//include/config.h.in source//include/config.h.in
+--- source.old//include/config.h.in	2008-11-20 14:45:04.000000000 +0000
++++ source//include/config.h.in	2008-11-30 21:04:17.990008933 +0000
+@@ -2672,7 +2672,7 @@
+ #undef USE_SETEUID
+ 
+ /* Whether setresuid() is available */
+-#undef USE_SETRESUID
++#define USE_SETRESUID 1
+ 
+ /* Whether setreuid() is available */
+ #undef USE_SETREUID
diff --git a/recipes/samba/samba_3.6.12.oe b/recipes/samba/samba_3.6.12.oe
new file mode 100644
index 0000000..4aab398
--- /dev/null
+++ b/recipes/samba/samba_3.6.12.oe
@@ -0,0 +1,13 @@ 
+# -*- mode:python; -*-
+require samba.inc
+require samba-basic.inc
+LICENSE = "GPL-3.0+"
+S = "${SRCDIR}/samba-${PV}/source3"
+
+SRC_URI += "file://config-h.patch"
+
+# FIXME: need to figure out if we should add support for patchdir
+#SRC_URI += "file://tdbheaderfix.patch;patchdir=${SRCDIR}/samba-${PV}"
+
+## https://bugzilla.samba.org/show_bug.cgi?id=8410
+SRC_URI += "file://bug-8410-workaround.patch;striplevel=2"
diff --git a/recipes/samba/samba_3.6.12.oe.sig b/recipes/samba/samba_3.6.12.oe.sig
new file mode 100644
index 0000000..c124544
--- /dev/null
+++ b/recipes/samba/samba_3.6.12.oe.sig
@@ -0,0 +1 @@ 
+e32ed81bbfaf71a6f7fcc7e1fc7a7a49b41f8bd8  samba-3.6.12.tar.gz