NetworkManager: update to 1.14.6.
This commit is contained in:
parent
0cb9e6cee2
commit
3ac9f6e892
|
@ -1,5 +1,5 @@
|
||||||
--- shared/n-acd/src/n-acd.c 2018-09-09 12:10:36.626987553 +0200
|
--- shared/n-acd/src/n-acd.c
|
||||||
+++ shared/n-acd/src/n-acd.c 2018-09-09 12:51:36.680798693 +0200
|
+++ shared/n-acd/src/n-acd.c
|
||||||
@@ -23,10 +23,10 @@
|
@@ -23,10 +23,10 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
@ -12,6 +12,31 @@
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
--- src/devices/nm-device.c
|
||||||
|
+++ src/devices/nm-device.c
|
||||||
|
@@ -34,7 +34,11 @@
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <linux/if_addr.h>
|
||||||
|
-#include <linux/if_arp.h>
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
|
+ #include <linux/if_arp.h>
|
||||||
|
+#else
|
||||||
|
+ #include <linux/if.h>
|
||||||
|
+#endif
|
||||||
|
#include <linux/rtnetlink.h>
|
||||||
|
#include <linux/pkt_sched.h>
|
||||||
|
|
||||||
|
--- src/nm-manager.c
|
||||||
|
+++ src/nm-manager.c
|
||||||
|
@@ -28,6 +28,7 @@
|
||||||
|
#include <errno.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
+#include <asm/types.h>
|
||||||
|
|
||||||
|
#include "nm-utils/nm-c-list.h"
|
||||||
|
|
||||||
--- src/platform/nm-linux-platform.c
|
--- src/platform/nm-linux-platform.c
|
||||||
+++ src/platform/nm-linux-platform.c
|
+++ src/platform/nm-linux-platform.c
|
||||||
@@ -20,6 +20,7 @@
|
@@ -20,6 +20,7 @@
|
||||||
|
@ -22,36 +47,22 @@
|
||||||
|
|
||||||
#include <poll.h>
|
#include <poll.h>
|
||||||
#include <endian.h>
|
#include <endian.h>
|
||||||
@@ -33,7 +34,9 @@
|
@@ -33,7 +34,11 @@
|
||||||
#include <netinet/icmp6.h>
|
#include <netinet/icmp6.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <linux/ip.h>
|
#include <linux/ip.h>
|
||||||
-#include <linux/if_arp.h>
|
-#include <linux/if_arp.h>
|
||||||
+#if defined(__GLIBC__)
|
+#if defined(__GLIBC__)
|
||||||
+ #include <linux/if_arp.h>
|
+ #include <linux/if_arp.h>
|
||||||
|
+#else
|
||||||
|
+ #include <linux/if.h>
|
||||||
+#endif
|
+#endif
|
||||||
#include <linux/if_link.h>
|
#include <linux/if_link.h>
|
||||||
#include <linux/if_tun.h>
|
#include <linux/if_tun.h>
|
||||||
#include <linux/if_tunnel.h>
|
#include <linux/if_tunnel.h>
|
||||||
@@ -53,7 +56,6 @@
|
@@ -53,7 +58,6 @@
|
||||||
#include "nm-platform-private.h"
|
#include "nm-platform-private.h"
|
||||||
#include "wifi/nm-wifi-utils.h"
|
#include "wifi/nm-wifi-utils.h"
|
||||||
#include "wifi/nm-wifi-utils-wext.h"
|
#include "wifi/nm-wifi-utils-wext.h"
|
||||||
-#include "wpan/nm-wpan-utils.h"
|
-#include "wpan/nm-wpan-utils.h"
|
||||||
#include "nm-utils/unaligned.h"
|
#include "nm-utils/unaligned.h"
|
||||||
#include "nm-utils/nm-io-utils.h"
|
|
||||||
#include "nm-utils/nm-udev-utils.h"
|
|
||||||
--- src/devices/nm-device.c
|
|
||||||
+++ src/devices/nm-device.c
|
|
||||||
@@ -34,7 +34,9 @@
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <linux/if_addr.h>
|
|
||||||
-#include <linux/if_arp.h>
|
|
||||||
+#if defined(__GLIBC__)
|
|
||||||
+ #include <linux/if_arp.h>
|
|
||||||
+#endif
|
|
||||||
#include <linux/rtnetlink.h>
|
|
||||||
#include <linux/pkt_sched.h>
|
|
||||||
#include <uuid/uuid.h>
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'NetworkManager'
|
# Template file for 'NetworkManager'
|
||||||
pkgname=NetworkManager
|
pkgname=NetworkManager
|
||||||
version=1.14.4
|
version=1.14.6
|
||||||
revision=5
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
build_helper="gir"
|
build_helper="gir"
|
||||||
configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient
|
configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient
|
||||||
|
@ -27,7 +27,7 @@ maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://wiki.gnome.org/Projects/NetworkManager"
|
homepage="https://wiki.gnome.org/Projects/NetworkManager"
|
||||||
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
||||||
checksum=35a3ede4c7d12d6212033c9e44cb82b7692f38063b53a067567f02f5937c8c18
|
checksum=693bcdad15eec7f07a06cbc6e43ddb3b1c13b2d2d23ec165fbb5adf4c3323a5d
|
||||||
|
|
||||||
# gtk-doc generation is disabled but gtkdocisze is required by autogen.sh
|
# gtk-doc generation is disabled but gtkdocisze is required by autogen.sh
|
||||||
hostmakedepends="automake bluez dbus-glib-devel dhclient gettext-devel
|
hostmakedepends="automake bluez dbus-glib-devel dhclient gettext-devel
|
||||||
|
@ -84,11 +84,6 @@ pre_build() {
|
||||||
export GIR_EXTRA_LIBS_PATH="${wrksrc}/libnm-util/.libs:${wrksrc}/libnm/.libs:${wrksrc}/libnm-glib/.libs"
|
export GIR_EXTRA_LIBS_PATH="${wrksrc}/libnm-util/.libs:${wrksrc}/libnm/.libs:${wrksrc}/libnm-glib/.libs"
|
||||||
}
|
}
|
||||||
|
|
||||||
do_check() {
|
|
||||||
# src/settings/plugins/ibft/tests/test-ibft errors out in chroot
|
|
||||||
:
|
|
||||||
}
|
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
|
vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
|
||||||
# remove unused stuff
|
# remove unused stuff
|
||||||
|
|
Loading…
Reference in New Issue