mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
samba:
- update to samba-3.4.5
This commit is contained in:
parent
2a9998c4ed
commit
a6d8041d9e
@ -5,13 +5,15 @@
|
||||
$SCRIPTS/build toolchain
|
||||
$SCRIPTS/build libiconv
|
||||
|
||||
export samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
|
||||
export samba_cv_USE_SETEUID=yes
|
||||
export samba_cv_HAVE_IFACE_IFCONF=yes
|
||||
export SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=no
|
||||
export samba_cv_have_longlong=yes
|
||||
#export samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
|
||||
#export samba_cv_USE_SETEUID=yes
|
||||
#export samba_cv_HAVE_IFACE_IFCONF=yes
|
||||
#export SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=no
|
||||
#export samba_cv_have_longlong=yes
|
||||
|
||||
cd $PKG_BUILD/source
|
||||
export samba_cv_CC_NEGATIVE_ENUM_VALUES=no
|
||||
|
||||
cd $PKG_BUILD/source3
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
@ -20,8 +22,7 @@ cd $PKG_BUILD/source
|
||||
--with-privatedir=/etc \
|
||||
--disable-pie \
|
||||
--disable-cups \
|
||||
--without-smbmount \
|
||||
--with-cifsmount \
|
||||
--without-cifsmount \
|
||||
--without-ldap \
|
||||
--without-winbind \
|
||||
--with-included-popt \
|
||||
@ -30,18 +31,20 @@ cd $PKG_BUILD/source
|
||||
--without-quotas \
|
||||
--without-sys-quotas \
|
||||
--with-syslog \
|
||||
--with-libiconv=$LIB_PREFIX \
|
||||
--with-libiconv=$SYSROOT_PREFIX/usr \
|
||||
|
||||
make include/proto.h
|
||||
make bin/mount.cifs \
|
||||
bin/smbtree \
|
||||
bin/libsmbclient.so
|
||||
[ "$SAMBA_SERVER" = yes ] && make \
|
||||
make bin/smbtree \
|
||||
bin/libsmbclient.so \
|
||||
bin/smbd
|
||||
|
||||
mkdir -p $SYSROOT_PREFIX/usr/lib
|
||||
cp bin/libsmbclient.so $SYSROOT_PREFIX/usr/lib
|
||||
cp -PR bin/libsmbclient.so* $SYSROOT_PREFIX/usr/lib
|
||||
cp -PR bin/libtalloc.so* $SYSROOT_PREFIX/usr/lib
|
||||
cp -PR bin/libtdb.so* $SYSROOT_PREFIX/usr/lib
|
||||
|
||||
mkdir -p $SYSROOT_PREFIX/usr/include
|
||||
cp include/libsmbclient.h $SYSROOT_PREFIX/usr/include
|
||||
cp include/libmsrpc.h $SYSROOT_PREFIX/usr/include
|
||||
#cp include/libmsrpc.h $SYSROOT_PREFIX/usr/include
|
||||
|
||||
mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
|
||||
cp pkgconfig/smbclient.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
|
||||
|
@ -7,15 +7,15 @@ $SCRIPTS/install libiconv
|
||||
PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp $PKG_BUILD/source/bin/libsmbclient.so $INSTALL/usr/lib/libsmbclient.so.0
|
||||
ln -s libsmbclient.so.0 $INSTALL/usr/lib/libsmbclient.so
|
||||
cp -PR $PKG_BUILD/source3/bin/libsmbclient.so* $INSTALL/usr/lib
|
||||
cp -PR $PKG_BUILD/source3/bin/libtalloc.so* $INSTALL/usr/lib
|
||||
cp -PR $PKG_BUILD/source3/bin/libtdb.so* $INSTALL/usr/lib
|
||||
|
||||
if [ "$SAMBA_SERVER" = yes ]; then
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/source/bin/smbd $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/source3/bin/smbd $INSTALL/usr/bin
|
||||
|
||||
mkdir -p $INSTALL/etc
|
||||
cp $PKG_DIR/config/smb.conf $INSTALL/etc/
|
||||
ln -sf /var/run/samba/secrets.tdb $INSTALL/etc/secrets.tdb
|
||||
|
||||
fi
|
||||
|
106518
packages/network/samba/patches/010_samba-3.4.5-crosscompile-0.1.diff
Normal file
106518
packages/network/samba/patches/010_samba-3.4.5-crosscompile-0.1.diff
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,71 +0,0 @@
|
||||
diff -Naur samba-3.0.25.orig/source/include/debug.h samba-3.0.25/source/include/debug.h
|
||||
--- samba-3.0.25.orig/source/include/debug.h 2007-05-17 12:28:16.000000000 +0200
|
||||
+++ samba-3.0.25/source/include/debug.h 2007-05-17 12:31:32.000000000 +0200
|
||||
@@ -162,54 +162,18 @@
|
||||
* will remove the extra conditional test.
|
||||
*/
|
||||
|
||||
-#define DEBUGLVL( level ) \
|
||||
- ( ((level) <= MAX_DEBUG_LEVEL) && \
|
||||
- ((DEBUGLEVEL_CLASS[ DBGC_CLASS ] >= (level))|| \
|
||||
- (!DEBUGLEVEL_CLASS_ISSET[ DBGC_CLASS ] && \
|
||||
- DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \
|
||||
- && dbghdr( level, __FILE__, FUNCTION_MACRO, (__LINE__) ) )
|
||||
-
|
||||
-
|
||||
-#define DEBUGLVLC( dbgc_class, level ) \
|
||||
- ( ((level) <= MAX_DEBUG_LEVEL) && \
|
||||
- ((DEBUGLEVEL_CLASS[ dbgc_class ] >= (level))|| \
|
||||
- (!DEBUGLEVEL_CLASS_ISSET[ dbgc_class ] && \
|
||||
- DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \
|
||||
- && dbghdr( level, __FILE__, FUNCTION_MACRO, (__LINE__) ) )
|
||||
-
|
||||
-
|
||||
-#define DEBUG( level, body ) \
|
||||
- (void)( ((level) <= MAX_DEBUG_LEVEL) && \
|
||||
- ((DEBUGLEVEL_CLASS[ DBGC_CLASS ] >= (level))|| \
|
||||
- (!DEBUGLEVEL_CLASS_ISSET[ DBGC_CLASS ] && \
|
||||
- DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \
|
||||
- && (dbghdr( level, __FILE__, FUNCTION_MACRO, (__LINE__) )) \
|
||||
- && (dbgtext body) )
|
||||
-
|
||||
-#define DEBUGC( dbgc_class, level, body ) \
|
||||
- (void)( ((level) <= MAX_DEBUG_LEVEL) && \
|
||||
- ((DEBUGLEVEL_CLASS[ dbgc_class ] >= (level))|| \
|
||||
- (!DEBUGLEVEL_CLASS_ISSET[ dbgc_class ] && \
|
||||
- DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \
|
||||
- && (dbghdr( level, __FILE__, FUNCTION_MACRO, (__LINE__) )) \
|
||||
- && (dbgtext body) )
|
||||
-
|
||||
-#define DEBUGADD( level, body ) \
|
||||
- (void)( ((level) <= MAX_DEBUG_LEVEL) && \
|
||||
- ((DEBUGLEVEL_CLASS[ DBGC_CLASS ] >= (level))|| \
|
||||
- (!DEBUGLEVEL_CLASS_ISSET[ DBGC_CLASS ] && \
|
||||
- DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \
|
||||
- && (dbgtext body) )
|
||||
-
|
||||
-#define DEBUGADDC( dbgc_class, level, body ) \
|
||||
- (void)( ((level) <= MAX_DEBUG_LEVEL) && \
|
||||
- ((DEBUGLEVEL_CLASS[ dbgc_class ] >= (level))|| \
|
||||
- (!DEBUGLEVEL_CLASS_ISSET[ dbgc_class ] && \
|
||||
- DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \
|
||||
- && (dbgtext body) )
|
||||
-
|
||||
-/* Print a separator to the debug log. */
|
||||
-#define DEBUGSEP(level)\
|
||||
- DEBUG((level),("===============================================================\n"))
|
||||
+#define DEBUGLVL( level ) (0)
|
||||
+
|
||||
+#define DEBUGLVLC( dbgc_class, level ) (0)
|
||||
+
|
||||
+#define DEBUG( level, body ) ((void)0)
|
||||
+
|
||||
+#define DEBUGC( dbgc_class, level, body ) ((void)0)
|
||||
+
|
||||
+#define DEBUGADD( level, body ) ((void)0)
|
||||
+
|
||||
+#define DEBUGADDC( dbgc_class, level, body ) ((void)0)
|
||||
+
|
||||
+#define DEBUGSEP( level ) ((void)0)
|
||||
|
||||
#endif
|
@ -1,12 +0,0 @@
|
||||
diff -Naur samba-3.0.25.orig/source/libsmb/clierror.c samba-3.0.25/source/libsmb/clierror.c
|
||||
--- samba-3.0.25.orig/source/libsmb/clierror.c 2007-05-17 12:28:16.000000000 +0200
|
||||
+++ samba-3.0.25/source/libsmb/clierror.c 2007-05-17 12:32:35.000000000 +0200
|
||||
@@ -159,7 +159,7 @@
|
||||
if (flgs2 & FLAGS2_32_BIT_ERROR_CODES) {
|
||||
NTSTATUS status = NT_STATUS(IVAL(cli->inbuf,smb_rcls));
|
||||
|
||||
- return nt_errstr(status);
|
||||
+ return "NT_STATUS_UNSUCCESSFUL";
|
||||
}
|
||||
|
||||
cli_dos_error(cli, &errclass, &errnum);
|
@ -1,16 +0,0 @@
|
||||
diff -Naur samba-3.0.20.orig/source/configure samba-3.0.20/source/configure
|
||||
--- samba-3.0.20.orig/source/configure 2005-08-19 22:09:01.000000000 +0300
|
||||
+++ samba-3.0.20/source/configure 2005-08-23 13:51:06.000000000 +0300
|
||||
@@ -18731,11 +18731,7 @@
|
||||
*linux*)
|
||||
# glibc <= 2.3.2 has a broken getgrouplist
|
||||
if test "$cross_compiling" = yes; then
|
||||
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
||||
-See \`config.log' for more details." >&5
|
||||
-echo "$as_me: error: cannot run test program while cross compiling
|
||||
-See \`config.log' for more details." >&2;}
|
||||
- { (exit 1); exit 1; }; }
|
||||
+ linux_getgrouplist_ok=no
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
@ -1,73 +0,0 @@
|
||||
diff -Naur samba-3.0.28a/source/utils/smbtree.c samba-3.0.28a.edit/source/utils/smbtree.c
|
||||
--- samba-3.0.28a/source/utils/smbtree.c 2008-04-05 16:11:02.000000000 +0200
|
||||
+++ samba-3.0.28a.edit/source/utils/smbtree.c 2008-04-05 16:10:17.000000000 +0200
|
||||
@@ -181,16 +181,18 @@
|
||||
}
|
||||
|
||||
|
||||
-static BOOL get_shares(char *server_name, struct user_auth_info *user_info)
|
||||
+static BOOL get_shares(char *server_name, struct in_addr *server_ip, struct user_auth_info *user_info)
|
||||
{
|
||||
struct cli_state *cli;
|
||||
|
||||
if (!(cli = get_ipc_connect(server_name, NULL, user_info)))
|
||||
return False;
|
||||
|
||||
+ *server_ip = cli->dest_ip;
|
||||
+
|
||||
if (get_rpc_shares(cli, add_name, &shares))
|
||||
return True;
|
||||
-
|
||||
+
|
||||
if (!cli_RNetShareEnum(cli, add_name, &shares))
|
||||
return False;
|
||||
|
||||
@@ -200,7 +202,8 @@
|
||||
static BOOL print_tree(struct user_auth_info *user_info)
|
||||
{
|
||||
struct name_list *wg, *sv, *sh;
|
||||
-
|
||||
+ struct in_addr server_ip;
|
||||
+
|
||||
/* List workgroups */
|
||||
|
||||
if (!get_workgroups(user_info))
|
||||
@@ -208,8 +211,6 @@
|
||||
|
||||
for (wg = workgroups; wg; wg = wg->next) {
|
||||
|
||||
- printf("%s\n", wg->name);
|
||||
-
|
||||
/* List servers */
|
||||
|
||||
free_name_list(servers);
|
||||
@@ -221,21 +222,23 @@
|
||||
|
||||
for (sv = servers; sv; sv = sv->next) {
|
||||
|
||||
- printf("\t\\\\%-15s\t\t%s\n",
|
||||
- sv->name, sv->comment);
|
||||
-
|
||||
/* List shares */
|
||||
|
||||
free_name_list(shares);
|
||||
shares = NULL;
|
||||
|
||||
if (level == LEV_SERVER ||
|
||||
- !get_shares(sv->name, user_info))
|
||||
+ !get_shares(sv->name, &server_ip, user_info))
|
||||
continue;
|
||||
|
||||
for (sh = shares; sh; sh = sh->next) {
|
||||
- printf("\t\t\\\\%s\\%-15s\t%s\n",
|
||||
- sv->name, sh->name, sh->comment);
|
||||
+ if (sh->server_type == STYPE_DISKTREE &&
|
||||
+ sh->name[strlen(sh->name)-1] != '$') {
|
||||
+ printf("%s/%s/%s\n",
|
||||
+ sv->name, inet_ntoa(server_ip),
|
||||
+ sh->name);
|
||||
+ fflush(stdout);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,17 +0,0 @@
|
||||
--- SAMBA_3_2/source/modules/vfs_default.c (revision 23961)
|
||||
+++ SAMBA_3_2/source/modules/vfs_default.c (revision 23962)
|
||||
@@ -826,10 +826,11 @@
|
||||
|
||||
START_PROFILE(syscall_linux_setlease);
|
||||
|
||||
-#ifdef LINUX
|
||||
+#ifdef HAVE_KERNEL_OPLOCKS_LINUX
|
||||
/* first set the signal handler */
|
||||
- if(linux_set_lease_sighandler(fd) == -1)
|
||||
+ if(linux_set_lease_sighandler(fd) == -1) {
|
||||
return -1;
|
||||
+ }
|
||||
|
||||
result = linux_setlease(fd, leasetype);
|
||||
#else
|
||||
|
@ -1,6 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options
|
||||
|
||||
$SCRIPTS/fixconfigtools $PKG_BUILD/source
|
||||
mkdir "`ls -d $PKG_BUILD/source`/bin"
|
@ -1 +1 @@
|
||||
http://us1.samba.org/samba/ftp/stable/samba-3.0.33.tar.gz
|
||||
http://samba.org/samba/ftp/stable/samba-3.4.5.tar.gz
|
Loading…
x
Reference in New Issue
Block a user