rpms
/
ModemManager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix big endian issue on s390x/ppc64

This commit is contained in:
Than Ngo 2016-04-07 17:11:08 +02:00
parent 343fc2ba43
commit 65315c567e
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ModemManager-bigendian.patch Normal file
View File

@ -0,0 +1,42 @@
diff -up ModemManager-1.5.991/plugins/huawei/tests/test-modem-helpers-huawei.c.than ModemManager-1.5.991/plugins/huawei/tests/test-modem-helpers-huawei.c
--- ModemManager-1.5.991/plugins/huawei/tests/test-modem-helpers-huawei.c.than 2016-04-07 08:04:47.226567436 -0400
+++ ModemManager-1.5.991/plugins/huawei/tests/test-modem-helpers-huawei.c 2016-04-07 10:45:48.832853814 -0400
@@ -161,6 +161,22 @@ static const DhcpTest dhcp_tests[] = {
{ NULL }
};
+static char * checkendian(char *ip)
+{
+#if __BYTE_ORDER == __BIG_ENDIAN
+ in_addr_t addr;
+ inet_pton(AF_INET, ip, &addr);
+ addr =
+ ((addr & 0xff000000) >> 24) |
+ ((addr & 0x00ff0000) >> 8) |
+ ((addr & 0x0000ff00) << 8) |
+ ((addr & 0x000000ff) << 24);
+
+ inet_ntop(AF_INET, &addr, ip, INET_ADDRSTRLEN);
+#endif
+ return ip;
+}
+
static void
test_dhcp (void)
{
@@ -180,11 +196,11 @@ test_dhcp (void)
&error) == TRUE);
g_assert_no_error (error);
- g_assert_cmpstr (inet_ntoa (*((struct in_addr *) &addr)), ==, dhcp_tests[i].expected_addr);
+ g_assert_cmpstr (checkendian(inet_ntoa (*((struct in_addr *) &addr))), ==, dhcp_tests[i].expected_addr);
g_assert_cmpint (prefix, ==, dhcp_tests[i].expected_prefix);
- g_assert_cmpstr (inet_ntoa (*((struct in_addr *) &gateway)), ==, dhcp_tests[i].expected_gateway);
- g_assert_cmpstr (inet_ntoa (*((struct in_addr *) &dns1)), ==, dhcp_tests[i].expected_dns1);
- g_assert_cmpstr (inet_ntoa (*((struct in_addr *) &dns2)), ==, dhcp_tests[i].expected_dns2);
+ g_assert_cmpstr (checkendian(inet_ntoa (*((struct in_addr *) &gateway))), ==, dhcp_tests[i].expected_gateway);
+ g_assert_cmpstr (checkendian(inet_ntoa (*((struct in_addr *) &dns1))), ==, dhcp_tests[i].expected_dns1);
+ g_assert_cmpstr (checkendian(inet_ntoa (*((struct in_addr *) &dns2))), ==, dhcp_tests[i].expected_dns2);
}
}

6
ModemManager.spec
View File

@ -36,6 +36,8 @@ BuildRequires: gobject-introspection-devel >= 1.38
BuildRequires: vala-tools vala-devel
BuildRequires: dbus
Patch0: ModemManager-bigendian.patch
%description
The ModemManager service manages WWAN modems and provides a consistent API for
interacting with these devices to client applications.
@ -83,6 +85,7 @@ Vala bindings for ModemManager
%prep
%setup -q -n %{name}-1.5.991
%patch0 -p1 -b .endian
%build
intltoolize --force
@ -170,6 +173,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/vala/vapi/libmm-glib.*
%changelog
* Thu Apr 07 2016 Than Ngo <than@redhat.com> - 1.6-0.2.rc2
- fix big endian issue on s390x/ppc64
* Fri Mar 25 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.6-0.1.rc2
- Update to 1.6 release candidate 2