upstream fix for update-md5-state

5 files changed, 121 insertions, 4 deletions

diff --git a/dev-lisp/cl-md5/ChangeLog b/dev-lisp/cl-md5/ChangeLog
index 180af1b2c7a6..6cd5abdb65ea 100644
--- a/dev-lisp/cl-md5/ChangeLog
+++ b/dev-lisp/cl-md5/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-md5
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-md5/ChangeLog,v 1.2 2003/10/16 07:34:28 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-md5/ChangeLog,v 1.3 2003/11/10 20:13:11 mkennedy Exp $
+
+*cl-md5-1.8.1-r1 (10 Nov 2003)
+
+  10 Nov 2003; <mkennedy@gentoo.org> cl-md5-1.8.1-r1.ebuild,
+  files/md5-1.8-mai-gentoo.patch:
+  upstream fix for short data buffers and subsequent update-md5-state calls
 
   16 Oct 2003; Matthew Kennedy <mkennedy@gentoo.org> cl-md5-1.8.1.ebuild,
   metadata.xml:
diff --git a/dev-lisp/cl-md5/Manifest b/dev-lisp/cl-md5/Manifest
index 266591d573de..ec373ca4ef5b 100644
--- a/dev-lisp/cl-md5/Manifest
+++ b/dev-lisp/cl-md5/Manifest
@@ -1,8 +1,7 @@
-MD5 9336fae6ed77f28c6d0120b3513671d3 ChangeLog 427
+MD5 35eb7e3ec4c6e590f3f9ae6562dd154d ChangeLog 631
 MD5 f554c3c1167bc1fa877681e5d2b490bc cl-md5-1.8.1.ebuild 874
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 83e3b4b32c22efa3bee9ee328fc7a58b cl-md5-1.8.1-r1.ebuild 950
-MD5 f554c3c1167bc1fa877681e5d2b490bc cl-md5-1.8.1-r1.ebuild~ 874
+MD5 0dfd3fbf18ee5a5c5d379e264984be13 cl-md5-1.8.1-r1.ebuild 962
 MD5 fb84d5c2d983a68825b83c54005260ff files/digest-cl-md5-1.8.1 67
 MD5 80b61a38a6790b6c5de4059239069aff files/md5-1.8-mai-gentoo.patch 3116
 MD5 fb84d5c2d983a68825b83c54005260ff files/digest-cl-md5-1.8.1-r1 67
