diff options
author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2012-08-24 16:57:20 +0000 |
---|---|---|
committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2012-08-24 16:57:20 +0000 |
commit | da57d5bec8d685ce44d696ec468007b16c607248 (patch) | |
tree | c4ebdba575857acddbc6660b2e6cb04f12f40704 /editors/flim | |
parent | - Update to 1.1.5 (diff) |
Fix build error.
Notes
Notes:
svn path=/head/; revision=303092
Diffstat (limited to 'editors/flim')
-rw-r--r-- | editors/flim/Makefile | 2 | ||||
-rw-r--r-- | editors/flim/files/patch-eword-encode.el | 23 | ||||
-rw-r--r-- | editors/flim/files/patch-hmac-def.el | 89 | ||||
-rw-r--r-- | editors/flim/files/patch-md4.el | 26 | ||||
-rw-r--r-- | editors/flim/files/patch-md5-el.el | 26 | ||||
-rw-r--r-- | editors/flim/files/patch-sha1-el.el | 154 |
6 files changed, 318 insertions, 2 deletions
diff --git a/editors/flim/Makefile b/editors/flim/Makefile index 6f7c7b65e883..292e270faebd 100644 --- a/editors/flim/Makefile +++ b/editors/flim/Makefile @@ -16,8 +16,6 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER?= nobutaka@FreeBSD.org COMMENT?= FLIM, message representation or encoding elisp library for emacs -BROKEN= does not package - PORTCLASS?= master # distfile version diff --git a/editors/flim/files/patch-eword-encode.el b/editors/flim/files/patch-eword-encode.el new file mode 100644 index 000000000000..7643b5fdfde2 --- /dev/null +++ b/editors/flim/files/patch-eword-encode.el @@ -0,0 +1,23 @@ +--- eword-encode.el.orig 2007-09-06 16:48:50.000000000 +0900 ++++ eword-encode.el 2012-08-23 00:42:35.000000000 +0900 +@@ -162,15 +162,15 @@ + ;;; + + (defmacro make-ew-rword (text charset encoding type) +- (` (list (, text)(, charset)(, encoding)(, type)))) ++ `(list ,text ,charset ,encoding ,type)) + (defmacro ew-rword-text (rword) +- (` (car (, rword)))) ++ `(car ,rword)) + (defmacro ew-rword-charset (rword) +- (` (car (cdr (, rword))))) ++ `(car (cdr ,rword))) + (defmacro ew-rword-encoding (rword) +- (` (car (cdr (cdr (, rword)))))) ++ `(car (cdr (cdr ,rword)))) + (defmacro ew-rword-type (rword) +- (` (car (cdr (cdr (cdr (, rword))))))) ++ `(car (cdr (cdr (cdr ,rword))))) + + (defun ew-find-charset-rule (charsets) + (if charsets diff --git a/editors/flim/files/patch-hmac-def.el b/editors/flim/files/patch-hmac-def.el new file mode 100644 index 000000000000..a035664cc127 --- /dev/null +++ b/editors/flim/files/patch-hmac-def.el @@ -0,0 +1,89 @@ +--- hmac-def.el.orig 2007-09-06 08:39:48.000000000 +0900 ++++ hmac-def.el 2012-08-23 00:42:35.000000000 +0900 +@@ -39,46 +39,46 @@ + B is a byte-length of a block size of H. (B=64 for both SHA1 and MD5.) + L is a byte-length of hash outputs. (L=16 for MD5, L=20 for SHA1.) + If BIT is non-nil, truncate output to specified bits." +- (` (defun (, name) (text key) +- (, (concat "Compute " +- (upcase (symbol-name name)) +- " over TEXT with KEY.")) +- (let ((key-xor-ipad (make-string (, B) ?\x36)) +- (key-xor-opad (make-string (, B) ?\x5C)) +- (len (length key)) +- (pos 0)) +- (unwind-protect +- (progn +- ;; if `key' is longer than the block size, apply hash function +- ;; to `key' and use the result as a real `key'. +- (if (> len (, B)) +- (setq key ((, H) key) +- len (, L))) +- (while (< pos len) +- (aset key-xor-ipad pos (logxor (aref key pos) ?\x36)) +- (aset key-xor-opad pos (logxor (aref key pos) ?\x5C)) +- (setq pos (1+ pos))) +- (setq key-xor-ipad (unwind-protect +- (concat key-xor-ipad text) +- (fillarray key-xor-ipad 0)) +- key-xor-ipad (unwind-protect +- ((, H) key-xor-ipad) +- (fillarray key-xor-ipad 0)) +- key-xor-opad (unwind-protect +- (concat key-xor-opad key-xor-ipad) +- (fillarray key-xor-opad 0)) +- key-xor-opad (unwind-protect +- ((, H) key-xor-opad) +- (fillarray key-xor-opad 0))) +- ;; now `key-xor-opad' contains +- ;; H(KEY XOR opad, H(KEY XOR ipad, TEXT)). +- (, (if (and bit (< (/ bit 8) L)) +- (` (substring key-xor-opad 0 (, (/ bit 8)))) +- ;; return a copy of `key-xor-opad'. +- (` (concat key-xor-opad))))) +- ;; cleanup. +- (fillarray key-xor-ipad 0) +- (fillarray key-xor-opad 0)))))) ++ `(defun ,name (text key) ++ ,(concat "Compute " ++ (upcase (symbol-name name)) ++ " over TEXT with KEY.") ++ (let ((key-xor-ipad (make-string ,B ?\x36)) ++ (key-xor-opad (make-string ,B ?\x5C)) ++ (len (length key)) ++ (pos 0)) ++ (unwind-protect ++ (progn ++ ;; if `key' is longer than the block size, apply hash function ++ ;; to `key' and use the result as a real `key'. ++ (if (> len ,B) ++ (setq key (,H key) ++ len ,L)) ++ (while (< pos len) ++ (aset key-xor-ipad pos (logxor (aref key pos) ?\x36)) ++ (aset key-xor-opad pos (logxor (aref key pos) ?\x5C)) ++ (setq pos (1+ pos))) ++ (setq key-xor-ipad (unwind-protect ++ (concat key-xor-ipad text) ++ (fillarray key-xor-ipad 0)) ++ key-xor-ipad (unwind-protect ++ (,H key-xor-ipad) ++ (fillarray key-xor-ipad 0)) ++ key-xor-opad (unwind-protect ++ (concat key-xor-opad key-xor-ipad) ++ (fillarray key-xor-opad 0)) ++ key-xor-opad (unwind-protect ++ (,H key-xor-opad) ++ (fillarray key-xor-opad 0))) ++ ;; now `key-xor-opad' contains ++ ;; H(KEY XOR opad, H(KEY XOR ipad, TEXT)). ++ ,(if (and bit (< (/ bit 8) L)) ++ `(substring key-xor-opad 0 ,(/ bit 8)) ++ ;; return a copy of `key-xor-opad'. ++ `(concat key-xor-opad))) ++ ;; cleanup. ++ (fillarray key-xor-ipad 0) ++ (fillarray key-xor-opad 0))))) + + (provide 'hmac-def) + diff --git a/editors/flim/files/patch-md4.el b/editors/flim/files/patch-md4.el new file mode 100644 index 000000000000..6fd1b66111ad --- /dev/null +++ b/editors/flim/files/patch-md4.el @@ -0,0 +1,26 @@ +--- md4.el.orig 2007-09-06 08:39:48.000000000 +0900 ++++ md4.el 2012-08-23 00:42:35.000000000 +0900 +@@ -88,11 +88,10 @@ + (defsubst md4-H (x y z) (logxor x y z)) + + (defmacro md4-make-step (name func) +- (` +- (defun (, name) (a b c d xk s ac) ++ `(defun ,name (a b c d xk s ac) + (let* +- ((h1 (+ (car a) ((, func) (car b) (car c) (car d)) (car xk) (car ac))) +- (l1 (+ (cdr a) ((, func) (cdr b) (cdr c) (cdr d)) (cdr xk) (cdr ac))) ++ ((h1 (+ (car a) (,func (car b) (car c) (car d)) (car xk) (car ac))) ++ (l1 (+ (cdr a) (,func (cdr b) (cdr c) (cdr d)) (cdr xk) (cdr ac))) + (h2 (logand 65535 (+ h1 (lsh l1 -16)))) + (l2 (logand 65535 l1)) + ;; cyclic shift of 32 bits integer +@@ -102,7 +101,7 @@ + (l3 (logand 65535 (if (> s 15) + (+ (lsh l2 (- s 32)) (lsh h2 (- s 16))) + (+ (lsh l2 s) (lsh h2 (- s 16))))))) +- (cons h3 l3))))) ++ (cons h3 l3)))) + + (md4-make-step md4-round1 md4-F) + (md4-make-step md4-round2 md4-G) diff --git a/editors/flim/files/patch-md5-el.el b/editors/flim/files/patch-md5-el.el new file mode 100644 index 000000000000..13c11b22989c --- /dev/null +++ b/editors/flim/files/patch-md5-el.el @@ -0,0 +1,26 @@ +--- md5-el.el.orig 2000-11-06 22:03:19.000000000 +0900 ++++ md5-el.el 2012-08-23 00:42:35.000000000 +0900 +@@ -169,11 +169,10 @@ + (defsubst md5-I (x y z) (logxor y (logior x (logand 65535 (lognot z))))) + + (defmacro md5-make-step (name func) +- (` +- (defun (, name) (a b c d x s ac) ++ `(defun ,name (a b c d x s ac) + (let* +- ((m1 (+ (car a) ((, func) (car b) (car c) (car d)) (car x) (car ac))) +- (l1 (+ (cdr a) ((, func) (cdr b) (cdr c) (cdr d)) (cdr x) (cdr ac))) ++ ((m1 (+ (car a) (,func (car b) (car c) (car d)) (car x) (car ac))) ++ (l1 (+ (cdr a) (,func (cdr b) (cdr c) (cdr d)) (cdr x) (cdr ac))) + (m2 (logand 65535 (+ m1 (lsh l1 -16)))) + (l2 (logand 65535 l1)) + (m3 (logand 65535 (if (> s 15) +@@ -182,7 +181,7 @@ + (l3 (logand 65535 (if (> s 15) + (+ (lsh l2 (- s 32)) (lsh m2 (- s 16))) + (+ (lsh l2 s) (lsh m2 (- s 16))))))) +- (md5-add (cons m3 l3) b))))) ++ (md5-add (cons m3 l3) b)))) + + (md5-make-step md5-FF md5-F) + (md5-make-step md5-GG md5-G) diff --git a/editors/flim/files/patch-sha1-el.el b/editors/flim/files/patch-sha1-el.el new file mode 100644 index 000000000000..571c34f9a378 --- /dev/null +++ b/editors/flim/files/patch-sha1-el.el @@ -0,0 +1,154 @@ +--- sha1-el.el.orig 2007-09-06 08:39:48.000000000 +0900 ++++ sha1-el.el 2012-08-23 00:42:35.000000000 +0900 +@@ -129,9 +129,9 @@ + ;;; (logand (lognot (, B)) (, D))))) + ;;; a little optimization from GnuPG/cipher/sha1.c. + (defmacro sha1-F0 (B C D) +- (` (logxor (, D) (logand (, B) (logxor (, C) (, D)))))) ++ `(logxor ,D (logand ,B (logxor ,C ,D)))) + (defmacro sha1-F1 (B C D) +- (` (logxor (, B) (, C) (, D)))) ++ `(logxor ,B ,C ,D)) + ;;; original definition of sha1-F2. + ;;; (defmacro sha1-F2 (B C D) + ;;; (` (logior (logand (, B) (, C)) +@@ -139,77 +139,77 @@ + ;;; (logand (, C) (, D))))) + ;;; a little optimization from GnuPG/cipher/sha1.c. + (defmacro sha1-F2 (B C D) +- (` (logior (logand (, B) (, C)) +- (logand (, D) (logior (, B) (, C)))))) ++ `(logior (logand ,B ,C) ++ (logand ,D (logior ,B ,C)))) + (defmacro sha1-F3 (B C D) +- (` (logxor (, B) (, C) (, D)))) ++ `(logxor ,B ,C ,D)) + + (defmacro sha1-S1 (W-high W-low) +- (` (let ((W-high (, W-high)) +- (W-low (, W-low))) +- (setq S1W-high (+ (% (* W-high 2) 65536) +- (/ W-low (, (/ 65536 2))))) +- (setq S1W-low (+ (/ W-high (, (/ 65536 2))) +- (% (* W-low 2) 65536)))))) ++ `(let ((W-high ,W-high) ++ (W-low ,W-low)) ++ (setq S1W-high (+ (% (* W-high 2) 65536) ++ (/ W-low ,(/ 65536 2)))) ++ (setq S1W-low (+ (/ W-high ,(/ 65536 2)) ++ (% (* W-low 2) 65536))))) + (defmacro sha1-S5 (A-high A-low) +- (` (progn +- (setq S5A-high (+ (% (* (, A-high) 32) 65536) +- (/ (, A-low) (, (/ 65536 32))))) +- (setq S5A-low (+ (/ (, A-high) (, (/ 65536 32))) +- (% (* (, A-low) 32) 65536)))))) ++ `(progn ++ (setq S5A-high (+ (% (* ,A-high 32) 65536) ++ (/ ,A-low ,(/ 65536 32)))) ++ (setq S5A-low (+ (/ ,A-high ,(/ 65536 32)) ++ (% (* ,A-low 32) 65536))))) + (defmacro sha1-S30 (B-high B-low) +- (` (progn +- (setq S30B-high (+ (/ (, B-high) 4) +- (* (% (, B-low) 4) (, (/ 65536 4))))) +- (setq S30B-low (+ (/ (, B-low) 4) +- (* (% (, B-high) 4) (, (/ 65536 4)))))))) ++ `(progn ++ (setq S30B-high (+ (/ ,B-high 4) ++ (* (% ,B-low 4) ,(/ 65536 4)))) ++ (setq S30B-low (+ (/ ,B-low 4) ++ (* (% ,B-high 4) ,(/ 65536 4)))))) + + (defmacro sha1-OP (round) +- (` (progn +- (sha1-S5 sha1-A-high sha1-A-low) +- (sha1-S30 sha1-B-high sha1-B-low) +- (setq sha1-A-low (+ ((, (intern (format "sha1-F%d" round))) +- sha1-B-low sha1-C-low sha1-D-low) +- sha1-E-low +- (, (symbol-value +- (intern (format "sha1-K%d-low" round)))) +- (aref block-low idx) +- (progn +- (setq sha1-E-low sha1-D-low) +- (setq sha1-D-low sha1-C-low) +- (setq sha1-C-low S30B-low) +- (setq sha1-B-low sha1-A-low) +- S5A-low))) +- (setq carry (/ sha1-A-low 65536)) +- (setq sha1-A-low (% sha1-A-low 65536)) +- (setq sha1-A-high (% (+ ((, (intern (format "sha1-F%d" round))) +- sha1-B-high sha1-C-high sha1-D-high) +- sha1-E-high +- (, (symbol-value +- (intern (format "sha1-K%d-high" round)))) +- (aref block-high idx) +- (progn +- (setq sha1-E-high sha1-D-high) +- (setq sha1-D-high sha1-C-high) +- (setq sha1-C-high S30B-high) +- (setq sha1-B-high sha1-A-high) +- S5A-high) +- carry) +- 65536))))) ++ `(progn ++ (sha1-S5 sha1-A-high sha1-A-low) ++ (sha1-S30 sha1-B-high sha1-B-low) ++ (setq sha1-A-low (+ (,(intern (format "sha1-F%d" round)) ++ sha1-B-low sha1-C-low sha1-D-low) ++ sha1-E-low ++ ,(symbol-value ++ (intern (format "sha1-K%d-low" round))) ++ (aref block-low idx) ++ (progn ++ (setq sha1-E-low sha1-D-low) ++ (setq sha1-D-low sha1-C-low) ++ (setq sha1-C-low S30B-low) ++ (setq sha1-B-low sha1-A-low) ++ S5A-low))) ++ (setq carry (/ sha1-A-low 65536)) ++ (setq sha1-A-low (% sha1-A-low 65536)) ++ (setq sha1-A-high (% (+ (,(intern (format "sha1-F%d" round)) ++ sha1-B-high sha1-C-high sha1-D-high) ++ sha1-E-high ++ ,(symbol-value ++ (intern (format "sha1-K%d-high" round))) ++ (aref block-high idx) ++ (progn ++ (setq sha1-E-high sha1-D-high) ++ (setq sha1-D-high sha1-C-high) ++ (setq sha1-C-high S30B-high) ++ (setq sha1-B-high sha1-A-high) ++ S5A-high) ++ carry) ++ 65536)))) + + (defmacro sha1-add-to-H (H X) +- (` (progn +- (setq (, (intern (format "sha1-%s-low" H))) +- (+ (, (intern (format "sha1-%s-low" H))) +- (, (intern (format "sha1-%s-low" X))))) +- (setq carry (/ (, (intern (format "sha1-%s-low" H))) 65536)) +- (setq (, (intern (format "sha1-%s-low" H))) +- (% (, (intern (format "sha1-%s-low" H))) 65536)) +- (setq (, (intern (format "sha1-%s-high" H))) +- (% (+ (, (intern (format "sha1-%s-high" H))) +- (, (intern (format "sha1-%s-high" X))) +- carry) +- 65536))))) ++ `(progn ++ (setq ,(intern (format "sha1-%s-low" H)) ++ (+ ,(intern (format "sha1-%s-low" H)) ++ ,(intern (format "sha1-%s-low" X)))) ++ (setq carry (/ ,(intern (format "sha1-%s-low" H)) 65536)) ++ (setq ,(intern (format "sha1-%s-low" H)) ++ (% ,(intern (format "sha1-%s-low" H)) 65536)) ++ (setq ,(intern (format "sha1-%s-high" H)) ++ (% (+ ,(intern (format "sha1-%s-high" H)) ++ ,(intern (format "sha1-%s-high" X)) ++ carry) ++ 65536)))) + ) + + ;;; buffers (H0 H1 H2 H3 H4). |