diff -Nru flim-1.14.9+0.20221214/debian/changelog flim-1.14.9+0.20230205/debian/changelog --- flim-1.14.9+0.20221214/debian/changelog 2023-01-08 08:06:48.000000000 +0000 +++ flim-1.14.9+0.20230205/debian/changelog 2023-02-05 21:29:15.000000000 +0000 @@ -1,3 +1,9 @@ +flim (1:1.14.9+0.20230205-1) unstable; urgency=medium + + * New upstream version 1.14.9+0.20230205 + + -- Tatsuya Kinoshita Mon, 06 Feb 2023 06:29:15 +0900 + flim (1:1.14.9+0.20221214-1) unstable; urgency=medium * New upstream version 1.14.9+0.20221214 diff -Nru flim-1.14.9+0.20221214/mel-q-ccl.el flim-1.14.9+0.20230205/mel-q-ccl.el --- flim-1.14.9+0.20221214/mel-q-ccl.el 2022-12-14 10:46:18.000000000 +0000 +++ flim-1.14.9+0.20230205/mel-q-ccl.el 2023-02-05 14:23:23.000000000 +0000 @@ -84,7 +84,7 @@ (defconst mel-ccl-high-table (vconcat (mapcar - (lambda (v) (nth (lsh v -4) mel-ccl-16-to-256-table)) + (lambda (v) (nth (ash v -4) mel-ccl-16-to-256-table)) mel-ccl-256-table))) (defconst mel-ccl-low-table @@ -169,7 +169,7 @@ `((write r0 ,(vconcat (mapcar (lambda (r0) - (logior (lsh r0 4) v)) + (logior (ash r0 4) v)) mel-ccl-16-table))) (break)) '(repeat))) @@ -703,7 +703,7 @@ ,(vconcat (mapcar (lambda (r0) - (logior (lsh r0 4) tmp)) + (logior (ash r0 4) tmp)) mel-ccl-16-table))) ;; '=' [\t ]* r1:r0:[0-9A-F] r2:[^0-9A-F] ;; invalid input @@ -745,7 +745,7 @@ (break)))))) `((read r0) (if (r0 == ?\ ) - (,reg |= ,(lsh 1 bit)) + (,reg |= ,(ash 1 bit)) (if (r0 != ?\t) ((r6 = ,(+ (* regnum 28) bit)) (break))))))) @@ -789,7 +789,7 @@ 'append (mapcar (lambda (bit) - `((if (,reg & ,(lsh 1 bit)) + `((if (,reg & ,(ash 1 bit)) (write ?\ ) (write ?\t)) (if (r6 == ,(+ (* regnum 28) bit 1)) diff -Nru flim-1.14.9+0.20221214/sasl.el flim-1.14.9+0.20230205/sasl.el --- flim-1.14.9+0.20221214/sasl.el 2022-12-14 10:46:18.000000000 +0000 +++ flim-1.14.9+0.20230205/sasl.el 2023-02-05 14:23:23.000000000 +0000 @@ -197,7 +197,7 @@ ;; Don't use microseconds from (current-time), they may be unsupported. ;; Instead we use this randomly inited counter. (setq sasl-unique-id-char - (% (1+ (or sasl-unique-id-char (logand (random t) (1- (lsh 1 20))))) + (% (1+ (or sasl-unique-id-char (logand (random t) (1- (ash 1 20))))) ;; (current-time) returns 16-bit ints, ;; and 2^16*25 just fits into 4 digits i base 36. (* 25 25))) @@ -205,10 +205,10 @@ (concat (sasl-unique-id-number-base36 (+ (/ tm 65536) - (lsh (% sasl-unique-id-char 25) 16)) 4) + (ash (% sasl-unique-id-char 25) 16)) 4) (sasl-unique-id-number-base36 (+ (% tm 65536) - (lsh (/ sasl-unique-id-char 25) 16)) 4)))) + (ash (/ sasl-unique-id-char 25) 16)) 4)))) (defun sasl-unique-id-number-base36 (num len) (if (if (< len 0) diff -Nru flim-1.14.9+0.20221214/sasl-scram.el flim-1.14.9+0.20230205/sasl-scram.el --- flim-1.14.9+0.20221214/sasl-scram.el 2022-12-14 10:46:18.000000000 +0000 +++ flim-1.14.9+0.20230205/sasl-scram.el 2023-02-05 14:23:23.000000000 +0000 @@ -88,9 +88,9 @@ (if no-security-layer (aset csecinfo 0 (logior (aref csecinfo 0) 1)) (aset csecinfo 1 - (lsh (logand buffer-size (lsh 255 16)) -16)) + (ash (logand buffer-size (ash 255 16)) -16)) (aset csecinfo 2 - (lsh (logand buffer-size (lsh 255 8)) -8)) + (ash (logand buffer-size (ash 255 8)) -8)) (aset csecinfo 3 (logand buffer-size 255))) csecinfo)) diff -Nru flim-1.14.9+0.20221214/sasl-xoauth2.el flim-1.14.9+0.20230205/sasl-xoauth2.el --- flim-1.14.9+0.20221214/sasl-xoauth2.el 2022-12-14 10:46:18.000000000 +0000 +++ flim-1.14.9+0.20230205/sasl-xoauth2.el 2023-02-05 14:23:23.000000000 +0000 @@ -130,13 +130,16 @@ (defun sasl-xoauth2-refresh-access (token) "Refresh OAuth access TOKEN. TOKEN should be obtained with `oauth2-request-access'." - (let ((response - (oauth2-make-access-request - (oauth2-token-token-url token) - (concat "client_id=" (oauth2-token-client-id token) - "&client_secret=" (oauth2-token-client-secret token) - "&refresh_token=" (oauth2-token-refresh-token token) - "&grant_type=refresh_token")))) + ;; url package would fail on Windows without EOL conversion. + (let* ((inhibit-eol-conversion nil) + (coding-system-for-read nil) + (response + (oauth2-make-access-request + (oauth2-token-token-url token) + (concat "client_id=" (oauth2-token-client-id token) + "&client_secret=" (oauth2-token-client-secret token) + "&refresh_token=" (oauth2-token-refresh-token token) + "&grant_type=refresh_token")))) (setf (oauth2-token-access-token token) (cdr (assq 'access_token response))) ;; Update authorization time. @@ -202,6 +205,9 @@ (defun sasl-xoauth2-response (client _step &optional _retry) (let ((host (sasl-client-server client)) (user (sasl-client-name client)) + ;; url package would fail on Windows without EOL conversion. + (inhibit-eol-conversion nil) + (coding-system-for-read nil) info access-token oauth2-token auth-url token-url client-id scope redirect-uri client-secret) (setq info (sasl-xoauth2-resolve-urls host user)