1.1--- a/lisp/lib/cry/cry.asd Sun May 26 22:59:21 2024 -0400
1.2+++ b/lisp/lib/cry/cry.asd Mon May 27 03:08:21 2024 -0400
1.3@@ -3,7 +3,7 @@
1.4 :maintainer "ellis <ellis@rwest.io>"
1.5 :bug-tracker "https://vc.compiler.company/comp/core/issues"
1.6 :depends-on
1.7- (:ironclad :sb-concurrency :sb-posix
1.8+ (#+crypto :ironclad :sb-concurrency :sb-posix
1.9 :sb-bsd-sockets :cl-ppcre
1.10 :std :log :obj)
1.11 :serial t
2.1--- a/lisp/lib/cry/pkg.lisp Sun May 26 22:59:21 2024 -0400
2.2+++ b/lisp/lib/cry/pkg.lisp Mon May 27 03:08:21 2024 -0400
2.3@@ -1,7 +1,7 @@
2.4 (defpackage :cry
2.5 (:nicknames :cryptography)
2.6- (:shadowing-import-from :ironclad :integer-to-octets :octets-to-integer :xor)
2.7- (:use :cl :std :sb-thread :sb-concurrency :ironclad :obj/db :obj/id)
2.8+ #+crypto (:shadowing-import-from :ironclad :integer-to-octets :octets-to-integer :xor)
2.9+ (:use :cl :std :sb-thread :sb-concurrency #+crypto :ironclad :obj/db :obj/id)
2.10 (:export :crypto-error :crypto-token-expired :crypto-token-invalid
2.11 :crypto-key :token :crypto-token :password
2.12 :*default-password-db* :*default-password-hasher* :*default-password-store* :*default-password-pepper*
3.1--- a/lisp/lib/net/cookie.lisp Sun May 26 22:59:21 2024 -0400
3.2+++ b/lisp/lib/net/cookie.lisp Mon May 27 03:08:21 2024 -0400
3.3@@ -141,7 +141,7 @@
3.4 (labels ((format-cookie-date (universal-time s)
3.5 (when universal-time
3.6 (format-timestring s (universal-to-timestamp universal-time)
3.7- :format +set-cookie-date-format+ :timezone local-time:+gmt-zone+))))
3.8+ :format +set-cookie-date-format+ :timezone obj/time:+gmt-zone+))))
3.9 (format stream
3.10 "~A=~A~@[; Expires=~A~]~@[; Max-age=~A~]~@[; Path=~A~]~@[; Domain=~A~]~@[; SameSite=~A~]~:[~;; Partitioned~]~:[~;; Secure~]~:[~;; HttpOnly~]"
3.11 (cookie-name cookie)
3.12@@ -178,18 +178,18 @@
3.13 (char<= #\0 char #\9))
3.14
3.15 (defun get-tz-offset (tz-abbrev)
3.16- (symbol-macrolet ((timezones local-time::*abbreviated-subzone-name->timezone-list*))
3.17+ (symbol-macrolet ((timezones obj/time::*abbreviated-subzone-name->timezone-list*))
3.18 (let* ((tz (gethash tz-abbrev timezones nil))
3.19 (tz (if tz
3.20 (car tz)
3.21 (when (zerop (hash-table-count timezones))
3.22- (local-time::reread-timezone-repository
3.23+ (obj/time::reread-timezone-repository
3.24 :timezone-repository (asdf:system-relative-pathname :local-time #P"zoneinfo/"))
3.25 (first (gethash tz-abbrev timezones nil))))))
3.26 (when tz
3.27- (loop for sub across (local-time::timezone-subzones tz)
3.28- when (equal tz-abbrev (local-time::subzone-abbrev sub))
3.29- do (return (local-time::subzone-offset sub)))))))
3.30+ (loop for sub across (obj/time::timezone-subzones tz)
3.31+ when (equal tz-abbrev (obj/time::subzone-abbrev sub))
3.32+ do (return (obj/time::subzone-offset sub)))))))
3.33
3.34 (defparameter *current-century-offset*
3.35 (* (1- (timestamp-century (today)))
3.36@@ -262,8 +262,8 @@
3.37 (when (< year 100)
3.38 (incf year *current-century-offset*))
3.39 (return-from parse-cookie-date
3.40- (local-time:timestamp-to-universal
3.41- (local-time:encode-timestamp 0 sec min hour day month year :timezone local-time:+gmt-zone+
3.42+ (obj/time:timestamp-to-universal
3.43+ (obj/time:encode-timestamp 0 sec min hour day month year :timezone obj/time:+gmt-zone+
3.44 :offset offset))))))
3.45 (error ()
3.46 (error 'invalid-expires-date
4.1--- a/lisp/lib/net/net.asd Sun May 26 22:59:21 2024 -0400
4.2+++ b/lisp/lib/net/net.asd Mon May 27 03:08:21 2024 -0400
4.3@@ -5,13 +5,13 @@
4.4 :depends-on
4.5 (:sb-concurrency :sb-posix
4.6 :sb-bsd-sockets :cl-ppcre
4.7+ :trivial-mimes
4.8+ :fast-io
4.9 :dat :obj :io :parse
4.10- ;; :swank ;; HACK 2024-05-12: temporarily disable, incompatible with current upstream
4.11- ;; :swank-client
4.12+ ;; #+swank :swank-client ;; HACK 2024-05-12: temporarily disable, incompatible with current upstream
4.13 :cl+ssl
4.14- :dexador ;; fetch
4.15 :chipz :babel :chunga
4.16- :hunchentoot :std :log)
4.17+ :std :log)
4.18 :serial t
4.19 :components ((:file "pkg")
4.20 (:file "err")
4.21@@ -27,6 +27,7 @@
4.22 (:file "osc")))
4.23 (:module "proto"
4.24 :components (;; (:file "crew") ;; HACK 2024-05-12: temporarily disable, incompatible with current upstream
4.25+ (:file "swank")
4.26 (:file "http")
4.27 (:file "dns")
4.28 (:file "ssh")))
5.1--- a/lisp/lib/net/pkg.lisp Sun May 26 22:59:21 2024 -0400
5.2+++ b/lisp/lib/net/pkg.lisp Mon May 27 03:08:21 2024 -0400
5.3@@ -131,6 +131,10 @@
5.4 ;; :worker-count
5.5 ;; :reconnect-worker))
5.6
5.7+(defpackage :net/proto/swank
5.8+ (:use :cl :sb-bsd-sockets :std :net/core :net/tcp)
5.9+ (:export))
5.10+
5.11 (defpackage :net/proto/dns
5.12 (:nicknames :net/dns)
5.13 (:use :cl :sb-bsd-sockets :std :net/core :net/udp :codec/dns)
6.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2+++ b/lisp/lib/net/proto/swank.lisp Mon May 27 03:08:21 2024 -0400
6.3@@ -0,0 +1,6 @@
6.4+;;; net/proto/swank.lisp --- Swank Protocol Support
6.5+
6.6+;;
6.7+
6.8+;;; Code:
6.9+(in-package :net/proto/swank)
7.1--- a/lisp/lib/net/req.lisp Sun May 26 22:59:21 2024 -0400
7.2+++ b/lisp/lib/net/req.lisp Mon May 27 03:08:21 2024 -0400
7.3@@ -1032,10 +1032,10 @@
7.4 stream))
7.5
7.6 (defun make-proxy-authorization (uri)
7.7- (let ((proxy-auth (quri:uri-userinfo uri)))
7.8+ (let ((proxy-auth (obj/uri:uri-userinfo uri)))
7.9 (when proxy-auth
7.10 (format nil "Basic ~A"
7.11- (cl-base64:string-to-base64-string proxy-auth)))))
7.12+ (dat/base64:string-to-base64-string proxy-auth)))))
7.13
7.14 (defconstant +socks5-version+ 5)
7.15 (defconstant +socks5-reserved+ 0)
7.16@@ -1166,7 +1166,7 @@
7.17 (insecure *no-ssl*)
7.18 ca-path
7.19 &aux
7.20- (proxy-uri (and proxy (quri:uri proxy)))
7.21+ (proxy-uri (and proxy (obj/uri:uri proxy)))
7.22 (original-user-supplied-stream stream)
7.23 (user-supplied-stream (if (usocket-wrapped-stream-p stream) (usocket-wrapped-stream-stream stream) stream)))
7.24 (declare (ignorable ssl-key-file ssl-cert-file ssl-key-password
7.25@@ -1255,7 +1255,7 @@
7.26 (boundary (and multipart-p
7.27 (make-random-string 12)))
7.28 (content (if (and form-urlencoded-p (not (stringp content))) ;; user can provide already encoded content, trust them.
7.29- (quri:url-encode-params content)
7.30+ (obj/uri::url-encode-params content)
7.31 content))
7.32 (stream (or user-supplied-stream
7.33 (and use-connection-pool
8.1--- a/lisp/std/pkg.lisp Sun May 26 22:59:21 2024 -0400
8.2+++ b/lisp/std/pkg.lisp Mon May 27 03:08:21 2024 -0400
8.3@@ -391,7 +391,8 @@
8.4 (:export
8.5 :current-lisp-implementation
8.6 :save-lisp-tree-shake-and-die
8.7- :save-lisp-and-live))
8.8+ :save-lisp-and-live
8.9+ :forget-shared-objects))
8.10
8.11 (defpkg :std
8.12 (:use :cl :sb-unicode :cl-ppcre :sb-mop :sb-c :sb-thread :sb-alien :sb-gray :sb-concurrency)
9.1--- a/lisp/std/sys.lisp Sun May 26 22:59:21 2024 -0400
9.2+++ b/lisp/std/sys.lisp Mon May 27 03:08:21 2024 -0400
9.3@@ -71,3 +71,7 @@
9.4 ;; (sb-di::debug-fun-lambda-list
9.5 ;; (sb-di::make-compiled-debug-fun cdf code))))))
9.6 ;; (print info))))
9.7+
9.8+(defun forget-shared-objects ()
9.9+ "Set the DONT-SAVE slot of all objects in SB-SYS:*SHARED-OBJECTS* to T."
9.10+ (mapcar (lambda (obj) (setf (sb-alien::shared-object-dont-save obj) t)) sb-sys:*shared-objects*))
10.1--- a/x.lisp Sun May 26 22:59:21 2024 -0400
10.2+++ b/x.lisp Mon May 27 03:08:21 2024 -0400
10.3@@ -6,7 +6,7 @@
10.4 x.lisp
10.5 |#
10.6 (require 'asdf)
10.7-(require 'sb-posix)
10.8+;; (require 'sb-posix)
10.9 (require 'sb-concurrency)
10.10
10.11 #-(or sbcl cl) (error "unsupported Lisp compiler")
10.12@@ -153,6 +153,8 @@
10.13 (format t "saving ~A to: ~A~%" name (merge-pathnames name *stash-path*))
10.14 (let ((sys (sb-int:keywordicate (format nil "BIN/~A" (string-upcase name)))))
10.15 (ql:quickload sys)
10.16+ (push :ssl *features*)
10.17+ (std/sys:forget-shared-objects)
10.18 (asdf:make sys)))
10.19
10.20 (defun x-build (args)
