projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 464b525)
samba: bump to version 3.6.16
authorGustavo Zacarias <gustavo@zacarias.com.ar>
Tue, 25 Jun 2013 18:42:20 +0000 (15:42 -0300)
committerPeter Korsgaard <jacmet@sunsite.dk>
Thu, 27 Jun 2013 12:23:33 +0000 (14:23 +0200)
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/samba/samba-fix-smbd-libs-avahi.patch patch | blob | history
package/samba/samba.mk patch | blob | history

diff --git a/package/samba/samba-fix-smbd-libs-avahi.patch b/package/samba/samba-fix-smbd-libs-avahi.patch
index d6423def9aa7883852c1bc913f46d9cd1c54c930..6624f57f6c6121e2d7a7ee15f8ea32135ba4eee5 100644 (file)
--- 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 <s.neumann@raumfeld.com>
---- 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 528e29c81a0f9a89ba0894beea62efcc4a20ca1c..fd90d96d905e6a4daae429a32dac0f0a1ac2b15f 100644 (file)
--- 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