mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-01 15:37:44 +00:00
samba: bump version
Closes #293. [peter: bump to 3.3.4] Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
163a062727
commit
a657cf77ea
@ -1,6 +1,6 @@
|
|||||||
--- a/source/client/mount.cifs.c
|
--- a/source/client/mount.cifs.c 2009-04-01 13:48:54.000000000 +0200
|
||||||
+++ b/source/client/mount.cifs.c
|
+++ b/source/client/mount.cifs.c 2009-04-20 12:59:57.000000000 +0200
|
||||||
@@ -96,6 +96,7 @@ char * prefixpath = NULL;
|
@@ -100,6 +100,7 @@
|
||||||
|
|
||||||
/* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We
|
/* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We
|
||||||
* don't link to libreplace so need them here. */
|
* don't link to libreplace so need them here. */
|
||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
/* like strncpy but does not 0 fill the buffer and always null
|
/* like strncpy but does not 0 fill the buffer and always null
|
||||||
* terminates. bufsize is the size of the destination buffer */
|
* terminates. bufsize is the size of the destination buffer */
|
||||||
@@ -177,6 +178,7 @@ static void mount_cifs_usage(void)
|
@@ -181,6 +182,7 @@
|
||||||
SAFE_FREE(mountpassword);
|
SAFE_FREE(mountpassword);
|
||||||
exit(EX_USAGE);
|
exit(EX_USAGE);
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/source/configure
|
--- a/source/configure 2009-04-01 14:19:36.000000000 +0200
|
||||||
+++ b/source/configure
|
+++ b/source/configure 2009-04-20 13:05:12.000000000 +0200
|
||||||
@@ -41016,85 +41016,8 @@ fi
|
@@ -44061,90 +44061,8 @@
|
||||||
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
|
||||||
@ -11,11 +11,13 @@
|
|||||||
- *linux*)
|
- *linux*)
|
||||||
- # glibc <= 2.3.2 has a broken getgrouplist
|
- # glibc <= 2.3.2 has a broken getgrouplist
|
||||||
- if test "$cross_compiling" = yes; then
|
- if test "$cross_compiling" = yes; then
|
||||||
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||||||
|
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
|
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
||||||
-See \`config.log' for more details." >&5
|
-See \`config.log' for more details." >&5
|
||||||
-echo "$as_me: error: cannot run test program while cross compiling
|
-$as_echo "$as_me: error: cannot run test program while cross compiling
|
||||||
-See \`config.log' for more details." >&2;}
|
-See \`config.log' for more details." >&2;}
|
||||||
- { (exit 1); exit 1; }; }
|
- { (exit 1); exit 1; }; }; }
|
||||||
-else
|
-else
|
||||||
- cat >conftest.$ac_ext <<_ACEOF
|
- cat >conftest.$ac_ext <<_ACEOF
|
||||||
-/* confdefs.h. */
|
-/* confdefs.h. */
|
||||||
@ -47,29 +49,32 @@
|
|||||||
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
- *) ac_try_echo=$ac_try;;
|
- *) ac_try_echo=$ac_try;;
|
||||||
-esac
|
-esac
|
||||||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||||
|
-$as_echo "$ac_try_echo") >&5
|
||||||
- (eval "$ac_link") 2>&5
|
- (eval "$ac_link") 2>&5
|
||||||
- ac_status=$?
|
- ac_status=$?
|
||||||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
||||||
- { (case "(($ac_try" in
|
- { (case "(($ac_try" in
|
||||||
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
- *) ac_try_echo=$ac_try;;
|
- *) ac_try_echo=$ac_try;;
|
||||||
-esac
|
-esac
|
||||||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||||
|
-$as_echo "$ac_try_echo") >&5
|
||||||
- (eval "$ac_try") 2>&5
|
- (eval "$ac_try") 2>&5
|
||||||
- ac_status=$?
|
- ac_status=$?
|
||||||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
- (exit $ac_status); }; }; then
|
- (exit $ac_status); }; }; then
|
||||||
- linux_getgrouplist_ok=yes
|
- linux_getgrouplist_ok=yes
|
||||||
-else
|
-else
|
||||||
- echo "$as_me: program exited with status $ac_status" >&5
|
- $as_echo "$as_me: program exited with status $ac_status" >&5
|
||||||
-echo "$as_me: failed program was:" >&5
|
-$as_echo "$as_me: failed program was:" >&5
|
||||||
-sed 's/^/| /' conftest.$ac_ext >&5
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
-
|
-
|
||||||
-( exit $ac_status )
|
-( exit $ac_status )
|
||||||
-linux_getgrouplist_ok=no
|
-linux_getgrouplist_ok=no
|
||||||
-fi
|
-fi
|
||||||
|
-rm -rf conftest.dSYM
|
||||||
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||||||
-fi
|
-fi
|
||||||
-
|
-
|
||||||
@ -88,7 +93,7 @@
|
|||||||
|
|
||||||
for ac_func in getgrouplist
|
for ac_func in getgrouplist
|
||||||
do
|
do
|
||||||
@@ -41189,8 +41112,6 @@ _ACEOF
|
@@ -44246,8 +44164,6 @@
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -1,27 +1,5 @@
|
|||||||
--- a/source/client/mount.cifs.c
|
--- a/source/client/mount.cifs.c
|
||||||
+++ b/source/client/mount.cifs.c
|
+++ b/source/client/mount.cifs.c
|
||||||
@@ -16,6 +16,10 @@
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
+#ifdef _SAMBA_BUILD_
|
|
||||||
+#include "include/config.h"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#ifndef _GNU_SOURCE
|
|
||||||
#define _GNU_SOURCE
|
|
||||||
#endif
|
|
||||||
@@ -57,10 +61,6 @@
|
|
||||||
#endif /* _SAMBA_BUILD_ */
|
|
||||||
#endif /* MOUNT_CIFS_VENDOR_SUFFIX */
|
|
||||||
|
|
||||||
-#ifdef _SAMBA_BUILD_
|
|
||||||
-#include "include/config.h"
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
#ifndef MS_MOVE
|
|
||||||
#define MS_MOVE 8192
|
|
||||||
#endif
|
|
||||||
@@ -138,6 +138,7 @@ static size_t strlcat(char *d, const cha
|
@@ -138,6 +138,7 @@ static size_t strlcat(char *d, const cha
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/source/configure.in
|
--- a/source/configure.in 2009-04-01 13:48:54.000000000 +0200
|
||||||
+++ b/source/configure.in
|
+++ b/source/configure.in 2009-04-20 13:08:42.000000000 +0200
|
||||||
@@ -1199,38 +1199,6 @@ AC_TRY_COMPILE([
|
@@ -1219,38 +1219,6 @@
|
||||||
AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[])
|
AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[])
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
# samba
|
# samba
|
||||||
#
|
#
|
||||||
#############################################################
|
#############################################################
|
||||||
SAMBA_VERSION:=3.2.7
|
SAMBA_VERSION:=3.3.4
|
||||||
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
|
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
|
||||||
SAMBA_SITE:=http://samba.org/samba/ftp/stable/
|
SAMBA_SITE:=http://samba.org/samba/ftp/stable/
|
||||||
SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source
|
SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source
|
||||||
|
Loading…
x
Reference in New Issue
Block a user