r10155: 11 Nov 2004 Kevin Rosenberg <kevin@rosenberg.net>

        * clsql-postgresql-socket.asd, db-postgresql-socket/postgresql-socket-package.lisp:
        Use sb-md5 package on SBCL, recommended by Chris capel

diff --git a/ChangeLog b/ChangeLog
index bc897d25fe8eb0e560f92ce84305d910ad044a28..5c88642bf4d73e1c6f80105df55f6d4e2fca0460 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+11 Nov 2004 Kevin Rosenberg <kevin@rosenberg.net>
+       * clsql-postgresql-socket.asd, db-postgresql-socket/postgresql-socket-package.lisp:
+       Use sb-md5 package on SBCL, recommended by Chris capel
+       
 09 Nov 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 3.1.0 released: New SQLite3 backend by Aurelio Bignoli
        * doc/appendix.xml: Document SQLITE3 backend, patch by Aurelio Bignoli

diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd
index e5e1320b52846c0f590b30f0a3b98b855b9bf190..f47eddf1cb4f235ff00d53d33ae345e1ecebaa5c 100644 (file)
--- a/clsql-postgresql-socket.asd
+++ b/clsql-postgresql-socket.asd
@@ -29,7 +29,7 @@
   :description "Common Lisp SQL PostgreSQL Socket Driver"
   :long-description "cl-sql-postgresql-socket package provides a database driver to the PostgreSQL database via a socket interface."
 
-  :depends-on (clsql uffi md5 #+sbcl sb-bsd-sockets)
+  :depends-on (clsql uffi #-sbcl md5 #+sbcl sb-md5 #+sbcl sb-bsd-sockets)
   :components
   ((:module :db-postgresql-socket
            :components

diff --git a/db-postgresql-socket/postgresql-socket-api.lisp b/db-postgresql-socket/postgresql-socket-api.lisp
index ba0cd221bbdc547c920d174bb023c22cdea58b3e..7ad32362f2c86da708aebc53d6a83de6100c6939 100644 (file)
--- a/db-postgresql-socket/postgresql-socket-api.lisp
+++ b/db-postgresql-socket/postgresql-socket-api.lisp
@@ -426,7 +426,7 @@ troubles."
 (defun encrypt-md5 (plaintext salt)
   (string-downcase
    (format nil "~{~2,'0X~}"
-          (coerce (md5:md5sum-sequence (concatenate 'string plaintext salt)) 'list))))
+          (coerce (md5sum-sequence (concatenate 'string plaintext salt)) 'list))))
 
 (defun reopen-postgresql-connection (connection)
   "Reopen the given PostgreSQL connection.  Closes any existing

diff --git a/db-postgresql-socket/postgresql-socket-package.lisp b/db-postgresql-socket/postgresql-socket-package.lisp
index fa4062b1aa110cb45be42b208cc9f76e4907ac4b..f038a94f91cde26c2ad817104dfd57a9d679da78 100644 (file)
--- a/db-postgresql-socket/postgresql-socket-package.lisp
+++ b/db-postgresql-socket/postgresql-socket-package.lisp
@@ -21,7 +21,7 @@
 #+lispworks (require "comm")
 
 (defpackage #:postgresql-socket
-  (:use #:cl)
+  (:use #:cl #-sbcl md5 #+sbcl sb-md5)
   (:export #:pgsql-ftype
           #:pgsql-ftype#bytea
           #:pgsql-ftype#int2