jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 21:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

samba: update to samba-3.6.16

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-08-01 02:46:22 +02:00
parent a8e12d52fd
commit 8a13ef7efd
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/xbmc/package.mk
View File

@ -258,7 +258,7 @@ if [ "$SAMBA_SUPPORT" = yes ]; then
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET samba" PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET samba"
PKG_DEPENDS="$PKG_DEPENDS samba" PKG_DEPENDS="$PKG_DEPENDS samba"
XBMC_SAMBA="--enable-samba" XBMC_SAMBA="--enable-samba"
XBMC_LIBS="$XBMC_LIBS -ltalloc -ltdb -lwbclient" XBMC_LIBS="$XBMC_LIBS -ltalloc -ltdb -ltevent -lwbclient"
else else
XBMC_SAMBA="--disable-samba" XBMC_SAMBA="--disable-samba"
fi fi

2
packages/network/samba/build
View File

@ -116,6 +116,7 @@ samba_cv_have_setresuid=yes \
--without-acl-support \ --without-acl-support \
--without-aio-support \ --without-aio-support \
--with-sendfile-support \ --with-sendfile-support \
--without-libtevent \
--without-wbclient \ --without-wbclient \
--without-winbind \ --without-winbind \
--with-included-popt \ --with-included-popt \
@ -126,6 +127,7 @@ samba_cv_have_setresuid=yes \
make bin/libtalloc.a make bin/libtalloc.a
make bin/libwbclient.a make bin/libwbclient.a
make bin/libtdb.a make bin/libtdb.a
make bin/libtevent.a
make bin/libsmbclient.a make bin/libsmbclient.a
if [ "$SAMBA_SERVER" = "yes" ]; then if [ "$SAMBA_SERVER" = "yes" ]; then

25
packages/network/samba/patches/samba-110-multicall.patch
View File

@ -1,6 +1,7 @@
--- a/source3/Makefile.in diff -Naur samba-3.6.16/source3/Makefile.in samba-3.6.16.patch/source3/Makefile.in
+++ b/source3/Makefile.in --- samba-3.6.16/source3/Makefile.in 2013-06-19 09:35:24.000000000 +0200
@@ -73,20 +73,20 @@ LDAP_LIBS=@LDAP_LIBS@ +++ samba-3.6.16.patch/source3/Makefile.in 2013-08-01 01:53:43.264428180 +0200
@@ -73,22 +73,22 @@
NSCD_LIBS=@NSCD_LIBS@ NSCD_LIBS=@NSCD_LIBS@
UUID_LIBS=@UUID_LIBS@ UUID_LIBS=@UUID_LIBS@
LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@ LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
@ -14,6 +15,9 @@
LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@ LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@
-LIBTALLOC_LIBS=@LIBTALLOC_LIBS@ -LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
+LIBTALLOC_LIBS=@LIBTALLOC_STATIC@ +LIBTALLOC_LIBS=@LIBTALLOC_STATIC@
LIBTEVENT=@LIBTEVENT_STATIC@ @LIBTEVENT_SHARED@
-LIBTEVENT_LIBS=@LIBTEVENT_LIBS@
+LIBTEVENT_LIBS=@LIBTEVENT_STATIC@
LIBREPLACE_LIBS=@LIBREPLACE_LIBS@ LIBREPLACE_LIBS=@LIBREPLACE_LIBS@
LIBTDB=@LIBTDB_STATIC@ @LIBTDB_SHARED@ LIBTDB=@LIBTDB_STATIC@ @LIBTDB_SHARED@
-LIBTDB_LIBS=@LIBTDB_LIBS@ -LIBTDB_LIBS=@LIBTDB_LIBS@
@ -25,7 +29,7 @@
LIBSMBCLIENT_LIBS=@LIBSMBCLIENT_LIBS@ LIBSMBCLIENT_LIBS=@LIBSMBCLIENT_LIBS@
LIBSMBSHAREMODES_LIBS=@LIBSMBSHAREMODES_LIBS@ LIBSMBSHAREMODES_LIBS=@LIBSMBSHAREMODES_LIBS@
@@ -214,7 +214,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_P @@ -216,7 +216,7 @@
# Note that all executable programs now provide for an optional executable suffix. # Note that all executable programs now provide for an optional executable suffix.
@ -34,7 +38,7 @@
BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \ BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \
bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@ \ bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@ \
@@ -1774,6 +1774,42 @@ bin/.dummy: @@ -1777,6 +1777,42 @@
dir=bin $(MAKEDIR); fi dir=bin $(MAKEDIR); fi
@: >> $@ || : > $@ # what a fancy emoticon! @: >> $@ || : > $@ # what a fancy emoticon!
@ -66,19 +70,20 @@
+ +
+MULTICALL_O = $(sort $(SMBD_MULTI_O) $(NMBD_MULTI_O) $(SMBPASSWD_MULTI_O) $(MULTI_O)) +MULTICALL_O = $(sort $(SMBD_MULTI_O) $(NMBD_MULTI_O) $(SMBPASSWD_MULTI_O) $(MULTI_O))
+ +
+bin/samba_multicall@EXEEXT@: $(BINARY_PREREQS) $(MULTICALL_O) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@ +bin/samba_multicall@EXEEXT@: $(BINARY_PREREQS) $(MULTICALL_O) $(LIBTALLOC) $(LIBTEVENT) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
+ @echo Linking $@ + @echo Linking $@
+ @$(CC) -o $@ $(MULTICALL_O) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \ + @$(CC) -o $@ $(MULTICALL_O) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
+ $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \ + $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
+ $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_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)
+ +
bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@ bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) $(LIBTALLOC) $(LIBTEVENT) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
@echo Linking $@ @echo Linking $@
@$(CC) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \ @$(CC) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
--- /dev/null diff -Naur samba-3.6.16/source3/multi.c samba-3.6.16.patch/source3/multi.c
+++ b/source3/multi.c --- samba-3.6.16/source3/multi.c 1970-01-01 01:00:00.000000000 +0100
+++ samba-3.6.16.patch/source3/multi.c 2013-08-01 01:24:51.794393962 +0200
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
+#include <stdio.h> +#include <stdio.h>
+#include <string.h> +#include <string.h>