[Pkg-samba-maint] r1596 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-11-23 21:03:57 +0000 (Fri, 23 Nov 2007)
New Revision: 1596

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.postinst
Log:
Drop some code from samba.postinst that only applies to upgrades from
pre-3.0 (i.e., pre-sarge) packages.  Dropped changes:

- don't chmod /etc/samba/smbpsaswd and /var/backups/smbpasswd.bak, the
  permissions are now always set correctly initially and never changed
  afterwards, so this is only relevant for fixing permissions set by ancient
  package verisons
- don't worry about removing /etc/samba/debian_config, this is long gone
- don't bother moving logfiles, there should no longer be any directly under
  /var/log



Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-11-23 20:26:05 UTC (rev 1595)
+++ trunk/samba/debian/changelog	2007-11-23 21:03:57 UTC (rev 1596)
@@ -18,12 +18,14 @@
     priority based on whether there's an existing value, since there's
     now *always* an existing value but the value doesn't tell us
     anything meaningful about the user's preference.  Closes: #451271.
+  * Drop some code from samba.postinst that only applies to upgrades from
+    pre-3.0 (i.e., pre-sarge) packages
 
   [ Christian Perrier ]
   * Update the "built by" part of README.debian
   * Remove the very outdated parts of README.debian
 
- -- Steve Langasek <vorlon at debian.org>  Fri, 23 Nov 2007 11:33:46 -0800
+ -- Steve Langasek <vorlon at debian.org>  Fri, 23 Nov 2007 12:58:14 -0800
 
 samba (3.0.27-1) unstable; urgency=low
 

Modified: trunk/samba/debian/samba.postinst
===================================================================
--- trunk/samba/debian/samba.postinst	2007-11-23 20:26:05 UTC (rev 1595)
+++ trunk/samba/debian/samba.postinst	2007-11-23 21:03:57 UTC (rev 1596)
@@ -105,25 +105,6 @@
 	update-inetd --enable netbios-ssn
 fi
 
-# This check is a safety net: the /etc/samba/smbpasswd file must have
-#	permissions 600.
-if [ -f /etc/samba/smbpasswd ]; then
-	chmod 600 /etc/samba/smbpasswd
-fi
-
-# Do the same check for /var/backup/smbpasswd.bak, just in case.
-if [ -f /var/backups/smbpasswd.bak ]; then
-	chmod 600 /var/backups/smbpasswd.bak
-fi
-
-# Delete old /etc/samba/debian_config file, which is not used anymore
-#	now that we are using debconf.
-rm -f /etc/samba/debian_config
-
-# Move old log files to the new location of Samba's log files
-mv -f /var/log/nmb* /var/log/samba/ 2> /dev/null || true
-mv -f /var/log/smb* /var/log/samba/ 2> /dev/null || true
-
 # add the sambashare group
 if ! getent group sambashare > /dev/null 2>&1
 then