[Pkg-samba-maint] r1179 - trunk
Peter Eisentraut
petere at costa.debian.org
Wed Oct 11 19:42:11 UTC 2006
Author: petere
Date: 2006-10-11 19:42:11 +0000 (Wed, 11 Oct 2006)
New Revision: 1179
Removed:
trunk/samba.prerm
Modified:
trunk/changelog
trunk/samba-common.config
trunk/samba-common.postinst
trunk/samba.config
trunk/samba.postinst
Log:
* Removed old upgrade support.
Modified: trunk/changelog
===================================================================
--- trunk/changelog 2006-10-11 03:02:42 UTC (rev 1178)
+++ trunk/changelog 2006-10-11 19:42:11 UTC (rev 1179)
@@ -37,6 +37,7 @@
Closes: #386499. (patch by Patrick Winnertz)
* Use upstream makefile to install Python module.
* Build-Depend on python-dev instead of python-all-dev.
+ * Removed old upgrade support.
[ Christian Perrier ]
* Add LSB info to the init script
Modified: trunk/samba-common.config
===================================================================
--- trunk/samba-common.config 2006-10-11 03:02:42 UTC (rev 1178)
+++ trunk/samba-common.config 2006-10-11 19:42:11 UTC (rev 1179)
@@ -75,24 +75,6 @@
db_set samba-common/encrypt_passwords "$ENCRYPT"
fi
-
- # If we're upgrading from an old version and there's no
- # 'passdb backend' setting, add one.
- if [ "$1" = "configure" -a -n "$2" ] \
- && dpkg --compare-versions "$2" lt 2.99.cvs.20020713-2 \
- && ! grep -q -i '^[[:space:]]*passdb backend[[:space:]]*=' $FILE
- then
- TMPFILE=/etc/samba/smb.conf.dpkg-tmp
- sed -e'
- s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
- s/^\([[:space:]]*\)encrypt passwords/\1encrypt passwords/i
- /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ {
- /^[[:space:]]*encrypt passwords[[:space:]]*=/a \
- passdb backend = smbpasswd guest
- }' < $FILE > ${TMPFILE}
- chmod a+r ${TMPFILE}
- mv -f ${TMPFILE} /etc/samba/smb.conf
- fi
fi
# Get workgroup name
Modified: trunk/samba-common.postinst
===================================================================
--- trunk/samba-common.postinst 2006-10-11 03:02:42 UTC (rev 1178)
+++ trunk/samba-common.postinst 2006-10-11 19:42:11 UTC (rev 1179)
@@ -93,18 +93,6 @@
< /etc/samba/smb.conf >${TMPFILE}
mv -f ${TMPFILE} /etc/samba/smb.conf
fi
-
- if dpkg --compare-versions "$2" lt 2.999+3.0.alpha20-4 \
- && ! grep -q "^[[:space:]]*panic action[[:space:]]*=" /etc/samba/smb.conf
- then
- sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
- /^[[:space:]]*\[global\]/a \\
-\\
-# Do something sensible when Samba crashes: mail the admin a backtrace\\
- panic action = /usr/share/samba/panic-action %d" < /etc/samba/smb.conf > ${TMPFILE}
- mv -f ${TMPFILE} /etc/samba/smb.conf
- fi
-
fi
chmod a+r /etc/samba/smb.conf
Modified: trunk/samba.config
===================================================================
--- trunk/samba.config 2006-10-11 03:02:42 UTC (rev 1178)
+++ trunk/samba.config 2006-10-11 19:42:11 UTC (rev 1179)
@@ -54,29 +54,6 @@
db_input medium samba/run_mode || true
db_go
-
-# Offer to move the password database for existing users
-if [ "$1" = "configure" -a -n "$2" -a -e /etc/samba/smbpasswd \
- -a ! -e /var/lib/samba/passdb.tdb ] \
- && dpkg --compare-versions "$2" lt 2.99.cvs.20020713-2
-then
- FILE=/etc/samba/smb.conf
- PASSDB=""
- if [ -f "$FILE" ]; then
- PASSDB=`smbconf_retr "passdb backend"`
- fi
- TDBPRIORITY=medium
- if echo "$PASSDB" | grep -q ldapsam; then
- TDBPRIORITY=low
- fi
- db_get samba-common/do_debconf || true
- if [ "${RET}" = "false" ]; then
- TDBPRIORITY=low
- fi
-
- db_input "$TDBPRIORITY" samba/tdbsam || true
-fi
-
# We vary the priority of the next question depending on whether
# the password database already exists...
if [ -e /etc/samba/smbpasswd -o -e /var/lib/samba/passdb.tdb ]; then
Modified: trunk/samba.postinst
===================================================================
--- trunk/samba.postinst 2006-10-11 03:02:42 UTC (rev 1178)
+++ trunk/samba.postinst 2006-10-11 19:42:11 UTC (rev 1179)
@@ -83,46 +83,8 @@
umask 022
-if [ -n "$2" -a -e /etc/samba/smbpasswd \
- -a ! -e /var/lib/samba/passdb.tdb -a "$PDB_MIGRATE" = "true" ] \
- && dpkg --compare-versions "$2" lt 2.99.cvs.20020713-2
-then
- umask 066
- pdbedit -i smbpasswd -e tdbsam
- rm /etc/samba/smbpasswd
- umask 022
-
- # The database has been moved, now make sure we can still find it.
- PASSDB=`sed -n -e"s/^[[:space:]]*\[global\]/\[global\]/i
- /^\[global\]/,/^[[:space:]]*\[/ \
- s/^[[:space:]]*passdb backend[[:space:]]*=[[:space:]]*//pi" \
- < /etc/samba/smb.conf \
- | tail -n 1`
- if echo "$PASSDB" | egrep -q "(^|[[:space:]])smbpasswd"; then
- if ! echo "$PASSDB" | egrep -q "(^|[[:space:]])tdbsam"; then
- PASSDB=`echo $PASSDB | sed -e's/\(^\|[[:space:]]\)smbpasswd/\1tdbsam/'`
- fi
- fi
- if ! echo "$PASSDB" | egrep -q "(^|[[:space:]])tdbsam"; then
- PASSDB="tdbsam $PASSDB"
- fi
- TMPFILE=/etc/samba/smb.conf.dpkg-tmp
- sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
- /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ \
- s/^\([[:space:]]*\)passdb backend[[:space:]]*=.*/\1passdb backend = ${PASSDB}/i" \
- < /etc/samba/smb.conf >${TMPFILE}
- chmod a+r ${TMPFILE}
- mv -f ${TMPFILE} /etc/samba/smb.conf
-fi
-
# ------------------------- Debconf questions end ---------------------
-# Handle removal of nmbd from inetd.conf, which is no longer a supported
-# configuration.
-if dpkg --compare-versions "$2" lt 2.999+3.0.alpha20-4; then
- update-inetd --remove netbios-ns
-fi
-
# We want to add these entries to inetd.conf commented out. Otherwise
# UDP traffic could make inetd to start nmbd or smbd right during
# the configuration stage.
Deleted: trunk/samba.prerm
===================================================================
--- trunk/samba.prerm 2006-10-11 03:02:42 UTC (rev 1178)
+++ trunk/samba.prerm 2006-10-11 19:42:11 UTC (rev 1179)
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = upgrade -a -n "$2" ] && dpkg --compare-versions "$2" lt 2.99 \
- && [ -e /var/lib/samba/passdb.tdb -a ! -e /etc/samba/smbpasswd ]
-then
- pdbedit -i tdbsam -e smbpasswd
- rm -f /var/lib/samba/passdb.tdb
-fi
-
-#DEBHELPER#
More information about the Pkg-samba-maint
mailing list