Fix C++11 issues. Fix obvious string handling bug. Bump revision.

5 files changed, 55 insertions, 3 deletions

diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 2148771d04b..092c4ef00d1 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2016/04/21 10:44:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.46 2017/06/17 19:52:13 joerg Exp $
 
 DISTNAME=	fwbuilder-5.1.0.3599
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 55c76ca7f9a..d8f82d5aa97 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2016/04/21 10:44:40 jperkin Exp $
+$NetBSD: distinfo,v 1.12 2017/06/17 19:52:13 joerg Exp $
 
 SHA1 (fwbuilder-5.1.0.3599.tar.gz) = 4a693eb7d5cd51b5eb16e874540cb27c5b726dc5
 RMD160 (fwbuilder-5.1.0.3599.tar.gz) = 38cb91aaa137bb5f0bc14b8d7e70da5a83467349
@@ -12,3 +12,6 @@ SHA1 (patch-ae) = d0a20d6592c54065d26c1008e6b40e1e4d7fcdc7
 SHA1 (patch-configure.in) = b8c65d446b5761f835ea3275476c395f8426d6d7
 SHA1 (patch-src_gui_main.cpp) = 36b869852d9ed25aa1124f79ff926fe060558c08
 SHA1 (patch-src_libfwbuilder_qmake.inc.in) = 43043c98224da7c3050b1a1d9b7a01a7950a5c30
+SHA1 (patch-src_libfwbuilder_src_fwbuilder_AddressRange.cpp) = bd56835ae173bad81d239f6030076080c330d6e1
+SHA1 (patch-src_libfwbuilder_src_fwbuilder_uint128.h) = e978e3892ff84442f8384871ac8e784cb7ee079b
+SHA1 (patch-src_libgui_startup__tip__url.h) = d20d06a16e674f7b638109a8614d60e7c3eb0150
diff --git a/security/fwbuilder/patches/patch-src_libfwbuilder_src_fwbuilder_AddressRange.cpp b/security/fwbuilder/patches/patch-src_libfwbuilder_src_fwbuilder_AddressRange.cpp
new file mode 100644
index 00000000000..398dcdf160e
--- /dev/null
+++ b/security/fwbuilder/patches/patch-src_libfwbuilder_src_fwbuilder_AddressRange.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libfwbuilder_src_fwbuilder_AddressRange.cpp,v 1.1 2017/06/17 19:52:13 joerg Exp $
+
+Adding integer to a char[] string doesn't do the right thing.
+
+--- src/libfwbuilder/src/fwbuilder/AddressRange.cpp.orig	2017-06-10 17:41:07.168361613 +0000
++++ src/libfwbuilder/src/fwbuilder/AddressRange.cpp
+@@ -79,7 +79,7 @@ FWObject& AddressRange::shallowDuplicate
+     const AddressRange *n = dynamic_cast<const AddressRange *>(o);
+     if (n==NULL)
+         throw(FWException(
+-"Attempt to copy incompatible object to AddressRange: objectID="+o->getId()));
++"Attempt to copy incompatible object to AddressRange: objectID="+std::to_string(o->getId())));
+ 
+     start_address = n->getRangeStart();
+     end_address   = n->getRangeEnd();
diff --git a/security/fwbuilder/patches/patch-src_libfwbuilder_src_fwbuilder_uint128.h b/security/fwbuilder/patches/patch-src_libfwbuilder_src_fwbuilder_uint128.h
new file mode 100644
index 00000000000..937065e0efa
--- /dev/null
+++ b/security/fwbuilder/patches/patch-src_libfwbuilder_src_fwbuilder_uint128.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_libfwbuilder_src_fwbuilder_uint128.h,v 1.1 2017/06/17 19:52:13 joerg Exp $
+
+Avoid User Defined Literals. Drop effectively redundant casts that
+actually introduce warnings.
+
+--- src/libfwbuilder/src/fwbuilder/uint128.h.orig	2017-06-10 17:34:20.490231501 +0000
++++ src/libfwbuilder/src/fwbuilder/uint128.h
+@@ -466,9 +466,9 @@ public:
+     {
+         char buf[33];
+         if (hi)
+-            sprintf(buf, "%"PRIX64"%08"PRIX64, (unsigned long long)hi,(unsigned long long)lo);
++            sprintf(buf, "%" PRIX64"%08" PRIX64, hi, lo);
+         else
+-            sprintf(buf,"%"PRIX64,(unsigned long long)lo);
++            sprintf(buf,"%" PRIX64, lo);
+         return buf;
+     }
+ 
diff --git a/security/fwbuilder/patches/patch-src_libgui_startup__tip__url.h b/security/fwbuilder/patches/patch-src_libgui_startup__tip__url.h
new file mode 100644
index 00000000000..5ea38a098b3
--- /dev/null
+++ b/security/fwbuilder/patches/patch-src_libgui_startup__tip__url.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libgui_startup__tip__url.h,v 1.1 2017/06/17 19:52:13 joerg Exp $
+
+Avoid User Defined Literals.
+
+--- src/libgui/startup_tip_url.h.orig	2017-06-10 17:39:29.007229821 +0000
++++ src/libgui/startup_tip_url.h
+@@ -29,7 +29,7 @@
+ 
+ #include "../../VERSION.h"
+ 
+-#define STARTUP_TIP_URL "http://update.fwbuilder.org/tips/gettip.cgi?v="VERSION
++#define STARTUP_TIP_URL "http://update.fwbuilder.org/tips/gettip.cgi?v=" VERSION
+ 
+ #endif
+