# HG changeset patch # User Richard Westhaver # Date 1716793701 14400 # Node ID d1d64b856fae3d8e006660f828824df083904bc4 # Parent 9eb2c112aa162bad24d7916ad799546de8c3204e rm dexador dependency diff -r 9eb2c112aa16 -r d1d64b856fae lisp/lib/cry/cry.asd --- a/lisp/lib/cry/cry.asd Sun May 26 22:59:21 2024 -0400 +++ b/lisp/lib/cry/cry.asd Mon May 27 03:08:21 2024 -0400 @@ -3,7 +3,7 @@ :maintainer "ellis " :bug-tracker "https://vc.compiler.company/comp/core/issues" :depends-on - (:ironclad :sb-concurrency :sb-posix + (#+crypto :ironclad :sb-concurrency :sb-posix :sb-bsd-sockets :cl-ppcre :std :log :obj) :serial t diff -r 9eb2c112aa16 -r d1d64b856fae lisp/lib/cry/pkg.lisp --- a/lisp/lib/cry/pkg.lisp Sun May 26 22:59:21 2024 -0400 +++ b/lisp/lib/cry/pkg.lisp Mon May 27 03:08:21 2024 -0400 @@ -1,7 +1,7 @@ (defpackage :cry (:nicknames :cryptography) - (:shadowing-import-from :ironclad :integer-to-octets :octets-to-integer :xor) - (:use :cl :std :sb-thread :sb-concurrency :ironclad :obj/db :obj/id) + #+crypto (:shadowing-import-from :ironclad :integer-to-octets :octets-to-integer :xor) + (:use :cl :std :sb-thread :sb-concurrency #+crypto :ironclad :obj/db :obj/id) (:export :crypto-error :crypto-token-expired :crypto-token-invalid :crypto-key :token :crypto-token :password :*default-password-db* :*default-password-hasher* :*default-password-store* :*default-password-pepper* diff -r 9eb2c112aa16 -r d1d64b856fae lisp/lib/net/cookie.lisp --- a/lisp/lib/net/cookie.lisp Sun May 26 22:59:21 2024 -0400 +++ b/lisp/lib/net/cookie.lisp Mon May 27 03:08:21 2024 -0400 @@ -141,7 +141,7 @@ (labels ((format-cookie-date (universal-time s) (when universal-time (format-timestring s (universal-to-timestamp universal-time) - :format +set-cookie-date-format+ :timezone local-time:+gmt-zone+)))) + :format +set-cookie-date-format+ :timezone obj/time:+gmt-zone+)))) (format stream "~A=~A~@[; Expires=~A~]~@[; Max-age=~A~]~@[; Path=~A~]~@[; Domain=~A~]~@[; SameSite=~A~]~:[~;; Partitioned~]~:[~;; Secure~]~:[~;; HttpOnly~]" (cookie-name cookie) @@ -178,18 +178,18 @@ (char<= #\0 char #\9)) (defun get-tz-offset (tz-abbrev) - (symbol-macrolet ((timezones local-time::*abbreviated-subzone-name->timezone-list*)) + (symbol-macrolet ((timezones obj/time::*abbreviated-subzone-name->timezone-list*)) (let* ((tz (gethash tz-abbrev timezones nil)) (tz (if tz (car tz) (when (zerop (hash-table-count timezones)) - (local-time::reread-timezone-repository + (obj/time::reread-timezone-repository :timezone-repository (asdf:system-relative-pathname :local-time #P"zoneinfo/")) (first (gethash tz-abbrev timezones nil)))))) (when tz - (loop for sub across (local-time::timezone-subzones tz) - when (equal tz-abbrev (local-time::subzone-abbrev sub)) - do (return (local-time::subzone-offset sub))))))) + (loop for sub across (obj/time::timezone-subzones tz) + when (equal tz-abbrev (obj/time::subzone-abbrev sub)) + do (return (obj/time::subzone-offset sub))))))) (defparameter *current-century-offset* (* (1- (timestamp-century (today))) @@ -262,8 +262,8 @@ (when (< year 100) (incf year *current-century-offset*)) (return-from parse-cookie-date - (local-time:timestamp-to-universal - (local-time:encode-timestamp 0 sec min hour day month year :timezone local-time:+gmt-zone+ + (obj/time:timestamp-to-universal + (obj/time:encode-timestamp 0 sec min hour day month year :timezone obj/time:+gmt-zone+ :offset offset)))))) (error () (error 'invalid-expires-date diff -r 9eb2c112aa16 -r d1d64b856fae lisp/lib/net/net.asd --- a/lisp/lib/net/net.asd Sun May 26 22:59:21 2024 -0400 +++ b/lisp/lib/net/net.asd Mon May 27 03:08:21 2024 -0400 @@ -5,13 +5,13 @@ :depends-on (:sb-concurrency :sb-posix :sb-bsd-sockets :cl-ppcre + :trivial-mimes + :fast-io :dat :obj :io :parse - ;; :swank ;; HACK 2024-05-12: temporarily disable, incompatible with current upstream - ;; :swank-client + ;; #+swank :swank-client ;; HACK 2024-05-12: temporarily disable, incompatible with current upstream :cl+ssl - :dexador ;; fetch :chipz :babel :chunga - :hunchentoot :std :log) + :std :log) :serial t :components ((:file "pkg") (:file "err") @@ -27,6 +27,7 @@ (:file "osc"))) (:module "proto" :components (;; (:file "crew") ;; HACK 2024-05-12: temporarily disable, incompatible with current upstream + (:file "swank") (:file "http") (:file "dns") (:file "ssh"))) diff -r 9eb2c112aa16 -r d1d64b856fae lisp/lib/net/pkg.lisp --- a/lisp/lib/net/pkg.lisp Sun May 26 22:59:21 2024 -0400 +++ b/lisp/lib/net/pkg.lisp Mon May 27 03:08:21 2024 -0400 @@ -131,6 +131,10 @@ ;; :worker-count ;; :reconnect-worker)) +(defpackage :net/proto/swank + (:use :cl :sb-bsd-sockets :std :net/core :net/tcp) + (:export)) + (defpackage :net/proto/dns (:nicknames :net/dns) (:use :cl :sb-bsd-sockets :std :net/core :net/udp :codec/dns) diff -r 9eb2c112aa16 -r d1d64b856fae lisp/lib/net/proto/swank.lisp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/lib/net/proto/swank.lisp Mon May 27 03:08:21 2024 -0400 @@ -0,0 +1,6 @@ +;;; net/proto/swank.lisp --- Swank Protocol Support + +;; + +;;; Code: +(in-package :net/proto/swank) diff -r 9eb2c112aa16 -r d1d64b856fae lisp/lib/net/req.lisp --- a/lisp/lib/net/req.lisp Sun May 26 22:59:21 2024 -0400 +++ b/lisp/lib/net/req.lisp Mon May 27 03:08:21 2024 -0400 @@ -1032,10 +1032,10 @@ stream)) (defun make-proxy-authorization (uri) - (let ((proxy-auth (quri:uri-userinfo uri))) + (let ((proxy-auth (obj/uri:uri-userinfo uri))) (when proxy-auth (format nil "Basic ~A" - (cl-base64:string-to-base64-string proxy-auth))))) + (dat/base64:string-to-base64-string proxy-auth))))) (defconstant +socks5-version+ 5) (defconstant +socks5-reserved+ 0) @@ -1166,7 +1166,7 @@ (insecure *no-ssl*) ca-path &aux - (proxy-uri (and proxy (quri:uri proxy))) + (proxy-uri (and proxy (obj/uri:uri proxy))) (original-user-supplied-stream stream) (user-supplied-stream (if (usocket-wrapped-stream-p stream) (usocket-wrapped-stream-stream stream) stream))) (declare (ignorable ssl-key-file ssl-cert-file ssl-key-password @@ -1255,7 +1255,7 @@ (boundary (and multipart-p (make-random-string 12))) (content (if (and form-urlencoded-p (not (stringp content))) ;; user can provide already encoded content, trust them. - (quri:url-encode-params content) + (obj/uri::url-encode-params content) content)) (stream (or user-supplied-stream (and use-connection-pool diff -r 9eb2c112aa16 -r d1d64b856fae lisp/std/pkg.lisp --- a/lisp/std/pkg.lisp Sun May 26 22:59:21 2024 -0400 +++ b/lisp/std/pkg.lisp Mon May 27 03:08:21 2024 -0400 @@ -391,7 +391,8 @@ (:export :current-lisp-implementation :save-lisp-tree-shake-and-die - :save-lisp-and-live)) + :save-lisp-and-live + :forget-shared-objects)) (defpkg :std (:use :cl :sb-unicode :cl-ppcre :sb-mop :sb-c :sb-thread :sb-alien :sb-gray :sb-concurrency) diff -r 9eb2c112aa16 -r d1d64b856fae lisp/std/sys.lisp --- a/lisp/std/sys.lisp Sun May 26 22:59:21 2024 -0400 +++ b/lisp/std/sys.lisp Mon May 27 03:08:21 2024 -0400 @@ -71,3 +71,7 @@ ;; (sb-di::debug-fun-lambda-list ;; (sb-di::make-compiled-debug-fun cdf code)))))) ;; (print info)))) + +(defun forget-shared-objects () + "Set the DONT-SAVE slot of all objects in SB-SYS:*SHARED-OBJECTS* to T." + (mapcar (lambda (obj) (setf (sb-alien::shared-object-dont-save obj) t)) sb-sys:*shared-objects*)) diff -r 9eb2c112aa16 -r d1d64b856fae x.lisp --- a/x.lisp Sun May 26 22:59:21 2024 -0400 +++ b/x.lisp Mon May 27 03:08:21 2024 -0400 @@ -6,7 +6,7 @@ x.lisp |# (require 'asdf) -(require 'sb-posix) +;; (require 'sb-posix) (require 'sb-concurrency) #-(or sbcl cl) (error "unsupported Lisp compiler") @@ -153,6 +153,8 @@ (format t "saving ~A to: ~A~%" name (merge-pathnames name *stash-path*)) (let ((sys (sb-int:keywordicate (format nil "BIN/~A" (string-upcase name))))) (ql:quickload sys) + (push :ssl *features*) + (std/sys:forget-shared-objects) (asdf:make sys))) (defun x-build (args)