Update to 0.9.0.429.

No official ChangeLog; primary change is switching to RSA for asymmetric
keys (was McEliece).  The 0.8.x network is now dead, forcing this bump.

6 files changed, 74 insertions, 21 deletions

diff --git a/net/entropy/Makefile b/net/entropy/Makefile
index 1d043090b24..67e248d09d2 100644
--- a/net/entropy/Makefile
+++ b/net/entropy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/06/28 16:59:36 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/30 16:31:47 tv Exp $
 #
 
-DISTNAME=		entropy-${ENTROPY_VERSION}
+DISTNAME=		entropy_rsa-${ENTROPY_VERSION}
 PKGNAME=		entropy-${ENTROPY_VERSION:S/-/./}
-WRKSRC=			${WRKDIR}/entropy-${ENTROPY_VERSION:C/-.*$//}
+WRKSRC=			${WRKDIR}/entropy_rsa-${ENTROPY_VERSION:C/-.*$//}
 CATEGORIES=		net www
 MASTER_SITES=		http://entropy.stop1984.com/files/
 EXTRACT_SUFX=		.tgz
@@ -15,7 +15,7 @@ COMMENT=		Anonymous peer-to-peer networking node (similar to Freenet)
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 
-ENTROPY_VERSION=	0.8.3-421
+ENTROPY_VERSION=	0.9.0-429
 
 CONFIGURE_ARGS+=	--enable-setproctitle --enable-verbose --disable-posix-sem
 LIBS+=			-L${BUILDLINK_PREFIX.zlib}/lib -lz -L${BUILDLINK_PREFIX.expat}/lib -lexpat
@@ -26,7 +26,7 @@ post-patch:
 	${SED} -e '/^# /!s/^#//' <${WRKSRC}/seed.txt-dist >${WRKSRC}/seed.txt
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/entropy ${PREFIX}/bin/entropy
+	${INSTALL_PROGRAM} ${WRKSRC}/entropy_rsa ${PREFIX}/bin/entropy
 	${INSTALL_PROGRAM} ${WRKSRC}/monoopt ${PREFIX}/bin/entropy-monoopt
 	${INSTALL_PROGRAM} ${WRKSRC}/storechg ${PREFIX}/bin/entropy-storechg
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/entropy
@@ -34,9 +34,9 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/entropy
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/entropy/de
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/entropy/node
-	${INSTALL_DATA} ${WRKSRC}/entropy.conf-dist ${PREFIX}/share/examples/entropy/entropy.conf
+	${INSTALL_DATA} ${WRKSRC}/entropy_rsa.conf-dist ${PREFIX}/share/examples/entropy/entropy.conf
 	${INSTALL_DATA} ${WRKSRC}/seed.txt ${PREFIX}/share/examples/entropy/
-	${INSTALL_DATA} ${WRKSRC}/de/entropy.lo ${PREFIX}/share/examples/entropy/de/
+	${INSTALL_DATA} ${WRKSRC}/de/entropy_rsa.lo ${PREFIX}/share/examples/entropy/de/entropy.lo
 	${INSTALL_DATA} ${WRKSRC}/node/[0-9a-z]* ${PREFIX}/share/examples/entropy/node/
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/entropy/PLIST b/net/entropy/PLIST
index 597114eb924..368263cde46 100644
--- a/net/entropy/PLIST
+++ b/net/entropy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/06/28 16:59:36 tv Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/06/30 16:31:47 tv Exp $
 bin/entropy
 bin/entropy-monoopt
 bin/entropy-storechg
@@ -16,7 +16,7 @@ share/examples/entropy/node/gateway.de.html
 share/examples/entropy/node/gateway.en.html
 share/examples/entropy/node/logo_small.png
 share/examples/entropy/node/mime.types
-share/examples/entropy/node/my0812.bdf.lzw
+share/examples/entropy/node/my0812.bdf.gz
 share/examples/entropy/node/next.png
 share/examples/entropy/node/prev.png
 share/examples/entropy/node/robots.txt
@@ -25,7 +25,7 @@ share/examples/entropy/node/s30.gif
 share/examples/entropy/node/s45.gif
 share/examples/entropy/node/s60.gif
 share/examples/entropy/node/style.css
-share/examples/entropy/node/unicode.txt.lzw
+share/examples/entropy/node/unicode.txt.gz
 share/examples/entropy/seed.txt
 @dirrm share/examples/entropy/node
 @dirrm share/examples/entropy/de
diff --git a/net/entropy/distinfo b/net/entropy/distinfo
index 04cc485d6de..1263fb060d6 100644
--- a/net/entropy/distinfo
+++ b/net/entropy/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/06/28 16:59:36 tv Exp $
+$NetBSD: distinfo,v 1.7 2005/06/30 16:31:47 tv Exp $
 
-SHA1 (entropy-0.8.3-421.tgz) = 4dd13e89286c7d957e7f6001db1c6989990e4af6
-RMD160 (entropy-0.8.3-421.tgz) = 465d6f397397b2cc3e608d48af83e6f9ec5f8480
-Size (entropy-0.8.3-421.tgz) = 972398 bytes
-SHA1 (patch-aa) = 733cd10c5d7b323b49212c503923c20a60634015
-SHA1 (patch-ac) = 3651aec19ae8e079217121de231467a30fb1f73a
+SHA1 (entropy_rsa-0.9.0-429.tgz) = da9a3c068e370f17695bd77e64d7abc2f102083e
+RMD160 (entropy_rsa-0.9.0-429.tgz) = 29e3dab1ada0ccab9548e973e30604b6cdd61a15
+Size (entropy_rsa-0.9.0-429.tgz) = 867671 bytes
+SHA1 (patch-aa) = f094ead71b69995d6a8a48ac954bddac22339982
+SHA1 (patch-ab) = 6e5ad3221243cb942b265d664e9833596c7f24c3
+SHA1 (patch-ac) = 5b9440de45da9cc80676bd16d3a94783b7b5cf67
diff --git a/net/entropy/patches/patch-aa b/net/entropy/patches/patch-aa
new file mode 100644
index 00000000000..57caef7093d
--- /dev/null
+++ b/net/entropy/patches/patch-aa
@@ -0,0 +1,35 @@
+$NetBSD: patch-aa,v 1.1 2005/06/30 16:31:47 tv Exp $
+
+--- Makefile.in.orig	2005-06-29 08:28:38.000000000 -0400
++++ Makefile.in
+@@ -8,7 +8,7 @@ STORE_TYPE=	@STORE_TYPE@
+ VERBOSE=	@VERBOSE@
+ 
+ CC=		@CC@
+-CPPFLAGS=	-Iinclude -Isrc/zlib -Isrc/expat @CPPFLAGS@
++CPPFLAGS=	-Iinclude @CPPFLAGS@
+ CFLAGS=		$(CPPFLAGS) @CFLAGS@
+ LDFLAGS=	@LDFLAGS@
+ LIBS=		@LIBS@
+@@ -64,21 +64,6 @@ OBJS1=\
+ 	${OBJ}/png.o \
+ 	${OBJ}/unicode.o \
+ 	${OBJ}/vt.o \
+-	${OBJ}/zlib/adler32.o \
+-	${OBJ}/zlib/compress.o \
+-	${OBJ}/zlib/crc32.o \
+-	${OBJ}/zlib/deflate.o \
+-	${OBJ}/zlib/gzio.o \
+-	${OBJ}/zlib/infback.o \
+-	${OBJ}/zlib/inffast.o \
+-	${OBJ}/zlib/inflate.o \
+-	${OBJ}/zlib/inftrees.o \
+-	${OBJ}/zlib/trees.o \
+-	${OBJ}/zlib/uncompr.o \
+-	${OBJ}/zlib/zutil.o \
+-	${OBJ}/expat/xmlparse.o \
+-	${OBJ}/expat/xmlrole.o \
+-	${OBJ}/expat/xmltok.o \
+ 	${OBJ}/proxy.o \
+ 	${OBJ}/news.o
+ 
diff --git a/net/entropy/patches/patch-ab b/net/entropy/patches/patch-ab
new file mode 100644
index 00000000000..19733434dca
--- /dev/null
+++ b/net/entropy/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/06/30 16:31:47 tv Exp $
+
+--- include/settings.h.orig	2005-06-30 12:22:44.000000000 -0400
++++ include/settings.h
+@@ -52,7 +52,7 @@
+ #define	MINOR_LEVEL(minor) ((uint32_t)(minor)/0x10000)
+ #define	MINOR_STEP(minor) ((uint32_t)(minor)%0x10000)
+ 
+-#define	PROGNAME		"entropy_rsa"
++#define	PROGNAME		"entropy"
+ 
+ #define	NODE_NAME		"ENTROPY/RSA"
+ 
diff --git a/net/entropy/patches/patch-ac b/net/entropy/patches/patch-ac
index 69daf0cf1ba..7793b436159 100644
--- a/net/entropy/patches/patch-ac
+++ b/net/entropy/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/03/29 18:40:43 tv Exp $
+$NetBSD: patch-ac,v 1.2 2005/06/30 16:31:47 tv Exp $
 
---- entropy.conf-dist.orig	Wed Nov 19 12:40:20 2003
-+++ entropy.conf-dist
-@@ -66,7 +66,7 @@ crypto_default=lorenz
+--- entropy_rsa.conf-dist.orig	2005-06-28 12:40:06.000000000 -0400
++++ entropy_rsa.conf-dist
+@@ -74,10 +74,10 @@ crypto_default=lorenz
  # If you list modules here, your node will reject connections trying to
  # use the specified module. The modules crypt0, crypt1 and incr could
  # be listed here, but they aren't (currently) used anyways.
@@ -10,4 +10,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/29 18:40:43 tv Exp $
 +crypto_reject=crypt0,crypt1,crypt2,vmc1,incr
  
  # Select a log filename. Default is entropy.log in the current directory.
- logfile=entropy.log
+-logfile=entropy_rsa.log
++logfile=entropy.log
+ 
+ # Select a logging level from none, error, normal, minor or debug.
+ # none - no reporting at all. You won't see error messages either.