Changes 2.1.15:

* Bug fix release

6 files changed, 27 insertions, 25 deletions

diff --git a/security/libfwbuilder21/Makefile b/security/libfwbuilder21/Makefile
index e943765b3ca..f2a80ea25c6 100644
--- a/security/libfwbuilder21/Makefile
+++ b/security/libfwbuilder21/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/03/24 18:37:19 bad Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/12 17:59:20 adam Exp $
 
-DISTNAME=	libfwbuilder-2.1.10
-PKGNAME=	libfwbuilder21-2.1.10
+DISTNAME=	libfwbuilder-2.1.15
+PKGNAME=	libfwbuilder21-2.1.15
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
diff --git a/security/libfwbuilder21/PLIST b/security/libfwbuilder21/PLIST
index 95af0f54079..7e0f595d7f6 100644
--- a/security/libfwbuilder21/PLIST
+++ b/security/libfwbuilder21/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/03/24 18:37:19 bad Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/12/12 17:59:20 adam Exp $
 bin/libfwbuilder-config-2.1
 include/fwb-2.1/fwbuilder/Address.h
 include/fwb-2.1/fwbuilder/AddressRange.h
@@ -50,7 +50,6 @@ include/fwb-2.1/fwbuilder/ThreadTools.h
 include/fwb-2.1/fwbuilder/Tools.h
 include/fwb-2.1/fwbuilder/UDPService.h
 include/fwb-2.1/fwbuilder/XMLTools.h
-include/fwb-2.1/fwbuilder/crypto.h
 include/fwb-2.1/fwbuilder/dns.h
 include/fwb-2.1/fwbuilder/libfwbuilder-config.h
 include/fwb-2.1/fwbuilder/libfwbuilder-version.h
@@ -101,6 +100,7 @@ share/libfwbuilder21/migration/FWObjectDatabase_2.0.0.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.1.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.10.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.11.xslt
+share/libfwbuilder21/migration/FWObjectDatabase_2.0.12.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.2.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.3.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.4.xslt
@@ -109,12 +109,14 @@ share/libfwbuilder21/migration/FWObjectDatabase_2.0.6.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.7.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.8.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.9.xslt
-share/libfwbuilder21/migration/FWObjectDatabase_2.0.10.xslt
-share/libfwbuilder21/migration/FWObjectDatabase_2.0.11.xslt
-share/libfwbuilder21/migration/FWObjectDatabase_2.0.12.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.0.99.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.1.0.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.1.1.xslt
+share/libfwbuilder21/migration/FWObjectDatabase_2.1.10.xslt
+share/libfwbuilder21/migration/FWObjectDatabase_2.1.11.xslt
+share/libfwbuilder21/migration/FWObjectDatabase_2.1.12.xslt
+share/libfwbuilder21/migration/FWObjectDatabase_2.1.13.xslt
+share/libfwbuilder21/migration/FWObjectDatabase_2.1.14.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.1.2.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.1.3.xslt
 share/libfwbuilder21/migration/FWObjectDatabase_2.1.4.xslt
