From 8b8d13e00b2655271aed830894492f76b62350f9 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@fedoraproject.org>
Date: Sep 11 2007 18:10:27 +0000
Subject: * Tue Sep 11 2007 Simo Sorce <ssorce@redhat.com> 3.0.26a-0.fc8

- upgrade to the latest upstream realease
- includes security fixes released today in 3.0.26

---

diff --git a/.cvsignore b/.cvsignore
index ea82edb..1749347 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-samba-3.0.25c.tar.gz
+samba-3.0.26a.tar.gz
diff --git a/filter-requires-samba.sh b/filter-requires-samba.sh
index c3c7a6b..8f61102 100755
--- a/filter-requires-samba.sh
+++ b/filter-requires-samba.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8)'
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8|smbldap_tools)'
diff --git a/samba-3.0.25-imdap-basedn.patch b/samba-3.0.25-imdap-basedn.patch
deleted file mode 100644
index 6765728..0000000
--- a/samba-3.0.25-imdap-basedn.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/source/nsswitch/idmap_ldap.c b/source/nsswitch/idmap_ldap.c
-index ca7d32b..7c02779 100644
---- a/source/nsswitch/idmap_ldap.c
-+++ b/source/nsswitch/idmap_ldap.c
-@@ -287,16 +287,9 @@ static NTSTATUS idmap_ldap_alloc_init(const char *params)
- 	}
- 	CHECK_ALLOC_DONE( idmap_alloc_ldap->url );
- 
--	tmp = lp_ldap_idmap_suffix();
-+	tmp = lp_parm_const_string(-1, "idmap alloc config", "ldap_base_dn", NULL);
- 	if ( ! tmp || ! *tmp) {
--		tmp = lp_parm_const_string(-1, "idmap alloc config", "ldap_base_dn", NULL);
--	}
--	if ( ! tmp) {
--		tmp = lp_ldap_suffix();
--		if (tmp) {
--			DEBUG(1, ("WARNING: Trying to use the global ldap suffix(%s)\n", tmp));
--			DEBUGADD(1, ("as suffix. This may not be what you want!\n"));
--		}
-+		tmp = lp_ldap_idmap_suffix();
- 		if ( ! tmp) {
- 			DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
- 			ret = NT_STATUS_UNSUCCESSFUL;
-@@ -780,21 +773,16 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom)
- 	}
- 	CHECK_ALLOC_DONE(ctx->url);
- 
--	tmp = lp_ldap_idmap_suffix();
--	if ( ! tmp || ! *tmp) {
--		tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
--	}
--	if ( ! tmp) {
--		tmp = lp_ldap_suffix();
--		if (tmp) {
--			DEBUG(1, ("WARNING: Trying to use the global ldap suffix(%s)\n", tmp));
--			DEBUGADD(1, ("as suffix. This may not be what you want!\n"));
--		} else {
--			DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
--			ret = NT_STATUS_UNSUCCESSFUL;
--			goto done;
--		}		
--	}
-+        tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
-+        if ( ! tmp || ! *tmp) {
-+                tmp = lp_ldap_idmap_suffix();
-+                if ( ! tmp) {
-+                        DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
-+                        ret = NT_STATUS_UNSUCCESSFUL;
-+                        goto done;
-+		}
-+        }
-+
- 	ctx->suffix = talloc_strdup(ctx, tmp);
- 	CHECK_ALLOC_DONE(ctx->suffix);
- 
diff --git a/samba.spec b/samba.spec
index ae340e5..541bf03 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,7 +1,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.0.25c
+Version: 3.0.26a
 Release: 0%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
@@ -41,7 +41,6 @@ Patch107: samba-3.0.23rc3-passwd.patch
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
-Patch210: samba-3.0.25-imdap-basedn.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -158,7 +157,6 @@ cp %{SOURCE11} packaging/Fedora/
 %patch110 -p1 -b .smbspool
 %patch111 -p1 -b .smbclient
 %patch200 -p0 -b .inotify
-%patch210 -p1 -b .idmap_basedn
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -641,6 +639,10 @@ exit 0
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Tue Sep 11 2007 Simo Sorce <ssorce@redhat.com> 3.0.26a-0.fc8
+- upgrade to the latest upstream realease
+- includes security fixes released today in 3.0.26
+
 * Tue Aug 21 2007 Simo Sorce <ssorce@redhat.com> 3.0.25c-0.fc7
 - update to 3.0.25c
 - add patch to fix samba bugzilla 4772
diff --git a/sources b/sources
index cdad85d..468a676 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87950694270b86cbc1b2074cb53dd1aa  samba-3.0.25c.tar.gz
+6511ff23d9b1d4858744778bba543c5d  samba-3.0.26a.tar.gz