7 files changed, 81 insertions, 20 deletions
diff --git a/patches/samba-3.0.23d/generic/samba-3.0.23d-autogen.diff.bz2 b/patches/samba-3.0.23d/generic/samba-3.0.23d-autogen.diff.bz2
deleted file mode 100644
index cf115ca8a..000000000
--- a/patches/samba-3.0.23d/generic/samba-3.0.23d-autogen.diff.bz2
+++ /dev/null
diff --git a/patches/samba-3.0.23d/generic/series b/patches/samba-3.0.23d/generic/series
deleted file mode 100644
index fc563765f..000000000
--- a/patches/samba-3.0.23d/generic/series
+++ /dev/null
@@ -1,2 +0,0 @@
-samba-3.0.23-configure.diff -p0
-samba-3.0.23d-autogen.diff.bz2
diff --git a/patches/samba-3.0.23d/generic/samba-3.0.23-configure.diff b/patches/samba-3.0.33/generic/samba-3.0.23-configure.diff
index 2a61d5c53..4bf7bf77e 100644
--- a/patches/samba-3.0.23d/generic/samba-3.0.23-configure.diff
+++ b/patches/samba-3.0.33/generic/samba-3.0.23-configure.diff
@@ -1,8 +1,12 @@
+---
+ source/configure.in |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
 Index: source/configure.in
 ===================================================================
 --- source/configure.in.orig
 +++ source/configure.in
-@@ -1403,7 +1403,7 @@ AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl 
+@@ -1386,7 +1386,7 @@ AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl 
  case "$host_os" in
      *linux*)
         # glibc <= 2.3.2 has a broken getgrouplist
@@ -11,7 +15,7 @@ Index: source/configure.in
  #include <unistd.h>
  #include <sys/utsname.h>
  main() {
-@@ -1419,10 +1419,14 @@ main() {
+@@ -1402,10 +1402,14 @@ main() {
  #endif
         exit(0);
  }
diff --git a/patches/samba-3.0.33/generic/samba-3.0.33-autogen.diff b/patches/samba-3.0.33/generic/samba-3.0.33-autogen.diff
new file mode 100644
index 000000000..b341f73ac
--- /dev/null
+++ b/patches/samba-3.0.33/generic/samba-3.0.33-autogen.diff
@@ -0,0 +1,45 @@
+diff -ur samba-3.0.33-orig/source/configure samba-3.0.33/source/configure
+--- samba-3.0.33-orig/source/configure	2008-11-20 15:13:46.000000000 +0100
++++ samba-3.0.33/source/configure	2009-01-02 15:34:24.000000000 +0100
+@@ -34672,18 +34672,9 @@
+     *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=maybe
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+ #include <unistd.h>
+ #include <sys/utsname.h>
+@@ -34735,6 +34726,7 @@
+ fi
+ 
+ 
++
+        if test x"$linux_getgrouplist_ok" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -34742,6 +34734,13 @@
+ _ACEOF
+ 
+        fi
++       if test x"$linux_getgrouplist_ok" = x"maybe"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GETGROUPLIST 1
++_ACEOF
++
++       fi
+        ;;
+     *)
+ 
diff --git a/patches/samba-3.0.33/generic/samba-3.0.33-linux_set_lease_sighandler.diff b/patches/samba-3.0.33/generic/samba-3.0.33-linux_set_lease_sighandler.diff
new file mode 100644
index 000000000..e85023689
--- /dev/null
+++ b/patches/samba-3.0.33/generic/samba-3.0.33-linux_set_lease_sighandler.diff
@@ -0,0 +1,25 @@
+
+http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23962
+
+---
+ source/modules/vfs_default.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+Index: samba-3.0.33/source/modules/vfs_default.c
+===================================================================
+--- samba-3.0.33.orig/source/modules/vfs_default.c
++++ samba-3.0.33/source/modules/vfs_default.c
+@@ -813,10 +813,11 @@ static int vfswrap_linux_setlease(vfs_ha
+ 
+ 	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
diff --git a/patches/samba-3.0.33/generic/series b/patches/samba-3.0.33/generic/series
new file mode 100644
index 000000000..aef004e50
--- /dev/null
+++ b/patches/samba-3.0.33/generic/series
@@ -0,0 +1,3 @@
+samba-3.0.23-configure.diff -p0
+samba-3.0.33-linux_set_lease_sighandler.diff
+samba-3.0.33-autogen.diff
diff --git a/rules/samba.make b/rules/samba.make
index 9f00248a5..155e431c9 100644
--- a/rules/samba.make
+++ b/rules/samba.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_SAMBA) += samba
 #
 # Paths and names
 #
-SAMBA_VERSION	:= 3.0.23d
+SAMBA_VERSION	:= 3.0.33
 SAMBA		:= samba-$(SAMBA_VERSION)
 SAMBA_SUFFIX	:= tar.gz
 SAMBA_URL	:= http://us5.samba.org/samba/ftp/old-versions/$(SAMBA).$(SAMBA_SUFFIX)
@@ -25,20 +25,6 @@ SAMBA_SOURCE	:= $(SRCDIR)/$(SAMBA).$(SAMBA_SUFFIX)
 SAMBA_DIR	:= $(BUILDDIR)/$(SAMBA)
 
 # ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-samba_get: $(STATEDIR)/samba.get
-
-$(STATEDIR)/samba.get: $(samba_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
-$(SAMBA_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, SAMBA)
-
-# ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
 
@@ -137,7 +123,7 @@ $(STATEDIR)/samba.targetinstall: $(samba_targetinstall_deps_default)
 	@$(call install_fixup, samba,DEPENDS,)
 	@$(call install_fixup, samba,DESCRIPTION,missing)
 
-	@$(call install_copy, samba, 0, 0, 0755, /etc/samba)	
+	@$(call install_copy, samba, 0, 0, 0755, /etc/samba)
 
 ifdef PTXCONF_SAMBA_COMMON
 	@$(call install_copy, samba, 0, 0, 0755, $(SAMBA_DIR)/source/bin/nmblookup, /usr/bin/nmblookup)