diff --git a/security/libfwbuilder21/buildlink3.mk b/security/libfwbuilder21/buildlink3.mk
index 9d37b0c99d1..bea4191152c 100644
--- a/security/libfwbuilder21/buildlink3.mk
+++ b/security/libfwbuilder21/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/03/24 18:37:19 bad Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2007/12/12 17:59:20 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBFWBUILDER21_BUILDLINK3_MK:=	${LIBFWBUILDER21_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	libfwbuilder21
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfwbuilder21
 
 .if !empty(LIBFWBUILDER21_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libfwbuilder21+=	libfwbuilder21-2.1.10
-BUILDLINK_ABI_DEPENDS.libfwbuilder21+=	libfwbuilder21-2.1.10
+BUILDLINK_API_DEPENDS.libfwbuilder21+=	libfwbuilder21>=2.1.15
+BUILDLINK_ABI_DEPENDS.libfwbuilder21+=	libfwbuilder21>=2.1.15
 BUILDLINK_PKGSRCDIR.libfwbuilder21?=	../../security/libfwbuilder21
 .endif	# LIBFWBUILDER21_BUILDLINK3_MK
 
diff --git a/security/libfwbuilder21/distinfo b/security/libfwbuilder21/distinfo
index 5bc3256519a..bcc2988fb56 100644
--- a/security/libfwbuilder21/distinfo
+++ b/security/libfwbuilder21/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2007/03/24 18:37:19 bad Exp $
+$NetBSD: distinfo,v 1.3 2007/12/12 17:59:21 adam Exp $
 
-SHA1 (libfwbuilder-2.1.10.tar.gz) = 019ede70f072e7a0b1c81dce0ec158b968bf2189
-RMD160 (libfwbuilder-2.1.10.tar.gz) = 596f41c9dc649c1a582490194ed910d5a2999cdc
-Size (libfwbuilder-2.1.10.tar.gz) = 320353 bytes
+SHA1 (libfwbuilder-2.1.15.tar.gz) = 8eae2486e9e83b98cfd74d007b50de77f9ebdbb0
+RMD160 (libfwbuilder-2.1.15.tar.gz) = edd1b4cafea6dcaff422cecdf10749fadde27337
+Size (libfwbuilder-2.1.15.tar.gz) = 315773 bytes
 SHA1 (patch-aa) = 21d0e029f6fcdd9c7bc1d4bea3f9126c2db8b80c
 SHA1 (patch-ab) = f8c193df3e32f6a653bef61cb7771a9bdc19cfb8
 SHA1 (patch-ac) = 396badb60ecdccd30061ee078f72944fb81a63ba
 SHA1 (patch-ad) = d921b6b2f6c4af5212878a8e444358942a1cb376
-SHA1 (patch-ae) = 9fa3afd91643a17c06989515ce11daa8714a9949
-SHA1 (patch-af) = 579f95e9d31effd9087011dafbb7a8d3d4571d5b
+SHA1 (patch-ae) = 27d30be400b96d5e7e80b48091c5262b43444d06
+SHA1 (patch-af) = bb40350518a686bd5d86f0983c9e71aa715b91f6
diff --git a/security/libfwbuilder21/patches/patch-ae b/security/libfwbuilder21/patches/patch-ae
index 758e4935704..eaf949a606d 100644
--- a/security/libfwbuilder21/patches/patch-ae
+++ b/security/libfwbuilder21/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/11/09 19:06:37 bad Exp $
+$NetBSD: patch-ae,v 1.2 2007/12/12 17:59:21 adam Exp $
 
---- configure.orig	2006-10-31 07:00:59.000000000 +0100
+--- configure.orig	2007-12-09 21:39:53.000000000 +0100
 +++ configure
-@@ -7024,7 +7024,7 @@ fi
+@@ -6750,7 +6750,7 @@ fi
  
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2006/11/09 19:06:37 bad Exp $
  
    LIB_RESOLV=""
    HAVE_RES_NQUERY=""
-@@ -10115,8 +10115,8 @@ fi
+@@ -9833,8 +9833,8 @@ fi
  if test "Z$ac_cv_gethostbyaddr_args" != "Z"; then
    echo "Function gethostbyaddr_r takes $ac_cv_gethostbyaddr_args arguments"
    echo -n "First argument for gethostbyaddr_r is "
diff --git a/security/libfwbuilder21/patches/patch-af b/security/libfwbuilder21/patches/patch-af
index 3d2c50c4eed..6f8d473bea3 100644
--- a/security/libfwbuilder21/patches/patch-af
+++ b/security/libfwbuilder21/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2006/11/09 19:06:37 bad Exp $
+$NetBSD: patch-af,v 1.2 2007/12/12 17:59:21 adam Exp $
 
---- configure.in.orig	2006-09-06 05:53:34.000000000 +0200
+--- configure.in.orig	2007-08-26 05:06:34.000000000 +0200
 +++ configure.in
-@@ -427,7 +427,7 @@ dnl  By default we assume user wants dns
+@@ -334,7 +334,7 @@ dnl  By default we assume user wants dns
  dnl  zone transfers support, provided script can find the library
  dnl
  
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.1.1.1 2006/11/09 19:06:37 bad Exp $
  
    LIB_RESOLV=""
    HAVE_RES_NQUERY=""
-@@ -841,8 +841,8 @@ fi
+@@ -744,8 +744,8 @@ fi
  if test "Z$ac_cv_gethostbyaddr_args" != "Z"; then
    echo "Function gethostbyaddr_r takes $ac_cv_gethostbyaddr_args arguments"
    echo -n "First argument for gethostbyaddr_r is "