$NetBSD$

--- ./xmppd/xmppd.py.orig	2009-06-04 17:49:03.000000000 +0000
+++ ./xmppd/xmppd.py	2010-07-14 16:22:58.000000000 +0000
@@ -32,7 +32,7 @@
 from math import *
 import traceback
 
-import socket,select,random,os,sys,thread,errno,time,threading,sha
+import socket,select,random,os,sys,thread,errno,time,threading,hashlib
 globals()['DEFAULT_LANG'] = 'en'
 #globals()['LANG_LIST'] = []
 
@@ -887,7 +887,7 @@
 			self.SESS_LOCK.release()
 
 class Server:
-    def __init__(self,cfgfile="./xmppd.xml",cmd_options={},under_restart=False):
+    def __init__(self,cfgfile="/usr/pkg/etc/spade/xmppd.xml",cmd_options={},under_restart=False):
 #        threading.Thread.__init__(self)
         self.defaultNamespace = NS_CLIENT
         #Load localizer as _l
@@ -953,7 +953,7 @@
 	if cmd_options.setdefault('socker_info',False): import xmlrpclib
 
 	if not cmd_options.setdefault('password',None):
-	    globals()['RPC_PASSWORD'] = sha.new(str(time.time())+globals()['SOCKER_TGUID']+sha.new(str(time.time())).hexdigest()).hexdigest()
+	    globals()['RPC_PASSWORD'] = hashlib.sha1(str(time.time())+globals()['SOCKER_TGUID']+hashlib.sha1(str(time.time())).hexdigest()).hexdigest()
 	else:
 	    globals()['RPC_PASSWORD'] = cmd_options['password']
 
