From 81739195ee5b1d4b2fe573b75d490987ae27adc1 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sun, 3 Nov 2002 15:13:25 +0000
Subject: [PATCH] Update to 2.1.0 (final). From: Jose Nazario <jose@monkey.org>

---
 security/apg/Makefile               |  5 ++---
 security/apg/distinfo               |  6 +++---
 security/apg/patches/patch-Makefile | 20 --------------------
 security/apg/patches/patch-rnd_c    | 14 --------------
 security/apg/patches/patch-rnd_h    | 15 ---------------
 5 files changed, 5 insertions(+), 55 deletions(-)
 delete mode 100644 security/apg/patches/patch-Makefile
 delete mode 100644 security/apg/patches/patch-rnd_c
 delete mode 100644 security/apg/patches/patch-rnd_h

diff --git a/security/apg/Makefile b/security/apg/Makefile
index 6dfab220622..a1f29f8afd9 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2002/05/13 09:06:08 jsyn Exp $
+# $OpenBSD: Makefile,v 1.6 2002/11/03 15:13:25 naddy Exp $
 
 COMMENT=		"automated password generator"
 
-DISTNAME=		apg-2.1.0a0
+DISTNAME=		apg-2.1.0
 CATEGORIES=     	security
-NEED_VERSION=		1.528
 
 HOMEPAGE=		http://www.adel.nursat.kz/apg/
 
diff --git a/security/apg/distinfo b/security/apg/distinfo
index 4a74e1dbf8f..0c3f84c6785 100644
--- a/security/apg/distinfo
+++ b/security/apg/distinfo
@@ -1,3 +1,3 @@
-MD5 (apg-2.1.0a0.tar.gz) = e3204157078f617f7ef025f4872a8d2f
-RMD160 (apg-2.1.0a0.tar.gz) = b745330e6ec1325503e1393e8fa9878174849fdd
-SHA1 (apg-2.1.0a0.tar.gz) = 27a2578161cd5e7304a67bb87767ff8bdb91eacb
+MD5 (apg-2.1.0.tar.gz) = 402769cce2c5ffef9806993d93c5b56d
+RMD160 (apg-2.1.0.tar.gz) = 4d4999cef5acb88432bf8fc5e9067cb3a3f62a76
+SHA1 (apg-2.1.0.tar.gz) = 415aeeae944c184bdc67ef36af9ea68c062c7cf9
diff --git a/security/apg/patches/patch-Makefile b/security/apg/patches/patch-Makefile
deleted file mode 100644
index b0b0efa1557..00000000000
--- a/security/apg/patches/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.4 2002/09/24 06:54:32 pvalchev Exp $
---- Makefile.orig	Tue Sep 24 00:38:07 2002
-+++ Makefile	Tue Sep 24 00:38:09 2002
-@@ -88,13 +88,13 @@ standalone: apg apgbfm
- cygwin: standalone
- 
- apg:
--	${CC} ${FLAGS} ${LIBS} ${LIBM} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES}
-+	${CC} ${FLAGS} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES} ${LIBS} ${LIBM}
- 
- apgd:
--	${CC} ${FLAGS} ${CS_LIBS} ${LIBM} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES}
-+	${CC} ${FLAGS} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES} ${CS_LIBS} ${LIBM}
- 
- apgbfm:
--	${CC} ${FLAGS} ${LIBM} -o ${BFM_PROGNAME} ${BFM_SOURCES}
-+	${CC} ${FLAGS} -o ${BFM_PROGNAME} ${BFM_SOURCES} ${LIBM}
- 
- strip:
- 	strip ${PROGNAME}
diff --git a/security/apg/patches/patch-rnd_c b/security/apg/patches/patch-rnd_c
deleted file mode 100644
index da7d3398dc0..00000000000
--- a/security/apg/patches/patch-rnd_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-rnd_c,v 1.1 2002/02/20 16:55:50 naddy Exp $
---- rnd.c.orig	Wed Feb 20 17:48:27 2002
-+++ rnd.c	Wed Feb 20 17:48:59 2002
-@@ -190,8 +190,8 @@ x917_setseed (UINT32 seed, int quiet)
- #ifndef CLISERV
-    if (quiet != TRUE)
-     {
--     fprintf(stderr,"CAN NOT USE /dev/random TO GENERATE RANDOM SEED\n");
--     fprintf(stderr,"USEING LOCAL TIME AND PID FOR SEED GENERATION !!!\n");
-+     fprintf(stderr,"CAN NOT USE RANDOM DEVICE TO GENERATE RANDOM SEED\n");
-+     fprintf(stderr,"USING LOCAL TIME AND PID FOR SEED GENERATION !!!\n");
-      fflush(stderr);
-     }
- #endif /* CLISERV */
diff --git a/security/apg/patches/patch-rnd_h b/security/apg/patches/patch-rnd_h
deleted file mode 100644
index 0f1da85e4b1..00000000000
--- a/security/apg/patches/patch-rnd_h
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-rnd_h,v 1.1 2002/02/20 16:55:50 naddy Exp $
---- rnd.h.orig	Wed Feb 20 17:49:10 2002
-+++ rnd.h	Wed Feb 20 17:50:10 2002
-@@ -37,7 +37,11 @@
- extern UINT32 __rnd_seed[2];
- 
- #define RND_MX 0x7FFFFFFF
-+#ifdef __OpenBSD__
-+#define APG_DEVRANDOM "/dev/arandom"
-+#else
- #define APG_DEVRANDOM "/dev/random"
-+#endif
- #define APG_DEVURANDOM "/dev/urandom"
- 
- extern void x917_setseed (UINT32 seed, int quiet);