Update pam-af to 1.0.2.

Bug fix release.

6 files changed, 13 insertions, 67 deletions

diff --git a/security/pam-af/Makefile b/security/pam-af/Makefile
index ce1e03ef25f..da0c3e168e9 100644
--- a/security/pam-af/Makefile
+++ b/security/pam-af/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2011/08/23 13:06:53 obache Exp $
+# $NetBSD: Makefile,v 1.9 2011/10/17 08:47:51 obache Exp $
 
-DISTNAME=	pam_af-1.0.1
+DISTNAME=	pam_af-1.0.2
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://mbsd.msk.ru/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -17,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Linux"
-.include "../../databases/gdbm/buildlink3.mk"
+.include "../../databases/gdbm_compat/buildlink3.mk"
 .endif
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pam-af/distinfo b/security/pam-af/distinfo
index 5a69ed34cb1..f890c116d45 100644
--- a/security/pam-af/distinfo
+++ b/security/pam-af/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.6 2011/03/23 08:10:33 obache Exp $
+$NetBSD: distinfo,v 1.7 2011/10/17 08:47:51 obache Exp $
 
-SHA1 (pam_af-1.0.1.tar.bz2) = f953e50791db0d13f124ce0346f1db43b9d0bafa
-RMD160 (pam_af-1.0.1.tar.bz2) = 6fd33ef36b810eac58a59cd6ae0eb918548205e3
-Size (pam_af-1.0.1.tar.bz2) = 18006 bytes
+SHA1 (pam_af-1.0.2.tar.bz2) = e3856a33d79beafa8d4e8cb44b19cbf79a3ed422
+RMD160 (pam_af-1.0.2.tar.bz2) = 0c4163d811ba83de32e9b4633780ac76c8d10d8f
+Size (pam_af-1.0.2.tar.bz2) = 17991 bytes
 SHA1 (patch-aa) = 90efac36df429a51461b7a912f3ea0db923f630e
-SHA1 (patch-ab) = 3a8518c5e2a91d470d8861a866c37640985cd85c
-SHA1 (patch-ac) = 4be5f4fac51d4f848723e463c09ee759f64740c0
-SHA1 (patch-ad) = 83c3c96f42a26cde7d5a66b31f48bc12ee059ae4
-SHA1 (patch-ae) = 353c2c1e13b564adee72f4fcd3b4006b968d123d
+SHA1 (patch-ab) = 93adab4e1a230e46f5742ecb4390ff50d96d56d5
+SHA1 (patch-ad) = 0f46fecfec3b920a08e2c22c14ada368214d6a69
diff --git a/security/pam-af/patches/patch-ab b/security/pam-af/patches/patch-ab
index 5674b4ea348..4c4f733b9be 100644
--- a/security/pam-af/patches/patch-ab
+++ b/security/pam-af/patches/patch-ab
@@ -1,9 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2011/01/25 09:07:58 obache Exp $
+$NetBSD: patch-ab,v 1.3 2011/10/17 08:47:51 obache Exp $
 
 * LOG_AUTHPRIV is not in Solaris, use LOG_AUTH instead.
-* Recent OpemPAM define `OPENPAM', not `_OPENPAM'.
 
---- pam_af.c.orig	2006-11-07 00:05:53.000000000 +0000
+--- pam_af.c.orig	2011-08-24 07:53:32.000000000 +0000
 +++ pam_af.c
 @@ -41,6 +41,9 @@
  #include <fcntl.h>
@@ -15,12 +14,3 @@ $NetBSD: patch-ab,v 1.2 2011/01/25 09:07:58 obache Exp $
  #include <assert.h>
  #include <ndbm.h>
  
-@@ -53,7 +56,7 @@
- 
- #include <security/pam_appl.h>
- #include <security/pam_modules.h>
--#ifdef _OPENPAM
-+#if defined(_OPENPAM) || defined(OPENPAM)
- # include <security/openpam.h>
- # include <security/pam_mod_misc.h>
- #endif
diff --git a/security/pam-af/patches/patch-ac b/security/pam-af/patches/patch-ac
deleted file mode 100644
index 82552cdaa71..00000000000
--- a/security/pam-af/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2011/01/25 09:07:58 obache Exp $
-
-* Recent OpemPAM define `OPENPAM', not `_OPENPAM'.
-
---- common/pam_af.h.orig	2005-10-16 15:55:28.000000000 +0000
-+++ common/pam_af.h
-@@ -37,7 +37,7 @@
- #define CFGDB "/etc/pam_af.conf"
- #define CFGDB_PERM (S_IRUSR | S_IWUSR)
- 
--#ifdef _OPENPAM
-+#if defined(_OPENPAM) || defined(OPENPAM)
- # define PAM_AF_LOG(...) \
- 	PAM_LOG(__VA_ARGS__)
- # define PAM_AF_LOGERR(...) \
diff --git a/security/pam-af/patches/patch-ad b/security/pam-af/patches/patch-ad
index 5e2ebfde332..c9055a77a8d 100644
--- a/security/pam-af/patches/patch-ad
+++ b/security/pam-af/patches/patch-ad
@@ -1,19 +1,9 @@
-$NetBSD: patch-ad,v 1.2 2011/03/23 08:10:33 obache Exp $
+$NetBSD: patch-ad,v 1.3 2011/10/17 08:47:52 obache Exp $
 
-* Recent OpemPAM define `OPENPAM', not `_OPENPAM'.
 * Remove needless assignment, it break strict-aliasing
 
---- common/subr.c.orig	2006-11-07 00:22:37.000000000 +0000
+--- common/subr.c.orig	2011-08-24 07:53:32.000000000 +0000
 +++ common/subr.c
-@@ -66,7 +66,7 @@
- # define LOGERR(...) warnx(__VA_ARGS__)
- #else /* !PAM_AF_DEFS */
- # include <security/pam_appl.h>
--# ifdef _OPENPAM
-+# if defined(_OPENPAM) || defined(OPENPAM)
- #  include <security/pam_mod_misc.h>
- #  include <security/openpam.h>
- # endif
 @@ -181,7 +181,6 @@ my_getnameinfo(addr, addrlen, buf, bufle
  
  		sockaddr = (struct sockaddr *)&sa;
diff --git a/security/pam-af/patches/patch-ae b/security/pam-af/patches/patch-ae
deleted file mode 100644
index 5c4956c4061..00000000000
--- a/security/pam-af/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2011/01/25 09:07:58 obache Exp $
-
-* catch `getopt' with `int' to cath `-1' correctly.
-
---- pam_af_tool/pam_af_tool.c.orig	2005-10-15 13:26:37.000000000 +0000
-+++ pam_af_tool/pam_af_tool.c
-@@ -199,7 +199,8 @@ handle_ruleadd(argc, argv)
- 	datum			key, data;
- 	struct myaddrinfo	*res, *res0;
- 	char			buf[1024], *tmp;
--	char			ch, *ep;
-+	int			ch;
-+	char			*ep;
- 	int			flags = 0, dbflags;
- 	int			ret;
-