Date: Fri, 24 Aug 2012 11:02:27 +0900 (JST) From: Yasuhiro KIMURA <yasu@utahime.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/170960: [PATCH] editors/flim: fix packaging issue Message-ID: <20120824020227.B51F12E553@eastasia.home.utahime.org> Resent-Message-ID: <201208240210.q7O2A6B0013231@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 170960
>Category: ports
>Synopsis: [PATCH] editors/flim: fix packaging issue
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 24 02:10:05 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Yasuhiro KIMURA
>Release: FreeBSD 9.0-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD xxxx 9.0-RELEASE-p4 FreeBSD 9.0-RELEASE-p4 #0: Sun Aug 12 22:27:34 JST 2012 xxxx i386
>Description:
- Fix packaging issue.
- Fix old-style backquotes issue.
- Remove bogus pkg-plist.emacs20.
>How-To-Repeat:
>Fix:
--- patch-flim begins here ---
Index: Makefile
===================================================================
RCS file: /usr0/freebsd/cvsroot/ports/editors/flim/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- Makefile 20 Aug 2012 07:00:26 -0000 1.59
+++ Makefile 24 Aug 2012 01:35:57 -0000
@@ -7,7 +7,7 @@
PORTNAME= flim
PORTVERSION= ${FLIM_VER}
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 1
CATEGORIES= editors elisp
MASTER_SITES= http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/flim/flim-1.14/
@@ -16,8 +16,6 @@
MAINTAINER?= nobutaka@FreeBSD.org
COMMENT?= FLIM, message representation or encoding elisp library for emacs
-BROKEN= does not package
-
PORTCLASS?= master
# distfile version
Index: pkg-plist.emacs20
===================================================================
RCS file: pkg-plist.emacs20
diff -N pkg-plist.emacs20
--- pkg-plist.emacs20 21 Jul 2008 13:49:14 -0000 1.15
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,89 +0,0 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hex-util.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hex-util.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-def.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-def.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-md5.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-md5.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/md4.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/md4.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5-el.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5-el.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-el.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-el.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/ntlm.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/ntlm.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-ntlm.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-ntlm.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.el
-%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.elc
-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/flim
-%%PORTDOCS%%%%FLIMDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%FLIMDOCDIR%%/NEWS
-%%PORTDOCS%%%%FLIMDOCDIR%%/README.en
-%%PORTDOCS%%%%FLIMDOCDIR%%/README.ja
-%%PORTDOCS%%%%FLIMDOCDIR%%/VERSION
-%%PORTDOCS%%@dirrm %%FLIMDOCDIR%%
-@unexec install-info --delete %D/info/mime-en.info %D/info/dir
-info/mime-en.info
-@exec install-info %D/info/mime-en.info %D/info/dir
-@unexec install-info --delete %D/info/mime-ja.info %D/info/dir
-info/mime-ja.info
-@exec install-info %D/info/mime-ja.info %D/info/dir
-share/flim/%%FLIM_COOKIE%%
-@unexec /bin/rmdir %D/share/flim || true
Index: files/patch-eword-encode.el
===================================================================
RCS file: files/patch-eword-encode.el
diff -N files/patch-eword-encode.el
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-eword-encode.el 24 Aug 2012 01:51:26 -0000
@@ -0,0 +1,79 @@
+Index: eword-encode.el
+===================================================================
+--- eword-encode.el (revision 2)
++++ eword-encode.el (working copy)
+@@ -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
+@@ -184,31 +184,31 @@
+ ;; which is not depended on the Mule model. We should redesign
+ ;; `eword-encode-split-string' to avoid to depend on the Mule model.
+ (if (featurep 'utf-2000)
+-;; for CHISE Architecture
+-(defun tm-eword::words-to-ruled-words (wl &optional mode)
+- (let (mcs)
++ ;; for CHISE Architecture
++ (defun tm-eword::words-to-ruled-words (wl &optional mode)
++ (let (mcs)
++ (mapcar (function
++ (lambda (word)
++ (setq mcs (detect-mime-charset-string (cdr word)))
++ (make-ew-rword
++ (cdr word)
++ mcs
++ (cdr (or (assq mcs mime-header-charset-encoding-alist)
++ (cons mcs mime-header-default-charset-encoding)))
++ mode)
++ ))
++ wl)))
++
++ ;; for legacy Mule
++ (defun tm-eword::words-to-ruled-words (wl &optional mode)
+ (mapcar (function
+ (lambda (word)
+- (setq mcs (detect-mime-charset-string (cdr word)))
+- (make-ew-rword
+- (cdr word)
+- mcs
+- (cdr (or (assq mcs mime-header-charset-encoding-alist)
+- (cons mcs mime-header-default-charset-encoding)))
+- mode)
+- ))
+- wl)))
++ (let ((ret (ew-find-charset-rule (car word))))
++ (make-ew-rword (cdr word) (car ret)(nth 1 ret) mode)
++ )))
++ wl))
++ )
+
+-;; for legacy Mule
+-(defun tm-eword::words-to-ruled-words (wl &optional mode)
+- (mapcar (function
+- (lambda (word)
+- (let ((ret (ew-find-charset-rule (car word))))
+- (make-ew-rword (cdr word) (car ret)(nth 1 ret) mode)
+- )))
+- wl))
+-)
+-
+ (defun ew-space-process (seq)
+ (let (prev a ac b c cc)
+ (while seq
Index: files/patch-hex-util.el
===================================================================
RCS file: files/patch-hex-util.el
diff -N files/patch-hex-util.el
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-hex-util.el 24 Aug 2012 01:51:26 -0000
@@ -0,0 +1,26 @@
+Index: hex-util.el
+===================================================================
+--- hex-util.el (revision 2)
++++ hex-util.el (working copy)
+@@ -28,14 +28,14 @@
+
+ (eval-when-compile
+ (defmacro hex-char-to-num (chr)
+- (` (let ((chr (, chr)))
+- (cond
+- ((and (<= ?a chr)(<= chr ?f)) (+ (- chr ?a) 10))
+- ((and (<= ?A chr)(<= chr ?F)) (+ (- chr ?A) 10))
+- ((and (<= ?0 chr)(<= chr ?9)) (- chr ?0))
+- (t (error "Invalid hexadecimal digit `%c'" chr))))))
++ `(let ((chr ,chr))
++ (cond
++ ((and (<= ?a chr)(<= chr ?f)) (+ (- chr ?a) 10))
++ ((and (<= ?A chr)(<= chr ?F)) (+ (- chr ?A) 10))
++ ((and (<= ?0 chr)(<= chr ?9)) (- chr ?0))
++ (t (error "Invalid hexadecimal digit `%c'" chr)))))
+ (defmacro num-to-hex-char (num)
+- (` (aref "0123456789abcdef" (, num)))))
++ `(aref "0123456789abcdef" ,num)))
+
+ (defun decode-hex-string (string)
+ "Decode hexadecimal STRING to octet string."
Index: files/patch-hmac-def.el
===================================================================
RCS file: files/patch-hmac-def.el
diff -N files/patch-hmac-def.el
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-hmac-def.el 24 Aug 2012 01:51:26 -0000
@@ -0,0 +1,91 @@
+Index: hmac-def.el
+===================================================================
+--- hmac-def.el (revision 2)
++++ hmac-def.el (working copy)
+@@ -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)
+
Index: files/patch-md4.el
===================================================================
RCS file: files/patch-md4.el
diff -N files/patch-md4.el
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-md4.el 24 Aug 2012 01:51:26 -0000
@@ -0,0 +1,42 @@
+Index: md4.el
+===================================================================
+--- md4.el (revision 2)
++++ md4.el (working copy)
+@@ -78,21 +78,20 @@
+ (setq m (md4-copy64 (substring buf 64)))
+ (md4-64 m)))
+
+- (concat (md4-pack-int32 (aref md4-buffer 0))
+- (md4-pack-int32 (aref md4-buffer 1))
+- (md4-pack-int32 (aref md4-buffer 2))
+- (md4-pack-int32 (aref md4-buffer 3))))
++ (concat (md4-pack-int32 (aref md4-buffer 0))
++ (md4-pack-int32 (aref md4-buffer 1))
++ (md4-pack-int32 (aref md4-buffer 2))
++ (md4-pack-int32 (aref md4-buffer 3))))
+
+ (defsubst md4-F (x y z) (logior (logand x y) (logand (lognot x) z)))
+ (defsubst md4-G (x y z) (logior (logand x y) (logand x z) (logand y z)))
+ (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)
Index: files/patch-sha1-el.el
===================================================================
RCS file: files/patch-sha1-el.el
diff -N files/patch-sha1-el.el
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-sha1-el.el 24 Aug 2012 01:51:26 -0000
@@ -0,0 +1,165 @@
+Index: sha1-el.el
+===================================================================
+--- sha1-el.el (revision 2)
++++ sha1-el.el (working copy)
+@@ -125,91 +125,91 @@
+
+ ;;; original definition of sha1-F0.
+ ;;; (defmacro sha1-F0 (B C D)
+-;;; (` (logior (logand (, B) (, C))
+-;;; (logand (lognot (, B)) (, D)))))
++;;; `(logior (logand ,B ,C)
++;;; (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))
+-;;; (logand (, B) (, D))
+-;;; (logand (, C) (, D)))))
++;;; `(logior (logand ,B ,C)
++;;; (logand ,B ,D)
++;;; (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).
--- patch-flim ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120824020227.B51F12E553>