cleanup: delete samba-3.3

diff --git a/archive-patches/samba-3.3.9-config.site b/archive-patches/samba-3.3.9-config.site
deleted file mode 100755 (executable)
index e7b5d99..0000000
--- a/archive-patches/samba-3.3.9-config.site
+++ /dev/null
@@ -1,8 +0,0 @@
-linux_getgrouplist_ok=yes
-samba_cv_REPLACE_READDIR=no 
-samba_cv_HAVE_WRFILE_KEYTAB=no 
-samba_cv_HAVE_Wdeclaration_after_statement=yes 
-samba_cv_HAVE_Werror=yes 
-samba_cv_HAVE_w2=yes 
-samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=no
-samba_cv_CC_NEGATIVE_ENUM_VALUES=yes

diff --git a/archive-patches/samba-3.3.9.diff b/archive-patches/samba-3.3.9.diff
deleted file mode 100644 (file)
index 720630f..0000000
--- a/archive-patches/samba-3.3.9.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-commit 84400c519dda1fe643ce62df46e406eeb88178dd
-Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
-Date:   Wed Jan 13 10:58:47 2010 +0100
-
-    fix build for coolstream HD1
-
-diff --git a/source/client/mtab.c b/source/client/mtab.c
-index 93fbd11..70789bc 100644
---- a/source/client/mtab.c
-+++ b/source/client/mtab.c
-@@ -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/source/configure.in b/source/configure.in
-index 462b112..ddc5bd8 100644
---- a/source/configure.in
-+++ b/source/configure.in
-@@ -1223,31 +1223,41 @@ AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[])
- #
- case "$host_os" in
-     *linux*)
--       # glibc <= 2.3.2 has a broken getgrouplist
--       AC_TRY_RUN([
--#include <unistd.h>
--#include <sys/utsname.h>
--main() {
--       /* glibc up to 2.3 has a broken getgrouplist */
-+
-+AC_CACHE_CHECK([for a broken Linux getgrouplist API],
-+             linux_getgrouplist_ok,
-+             [
-+                 AC_TRY_RUN([
-+include <unistd.h>
-+include <sys/utsname.h>
-+
-+                     int 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);
-+                            int libc_major = __GLIBC__;
-+                            int libc_minor = __GLIBC_MINOR__;
-+
-+                            if (libc_major < 2)
-+                                   return 1;
-+                            if ((libc_major == 2) && (libc_minor <= 3))
-+                                   return 1;
- #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])
--       fi
--       ;;
--    *)
--       AC_CHECK_FUNCS(getgrouplist)
--       ;;
-+                            return 0;
-+                     }
-+
-+                 ],
-+                 [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
-+
-+
- esac
- 
- #

diff --git a/make/samba.mk b/make/samba.mk
index 0f2878405bee9c2d5a6fcd7427b43c5e657f3359..469d1b9b8a4b95396c288d63807d4c4ee32c8ad7 100644 (file)
--- a/make/samba.mk
+++ b/make/samba.mk
@@ -93,36 +93,6 @@ $(D)/samba2: $(ARCHIVE)/samba-$(SAMBA2_VER).tar.gz | $(TARGETPREFIX)
        $(REMOVE)/samba-$(SAMBA2_VER)
        $(TOUCH)
 
-$(D)/samba33: $(D)/libiconv $(ARCHIVE)/samba-$(SAMBA33_VER).tar.gz | $(TARGETPREFIX)
-       $(START_BUILD)
-       rm -rf $(SAMBA_TARGET)
-       mkdir -p $(SAMBA_TARGET)
-       mkdir -p $(SAMBA_TARGET)/bin
-       mkdir -p $(SAMBA_TARGET)/var/etc
-       $(UNTAR)/samba-$(SAMBA33_VER).tar.gz
-       cd $(BUILD_TMP)/samba-$(SAMBA33_VER) && \
-               $(PATCH)/samba-3.3.9.diff && \
-               cd source && \
-               export CONFIG_SITE=$(PATCHES)/samba-3.3.9-config.site && \
-               ./autogen.sh && \
-               $(CONFIGURE) --build=$(BUILD) --host=$(TARGET) --target=$(TARGET) \
-                       --prefix=/ --mandir=/.remove \
-                       --sysconfdir=/etc/samba \
-                       --with-configdir=/etc/samba \
-                       --with-privatedir=/etc/samba \
-                       --with-modulesdir=/lib/samba \
-                       --datadir=/var/samba \
-                       --localstatedir=/var/samba \
-                       --with-piddir=/tmp \
-                       --with-libiconv=/lib \
-                       --without-krb5 --without-ldap --without-ads --disable-cups --disable-swat \
-                       && \
-               $(MAKE) && \
-               $(MAKE) install DESTDIR=$(SAMBA_TARGET)
-       rm -f -r $(SAMBA_TARGET)/.remove
-       $(REMOVE)/samba-$(SAMBA33_VER)
-       $(TOUCH)
-       
 SAMBA36_CONF_OPTS = \
        --prefix=$(SMB_PREFIX) \
        --datadir=/var/samba \