aboutsummaryrefslogtreecommitdiff
path: root/net/qt5-network
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2019-02-12 17:43:00 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2019-02-12 17:43:00 +0000
commit031fc9bfb6a4547020ec03524ede44c8ba3e359a (patch)
tree1dfb95498040d1c8d079ee7f59f242c1a89292b3 /net/qt5-network
parent886e72e106f245bf02174c7401458aa999f33fbd (diff)
downloadports-031fc9bfb6a4547020ec03524ede44c8ba3e359a.tar.gz
ports-031fc9bfb6a4547020ec03524ede44c8ba3e359a.zip
Notes
Diffstat (limited to 'net/qt5-network')
-rw-r--r--net/qt5-network/Makefile1
-rw-r--r--net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp40
2 files changed, 17 insertions, 24 deletions
diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile
index 35e2145fcd80..3918871f81c0 100644
--- a/net/qt5-network/Makefile
+++ b/net/qt5-network/Makefile
@@ -2,7 +2,6 @@
PORTNAME= network
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 5
CATEGORIES= net ipv6
PKGNAMEPREFIX= qt5-
diff --git a/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp b/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp
index 50747b2c88f0..732fc793d947 100644
--- a/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp
+++ b/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp
@@ -9,9 +9,9 @@ Clean up interface type and MTU detection.
place them on top of each other, that would be ok).
- IFM_FDDI (still) exists in 11.2, not in 12.0
---- src/network/kernel/qnetworkinterface_unix.cpp.orig 2018-12-03 11:15:26 UTC
-+++ src/network/kernel/qnetworkinterface_unix.cpp
-@@ -419,12 +419,23 @@ QT_BEGIN_INCLUDE_NAMESPACE
+--- src/network/kernel/qnetworkinterface_unix.cpp.orig 2019-02-09 11:35:25.320227000 +0100
++++ src/network/kernel/qnetworkinterface_unix.cpp 2019-02-09 11:43:51.515736000 +0100
+@@ -420,13 +420,25 @@
#endif // QT_PLATFORM_UIKIT
QT_END_INCLUDE_NAMESPACE
@@ -22,6 +22,7 @@ Clean up interface type and MTU detection.
- socket = qt_safe_socket(AF_INET, SOCK_DGRAM, 0);
- return socket;
-}
+
+ int socket{-1};
+
+ int open()
@@ -36,21 +37,12 @@ Clean up interface type and MTU detection.
+ if (socket != -1)
+ qt_safe_close(socket);
+ }
-+} ;
-
++};
++
static QNetworkInterface::InterfaceType probeIfType(int socket, int iftype, struct ifmediareq *req)
{
-@@ -463,9 +474,6 @@ static QNetworkInterface::InterfaceType
- case IFM_ETHER:
- return QNetworkInterface::Ethernet;
-
-- case IFM_FDDI:
-- return QNetworkInterface::Fddi;
--
- case IFM_IEEE80211:
- return QNetworkInterface::Ieee80211;
- }
-@@ -477,15 +485,8 @@ static QNetworkInterface::InterfaceType
+ // Determine the interface type.
+@@ -480,16 +492,9 @@
static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList)
{
QList<QNetworkInterfacePrivate *> interfaces;
@@ -59,20 +51,21 @@ Clean up interface type and MTU detection.
- struct ifreq req;
- };
- int socket = -1;
--
-- // ensure both structs start with the name field, of size IFNAMESIZ
-- Q_STATIC_ASSERT(sizeof(mediareq.ifm_name) == sizeof(req.ifr_name));
-- Q_ASSERT(&mediareq.ifm_name == &req.ifr_name);
+ SockPuppet<AF_INET> socket;
+ SockPuppet<AF_LOCAL> localSocket;
+- // ensure both structs start with the name field, of size IFNAMESIZ
+- Q_STATIC_ASSERT(sizeof(mediareq.ifm_name) == sizeof(req.ifr_name));
+- Q_ASSERT(&mediareq.ifm_name == &req.ifr_name);
+-
// on NetBSD we use AF_LINK and sockaddr_dl
// scan the list for that family
-@@ -500,13 +501,21 @@ static QList<QNetworkInterfacePrivate *>
+ for (ifaddrs *ptr = rawList; ptr; ptr = ptr->ifa_next)
+@@ -503,13 +508,22 @@
iface->flags = convertFlags(ptr->ifa_flags);
iface->hardwareAddress = iface->makeHwAddress(sdl->sdl_alen, (uchar*)LLADDR(sdl));
-- strlcpy(mediareq.ifm_name, ptr->ifa_name, sizeof(mediareq.ifm_name));
+- qstrncpy(mediareq.ifm_name, ptr->ifa_name, sizeof(mediareq.ifm_name));
- iface->type = probeIfType(openSocket(socket), sdl->sdl_type, &mediareq);
- iface->mtu = getMtu(socket, &req);
+ {
@@ -88,6 +81,7 @@ Clean up interface type and MTU detection.
+ req.ifr_addr.sa_family = AF_LOCAL;
+ iface->mtu = getMtu(localSocket.open(), &req);
+ }
++
}
- if (socket != -1)
@@ -95,7 +89,7 @@ Clean up interface type and MTU detection.
return interfaces;
}
-@@ -605,7 +614,7 @@ static QList<QNetworkInterfacePrivate *>
+@@ -608,7 +622,7 @@
{
QList<QNetworkInterfacePrivate *> interfaces;