rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backport more inet_addr removal

Browse Source
This commit is contained in:
Caolán McNamara 2021-06-21 08:53:42 +01:00
parent 69af4aa932
commit 0cd62dff33
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-Simplify-construction-of-a-hardcoded-IPv4-address.patch Normal file
View File

@ -0,0 +1,39 @@
From 68a6c70f25762374f7aed0d4d755345c6f37c78d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 31 May 2021 10:56:38 +0200
Subject: [PATCH] Simplify construction of a hardcoded IPv4 address
Change-Id: I822313ee708935dd4ecb636c13a961fdd054d660
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116434
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
sd/source/ui/remotecontrol/DiscoveryService.cxx | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 9ed2ae727761..cf0043387403 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -119,17 +119,7 @@ void DiscoveryService::setupSockets()
struct ip_mreq multicastRequest;
-// the Win32 SDK 8.1 deprecates inet_addr()
-#if defined(_WIN32)
- IN_ADDR addr;
- INT ret = InetPtonW(AF_INET, L"239.0.0.1", & addr);
- if (1 == ret)
- {
- multicastRequest.imr_multiaddr.s_addr = addr.S_un.S_addr;
- }
-#else
- multicastRequest.imr_multiaddr.s_addr = inet_addr( "239.0.0.1" );
-#endif
+ multicastRequest.imr_multiaddr.s_addr = htonl((239U << 24) | 1U); // 239.0.0.1
multicastRequest.imr_interface.s_addr = htonl(INADDR_ANY);
rc = setsockopt( mSocket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
--
2.31.1

7
libreoffice.spec
View File

@ -254,9 +254,10 @@ Patch6: 0001-Adapt-to-libstdc-Implement-LWG-1203-for-rvalue-iostr.patch
Patch7: 0001-Adapt-to-hamcrest-2.2-3.fc35.noarch.rpm.patch
Patch8: 0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch
Patch9: 0001-Replace-inet_ntoa-with-inet_ntop.patch
Patch10: 0001-dtd-files-are-not-xml-files-and-shouldn-t-have-xml-h.patch
Patch11: 0002-xmllint-Namespace-prefix-menu-on-menuseparator-is-no.patch
Patch12: 0001-allow-system-firebird-4.patch
Patch10: 0001-Simplify-construction-of-a-hardcoded-IPv4-address.patch
Patch11: 0001-dtd-files-are-not-xml-files-and-shouldn-t-have-xml-h.patch
Patch12: 0002-xmllint-Namespace-prefix-menu-on-menuseparator-is-no.patch
Patch13: 0001-allow-system-firebird-4.patch
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch