1.1--- a/lisp/lib/net/net.asd	Sun May 12 20:17:34 2024 -0400
     1.2+++ b/lisp/lib/net/net.asd	Sun May 12 20:28:00 2024 -0400
     1.3@@ -7,14 +7,14 @@
     1.4    :sb-bsd-sockets :cl-ppcre
     1.5    :dat :obj
     1.6    ;; :swank  ;; HACK 2024-05-12: temporarily disable, incompatible with current upstream
     1.7-   :swank-client
     1.8+   ;; :swank-client
     1.9    :dexador ;; fetch
    1.10    :hunchentoot :std :log)
    1.11   :serial t
    1.12   :components ((:file "pkg")
    1.13                (:file "err")
    1.14                (:file "obj")
    1.15-               (:file "sans-io")
    1.16+               ;; (:file "sans-io")
    1.17                (:file "util")
    1.18                (:file "udp")
    1.19                (:file "tcp")
    1.20@@ -24,7 +24,7 @@
    1.21                              (:file "tlv")
    1.22                              (:file "osc")))
    1.23                (:module "proto"
    1.24-                :components ((:file "crew")
    1.25+                :components (;; (:file "crew") ;; HACK 2024-05-12: temporarily disable, incompatible with current upstream
    1.26                              ;; (:file "http")
    1.27                              (:file "dns")
    1.28                              (:file "ssh")))

     2.1--- a/lisp/lib/net/pkg.lisp	Sun May 12 20:17:34 2024 -0400
     2.2+++ b/lisp/lib/net/pkg.lisp	Sun May 12 20:28:00 2024 -0400
     2.3@@ -19,9 +19,9 @@
     2.4   (:use :cl :obj :dat/proto :std :log :net/core :sb-bsd-sockets)
     2.5   (:export :get-address-by-name))
     2.6 
     2.7-(defpackage :net/sans-io
     2.8-  (:use :cl :obj :dat/proto :std :net/core :sb-bsd-sockets)
     2.9-  (:export))
    2.10+;; (defpackage :net/sans-io
    2.11+;;   (:use :cl :obj :dat/proto :std :net/core :sb-bsd-sockets)
    2.12+;;   (:export))
    2.13   
    2.14 (defpackage :net/udp
    2.15   (:nicknames :udp)
    2.16@@ -94,42 +94,42 @@
    2.17    :print-as-double))
    2.18 
    2.19 ;; sb-thread::make-condition
    2.20-(defpackage :net/proto/crew
    2.21-  (:nicknames :net/crew)
    2.22-  (:use :cl :sb-bsd-sockets :std :net/core :obj/id)
    2.23-  (:import-from #:sb-thread
    2.24-                #:condition-notify
    2.25-                #:condition-wait
    2.26-                ;; #:make-condition-variable
    2.27-                #:make-mutex ;; make-lock
    2.28-                #:make-thread
    2.29-                #:with-mutex)
    2.30-  (:import-from :sb-concurrency
    2.31-                :make-gate)
    2.32-  (:import-from #:swank-client
    2.33-                #:slime-close
    2.34-                #:slime-connect
    2.35-                #:slime-eval
    2.36-                #:slime-eval-async
    2.37-                #:slime-migrate-evals
    2.38-                #:slime-network-error
    2.39-                #:slime-pending-evals-p
    2.40-                #:swank-connection
    2.41-                #:with-slime-connection)
    2.42-  (:export 
    2.43-   :crew-connection-info
    2.44-   :make-worker-pool
    2.45-   :crew-worker :crew-worker-pool
    2.46-   :*crew-worker-pools-lock*
    2.47-   :*crew-worker-pools*
    2.48-   :connect-worker
    2.49-   :disconnect-worker
    2.50-   :parallel-mapcar :parallel-reduce
    2.51-   :eval-form-all-workers
    2.52-   :eval-form-repeatedly
    2.53-   :eval-repeatedly-async-state   
    2.54-   :worker-count
    2.55-   :reconnect-worker))
    2.56+;; (defpackage :net/proto/crew
    2.57+;;   (:nicknames :net/crew)
    2.58+;;   (:use :cl :sb-bsd-sockets :std :net/core :obj/id)
    2.59+;;   (:import-from #:sb-thread
    2.60+;;                 #:condition-notify
    2.61+;;                 #:condition-wait
    2.62+;;                 ;; #:make-condition-variable
    2.63+;;                 #:make-mutex ;; make-lock
    2.64+;;                 #:make-thread
    2.65+;;                 #:with-mutex)
    2.66+;;   (:import-from :sb-concurrency
    2.67+;;                 :make-gate)
    2.68+;;   (:import-from #:swank-client
    2.69+;;                 #:slime-close
    2.70+;;                 #:slime-connect
    2.71+;;                 #:slime-eval
    2.72+;;                 #:slime-eval-async
    2.73+;;                 #:slime-migrate-evals
    2.74+;;                 #:slime-network-error
    2.75+;;                 #:slime-pending-evals-p
    2.76+;;                 #:swank-connection
    2.77+;;                 #:with-slime-connection)
    2.78+;;   (:export 
    2.79+;;    :crew-connection-info
    2.80+;;    :make-worker-pool
    2.81+;;    :crew-worker :crew-worker-pool
    2.82+;;    :*crew-worker-pools-lock*
    2.83+;;    :*crew-worker-pools*
    2.84+;;    :connect-worker
    2.85+;;    :disconnect-worker
    2.86+;;    :parallel-mapcar :parallel-reduce
    2.87+;;    :eval-form-all-workers
    2.88+;;    :eval-form-repeatedly
    2.89+;;    :eval-repeatedly-async-state   
    2.90+;;    :worker-count
    2.91+;;    :reconnect-worker))
    2.92 
    2.93 (defpackage :net/proto/dns
    2.94   (:nicknames :net/dns)
    2.95@@ -169,11 +169,11 @@
    2.96    :net/core 
    2.97    :net/tcp 
    2.98    :net/udp
    2.99-   :net/sans-io
   2.100+   ;; :net/sans-io
   2.101    :net/codec/dns 
   2.102    :net/codec/osc 
   2.103    :net/codec/tlv
   2.104    :net/proto/dns 
   2.105-   :net/proto/crew 
   2.106+   ;; :net/proto/crew 
   2.107    :net/proto/ssh
   2.108    :net/proto/http))