From patchwork Tue Jan 14 12:34:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 310679 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 093AF2C00AB for ; Tue, 14 Jan 2014 23:36:06 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 76E0140572 for ; Tue, 14 Jan 2014 13:36:05 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 6E5804053D for ; Tue, 14 Jan 2014 13:35:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=3309; q=dns/txt; s=ironport1; t=1389702906; x=1421238906; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Qj4mctATzTYnNUiWN8iu49qkcwSQIh4gHaJzeOVrlkw=; b=mnPNzEceY4gh0OtsD6RQmkhQInYdh9veXQPYkv55YrUBgKlDBfXFZtcW E6M/dJDTp27A3fv4JQT3inIMHA+dynBdFIJwL85KvVKfwLzVnkaHr6ZJf NXOeG3UpSJHRGCF9JQOxfJf/sCuzdiAq/zPdZTjIhZnJrOyUcxVYEGUXd A=; X-IronPort-AV: E=Sophos;i="4.95,658,1384297200"; d="scan'208";a="4300254" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 14 Jan 2014 13:35:05 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Tue, 14 Jan 2014 13:35:04 +0100 Received: by localhost (Postfix, from userid 30007) id 477206815EE; Tue, 14 Jan 2014 12:35:04 +0000 (UTC) From: To: Subject: [PATCH 119/131] samba: Remove version 3.6.12 Date: Tue, 14 Jan 2014 12:34:46 +0000 Message-ID: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Sørensen Signed-off-by: Christian Sørensen --- recipes/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 deletions(-) delete mode 100644 recipes/samba/samba-3.6.12/bug-8410-workaround.patch delete mode 100644 recipes/samba/samba-3.6.12/config-h.patch delete mode 100644 recipes/samba/samba_3.6.12.oe delete mode 100644 recipes/samba/samba_3.6.12.oe.sig diff --git a/recipes/samba/samba-3.6.12/bug-8410-workaround.patch b/recipes/samba/samba-3.6.12/bug-8410-workaround.patch deleted file mode 100644 index d8a9866..0000000 --- a/recipes/samba/samba-3.6.12/bug-8410-workaround.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index eeb2268..0000000 --- a/recipes/samba/samba-3.6.12/config-h.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 4aab398..0000000 --- a/recipes/samba/samba_3.6.12.oe +++ /dev/null @@ -1,13 +0,0 @@ -# -*- 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 deleted file mode 100644 index c124544..0000000 --- a/recipes/samba/samba_3.6.12.oe.sig +++ /dev/null @@ -1 +0,0 @@ -e32ed81bbfaf71a6f7fcc7e1fc7a7a49b41f8bd8 samba-3.6.12.tar.gz