From 87e8d8e8a97591d9a33754f1c7cd706bb0918b3a Mon Sep 17 00:00:00 2001
From: extrowerk <5569059+extrowerk@users.noreply.github.com>
Date: Sun, 6 Jun 2021 18:18:07 +0200
Subject: [PATCH] libnpupnp: bump (#5961)

---
 ...p-4.0.14.recipe => libnpupnp-4.1.4.recipe} |  7 ++--
 .../patches/libnpupnp-4.0.14.patchset         | 39 -------------------
 2 files changed, 3 insertions(+), 43 deletions(-)
 rename net-libs/libnpupnp/{libnpupnp-4.0.14.recipe => libnpupnp-4.1.4.recipe} (92%)
 delete mode 100644 net-libs/libnpupnp/patches/libnpupnp-4.0.14.patchset

diff --git a/net-libs/libnpupnp/libnpupnp-4.0.14.recipe b/net-libs/libnpupnp/libnpupnp-4.1.4.recipe
similarity index 92%
rename from net-libs/libnpupnp/libnpupnp-4.0.14.recipe
rename to net-libs/libnpupnp/libnpupnp-4.1.4.recipe
index 4e13be69c..3723e62ce 100644
--- a/net-libs/libnpupnp/libnpupnp-4.0.14.recipe
+++ b/net-libs/libnpupnp/libnpupnp-4.1.4.recipe
@@ -9,14 +9,13 @@ COPYRIGHT="2000-2003 Intel Corporation
 LICENSE="BSD (3-clause)"
 REVISION="3"
 SOURCE_URI="https://framagit.org/medoc92/npupnp/-/archive/libnpupnp-v${portVersion}/npupnp-libnpupnp-v${portVersion}.tar.bz2"
-CHECKSUM_SHA256="6c19004bebc0d74900f9b6e025e8eb54030fe788341b58085a7992b3cdb2a9ed"
+CHECKSUM_SHA256="20f3963f761fdf12e78e9f75ebdcd65c86d7ebd0449e1345b10387cab9b33b14"
 SOURCE_DIR="npupnp-libnpupnp-v$portVersion"
-PATCHES="libnpupnp-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion="4.0.2"
+libVersion="4.2.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
@@ -71,7 +70,7 @@ BUILD()
 {
 	./autogen.sh
 
-	LDFLAGS="-lnetwork" runConfigure ./configure \
+	CXXFLAGS="-D_DEFAULT_SOURCE" LDFLAGS="-lnetwork" runConfigure ./configure \
 		--enable-client \
 		--enable-debug \
 		--enable-device \
diff --git a/net-libs/libnpupnp/patches/libnpupnp-4.0.14.patchset b/net-libs/libnpupnp/patches/libnpupnp-4.0.14.patchset
deleted file mode 100644
index 0149a50e1..000000000
--- a/net-libs/libnpupnp/patches/libnpupnp-4.0.14.patchset
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4c464f6c022ca3945430a146c2a1606fc6d6b5e5 Mon Sep 17 00:00:00 2001
-From: Jean-Francois Dockes <jf@dockes.org>
-Date: Sat, 6 Feb 2021 15:58:25 +0100
-Subject: [PATCH] Haiku OS: fake the MULTICAST flag on interfaces
-
----
- src/utils/netif.cpp | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/utils/netif.cpp b/src/utils/netif.cpp
-index d99c7fc..5b3d8ec 100644
---- a/src/utils/netif.cpp
-+++ b/src/utils/netif.cpp
-@@ -448,9 +448,7 @@ Interfaces::Internal::Internal()
-     std::vector<Interface> vifs;
-     for (ifa = ifap; ifa != nullptr; ifa = ifa->ifa_next) {
-         LOGDEB("NetIF::Interfaces: I/F name " << ifa->ifa_name << "\n");
--
--        // Skip interfaces which are address-less, LOOPBACK, DOWN, or
--        // that don't support MULTICAST.
-+        // Skip interfaces which are address-less.
-         if (nullptr == ifa->ifa_addr) {
-             LOGDEB("NetIF::Interfaces: Skipping " << ifa->ifa_name <<
-                    " because it has no address.\n");
-@@ -475,6 +473,12 @@ Interfaces::Internal::Internal()
-             LOGDEB("NetIF::Interfaces: " << ifa->ifa_name << " has MULTICAST\n");
-             ifit->m->setflag(Interface::Flags::MULTICAST);
-         }
-+#ifdef __HAIKU__
-+        // It seems that Haiku does not set the MULTICAST flag even on
-+        // interfaces which do support the function. So, force it and hope for the
-+        // best:
-+        ifit->m->setflag(Interface::Flags::MULTICAST);
-+#endif        
-         ifit->m->index = if_nametoindex(ifa->ifa_name);
-         switch (ifa->ifa_addr->sa_family) {
-         case AF_INET:
--- 
-GitLab