summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>1999-05-26 17:04:31 +0000
committertv <tv@pkgsrc.org>1999-05-26 17:04:31 +0000
commit9b38e48aac9bcbf78894a6ee005b71c446ba2ce8 (patch)
tree008d43afca60d49348af10027db3748e6d81052a
parentc7a4ad2283ceb00c8d29bd91922071e016246a2c (diff)
downloadpkgsrc-9b38e48aac9bcbf78894a6ee005b71c446ba2ce8.tar.gz
Work around rsaref's internal md5, and update rsaref dependency to "2.0p2".
-rw-r--r--archivers/hpack/Makefile4
-rw-r--r--archivers/hpack/patches/patch-ag24
2 files changed, 26 insertions, 2 deletions
diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index 3480b18b19a..221f72c74a3 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/05/23 22:41:21 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/26 17:04:31 tv Exp $
DISTNAME= hpack79${USE_RSAREF2:S/YES/u/:C/[^u]*//g}src
PKGNAME= hpack-0.79
@@ -20,7 +20,7 @@ MAKE_FLAGS= CFLAGS="-c -DBSD386 -D__UNIX__ -DPREFIX=\\\"${PREFIX}\\\" -I. ${CFLA
.include "../../mk/bsd.prefs.mk"
.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
-DEPENDS+= rsaref-2.0p1:../../security/rsaref
+DEPENDS+= rsaref-2.0p2:../../security/rsaref
LDFLAGS+= -L${LOCALBASE}/lib -lrsaref
CFLAGS+= -I${LOCALBASE}/include -DRSAREF
.endif
diff --git a/archivers/hpack/patches/patch-ag b/archivers/hpack/patches/patch-ag
new file mode 100644
index 00000000000..d2f19924bf6
--- /dev/null
+++ b/archivers/hpack/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.1 1999/05/26 17:04:32 tv Exp $
+
+--- crypt/md5.h.orig Wed May 26 12:22:50 1999
++++ crypt/md5.h Wed May 26 12:23:43 1999
+@@ -19,6 +19,9 @@
+
+ #define _MD5_DEFINED
+
++/* avoid rsaref md5.h */
++#define _MD5_H_
++
+ #include "defs.h"
+
+ /****************************************************************************
+@@ -41,8 +44,8 @@
+ /* The structure for storing MD5 info */
+
+ typedef struct {
+- LONG i[ 2 ]; /* Number of bits handled mod 2^64 */
+ LONG buf[ 4 ]; /* Scratch buffer */
++ LONG i[ 2 ]; /* Number of bits handled mod 2^64 */
+ BYTE in[ MD5_BLOCKSIZE ]; /* Input buffer */
+ BYTE digest[ 16 ]; /* Actual digest after MD5Final() call */
+ } MD5_CTX;