summaryrefslogtreecommitdiff
path: root/packages/samba
diff options
context:
space:
mode:
Diffstat (limited to 'packages/samba')
-rw-r--r--packages/samba/files/Managing-Samba.txt40
-rw-r--r--packages/samba/files/cifs.patch10
-rw-r--r--packages/samba/files/config-h.patch12
-rw-r--r--packages/samba/files/config-lfs.patch47
-rw-r--r--packages/samba/files/configure-3.2.8.patch92
-rw-r--r--packages/samba/files/configure-3.3.0.patch85
-rw-r--r--packages/samba/files/configure.patch179
-rw-r--r--packages/samba/files/init58
-rw-r--r--packages/samba/files/init-essential68
-rw-r--r--packages/samba/files/mtab.patch11
-rw-r--r--packages/samba/files/quota.patch11
-rw-r--r--packages/samba/files/smb-essential-inactive.conf34
-rw-r--r--packages/samba/files/smb-essential.conf82
-rw-r--r--packages/samba/files/smb.conf266
-rw-r--r--packages/samba/files/volatiles.03_samba2
-rw-r--r--packages/samba/samba-3.0.23c/configure.patch170
-rw-r--r--packages/samba/samba-3.0.34/configure.patch213
-rw-r--r--packages/samba/samba-3.0.34/uclibc-strlcpy-strlcat.patch46
-rw-r--r--packages/samba/samba-ads-3.3.0/wbstatic.patch194
-rw-r--r--packages/samba/samba-ads.inc38
-rw-r--r--packages/samba/samba-ads_3.2.8.bb10
-rw-r--r--packages/samba/samba-ads_3.3.0.bb15
-rw-r--r--packages/samba/samba-basic.inc24
-rw-r--r--packages/samba/samba-essential.inc42
-rw-r--r--packages/samba/samba-essential_3.0.20.bb71
-rw-r--r--packages/samba/samba.inc86
-rw-r--r--packages/samba/samba_3.0.23c.bb27
-rw-r--r--packages/samba/samba_3.0.34.bb25
-rw-r--r--packages/samba/samba_3.2.8.bb24
-rw-r--r--packages/samba/samba_3.3.0.bb34
30 files changed, 0 insertions, 2016 deletions
diff --git a/packages/samba/files/Managing-Samba.txt b/packages/samba/files/Managing-Samba.txt
deleted file mode 100644
index 01f7592824..0000000000
--- a/packages/samba/files/Managing-Samba.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-This device is running a bare-bone Samba server which allows easy
-transfer of files and directories between any networked desktop PC and
-your networked PDA.
-
-Since it is generally a bad idea to allow everyone read and write access
-to your PDA, you will have to configure at least one user to get access to
-any shared folder.
-
-How to create a Samba user with password:
-
-- If you haven't already created a non-root user, do so now:
- root@poodle:/usr/bin# adduser testuser
- Changing password for testuser
- Enter the new password (minimum of 5, maximum of 8 characters)
- Please use a combination of upper and lower case letters and numbers.
- Enter new password:
- Bad password: too short.
-
- Warning: weak password (continuing).
- Re-enter new password:
- Password changed.
- root@poodle:/usr/bin#
-
-- Note that the password you entered will _not_ be your samba password.
- Samba uses its own password database.
-
-- Add a Samba password for your user:
- root@poodle:/usr/bin# smbpasswd -a testuser
- New SMB password:
- Retype new SMB password:
- Added user testuser.
- root@poodle:/usr/bin#
-
-- After you have added your new samba user, you'll have to restart the samba
- server by running "/etc/init.d/samba restart" or by rebooting the device
-
-- Use the newly created username / password combination to access your network
- shares. Please note the the Samba username must also exist as a unix username!
-
-
diff --git a/packages/samba/files/cifs.patch b/packages/samba/files/cifs.patch
deleted file mode 100644
index ee6dab567f..0000000000
--- a/packages/samba/files/cifs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- source/client/mount.cifs.c.old 2004-11-28 02:33:52.000000000 +1030
-+++ source/client/mount.cifs.c 2004-11-28 02:33:59.000000000 +1030
-@@ -36,6 +36,7 @@
- #include <string.h>
- #include <mntent.h>
- #include <fcntl.h>
-+#include <linux/limits.h>
-
- #define MOUNT_CIFS_VERSION_MAJOR "1"
- #define MOUNT_CIFS_VERSION_MINOR "2"
diff --git a/packages/samba/files/config-h.patch b/packages/samba/files/config-h.patch
deleted file mode 100644
index eeb22684ee..0000000000
--- a/packages/samba/files/config-h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN source.old//include/config.h.in source//include/config.h.in
---- source.old//include/config.h.in 2008-11-20 14:45:04.000000000 +0000
-+++ source//include/config.h.in 2008-11-30 21:04:17.990008933 +0000
-@@ -2672,7 +2672,7 @@
- #undef USE_SETEUID
-
- /* Whether setresuid() is available */
--#undef USE_SETRESUID
-+#define USE_SETRESUID 1
-
- /* Whether setreuid() is available */
- #undef USE_SETREUID
diff --git a/packages/samba/files/config-lfs.patch b/packages/samba/files/config-lfs.patch
deleted file mode 100644
index b37ed690ce..0000000000
--- a/packages/samba/files/config-lfs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Cache the check for Linux LFS support, so it can be prepopulated from
-the site cache for configure variables for cross-compiling. Without this,
-samba gets the idea that it can use dirent64 and friends without defining
-the flags it needs to get it, such as _GNU_SOURCE and _LARGEFILE64_SOURCE.
-
-Symptoms of getting the configuration wrong on cross-compile inculde
-warnings such as
-
- smbd/trans2.c: In function `get_lanman2_dir_entry':
- smbd/trans2.c:1065: warning: right shift count >= width of type
-
-and errors like
-
- smbd/vfs.c:630: error: dereferencing pointer to incomplete type
-
-(when trying to dereference dirent64.)
-
---- source/configure.in.orig 2005-05-29 14:46:18.000000000 -0700
-+++ source/configure.in 2005-05-29 14:51:57.000000000 -0700
-@@ -588,7 +588,7 @@
- # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
- #
- *linux*)
-- AC_MSG_CHECKING([for LFS support])
-+ AC_CACHE_CHECK([for LFS support], samba_cv_LINUX_LFS_SUPPORT,[
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
- AC_TRY_RUN([
-@@ -627,15 +627,14 @@
- exit(1);
- #endif
- }
--], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross])
-- CPPFLAGS="$old_CPPFLAGS"
-- if test x$LINUX_LFS_SUPPORT = xyes ; then
-+], [samba_cv_LINUX_LFS_SUPPORT=yes], [samba_cv_LINUX_LFS_SUPPORT=no], [samba_cv_LINUX_LFS_SUPPORT=cross])
-+ CPPFLAGS="$old_CPPFLAGS"])
-+ if test x"$samba_cv_LINUX_LFS_SUPPORT" = x"yes" ; then
- CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
- AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
- AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
- AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions])
- fi
-- AC_MSG_RESULT([$LINUX_LFS_SUPPORT])
- ;;
-
- #
diff --git a/packages/samba/files/configure-3.2.8.patch b/packages/samba/files/configure-3.2.8.patch
deleted file mode 100644
index 2668b9d632..0000000000
--- a/packages/samba/files/configure-3.2.8.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -urN source.old//configure source//configure
---- source.old//configure 2009-02-03 16:34:41.000000000 +0000
-+++ source//configure 2009-02-06 00:25:49.502205687 +0000
-@@ -43860,13 +43860,14 @@
- *linux*)
- # glibc <= 2.3.2 has a broken getgrouplist
- if test "$cross_compiling" = yes; then
-- { { $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
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+# { { $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
-+#$as_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. */
-diff -urN source.old//configure.in source//configure.in
---- source.old//configure.in 2009-02-03 16:10:07.000000000 +0000
-+++ source//configure.in 2009-02-06 00:23:27.346211236 +0000
-@@ -275,6 +275,8 @@
- fi
- AC_SUBST(BROKEN_CC)
-
-+AC_TRY_COMPILE([],[(void)sizeof(char[-1])],AC_MSG_ERROR([configure's compilation assert doesn't work with $CC]))
-+
- dnl Check if the C compiler understands -Werror
- AC_CACHE_CHECK([that the C compiler understands -Werror],samba_cv_HAVE_Werror, [
- AC_TRY_RUN_STRICT([
-@@ -325,25 +327,11 @@
- # a runtime test is needed here
- AC_SUBST(PIDL_ARGS)
- AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_CC_NEGATIVE_ENUM_VALUES, [
-- AC_TRY_RUN(
-+ AC_TRY_COMPILE([],
- [
-- #include <stdio.h>
- enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
-- int main(void) {
-- enum negative_values v1 = NEGATIVE_VALUE;
-- unsigned v2 = NEGATIVE_VALUE;
--
-- if (v1 != 0xFFFFFFFF) {
-- printf("%u != 0xFFFFFFFF\n", v1);
-- return 1;
-- }
-- if (v2 != 0xFFFFFFFF) {
-- printf("%u != 0xFFFFFFFF\n", v2);
-- return 1;
-- }
--
-- return 0;
-- }
-+ (void)sizeof(char[1-2*( (unsigned)NEGATIVE_VALUE != 0xFFFFFFFF)]);
-+ (void)sizeof(char[1-2*((enum negative_values)NEGATIVE_VALUE != 0xFFFFFFFF)]);
- ],
- samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv__CC_NEGATIVE_ENUM_VALUES=no)])
- if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
-@@ -1204,22 +1192,12 @@
- case "$host_os" in
- *linux*)
- # glibc <= 2.3.2 has a broken getgrouplist
-- AC_TRY_RUN([
--#include <unistd.h>
-+ AC_TRY_COMPILE([
- #include <sys/utsname.h>
--main() {
-- /* glibc up to 2.3 has a broken getgrouplist */
-+],[
- #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-- int libc_major = __GLIBC__;
-- int libc_minor = __GLIBC_MINOR__;
--
-- if (libc_major < 2)
-- exit(1);
-- if ((libc_major == 2) && (libc_minor <= 3))
-- exit(1);
-+ (void)sizeof(char[1-2*(__GLIBC__ < 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)]);
- #endif
-- exit(0);
--}
- ], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
- if test x"$linux_getgrouplist_ok" = x"yes"; then
- AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
diff --git a/packages/samba/files/configure-3.3.0.patch b/packages/samba/files/configure-3.3.0.patch
deleted file mode 100644
index 19fb9864da..0000000000
--- a/packages/samba/files/configure-3.3.0.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -urN source.old//configure source//configure
---- source.old//configure 2009-01-27 07:53:11.000000000 +0000
-+++ source//configure 2009-01-31 21:07:25.811887936 +0000
-@@ -43860,13 +43860,7 @@
- *linux*)
- # glibc <= 2.3.2 has a broken getgrouplist
- if test "$cross_compiling" = yes; then
-- { { $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
--$as_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. */
-diff -urN source.old//configure.in source//configure.in
---- source.old//configure.in 2009-01-26 13:56:34.000000000 +0000
-+++ source//configure.in 2009-01-31 21:04:39.051889949 +0000
-@@ -280,6 +280,8 @@
- fi
- AC_SUBST(BROKEN_CC)
-
-+AC_TRY_COMPILE([],[(void)sizeof(char[-1])],AC_MSG_ERROR([configure's compilation assert doesn't work with $CC]))
-+
- dnl Check if the C compiler understands -Werror
- AC_CACHE_CHECK([that the C compiler understands -Werror],samba_cv_HAVE_Werror, [
- AC_TRY_RUN_STRICT([
-@@ -330,25 +332,11 @@
- # a runtime test is needed here
- AC_SUBST(PIDL_ARGS)
- AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_CC_NEGATIVE_ENUM_VALUES, [
-- AC_TRY_RUN(
-+ AC_TRY_COMPILE([],
- [
-- #include <stdio.h>
- enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
-- int main(void) {
-- enum negative_values v1 = NEGATIVE_VALUE;
-- unsigned v2 = NEGATIVE_VALUE;
--
-- if (v1 != 0xFFFFFFFF) {
-- printf("%u != 0xFFFFFFFF\n", v1);
-- return 1;
-- }
-- if (v2 != 0xFFFFFFFF) {
-- printf("%u != 0xFFFFFFFF\n", v2);
-- return 1;
-- }
--
-- return 0;
-- }
-+ (void)sizeof(char[1-2*( (unsigned)NEGATIVE_VALUE != 0xFFFFFFFF)]);
-+ (void)sizeof(char[1-2*((enum negative_values)NEGATIVE_VALUE != 0xFFFFFFFF)]);
- ],
- samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv__CC_NEGATIVE_ENUM_VALUES=no)])
- if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
-@@ -1224,22 +1212,12 @@
- case "$host_os" in
- *linux*)
- # glibc <= 2.3.2 has a broken getgrouplist
-- AC_TRY_RUN([
--#include <unistd.h>
-+ AC_TRY_COMPILE([
- #include <sys/utsname.h>
--main() {
-- /* glibc up to 2.3 has a broken getgrouplist */
-+],[
- #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-- int libc_major = __GLIBC__;
-- int libc_minor = __GLIBC_MINOR__;
--
-- if (libc_major < 2)
-- exit(1);
-- if ((libc_major == 2) && (libc_minor <= 3))
-- exit(1);
-+ (void)sizeof(char[1-2*(__GLIBC__ < 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)]);
- #endif
-- exit(0);
--}
- ], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
- if test x"$linux_getgrouplist_ok" = x"yes"; then
- AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
diff --git a/packages/samba/files/configure.patch b/packages/samba/files/configure.patch
deleted file mode 100644
index b7ba287795..0000000000
--- a/packages/samba/files/configure.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- source/configure.in~configure 2003-12-14 22:36:25.000000000 -0500
-+++ source/configure.in 2004-01-26 14:33:15.000000000 -0500
-@@ -959,7 +959,7 @@
- #endif
- exit(0);
- }
--], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
-+], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no], [linux_getgrouplist_ok=cross])
- if test x"$linux_getgrouplist_ok" = x"yes"; then
- AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
- fi
---- source/aclocal.m4~configure 2004-01-26 14:33:15.000000000 -0500
-+++ source/aclocal.m4 2004-01-26 17:34:28.000000000 -0500
-@@ -2,7 +2,7 @@
- dnl if the cache file is inconsistent with the current host,
- dnl target and build system types, execute CMD or print a default
- dnl error message.
--AC_DEFUN(AC_VALIDATE_CACHE_SYSTEM_TYPE, [
-+AC_DEFUN([AC_VALIDATE_CACHE_SYSTEM_TYPE], [
- AC_REQUIRE([AC_CANONICAL_SYSTEM])
- AC_MSG_CHECKING([config.cache system type])
- if { test x"${ac_cv_host_system_type+set}" = x"set" &&
-@@ -24,7 +24,7 @@
-
-
- dnl test whether dirent has a d_off member
--AC_DEFUN(AC_DIRENT_D_OFF,
-+AC_DEFUN([AC_DIRENT_D_OFF],
- [AC_CACHE_CHECK([for d_off in dirent], ac_cv_dirent_d_off,
- [AC_TRY_COMPILE([
- #include <unistd.h>
-@@ -38,7 +38,7 @@
-
- dnl Mark specified module as shared
- dnl SMB_MODULE(name,static_files,shared_files,subsystem,whatif-static,whatif-shared)
--AC_DEFUN(SMB_MODULE,
-+AC_DEFUN([SMB_MODULE],
- [
- AC_MSG_CHECKING([how to build $1])
- if test "$[MODULE_][$1]"; then
-@@ -68,7 +68,7 @@
- fi
- ])
-
--AC_DEFUN(SMB_SUBSYSTEM,
-+AC_DEFUN([SMB_SUBSYSTEM],
- [
- AC_SUBST($1_STATIC)
- AC_SUBST($1_MODULES)
-@@ -77,7 +77,7 @@
- ])
-
- dnl AC_PROG_CC_FLAG(flag)
--AC_DEFUN(AC_PROG_CC_FLAG,
-+AC_DEFUN([AC_PROG_CC_FLAG],
- [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_cv_prog_cc_$1,
- [echo 'void f(){}' > conftest.c
- if test -z "`${CC-cc} -$1 -c conftest.c 2>&1`"; then
-@@ -91,7 +91,7 @@
- dnl see if a declaration exists for a function or variable
- dnl defines HAVE_function_DECL if it exists
- dnl AC_HAVE_DECL(var, includes)
--AC_DEFUN(AC_HAVE_DECL,
-+AC_DEFUN([AC_HAVE_DECL],
- [
- AC_CACHE_CHECK([for $1 declaration],ac_cv_have_$1_decl,[
- AC_TRY_COMPILE([$2],[int i = (int)$1],
-@@ -105,7 +105,7 @@
- dnl check for a function in a library, but don't
- dnl keep adding the same library to the LIBS variable.
- dnl AC_LIBTESTFUNC(lib,func)
--AC_DEFUN(AC_LIBTESTFUNC,
-+AC_DEFUN([AC_LIBTESTFUNC],
- [case "$LIBS" in
- *-l$1*) AC_CHECK_FUNCS($2) ;;
- *) AC_CHECK_LIB($1, $2)
-@@ -223,7 +223,7 @@
-
- dnl Define an AC_DEFINE with ifndef guard.
- dnl AC_N_DEFINE(VARIABLE [, VALUE])
--define(AC_N_DEFINE,
-+define([AC_N_DEFINE],
- [cat >> confdefs.h <<\EOF
- [#ifndef] $1
- [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
-@@ -233,14 +233,14 @@
-
- dnl Add an #include
- dnl AC_ADD_INCLUDE(VARIABLE)
--define(AC_ADD_INCLUDE,
-+define([AC_ADD_INCLUDE],
- [cat >> confdefs.h <<\EOF
- [#include] $1
- EOF
- ])
-
- dnl Copied from libtool.m4
--AC_DEFUN(AC_PROG_LD_GNU,
-+AC_DEFUN([AC_PROG_LD_GNU],
- [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
- [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
- if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-@@ -259,7 +259,7 @@
- dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for XML, and define XML_CFLAGS and XML_LIBS
- dnl
--AC_DEFUN(AM_PATH_XML2,[
-+AC_DEFUN([AM_PATH_XML2],[
- AC_ARG_WITH(xml-prefix,
- [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
- xml_config_prefix="$withval", xml_config_prefix="")
-@@ -443,7 +443,7 @@
- dnl AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS
- dnl
--AC_DEFUN(AM_PATH_MYSQL,
-+AC_DEFUN([AM_PATH_MYSQL],
- [dnl
- dnl Get the cflags and libraries from the mysql_config script
- dnl
-@@ -485,7 +485,7 @@
- ])
-
- dnl Removes -I/usr/include/? from given variable
--AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[
-+AC_DEFUN([CFLAGS_REMOVE_USR_INCLUDE],[
- ac_new_flags=""
- for i in [$]$1; do
- case [$]i in
-@@ -497,7 +497,7 @@
- ])
-
- dnl Removes -L/usr/lib/? from given variable
--AC_DEFUN(LIB_REMOVE_USR_LIB,[
-+AC_DEFUN([LIB_REMOVE_USR_LIB],[
- ac_new_flags=""
- for i in [$]$1; do
- case [$]i in
-@@ -510,7 +510,7 @@
-
- dnl From Bruno Haible.
-
--AC_DEFUN(jm_ICONV,
-+AC_DEFUN([jm_ICONV],
- [
- dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
- dnl those with the standalone portable libiconv installed).
-@@ -607,7 +607,7 @@
- fi
- ])
-
--AC_DEFUN(rjs_CHARSET,[
-+AC_DEFUN([rjs_CHARSET],[
- dnl Find out if we can convert from $1 to UCS2-LE
- AC_MSG_CHECKING([can we convert from $1 to UCS2-LE?])
- AC_TRY_RUN([
-@@ -625,7 +625,7 @@
-
- dnl CFLAGS_ADD_DIR(CFLAGS, $INCDIR)
- dnl This function doesn't add -I/usr/include into CFLAGS
--AC_DEFUN(CFLAGS_ADD_DIR,[
-+AC_DEFUN([CFLAGS_ADD_DIR],[
- if test "$2" != "/usr/include" ; then
- $1="$$1 -I$2"
- fi
-@@ -633,7 +633,7 @@
-
- dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
- dnl This function doesn't add -L/usr/lib into LDFLAGS
--AC_DEFUN(LIB_ADD_DIR,[
-+AC_DEFUN([LIB_ADD_DIR],[
- if test "$2" != "/usr/lib" ; then
- $1="$$1 -L$2"
- fi
diff --git a/packages/samba/files/init b/packages/samba/files/init
deleted file mode 100644
index cb57b17de4..0000000000
--- a/packages/samba/files/init
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-#
-# This is an init script for openembedded
-# Copy it to /etc/init.d/samba and type
-# > update-rc.d samba defaults 60
-#
-
-
-smbd=/usr/sbin/smbd
-test -x "$smbd" || exit 0
-nmbd=/usr/sbin/nmbd
-test -x "$nmbd" || exit 0
-
-
-case "$1" in
- start)
- echo -n "Starting Samba: smbd"
- start-stop-daemon --start --quiet --exec $smbd
- echo -n " nmbd"
- start-stop-daemon --start --quiet --exec $nmbd
- echo "."
- ;;
- stop)
- echo -n "Stopping Samba: smbd"
- start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid
- echo -n " nmbd"
- start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid
- echo "."
- ;;
- reload|force-reload)
- start-stop-daemon --stop --quiet --signal 1 --exec $smbd
- start-stop-daemon --stop --quiet --signal 1 --exec $nmbd
- ;;
- restart)
- echo -n "Stopping Samba: smbd"
- start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid
- echo -n " nmbd"
- start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid
- echo ""
- echo -n "Waiting for samba processes to die off"
- for i in 1 2 3 ;
- do
- sleep 1
- echo -n "."
- done
- echo ""
- echo -n "Starting Samba: smbd"
- start-stop-daemon --start --quiet --exec $smbd
- echo -n " nmbd"
- start-stop-daemon --start --quiet --exec $nmbd
- echo "."
- ;;
- *)
- echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}"
- exit 1
-esac
-
-exit 0 \ No newline at end of file
diff --git a/packages/samba/files/init-essential b/packages/samba/files/init-essential
deleted file mode 100644
index 59184ce733..0000000000
--- a/packages/samba/files/init-essential
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh
-#
-# This is an init script for openembedded
-# Copy it to /etc/init.d/samba and type
-# > update-rc.d samba defaults 60
-#
-
-
-smbd=/usr/sbin/smbd
-test -x "$smbd" || exit 0
-nmbd=/usr/sbin/nmbd
-test -x "$nmbd" || exit 0
-
-
-if test -e /etc/samba/private/smbpasswd
-then
- if test -n "`cat /etc/samba/private/smbpasswd`"
- then
- CONFIG_FILE="/etc/samba/smb.conf"
- fi
-fi
-
-test -z "$CONFIG_FILE" && CONFIG_FILE="/etc/samba/smb-essential-inactive.conf"
-
-case "$1" in
- start)
- echo -n "Starting Samba: smbd"
- start-stop-daemon --start --quiet --exec $smbd -- -s $CONFIG_FILE
- echo -n " nmbd"
- start-stop-daemon --start --quiet --exec $nmbd -- -s $CONFIG_FILE
- echo "."
- ;;
- stop)
- echo -n "Stopping Samba: smbd"
- start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid
- echo -n " nmbd"
- start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid
- echo "."
- ;;
- reload|force-reload)
- start-stop-daemon --stop --quiet --signal 1 --exec $smbd -- -s $CONFIG_FILE
- start-stop-daemon --stop --quiet --signal 1 --exec $nmbd -- -s $CONFIG_FILE
- ;;
- restart)
- echo -n "Stopping Samba: smbd"
- start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid
- echo -n " nmbd"
- start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid
- echo ""
- echo -n "Waiting for samba processes to die off"
- for i in 1 2 3 ;
- do
- sleep 1
- echo -n "."
- done
- echo ""
- echo -n "Starting Samba: smbd"
- start-stop-daemon --start --quiet --exec $smbd -- -s $CONFIG_FILE
- echo -n " nmbd"
- start-stop-daemon --start --quiet --exec $nmbd -- -s $CONFIG_FILE
- echo "."
- ;;
- *)
- echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}"
- exit 1
-esac
-
-exit 0
diff --git a/packages/samba/files/mtab.patch b/packages/samba/files/mtab.patch
deleted file mode 100644
index 2ee8ba0941..0000000000
--- a/packages/samba/files/mtab.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN source/client/mtab.c samba-3.2.7//source/client/mtab.c
---- source/client/mtab.c 2008-12-19 13:57:33.000000000 +0000
-+++ source/client/mtab.c 2009-01-09 23:14:00.717671075 +0000
-@@ -32,6 +32,7 @@
- #include <errno.h>
- #include <stdio.h>
- #include <sys/time.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <fcntl.h>
- #include <mntent.h>
diff --git a/packages/samba/files/quota.patch b/packages/samba/files/quota.patch
deleted file mode 100644
index 6f42ff868f..0000000000
--- a/packages/samba/files/quota.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/sysquotas_4A.c.old 2005-07-03 17:16:00.000000000 +0200
-+++ lib/sysquotas_4A.c 2005-07-03 17:10:09.000000000 +0200
-@@ -28,6 +28,8 @@
- /* long quotactl(int cmd, char *special, qid_t id, caddr_t addr) */
- /* this is used by: HPUX,IRIX */
-
-+ #define _LINUX_QUOTA_VERSION 1
-+
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
diff --git a/packages/samba/files/smb-essential-inactive.conf b/packages/samba/files/smb-essential-inactive.conf
deleted file mode 100644
index d42d63cb9a..0000000000
--- a/packages/samba/files/smb-essential-inactive.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-[global]
- workgroup = MYWORKGROUP
- server string = OpenZaurus Samba Server
-
- netbios name = %L-INACTIVE
-
- security = share
-
- load printers = no
-
- socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
-
- dns proxy = yes
-
-
-#============================ Share Definitions ==============================
-
-[Samba-Help]
- comment = How to enable Samba
- path = /usr/share/samba/help
- writable = no
- public = yes
- printable = no
-
-[printers]
- comment = All Printers
- path = /usr/spool/samba
- guest ok = no
- writable = no
- printable = yes
- browseable = no
-
diff --git a/packages/samba/files/smb-essential.conf b/packages/samba/files/smb-essential.conf
deleted file mode 100644
index 24cb2a56cb..0000000000
--- a/packages/samba/files/smb-essential.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-[global]
- workgroup = MYWORKGROUP
- server string = OpenZaurus Samba Server
-
- security = user
-
- load printers = no
-
-; guest account = pcguest
-
- log file = /var/log.%m
-
- max log size = 50
-
- socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
-
- dns proxy = yes
-
-
-#============================ Share Definitions ==============================
-[homes]
- comment = Home Directory for %U
- browseable = no
- writable = yes
- follow symlinks = yes
- include = /etc/test.%U
-
-# This one is useful for people to share files
-;[tmp]
-; comment = Temporary file space
-; path = /tmp
-; read only = no
-; public = yes
-
-[printers]
- comment = All Printers
- path = /usr/spool/samba
- guest ok = no
- writable = no
- printable = yes
- browseable = no
-
-[CompactFlash]
- comment = Compact Flash Storage
- path = /media/cf
- writable = yes
- printable = no
- public = no
-
-[SD-MMC]
- comment = SD & MMC Storage
- path = /media/card
- writable = yes
- printable = no
- public = no
-
-[RootFS]
- comment = Zaurus Rootfs
- path = /
- writable = yes
- printable = no
- public = no
- follow symlinks = yes
-
-[Home]
- comment = "User Home Directories"
- path = /home
- writable = yes
- printable = no
- public = no
- follow symlinks = yes
-
-[Samba-Help]
- comment = How to configure Samba
- path = /usr/share/samba/help
- writable = no
- public = yes
- printable = no
-
-
diff --git a/packages/samba/files/smb.conf b/packages/samba/files/smb.conf
deleted file mode 100644
index f07e3e4ec7..0000000000
--- a/packages/samba/files/smb.conf
+++ /dev/null
@@ -1,266 +0,0 @@
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options (perhaps too
-# many!) most of which are not shown in this example
-#
-# For a step to step guide on installing, configuring and using samba,
-# read the Samba-HOWTO-Collection. This may be obtained from:
-# http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
-#
-# Many working examples of smb.conf files can be found in the
-# Samba-Guide which is generated daily and can be downloaded from:
-# http://www.samba.org/samba/docs/Samba-Guide.pdf
-#
-# Any line which starts with a ; (semi-colon) or a # (hash)
-# is a comment and is ignored. In this example we will use a #
-# for commentry and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not made any basic syntactic errors.
-#
-#======================= Global Settings =====================================
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
- workgroup = MYGROUP
-
-# server string is the equivalent of the NT Description field
- server string = Samba Server
-
-# Security mode. Defines in which mode Samba will operate. Possible
-# values are share, user, server, domain and ads. Most people will want
-# user level security. See the Samba-HOWTO-Collection for details.
- security = user
-
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-; hosts allow = 192.168.1. 192.168.2. 127.
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
- load printers = yes
-
-# you may wish to override the location of the printcap file
-; printcap name = /etc/printcap
-
-# on SystemV system setting printcap name to lpstat should allow
-# you to automatically obtain a printer list from the SystemV spool
-# system
-; printcap name = lpstat
-
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
-; printing = cups
-
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-; guest account = pcguest
-
-# this tells Samba to use a separate log file for each machine
-# that connects
- log file = /var/log/samba/log.%m
-
-# Put a capping on the size of the log files (in Kb).
- max log size = 50
-
-# Use password server option only with security = server
-# The argument list may include:
-# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-# password server = *
-; password server = <NT-Server-Name>
-
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-; realm = MY_REALM
-
-# Backend to store user information in. New installations should
-# use either tdbsam or ldapsam. smbpasswd is available for backwards
-# compatibility. tdbsam requires no further configuration.
-; passdb backend = tdbsam
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting.
-# Note: Consider carefully the location in the configuration file of
-# this line. The included file is read at that point.
-; include = /usr/local/samba/lib/smb.conf.%m
-
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-; interfaces = 192.168.12.2/24 192.168.13.2/24
-
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-; local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-; os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-; domain master = yes
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-; preferred master = yes
-
-# Enable this if you want Samba to be a domain logon server for
-# Windows95 workstations.
-; domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-; logon script = %m.bat
-# run a specific logon batch file per username
-; logon script = %U.bat
-
-# Where to store roving profiles (only for Win95 and WinNT)
-# %L substitutes for this servers netbios name, %U is username
-# You must uncomment the [Profiles] share below
-; logon path = \\%L\Profiles\%U
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-; wins support = yes
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-; wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one WINS Server on the network. The default is NO.
-; wins proxy = yes
-
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The default is NO.
- dns proxy = no
-
-# These scripts are used on a domain controller or stand-alone
-# machine to add or delete corresponding unix accounts
-; add user script = /usr/sbin/useradd %u
-; add group script = /usr/sbin/groupadd %g
-; add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-; delete user script = /usr/sbin/userdel %u
-; delete user from group script = /usr/sbin/deluser %u %g
-; delete group script = /usr/sbin/groupdel %g
-
-
-#============================ Share Definitions ==============================
-[homes]
- comment = Home Directories
- browseable = yes
- writable = yes
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-; [netlogon]
-; comment = Network Logon Service
-; path = /usr/local/samba/lib/netlogon
-; guest ok = yes
-; writable = no
-; share modes = no
-
-
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-;[Profiles]
-; path = /usr/local/samba/profiles
-; browseable = no
-; guest ok = yes
-
-
-# NOTE: If you have a BSD-style print system there is no need to
-# specifically define each individual printer
-[printers]
- comment = All Printers
- path = /var/spool/samba
- browseable = no
-# Set public = yes to allow user 'guest account' to print
- guest ok = no
- writable = no
- printable = yes
-
-# This one is useful for people to share files
-;[tmp]
-; comment = Temporary file space
-; path = /tmp
-; read only = no
-; public = yes
-
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-; comment = Public Stuff
-; path = /home/samba
-; public = yes
-; writable = yes
-; printable = no
-; write list = @staff
-
-# Other examples.
-#
-# A private printer, usable only by fred. Spool data will be placed in fred's
-# home directory. Note that fred must have write access to the spool directory,
-# wherever it is.
-;[fredsprn]
-; comment = Fred's Printer
-; valid users = fred
-; path = /homes/fred
-; printer = freds_printer
-; public = no
-# A private directory, usable only by fred. Note that fred requires write
-# access to the directory.
-;[fredsdir]
-; comment = Fred's Service
-; path = /usr/somewhere/private
-; valid users = fred
-; public = no
-; writable = yes
-; printable = no
-
-# a service which has a different directory for each machine that connects
-# this allows you to tailor configurations to incoming machines. You could
-# also use the %U option to tailor it by user name.
-# The %m gets replaced with the machine name that is connecting.
-;[pchome]
-; comment = PC Directories
-; path = /usr/pc/%m
-; public = no
-; writable = yes
-
-# A publicly accessible directory, read/write to all users. Note that all files
-# created in the directory by users will be owned by the default user, so
-# any user with access can delete any other user's files. Obviously this
-# directory must be writable by the default user. Another user could of course
-# be specified, in which case all files would be owned by that user instead.
-;[public]
-; path = /usr/somewhere/else/public
-; public = yes
-; only guest = yes
-; writable = yes
-; printable = no
-
-# The following two entries demonstrate how to share a directory so that two
-# users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writable by both users and should have the
-# sticky bit set on it to prevent abuse. Obviously this could be extended to
-# as many users as required.
-;[myshare]
-; comment = Mary's and Fred's stuff
-; path = /usr/somewhere/shared
-; valid users = mary fred
-; public = no
-; writable = yes
-; printable = no
-; create mask = 0765
diff --git a/packages/samba/files/volatiles.03_samba b/packages/samba/files/volatiles.03_samba
deleted file mode 100644
index 469bc9e7b0..0000000000
--- a/packages/samba/files/volatiles.03_samba
+++ /dev/null
@@ -1,2 +0,0 @@
-# <type> <owner> <group> <mode> <path> <linksource>
-d root root 0755 /var/log/samba none
diff --git a/packages/samba/samba-3.0.23c/configure.patch b/packages/samba/samba-3.0.23c/configure.patch
deleted file mode 100644
index 0366efb314..0000000000
--- a/packages/samba/samba-3.0.23c/configure.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- source/configure.in~configure 2003-12-14 22:36:25.000000000 -0500
-+++ source/configure.in 2004-01-26 14:33:15.000000000 -0500
-@@ -959,7 +959,7 @@
- #endif
- exit(0);
- }
--], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
-+], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no], [linux_getgrouplist_ok=cross])
- if test x"$linux_getgrouplist_ok" = x"yes"; then
- AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
- fi
---- source/aclocal.m4~configure 2004-01-26 14:33:15.000000000 -0500
-+++ source/aclocal.m4 2004-01-26 17:34:28.000000000 -0500
-@@ -2,7 +2,7 @@
- dnl if the cache file is inconsistent with the current host,
- dnl target and build system types, execute CMD or print a default
- dnl error message.
--AC_DEFUN(AC_VALIDATE_CACHE_SYSTEM_TYPE, [
-+AC_DEFUN([AC_VALIDATE_CACHE_SYSTEM_TYPE], [
- AC_REQUIRE([AC_CANONICAL_SYSTEM])
- AC_MSG_CHECKING([config.cache system type])
- if { test x"${ac_cv_host_system_type+set}" = x"set" &&
-@@ -24,7 +24,7 @@
-
-
- dnl test whether dirent has a d_off member
--AC_DEFUN(AC_DIRENT_D_OFF,
-+AC_DEFUN([AC_DIRENT_D_OFF],
- [AC_CACHE_CHECK([for d_off in dirent], ac_cv_dirent_d_off,
- [AC_TRY_COMPILE([
- #include <unistd.h>
-@@ -38,7 +38,7 @@
-
- dnl Mark specified module as shared
- dnl SMB_MODULE(name,static_files,shared_files,subsystem,whatif-static,whatif-shared)
--AC_DEFUN(SMB_MODULE,
-+AC_DEFUN([SMB_MODULE],
- [
- AC_MSG_CHECKING([how to build $1])
- if test "$[MODULE_][$1]"; then
-@@ -68,7 +68,7 @@
- fi
- ])
-
--AC_DEFUN(SMB_SUBSYSTEM,
-+AC_DEFUN([SMB_SUBSYSTEM],
- [
- AC_SUBST($1_STATIC)
- AC_SUBST($1_MODULES)
-@@ -77,7 +77,7 @@
- ])
-
- dnl AC_PROG_CC_FLAG(flag)
--AC_DEFUN(AC_PROG_CC_FLAG,
-+AC_DEFUN([AC_PROG_CC_FLAG],
- [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_cv_prog_cc_$1,
- [echo 'void f(){}' > conftest.c
- if test -z "`${CC-cc} -$1 -c conftest.c 2>&1`"; then
-@@ -91,7 +91,7 @@
- dnl see if a declaration exists for a function or variable
- dnl defines HAVE_function_DECL if it exists
- dnl AC_HAVE_DECL(var, includes)
--AC_DEFUN(AC_HAVE_DECL,
-+AC_DEFUN([AC_HAVE_DECL],
- [
- AC_CACHE_CHECK([for $1 declaration],ac_cv_have_$1_decl,[
- AC_TRY_COMPILE([$2],[int i = (int)$1],
-@@ -223,7 +223,7 @@
-
- dnl Define an AC_DEFINE with ifndef guard.
- dnl AC_N_DEFINE(VARIABLE [, VALUE])
--define(AC_N_DEFINE,
-+define([AC_N_DEFINE],
- [cat >> confdefs.h <<\EOF
- [#ifndef] $1
- [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
-@@ -233,14 +233,14 @@
-
- dnl Add an #include
- dnl AC_ADD_INCLUDE(VARIABLE)
--define(AC_ADD_INCLUDE,
-+define([AC_ADD_INCLUDE],
- [cat >> confdefs.h <<\EOF
- [#include] $1
- EOF
- ])
-
- dnl Copied from libtool.m4
--AC_DEFUN(AC_PROG_LD_GNU,
-+AC_DEFUN([AC_PROG_LD_GNU],
- [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
- [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
- if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-@@ -259,7 +259,7 @@
- dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for XML, and define XML_CFLAGS and XML_LIBS
- dnl
--AC_DEFUN(AM_PATH_XML2,[
-+AC_DEFUN([AM_PATH_XML2],[
- AC_ARG_WITH(xml-prefix,
- [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
- xml_config_prefix="$withval", xml_config_prefix="")
-@@ -443,7 +443,7 @@
- dnl AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS
- dnl
--AC_DEFUN(AM_PATH_MYSQL,
-+AC_DEFUN([AM_PATH_MYSQL],
- [dnl
- dnl Get the cflags and libraries from the mysql_config script
- dnl
-@@ -485,7 +485,7 @@
- ])
-
- dnl Removes -I/usr/include/? from given variable
--AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[
-+AC_DEFUN([CFLAGS_REMOVE_USR_INCLUDE],[
- ac_new_flags=""
- for i in [$]$1; do
- case [$]i in
-@@ -497,7 +497,7 @@
- ])
-
- dnl Removes -L/usr/lib/? from given variable
--AC_DEFUN(LIB_REMOVE_USR_LIB,[
-+AC_DEFUN([LIB_REMOVE_USR_LIB],[
- ac_new_flags=""
- for i in [$]$1; do
- case [$]i in
-@@ -510,7 +510,7 @@
-
- dnl From Bruno Haible.
-
--AC_DEFUN(jm_ICONV,
-+AC_DEFUN([jm_ICONV],
- [
- dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
- dnl those with the standalone portable libiconv installed).
-@@ -607,7 +607,7 @@
- fi
- ])
-
--AC_DEFUN(rjs_CHARSET,[
-+AC_DEFUN([rjs_CHARSET],[
- dnl Find out if we can convert from $1 to UCS2-LE
- AC_MSG_CHECKING([can we convert from $1 to UCS2-LE?])
- AC_TRY_RUN([
-@@ -625,7 +625,7 @@
-
- dnl CFLAGS_ADD_DIR(CFLAGS, $INCDIR)
- dnl This function doesn't add -I/usr/include into CFLAGS
--AC_DEFUN(CFLAGS_ADD_DIR,[
-+AC_DEFUN([CFLAGS_ADD_DIR],[
- if test "$2" != "/usr/include" ; then
- $1="$$1 -I$2"
- fi
-@@ -633,7 +633,7 @@
-
- dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
- dnl This function doesn't add -L/usr/lib into LDFLAGS
--AC_DEFUN(LIB_ADD_DIR,[
-+AC_DEFUN([LIB_ADD_DIR],[
- if test "$2" != "/usr/lib" ; then
- $1="$$1 -L$2"
- fi
diff --git a/packages/samba/samba-3.0.34/configure.patch b/packages/samba/samba-3.0.34/configure.patch
deleted file mode 100644
index ddcb9e9a15..0000000000
--- a/packages/samba/samba-3.0.34/configure.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-diff -urN source.old//aclocal.m4 source//aclocal.m4
---- source.old//aclocal.m4 2008-08-25 22:09:21.000000000 +0100
-+++ source//aclocal.m4 2008-11-23 17:44:58.050646210 +0000
-@@ -1,5 +1,5 @@
- dnl test whether dirent has a d_off member
--AC_DEFUN(AC_DIRENT_D_OFF,
-+AC_DEFUN([AC_DIRENT_D_OFF],
- [AC_CACHE_CHECK([for d_off in dirent], ac_cv_dirent_d_off,
- [AC_TRY_COMPILE([
- #include <unistd.h>
-@@ -13,7 +13,7 @@
-
- dnl Mark specified module as shared
- dnl SMB_MODULE(name,static_files,shared_files,subsystem,whatif-static,whatif-shared)
--AC_DEFUN(SMB_MODULE,
-+AC_DEFUN([SMB_MODULE],
- [
- AC_MSG_CHECKING([how to build $1])
- if test "$[MODULE_][$1]"; then
-@@ -44,7 +44,7 @@
- fi
- ])
-
--AC_DEFUN(SMB_SUBSYSTEM,
-+AC_DEFUN([SMB_SUBSYSTEM],
- [
- AC_SUBST($1_STATIC)
- AC_SUBST($1_MODULES)
-@@ -229,7 +229,7 @@
-
- dnl Define an AC_DEFINE with ifndef guard.
- dnl AC_N_DEFINE(VARIABLE [, VALUE])
--define(AC_N_DEFINE,
-+define([AC_N_DEFINE],
- [cat >> confdefs.h <<\EOF
- [#ifndef] $1
- [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
-@@ -239,14 +239,14 @@
-
- dnl Add an #include
- dnl AC_ADD_INCLUDE(VARIABLE)
--define(AC_ADD_INCLUDE,
-+define([AC_ADD_INCLUDE],
- [cat >> confdefs.h <<\EOF
- [#include] $1
- EOF
- ])
-
- dnl Copied from libtool.m4
--AC_DEFUN(AC_PROG_LD_GNU,
-+AC_DEFUN([AC_PROG_LD_GNU],
- [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
- [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
- if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-@@ -257,7 +257,7 @@
- ])
-
- dnl Removes -I/usr/include/? from given variable
--AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[
-+AC_DEFUN([CFLAGS_REMOVE_USR_INCLUDE],[
- ac_new_flags=""
- for i in [$]$1; do
- case [$]i in
-@@ -270,7 +270,7 @@
-
- dnl Removes '-L/usr/lib[/]', '-Wl,-rpath,/usr/lib[/]'
- dnl and '-Wl,-rpath -Wl,/usr/lib[/]' from given variable
--AC_DEFUN(LIB_REMOVE_USR_LIB,[
-+AC_DEFUN([LIB_REMOVE_USR_LIB],[
- ac_new_flags=""
- l=""
- for i in [$]$1; do
-@@ -301,7 +301,7 @@
-
- dnl From Bruno Haible.
-
--AC_DEFUN(jm_ICONV,
-+AC_DEFUN([jm_ICONV],
- [
- dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
- dnl those with the standalone portable libiconv installed).
-@@ -387,7 +387,7 @@
- fi
- ])
-
--AC_DEFUN(rjs_CHARSET,[
-+AC_DEFUN([rjs_CHARSET],[
- dnl Find out if we can convert from $1 to UCS2-LE
- AC_MSG_CHECKING([can we convert from $1 to UCS2-LE?])
- AC_TRY_RUN([
-@@ -405,7 +405,7 @@
-
- dnl CFLAGS_ADD_DIR(CFLAGS, $INCDIR)
- dnl This function doesn't add -I/usr/include into CFLAGS
--AC_DEFUN(CFLAGS_ADD_DIR,[
-+AC_DEFUN([CFLAGS_ADD_DIR],[
- if test "$2" != "/usr/include" ; then
- $1="$$1 -I$2"
- fi
-@@ -413,7 +413,7 @@
-
- dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
- dnl This function doesn't add -L/usr/lib into LDFLAGS
--AC_DEFUN(LIB_ADD_DIR,[
-+AC_DEFUN([LIB_ADD_DIR],[
- if test "$2" != "/usr/lib" ; then
- $1="$$1 -L$2"
- fi
-@@ -486,7 +486,7 @@
- dnl AC_TRY_RUN_STRICT(PROGRAM,CFLAGS,CPPFLAGS,LDFLAGS,
- dnl [ACTION-IF-TRUE],[ACTION-IF-FALSE],
- dnl [ACTION-IF-CROSS-COMPILING = RUNTIME-ERROR])
--AC_DEFUN( [AC_TRY_RUN_STRICT],
-+AC_DEFUN([AC_TRY_RUN_STRICT],
- [
- old_CFLAGS="$CFLAGS";
- CFLAGS="$2";
-diff -urN source.old//configure.in source//configure.in
---- source.old//configure.in 2008-08-25 22:09:21.000000000 +0100
-+++ source//configure.in 2008-11-23 17:22:17.108791515 +0000
-@@ -1402,7 +1402,7 @@
- #endif
- exit(0);
- }
--], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
-+], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no], [linux_getgrouplist_ok=cross])
- if test x"$linux_getgrouplist_ok" = x"yes"; then
- AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
- fi
-diff -urN source.old//lib/replace/libreplace.m4 source//lib/replace/libreplace.m4
---- source.old//lib/replace/libreplace.m4 2008-08-25 22:09:21.000000000 +0100
-+++ source//lib/replace/libreplace.m4 2008-11-23 17:54:27.942153096 +0000
-@@ -1,4 +1,4 @@
--AC_DEFUN_ONCE(AC_LIBREPLACE_LOCATION_CHECKS,
-+AC_DEFUN_ONCE([AC_LIBREPLACE_LOCATION_CHECKS],
- [
- echo "LIBREPLACE_LOCATION_CHECKS: START"
-
-@@ -27,7 +27,7 @@
- ]) dnl end AC_LIBREPLACE_LOCATION_CHECKS
-
-
--AC_DEFUN_ONCE(AC_LIBREPLACE_BROKEN_CHECKS,
-+AC_DEFUN_ONCE([AC_LIBREPLACE_BROKEN_CHECKS],
- [
- echo "LIBREPLACE_BROKEN_CHECKS: START"
-
-@@ -325,25 +325,25 @@
- AC_DEFINE(HAVE_VOLATILE, 1, [Whether the C compiler understands volatile])
- fi
-
--m4_include(system/config.m4)
-+m4_include(lib/replace/system/config.m4)
-
--m4_include(dlfcn.m4)
--m4_include(getpass.m4)
--m4_include(strptime.m4)
--m4_include(win32.m4)
--m4_include(timegm.m4)
--m4_include(repdir.m4)
-+m4_include(lib/replace/dlfcn.m4)
-+m4_include(lib/replace/getpass.m4)
-+m4_include(lib/replace/strptime.m4)
-+m4_include(lib/replace/win32.m4)
-+m4_include(lib/replace/timegm.m4)
-+m4_include(lib/replace/repdir.m4)
-
- AC_CHECK_FUNCS([syslog memset memcpy],,[AC_MSG_ERROR([Required function not found])])
-
- echo "LIBREPLACE_BROKEN_CHECKS: END"
- ]) dnl end AC_LIBREPLACE_BROKEN_CHECKS
-
--AC_DEFUN_ONCE(AC__LIBREPLACE_ALL_CHECKS_START,
-+AC_DEFUN_ONCE([AC__LIBREPLACE_ALL_CHECKS_START],
- [
- #LIBREPLACE_ALL_CHECKS: START"
- ])
--AC_DEFUN_ONCE(AC__LIBREPLACE_ALL_CHECKS_END,
-+AC_DEFUN_ONCE([AC__LIBREPLACE_ALL_CHECKS_END],
- [
- #LIBREPLACE_ALL_CHECKS: END"
- ])
-@@ -356,6 +356,6 @@
- AC__LIBREPLACE_ALL_CHECKS_END
- ])
-
--m4_include(libreplace_cc.m4)
--m4_include(libreplace_macros.m4)
--m4_include(autoconf-2.60.m4)
-+m4_include(lib/replace/libreplace_cc.m4)
-+m4_include(lib/replace/libreplace_macros.m4)
-+m4_include(lib/replace/autoconf-2.60.m4)
-diff -urN source.old//lib/replace/libreplace_macros.m4 source//lib/replace/libreplace_macros.m4
---- source.old//lib/replace/libreplace_macros.m4 2008-08-25 22:09:21.000000000 +0100
-+++ source//lib/replace/libreplace_macros.m4 2008-11-23 17:31:08.269791372 +0000
-@@ -76,7 +76,7 @@
- ])
-
- dnl AC_PROG_CC_FLAG(flag)
--AC_DEFUN(AC_PROG_CC_FLAG,
-+AC_DEFUN([AC_PROG_CC_FLAG],
- [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_cv_prog_cc_$1,
- [echo 'void f(){}' > conftest.c
- if test -z "`${CC-cc} -$1 -c conftest.c 2>&1`"; then
-@@ -103,7 +103,7 @@
- dnl see if a declaration exists for a function or variable
- dnl defines HAVE_function_DECL if it exists
- dnl AC_HAVE_DECL(var, includes)
--AC_DEFUN(AC_HAVE_DECL,
-+AC_DEFUN([AC_HAVE_DECL],
- [
- AC_CACHE_CHECK([for $1 declaration],ac_cv_have_$1_decl,[
- AC_TRY_COMPILE([$2],[int i = (int)$1],
diff --git a/packages/samba/samba-3.0.34/uclibc-strlcpy-strlcat.patch b/packages/samba/samba-3.0.34/uclibc-strlcpy-strlcat.patch
deleted file mode 100644
index b10a1b1084..0000000000
--- a/packages/samba/samba-3.0.34/uclibc-strlcpy-strlcat.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git source.old/client/mount.cifs.c source/client/mount.cifs.c
-index 3b56e5f..b7a76c6 100644
---- source.old/client/mount.cifs.c
-+++ source/client/mount.cifs.c
-@@ -56,6 +56,10 @@
- #endif /* _SAMBA_BUILD_ */
- #endif /* MOUNT_CIFS_VENDOR_SUFFIX */
-
-+#ifdef _SAMBA_BUILD_
-+#include "include/config.h"
-+#endif
-+
- #ifndef MS_MOVE
- #define MS_MOVE 8192
- #endif
-@@ -94,6 +98,8 @@ char * prefixpath = NULL;
-
- /* like strncpy but does not 0 fill the buffer and always null
- * terminates. bufsize is the size of the destination buffer */
-+
-+#ifndef HAVE_STRLCPY
- static size_t strlcpy(char *d, const char *s, size_t bufsize)
- {
- size_t len = strlen(s);
-@@ -104,10 +110,13 @@ static size_t strlcpy(char *d, const char *s, size_t bufsize)
- d[len] = 0;
- return ret;
- }
-+#endif
-
- /* like strncat but does not 0 fill the buffer and always null
- * terminates. bufsize is the length of the buffer, which should
- * be one more than the maximum resulting string length */
-+
-+#ifndef HAVE_STRLCAT
- static size_t strlcat(char *d, const char *s, size_t bufsize)
- {
- size_t len1 = strlen(d);
-@@ -126,6 +135,7 @@ static size_t strlcat(char *d, const char *s, size_t bufsize)
- }
- return ret;
- }
-+#endif
-
- /* BB finish BB
-
diff --git a/packages/samba/samba-ads-3.3.0/wbstatic.patch b/packages/samba/samba-ads-3.3.0/wbstatic.patch
deleted file mode 100644
index 1d2260cb55..0000000000
--- a/packages/samba/samba-ads-3.3.0/wbstatic.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff -urN source.old//Makefile.in source//Makefile.in
---- source.old//Makefile.in 2009-01-26 13:56:34.000000000 +0000
-+++ source//Makefile.in 2009-02-13 22:53:43.197061293 +0000
-@@ -690,7 +690,7 @@
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
- $(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) \
- $(REG_FULL_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \
-- $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ) @LIBWBCLIENT_STATIC@ \
-+ $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ) bin/libwbclient.a \
- $(LIBSMBCONF_OBJ) \
- $(PRIVILEGES_BASIC_OBJ)
-
-@@ -725,7 +725,7 @@
- web/swat.o web/neg_lang.o
-
- SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(PRINTBASE_OBJ) $(LIBSMB_OBJ) \
-- $(LOCKING_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(KRBCLIENT_OBJ) \
-+ $(LOCKING_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(KRBCLIENT_OBJ) \
- $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \
- $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
- $(PASSCHANGE_OBJ) $(LDB_OBJ)
-@@ -745,7 +745,7 @@
- $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
- rpc_client/cli_pipe.o librpc/rpc/binding.o $(RPC_PARSE_OBJ2) \
- $(RPC_CLIENT_OBJ1) \
-- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
-+ $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
- $(LIBMSRPC_GEN_OBJ)
-
- TESTPARM_OBJ = utils/testparm.o \
-@@ -755,18 +755,18 @@
- PASSWD_UTIL_OBJ = utils/passwd_util.o
-
- SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
-- $(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \
-+ $(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) bin/libwbclient.a \
- $(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
- $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) \
- $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) $(LDB_OBJ)
-
--PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \
-+PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) bin/libwbclient.a \
- $(LIBSAMBA_OBJ) \
- $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \
- $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) libsmb/asn1.o \
- $(LDB_OBJ)
-
--SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
-+SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1) bin/libwbclient.a
-
- DISPLAY_SEC_OBJ= lib/display_sec.o
-
-@@ -782,7 +782,7 @@
-
- RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
- $(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
-- $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
-+ $(RPC_PARSE_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
- $(READLINE_OBJ) $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIBADS_OBJ) $(POPT_LIB_OBJ) \
- $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ)
-@@ -810,7 +810,7 @@
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
- $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
-
--LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
-+LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) bin/libwbclient.a
-
- # This shared library is intended for linking with unit test programs
- # to test Samba internals. It's called libbigballofmud.so to
-@@ -819,7 +819,7 @@
- LIBBIGBALLOFMUD_MAJOR = 0
-
- LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-- $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \
-+ $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ) bin/libwbclient.a \
- $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
-
- CLIENT_OBJ1 = client/client.o client/clitar.o rpc_client/cli_pipe.o \
-@@ -831,7 +831,7 @@
- CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
- $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
- $(READLINE_OBJ) $(POPT_LIB_OBJ) \
-- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
-+ $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
- $(DISPLAY_SEC_OBJ)
-
- LIBSMBCONF_OBJ = lib/smbconf/smbconf.o lib/smbconf/smbconf_util.o \
-@@ -886,7 +886,7 @@
- $(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \
- $(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ) \
- $(LIBSMBCONF_OBJ) \
-- @LIBWBCLIENT_STATIC@ \
-+ bin/libwbclient.a \
- $(PRIVILEGES_BASIC_OBJ)
-
- CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
-@@ -926,7 +926,7 @@
- $(LIBNDR_GEN_OBJ0)
-
- PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-- $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
-+ $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) \
- $(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ) \
- $(LIBNDR_GEN_OBJ0)
-
-@@ -942,14 +942,14 @@
-
- SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
- $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
-- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
-+ $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
- $(POPT_LIB_OBJ) $(DCUTIL_OBJ) $(LIBADS_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
-
- SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(PARAM_OBJ) \
- $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(POPT_LIB_OBJ) \
-- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
-+ $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
-
- EVTLOGADM_OBJ0 = utils/eventlogadm.o
-
-@@ -988,7 +988,7 @@
-
- PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
- pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
--PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
-+PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) \
- $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
- $(LDB_OBJ)
-
-@@ -1036,7 +1036,7 @@
- smbd/connection.o
-
- WINBINDD_OBJ = \
-- $(WINBINDD_OBJ1) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
-+ $(WINBINDD_OBJ1) $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) \
- $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
- $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
- $(PROFILE_OBJ) $(SLCACHE_OBJ) $(SMBLDAP_OBJ) \
-@@ -1047,7 +1047,7 @@
-
- WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
- $(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
-- lib/winbind_util.o $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@
-+ lib/winbind_util.o $(WBCOMMON_OBJ) bin/libwbclient.a
-
- WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) @WINBIND_NSS_EXTRA_OBJS@
-
-@@ -1111,7 +1111,7 @@
- $(SERVER_MUTEX_OBJ) $(LIBADS_SERVER_OBJ) \
- $(PASSDB_OBJ) $(GROUPDB_OBJ) \
- $(SMBLDAP_OBJ) $(LIBNMB_OBJ) \
-- $(LDB_OBJ) $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ \
-+ $(LDB_OBJ) $(WBCOMMON_OBJ) bin/libwbclient.a \
- $(LIBNDR_GEN_OBJ0) $(LIBNDR_GEN_OBJ1)
-
-
-@@ -1120,14 +1120,14 @@
- VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
- $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
- $(READLINE_OBJ) $(POPT_LIB_OBJ) \
-- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
-+ $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
- $(DISPLAY_SEC_OBJ)
-
- RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
- $(LIBSMB_OBJ) \
- $(PARAM_OBJ) \
- $(PASSDB_OBJ) \
-- @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
-+ bin/libwbclient.a $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
- $(LIB_NONSMBD_OBJ) \
- $(KRBCLIENT_OBJ) \
- $(RPC_PARSE_OBJ2) \
-@@ -1743,7 +1743,7 @@
- LIBWBCLIENT_SOVER=@LIBWBCLIENT_SOVER@
- LIBWBCLIENT_SHARED_TARGET_SONAME=$(LIBWBCLIENT_SHARED_TARGET).$(LIBWBCLIENT_SOVER)
- LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@
--LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
-+LIBWBCLIENT=bin/libwbclient.a @LIBWBCLIENT_SHARED@
- LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.@SYMSEXT@
- LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h
-
-@@ -1880,7 +1880,7 @@
- $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
- $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
-- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
-+ $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
- $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ) \
- auth/token_util.o
-
diff --git a/packages/samba/samba-ads.inc b/packages/samba/samba-ads.inc
deleted file mode 100644
index e2f77b8cd9..0000000000
--- a/packages/samba/samba-ads.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-# openldap and kerberos are for active directory support
-# netatalk is needed to support a vfs module
-DEPENDS += " openldap krb5 netatalk"
-
-EXTRA_OECONF += "\
- SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
- samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
- linux_getgrouplist_ok=no \
- samba_cv_HAVE_BROKEN_GETGROUPS=no \
- samba_cv_HAVE_FTRUNCATE_EXTEND=yes \
- ac_cv_path_KRB5CONFIG=${STAGING_BINDIR_CROSS}/krb5-config \
- samba_cv_have_setresuid=yes \
- samba_cv_have_setresgid=yes \
- samba_cv_HAVE_WRFILE_KEYTAB=yes \
- smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=yes \
- smb_krb5_cv_enctype_to_string_takes_size_t_arg=yes \
- --with-krb5=${STAGING_LIBDIR} \
- --with-ads \
- "
-
-PACKAGES =+ "libsmbclient-ads libsmbclient-ads-dev cifs-ads cifs-ads-doc swat-ads"
-
-RCONFLICTS_${PN} = "samba"
-RCONFLICTS_libsmbclient-ads = "libsmbclient"
-RCONFLICTS_libsmbclient-ads-dev = "libsmbclient-dev"
-RCONFLICTS_cifs-ads = "cifs"
-RCONFLICTS_cifs-ads-doc = "cifs-doc"
-RCONFLICTS_swat-ads = "swat"
-
-FILES_cifs-ads = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
-FILES_cifs-ads-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
-FILES_libsmbclient-ads = "${libdir}/libsmbclient.so.*"
-FILES_libsmbclient-ads-dev = "${libdir}/libsmbclient.so ${includedir}"
-FILES_swat-ads = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
-
-do_configure() {
- oe_runconf
-}
diff --git a/packages/samba/samba-ads_3.2.8.bb b/packages/samba/samba-ads_3.2.8.bb
deleted file mode 100644
index 95f09c16cb..0000000000
--- a/packages/samba/samba-ads_3.2.8.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require samba.inc
-require samba-ads.inc
-
-PR = "r2"
-SRC_URI += "file://config-lfs.patch;patch=1 \
- file://quota.patch;patch=1;pnum=0 \
- file://configure-3.2.8.patch;patch=1 \
- file://config-h.patch;patch=1 \
- file://mtab.patch;patch=1 \
- "
diff --git a/packages/samba/samba-ads_3.3.0.bb b/packages/samba/samba-ads_3.3.0.bb
deleted file mode 100644
index 9fd4303143..0000000000
--- a/packages/samba/samba-ads_3.3.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require samba.inc
-require samba-ads.inc
-
-PR = "r3"
-SRC_URI += "file://config-lfs.patch;patch=1 \
- file://quota.patch;patch=1;pnum=0 \
- file://configure-3.3.0.patch;patch=1 \
- file://config-h.patch;patch=1 \
- file://mtab.patch;patch=1 \
- file://wbstatic.patch;patch=1 \
- "
-
-do_compile () {
- base_do_compile
-}
diff --git a/packages/samba/samba-basic.inc b/packages/samba/samba-basic.inc
deleted file mode 100644
index f1bda65286..0000000000
--- a/packages/samba/samba-basic.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SRC_URI += "file://config-lfs.patch;patch=1 \
- file://quota.patch;patch=1;pnum=0 \
- "
-
-EXTRA_OECONF += "\
- --without-ads \
- --without-winbind \
- --without-ldap \
- --without-krb5"
-
-PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc swat"
-
-RCONFLICTS_${PN} = "samba-ads"
-RCONFLICTS_libsmbclient = "libsmbclient-ads"
-RCONFLICTS_libsmbclient-dev = "libsmbclient-ads-dev"
-RCONFLICTS_cifs = "cifs-ads"
-RCONFLICTS_cifs-doc = "cifs-ads-doc"
-RCONFLICTS_swat = "swat-ads"
-
-FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
-FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
-FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
-FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
-FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
diff --git a/packages/samba/samba-essential.inc b/packages/samba/samba-essential.inc
deleted file mode 100644
index d718fc8a96..0000000000
--- a/packages/samba/samba-essential.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "readline"
-
-SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://cifs.patch;patch=1"
-S = "${WORKDIR}/samba-${PV}/source"
-
-inherit autotools
-
-EXTRA_OECONF = '--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
- --without-ads --without-automount --without-smbmount --without-syslog \
- --without-ldapsam --without-quotas --without-nisplus-home \
- --without-sys-quotas --without-libsmbclient --without-winbind \
- --without-acl-support'
-
-do_configure_prepend () {
- ./script/mkversion.sh
- if [ ! -e acinclude.m4 ]; then
- cat aclocal.m4 > acinclude.m4
- fi
-}
-
-do_compile () {
- oe_runmake proto_exists
- base_do_compile
-}
-
-do_install_append() {
- rm -f ${D}${bindir}/*.old
- rm -f ${D}${sbindir}/*.old
-
- mkdir -p ${D}/sbin/
-}
-
-do_install_prepend() {
-
- mkdir -p ${D}/sbin/
-
-}
-
diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb
deleted file mode 100644
index 5486e0ff88..0000000000
--- a/packages/samba/samba-essential_3.0.20.bb
+++ /dev/null
@@ -1,71 +0,0 @@
-require samba-essential.inc
-inherit update-rc.d
-
-PR = "r7"
-
-SRC_URI = "file://config-lfs.patch;patch=1 \
- file://init-essential \
- file://quota.patch;patch=1;pnum=0 \
- file://smb-essential.conf \
- file://smb-essential-inactive.conf \
- file://Managing-Samba.txt"
-
-RCONFLICTS = "samba"
-
-INITSCRIPT_NAME = "samba"
-# No dependencies, goes in at level 20 (NOTE: take care with the
-# level, later levels put the shutdown later too - see the links
-# in rc6.d, the shutdown must precede network shutdown).
-INITSCRIPT_PARAMS = "defaults"
-CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
-
-# The file system settings --foodir=dirfoo and overridden unconditionally
-# in the samba config by --with-foodir=dirfoo - even if the --with is not
-# specified! Fix that here. Set the privatedir to /etc/samba/private.
-EXTRA_OECONF += "\
- --with-configdir=${sysconfdir}/samba \
- --with-privatedir=${sysconfdir}/samba/private \
- --with-lockdir=${localstatedir}/lock \
- --with-piddir=${localstatedir}/run \
- --with-logfilebase=${localstatedir}/log \
- --with-libdir=${libdir} \
- --with-mandir=${mandir} \
- "
-
-do_install_append() {
- install -d "${D}${localstatedir}/log"
- rm -f ${D}/sbin/mount.smbfs
- rmdir ${D}/sbin
- install -d "${D}${sysconfdir}/init.d"
- install -d "${D}${sysconfdir}/samba/private"
-
- install -c -m 755 ${WORKDIR}/init-essential ${D}${sysconfdir}/init.d/samba
-
- install -d "${D}${sysconfdir}/samba"
- install -d "${D}/usr/share/samba/help"
-
- install -m 0644 ${WORKDIR}/smb-essential-inactive.conf "${D}${sysconfdir}/samba/"
- install -m 0644 ${WORKDIR}/smb-essential.conf "${D}${sysconfdir}/samba/smb.conf"
-
- install -m 0644 ${WORKDIR}/Managing-Samba.txt ${D}/usr/share/samba/help
-
-}
-
-do_configure_append() {
- distro_up="`echo "${DISTRO}" | awk '{printf("%s\n",toupper($0))}'`"
-
- cat ${WORKDIR}/smb-essential-inactive.conf | sed "s/MYWORKGROUP/${distro_up}/" > ${WORKDIR}/smb-essential-inactive.conf_
- mv ${WORKDIR}/smb-essential-inactive.conf_ ${WORKDIR}/smb-essential-inactive.conf
-
- cat ${WORKDIR}/smb-essential.conf | sed "s/MYWORKGROUP/${distro_up}/" > ${WORKDIR}/smb-essential.conf_
- mv ${WORKDIR}/smb-essential.conf_ ${WORKDIR}/smb-essential.conf
-}
-
-FILES_${PN} = "${bindir}/smbpasswd \
- ${sbindir}/nmbd \
- ${sbindir}/smbd \
- ${libdir}/charset \
- ${libdir}/vfs \
- ${libdir}/*.dat \
- /usr/share/samba \
- /etc"
diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
deleted file mode 100644
index 36de08beca..0000000000
--- a/packages/samba/samba.inc
+++ /dev/null
@@ -1,86 +0,0 @@
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "readline virtual/libiconv"
-
-SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://volatiles.03_samba \
- file://smb.conf \
- file://init \
- "
-
-S = "${WORKDIR}/samba-${PV}/source"
-
-inherit autotools update-rc.d
-
-FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat \
- ${libdir}/auth/*.so ${libdir}/security/*.so"
-FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so \
- ${libdir}/auth/.debug/*.so ${libdir}/security/.debug/*.so"
-
-# The file system settings --foodir=dirfoo and overridden unconditionally
-# in the samba config by --with-foodir=dirfoo - even if the --with is not
-# specified! Fix that here. Set the privatedir to /etc/samba/private.
-EXTRA_OECONF='--disable-cups \
- --with-readline=${STAGING_LIBDIR}/.. \
- --with-libiconv=${STAGING_LIBDIR}/.. \
- --without-automount \
- --with-configdir=${sysconfdir}/samba \
- --with-privatedir=${sysconfdir}/samba/private \
- --with-lockdir=${localstatedir}/lock \
- --with-piddir=${localstatedir}/run \
- --with-logfilebase=${localstatedir}/log \
- --with-libdir=${libdir} \
- --with-mandir=${mandir} \
- --with-swatdir=${datadir}/swat \
- samba_cv_struct_timespec=yes'
-
-INITSCRIPT_NAME = "samba"
-# No dependencies, goes in at level 20 (NOTE: take care with the
-# level, later levels put the shutdown later too - see the links
-# in rc6.d, the shutdown must precede network shutdown).
-INITSCRIPT_PARAMS = "defaults"
-CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
-
-do_configure_prepend () {
- ./script/mkversion.sh
- if [ ! -e acinclude.m4 ]; then
- touch aclocal.m4
- cat aclocal.m4 > acinclude.m4
- fi
-}
-
-do_compile () {
- oe_runmake proto_exists
- base_do_compile
-}
-
-do_install_append() {
- mv ${D}${libdir}/libsmbclient.so ${D}${libdir}/libsmbclient.so.0 || true
- ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so
- mkdir -p ${D}${base_sbindir}
- rm -f ${D}${bindir}/*.old
- rm -f ${D}${sbindir}/*.old
- [ -f ${D}${sbindir}/mount.cifs ] && mv ${D}${sbindir}/mount.cifs ${D}${base_sbindir}/
- [ -f ${D}${sbindir}/umount.cifs ] && mv ${D}${sbindir}/umount.cifs ${D}${base_sbindir}/
-
- # This is needed for < 3.2.4
- rm -f ${D}${sbindir}/mount.smbfs ${D}${base_sbindir}/mount.smbfs
- if [ -f ${D}${bindir}/smbmount ]; then
- ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smb
- ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smbfs
- fi
-
- install -D -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba
- install -D -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf
- install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/volatiles.03_samba
- install -d ${D}/var/log/samba
- install -d ${D}/var/spool/samba
-}
-
-do_stage() {
- install -m 0644 include/libsmbclient.h ${STAGING_INCDIR}
- oe_libinstall -C bin -a -so libsmbclient ${STAGING_LIBDIR}
- oe_libinstall -C bin -a -so libtdb ${STAGING_LIBDIR}
- oe_libinstall -C bin -a -so libtalloc ${STAGING_LIBDIR}
- oe_libinstall -C bin -so libwbclient ${STAGING_LIBDIR}
-}
diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb
deleted file mode 100644
index c08dc04cce..0000000000
--- a/packages/samba/samba_3.0.23c.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require samba.inc
-require samba-basic.inc
-
-SRC_URI += "file://configure.patch;patch=1 \
- file://cifs.patch;patch=1"
-
-PR = "r7"
-
-EXTRA_OECONF += "\
- --with-smbmount \
- "
-
-PACKAGES =+ " smbfs smbfs-doc"
-RCONFLICTS_smbfs-doc = "smbfs-ads-doc"
-FILES_smbfs = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb"
-FILES_smbfs-doc = "${mandir}/man8/smbmount.8 ${mandir}/man8/smbumount.8 ${mandir}/man8/smbmnt.8"
-
-do_compile () {
- oe_runmake proto_exists
- base_do_compile
- ${CC} client/mount.cifs.c -o mount.cifs
-}
-
-do_stage() {
- install -m 0644 include/libsmbclient.h ${STAGING_INCDIR}
- oe_libinstall -C bin -a -so libsmbclient ${STAGING_LIBDIR}
-}
diff --git a/packages/samba/samba_3.0.34.bb b/packages/samba/samba_3.0.34.bb
deleted file mode 100644
index d43c50dcdb..0000000000
--- a/packages/samba/samba_3.0.34.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require samba.inc
-require samba-basic.inc
-
-SRC_URI += "file://configure.patch;patch=1 \
- "
-SRC_URI_append_linux-uclibc = "file://uclibc-strlcpy-strlcat.patch;patch=1"
-SRC_URI_append_linux-uclibcgnueabi = "file://uclibc-strlcpy-strlcat.patch;patch=1"
-
-PR = "r5"
-
-PACKAGES =+ " smbfs smbfs-doc"
-
-FILES_smbfs = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb"
-RCONFLICTS_smbfs-doc = "smbfs-ads-doc"
-FILES_smbfs-doc = "${mandir}/man8/smbmount.8 ${mandir}/man8/smbumount.8 ${mandir}/man8/smbmnt.8"
-
-EXTRA_OECONF += "\
- SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
- --with-smbmount \
- "
-
-do_stage() {
- install -m 0644 include/libsmbclient.h ${STAGING_INCDIR}
- oe_libinstall -C bin -a -so libsmbclient ${STAGING_LIBDIR}
-}
diff --git a/packages/samba/samba_3.2.8.bb b/packages/samba/samba_3.2.8.bb
deleted file mode 100644
index 2e2cb959f8..0000000000
--- a/packages/samba/samba_3.2.8.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require samba.inc
-require samba-basic.inc
-
-SRC_URI += "file://configure-3.2.8.patch;patch=1 \
- file://config-h.patch;patch=1 \
- file://mtab.patch;patch=1 \
- "
-
-PR = "r1"
-
-EXTRA_OECONF += "\
- SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
- samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
- linux_getgrouplist_ok=no \
- samba_cv_HAVE_BROKEN_GETGROUPS=no \
- samba_cv_HAVE_FTRUNCATE_EXTEND=yes \
- samba_cv_have_setresuid=yes \
- samba_cv_have_setresgid=yes \
- samba_cv_HAVE_WRFILE_KEYTAB=yes \
- "
-
-do_configure() {
- oe_runconf
-}
diff --git a/packages/samba/samba_3.3.0.bb b/packages/samba/samba_3.3.0.bb
deleted file mode 100644
index 6270c8c0d7..0000000000
--- a/packages/samba/samba_3.3.0.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-require samba.inc
-require samba-basic.inc
-
-# 3.3.0 and newer will upgrade your tdb database to a
-# new version that you can not downgrade to use with older
-# releases. More testing will happen before this is removed
-# should there be further issues. Appears to work though :)
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI += "file://configure-3.3.0.patch;patch=1 \
- file://config-h.patch;patch=1 \
- file://mtab.patch;patch=1 \
- "
-
-PR = "r2"
-
-EXTRA_OECONF += "\
- SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
- samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
- linux_getgrouplist_ok=no \
- samba_cv_HAVE_BROKEN_GETGROUPS=no \
- samba_cv_HAVE_FTRUNCATE_EXTEND=yes \
- samba_cv_have_setresuid=yes \
- samba_cv_have_setresgid=yes \
- samba_cv_HAVE_WRFILE_KEYTAB=yes \
- "
-
-do_configure() {
- oe_runconf
-}
-
-do_compile () {
- base_do_compile
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 19:40:50 +0000