From patchwork Tue Jun 25 18:42:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 254288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 94E5A2C0040 for ; Wed, 26 Jun 2013 04:42:56 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B2E9010BC33; Tue, 25 Jun 2013 18:42:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UV+DUgxZTRx1; Tue, 25 Jun 2013 18:42:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B69D210BBA7; Tue, 25 Jun 2013 18:42:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5E7DA8F7A2 for ; Tue, 25 Jun 2013 18:42:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4264A88DB9 for ; Tue, 25 Jun 2013 18:42:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2cndMkmboCN3 for ; Tue, 25 Jun 2013 18:42:35 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9096E87B76 for ; Tue, 25 Jun 2013 18:42:35 +0000 (UTC) Received: from asgard (host17.190-139-225.telecom.net.ar [190.139.225.17]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.7/8.14.7) with ESMTP id r5PIgTCO019571 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 25 Jun 2013 18:42:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1372185753; bh=1mDTmFX4/yW7nACLmMogtgq77AZr4i3jJZ9hAJJC3Bg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EVlv3QYtg1fjb0LrajVu6kynGp20wpWZjQIYr+xnULIRJLOn8Rbffirjf0Oei/BtT lYjXEoITXeXmVJnH4orHys6CVu4Uwb8sQ5ZArYKN0+VVfWlmbmGEnLbZcjoiVQPe// cj657JJbOwwd/YUdGJbLC4YYBaId3rYyKy/i4dw0= Received: by asgard (sSMTP sendmail emulation); Tue, 25 Jun 2013 15:42:28 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Tue, 25 Jun 2013 15:42:20 -0300 Message-Id: <1372185740-28886-2-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1372185740-28886-1-git-send-email-gustavo@zacarias.com.ar> References: <1372185740-28886-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.7 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 2/2] samba: bump to version 3.6.16 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Gustavo Zacarias --- package/samba/samba-fix-smbd-libs-avahi.patch | 14 ++++++++------ package/samba/samba.mk | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package/samba/samba-fix-smbd-libs-avahi.patch b/package/samba/samba-fix-smbd-libs-avahi.patch index d6423de..6624f57 100644 --- a/package/samba/samba-fix-smbd-libs-avahi.patch +++ b/package/samba/samba-fix-smbd-libs-avahi.patch @@ -2,14 +2,16 @@ Expliticly link with -lpthread if smbd is compiled with avahi support. Otherwise the binary will fail to run. Signed-off-by: Sven Neumann ---- samba-3.5.6-orig/source3/Makefile.in 2010-10-07 18:41:16.000000000 +0200 -+++ samba-3.5.6/source3/Makefile.in 2010-10-27 14:52:40.000000000 +0200 -@@ -1552,7 +1552,7 @@ + +diff -Nura samba-3.6.16.orig/source3/Makefile.in samba-3.6.16/source3/Makefile.in +--- samba-3.6.16.orig/source3/Makefile.in 2013-06-21 08:12:39.995871935 -0300 ++++ samba-3.6.16/source3/Makefile.in 2013-06-21 08:13:17.778103805 -0300 +@@ -1783,7 +1783,7 @@ $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \ $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \ - $(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \ + $(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) \ - $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) + $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PTHREAD_LDFLAGS) - - bin/nmbd@EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) + + bin/nmbd@EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTEVENT) $(LIBTDB) $(LIBWBCLIENT) @echo Linking $@ diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 528e29c..fd90d96 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA_VERSION = 3.6.15 +SAMBA_VERSION = 3.6.16 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable SAMBA_SUBDIR = source3 SAMBA_INSTALL_STAGING = YES