diff --git a/dev-lisp/cl-md5/cl-md5-1.8.1-r1.ebuild b/dev-lisp/cl-md5/cl-md5-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..0784d338d91f
--- /dev/null
+++ b/dev-lisp/cl-md5/cl-md5-1.8.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-md5/cl-md5-1.8.1-r1.ebuild,v 1.1 2003/11/10 20:13:11 mkennedy Exp $
+
+inherit common-lisp
+
+DESCRIPTION="Common Lisp package for MD5 Message Digests"
+HOMEPAGE="http://www.pmsf.de/resources/lisp/MD5.html
+	http://packages.debian.org/unstable/devel/cl-md5.html"
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-md5/${PN}_${PV}.orig.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="dev-lisp/common-lisp-controller
+	virtual/commonlisp"
+
+CLPACKAGE=md5
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/md5-1.8-mai-gentoo.patch
+}
+
+src_install() {
+	common-lisp-install *.asd *.lisp
+	common-lisp-system-symlink
+}
+
+
+pkg_preinst() {
+	rm -rf /usr/lib/common-lisp/*/${CLPACKAGE} || true
+}
+
+pkg_postrm() {
+	rm -rf /usr/lib/common-lisp/*/${CLPACKAGE} || true
+}
diff --git a/dev-lisp/cl-md5/files/digest-cl-md5-1.8.1-r1 b/dev-lisp/cl-md5/files/digest-cl-md5-1.8.1-r1
new file mode 100644
index 000000000000..c66763ac239e
--- /dev/null
+++ b/dev-lisp/cl-md5/files/digest-cl-md5-1.8.1-r1
@@ -0,0 +1 @@
+MD5 f13319f74363289f7b7e02ab70467a44 cl-md5_1.8.1.orig.tar.gz 8932
diff --git a/dev-lisp/cl-md5/files/md5-1.8-mai-gentoo.patch b/dev-lisp/cl-md5/files/md5-1.8-mai-gentoo.patch
new file mode 100644
index 000000000000..8e72f40e7207
--- /dev/null
+++ b/dev-lisp/cl-md5/files/md5-1.8-mai-gentoo.patch
@@ -0,0 +1,71 @@
+Index: md5.lisp
+===================================================================
+RCS file: /prj/EXPORT/pubcvs/PMSF/CLASH/src/md5.lisp,v
+retrieving revision 1.8
+diff -u -r1.8 md5.lisp
+--- md5.lisp	25 Jan 2003 00:18:27 -0000	1.8
++++ md5.lisp	3 Nov 2003 22:28:34 -0000
+@@ -391,24 +391,34 @@
+ 	   (ext:optimize-interface (safety 1) (debug 1)))
+   (let ((regs (md5-state-regs state))
+ 	(block (md5-state-block state))
+-	(buffer (md5-state-buffer state))
+-	(buffer-index (md5-state-buffer-index state))
+-	(length (- end start)))
+-    (declare (type md5-regs regs) (type fixnum length)
+-	     (type (integer 0 63) buffer-index)
++	(buffer (md5-state-buffer state)))
++    (declare (type md5-regs regs)
+ 	     (type (simple-array (unsigned-byte 32) (16)) block)
+ 	     (type (simple-array (unsigned-byte 8) (64)) buffer))
+     ;; Handle old rest
+-    (unless (zerop buffer-index)
+-      (let ((amount (min (- 64 buffer-index) length)))
+-	(declare (type (integer 0 63) amount))
+-	(copy-to-buffer sequence start amount buffer buffer-index)
+-	(setq start (the fixnum (+ start amount)))
+-	(when (>= start end)
+-	  (setf (md5-state-buffer-index state) (+ buffer-index amount))
+-	  (return-from update-md5-state state)))
+-      (fill-block-ub8 block buffer 0)
+-      (update-md5-block regs block))
++    (unless (zerop (md5-state-buffer-index state))
++      (let* ((buffer-index (md5-state-buffer-index state))
++             (remainder (- 64 buffer-index))
++             (length (- end start))
++             (amount (min remainder length)))
++        (declare (type (integer 0 63) buffer-index remainder amount)
++                 (type fixnum length))
++        (copy-to-buffer sequence start amount buffer buffer-index)
++        (setf (md5-state-amount state)
++              #-md5-small-length (+ (md5-state-amount state) amount)
++              #+md5-small-length (the (unsigned-byte 29)
++                                      (+ (md5-state-amount state) amount)))
++        (setq start (the fixnum (+ start amount)))
++        (if (< length remainder)
++            (setf (md5-state-buffer-index state)
++                  (the (integer 0 63) (+ buffer-index amount)))
++          (progn
++            (fill-block-ub8 block buffer 0)
++            (update-md5-block regs block)
++            (setf (md5-state-buffer-index state) 0)))))
++    ;; Leave when nothing to do
++    (when (>= start end)
++      (return-from update-md5-state state))
+     ;; Handle main-part and new-rest
+     (etypecase sequence
+       ((simple-array (unsigned-byte 8) (*))
+@@ -438,9 +448,11 @@
+ 		   (copy-to-buffer sequence offset amount buffer 0))
+ 		 (setf (md5-state-buffer-index state) amount))))))
+     (setf (md5-state-amount state)
+-	  #-md5-small-length (+ (md5-state-amount state) length)
++	  #-md5-small-length (+ (md5-state-amount state) 
++                                (the fixnum (- end start)))
+ 	  #+md5-small-length (the (unsigned-byte 29)
+-			       (+ (md5-state-amount state) length)))
++			       (+ (md5-state-amount state) 
++                                  (the fixnum (- end start)))))
+     state))
+ 
+ (defun finalize-md5-state (state)