[Pkg-samba-maint] r2329 - in branches/samba/backports/lenny/debian: . patches

[bubulle at alioth.debian.org]

tags 508388 pending
thanks

Author: bubulle
Date: 2009-01-07 18:38:09 +0000 (Wed, 07 Jan 2009)
New Revision: 2329

Added:
   branches/samba/backports/lenny/debian/patches/documentation-links-debian.patch
   branches/samba/backports/lenny/debian/patches/documentation-links.patch
Modified:
   branches/samba/backports/lenny/debian/changelog
   branches/samba/backports/lenny/debian/patches/series
Log:
New upstream release and merge changes from 2:3.2.5-3


Modified: branches/samba/backports/lenny/debian/changelog
===================================================================
--- branches/samba/backports/lenny/debian/changelog	2009-01-06 21:28:33 UTC (rev 2328)
+++ branches/samba/backports/lenny/debian/changelog	2009-01-07 18:38:09 UTC (rev 2329)
@@ -1,3 +1,16 @@
+samba (2:3.2.7-1~bpo50+1) lenny-backports; urgency=low
+
+  * New upstream release
+    Fix Potential access to "/" in setups with registry shares enabled
+    This fixes CVE-2009-0022.
+  * Resync with changes from 2:3.2.5-3 in lenny
+  * Fix links in HTML documentation index file.
+    Closes: #508388
+  * Drop spurious docs-xml/smbdotconf/parameters.global.xml.new
+    file in the diff. Thanks to the release managers for spotting it
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 21 Dec 2008 08:09:31 +0100
+
 samba (2:3.2.6-1~bpo50+1) lenny-backports; urgency=low
 
   * New upstream release, backported to lenny

Added: branches/samba/backports/lenny/debian/patches/documentation-links-debian.patch
===================================================================
--- branches/samba/backports/lenny/debian/patches/documentation-links-debian.patch	                        (rev 0)
+++ branches/samba/backports/lenny/debian/patches/documentation-links-debian.patch	2009-01-07 18:38:09 UTC (rev 2329)
@@ -0,0 +1,21 @@
+Goal: Fix documentation links
+
+Fixes: #508388
+
+Status wrt upstream: Debian-specific
+
+Note: 
+
+Index: samba-3.2.5/docs/htmldocs/index.html
+===================================================================
+--- samba-3.2.5.orig/docs/htmldocs/index.html
++++ samba-3.2.5/docs/htmldocs/index.html
+@@ -30,8 +30,4 @@
+  <td valign="top"><a href="manpages/index.html">Man pages</a></td>
+  <td valign="top">The Samba man pages in HTML.</td>
+ </tr>
+-<tr>
+- <td valign="top"><a href="../../WHATSNEW.txt">WHATSNEW</a></td>
+-  <td valign="top">Samba Release Notes.</td>
+-</tr>
+ </table></body></html>

Added: branches/samba/backports/lenny/debian/patches/documentation-links.patch
===================================================================
--- branches/samba/backports/lenny/debian/patches/documentation-links.patch	                        (rev 0)
+++ branches/samba/backports/lenny/debian/patches/documentation-links.patch	2009-01-07 18:38:09 UTC (rev 2329)
@@ -0,0 +1,34 @@
+Goal: Fix documentation links
+
+Fixes: #508388
+
+Status wrt upstream: Reported as #5968
+
+Note: 
+
+Index: samba-3.2.5/docs/htmldocs/index.html
+===================================================================
+--- samba/docs/htmldocs/index.html	2008-11-27 16:48:42.000000000 +0100
++++ samba.orig/docs/htmldocs/index.html	2008-12-14 08:40:14.841582235 +0100
+@@ -23,19 +23,15 @@
+  <td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
+ </tr>
+ <tr>
+- <td valign="top"><a href="../using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
++ <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
+  <td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
+ </tr>
+ <tr>
+- <td valign="top"><a href="manpages-3/index.html">Man pages</a></td>
++ <td valign="top"><a href="manpages/index.html">Man pages</a></td>
+  <td valign="top">The Samba man pages in HTML.</td>
+ </tr>
+ <tr>
+  <td valign="top"><a href="../../WHATSNEW.txt">WHATSNEW</a></td>
+   <td valign="top">Samba Release Notes.</td>
+ </tr>
+-<tr>
+- <td valign="top"><a href="../../README.VENDOR">README.VENDOR</a></td>
+-  <td valign="top">VENDOR specific information.</td>
+-</tr>
+ </table></body></html>

Modified: branches/samba/backports/lenny/debian/patches/series
===================================================================
--- branches/samba/backports/lenny/debian/patches/series	2009-01-06 21:28:33 UTC (rev 2328)
+++ branches/samba/backports/lenny/debian/patches/series	2009-01-07 18:38:09 UTC (rev 2329)
@@ -18,3 +18,5 @@
 smbtar-bashism.patch
 no-unnecessary-cups.patch
 shrink-dead-code.patch
+documentation-links.patch
+documentation-links-debian.patch