diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-03 10:11:29 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-03 10:11:29 +0000 |
commit | cd796398d0d21f805a296900cc1f67f3e991ff9c (patch) | |
tree | 72c8afcee0af49e70da5321afadd03882d871f7f | |
parent | 28648190fd6f9d06d4db3f636dd91af48f293158 (diff) | |
download | alpine_aports-cd796398d0d21f805a296900cc1f67f3e991ff9c.tar.bz2 alpine_aports-cd796398d0d21f805a296900cc1f67f3e991ff9c.tar.xz alpine_aports-cd796398d0d21f805a296900cc1f67f3e991ff9c.zip |
testing/networkmanager: upgrade to 0.9.8.10
-rw-r--r-- | testing/networkmanager/APKBUILD | 19 | ||||
-rw-r--r-- | testing/networkmanager/musl-fix-headers.patch | 78 |
2 files changed, 91 insertions, 6 deletions
diff --git a/testing/networkmanager/APKBUILD b/testing/networkmanager/APKBUILD index c94f931295..6e923f05f6 100644 --- a/testing/networkmanager/APKBUILD +++ b/testing/networkmanager/APKBUILD | |||
@@ -1,15 +1,15 @@ | |||
1 | # Contributor: William Pitcock <nenolod@dereferenced.org> | 1 | # Contributor: William Pitcock <nenolod@dereferenced.org> |
2 | # Maintainer: William Pitcock <nenolod@dereferenced.org> | 2 | # Maintainer: William Pitcock <nenolod@dereferenced.org> |
3 | pkgname=networkmanager | 3 | pkgname=networkmanager |
4 | pkgver=0.9.8.8 | 4 | pkgver=0.9.8.10 |
5 | _ver=0.9 | 5 | _ver=0.9 |
6 | pkgrel=2 | 6 | pkgrel=0 |
7 | pkgdesc="network management tool" | 7 | pkgdesc="network management tool" |
8 | url="http://projects.gnome.org/NetworkManager/" | 8 | url="http://projects.gnome.org/NetworkManager/" |
9 | arch="all" | 9 | arch="all" |
10 | license="GPL" | 10 | license="GPL" |
11 | depends="dhcpcd iptables dbus" | 11 | depends="dhcpcd iptables dbus" |
12 | depends_dev="dbus-glib-dev udev-dev libnl3-dev util-linux-dev | 12 | depends_dev="dbus-glib-dev udev-dev libnl3-dev util-linux-dev |
13 | polkit-dev ppp-dev zlib-dev libiconv-dev wireless-tools-dev | 13 | polkit-dev ppp-dev zlib-dev libiconv-dev wireless-tools-dev |
14 | nss-dev nspr-dev gobject-introspection-dev" | 14 | nss-dev nspr-dev gobject-introspection-dev" |
15 | makedepends="$depends_dev intltool" | 15 | makedepends="$depends_dev intltool" |
@@ -17,6 +17,7 @@ install="" | |||
17 | subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" | 17 | subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" |
18 | source="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$_ver/NetworkManager-$pkgver.tar.xz | 18 | source="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$_ver/NetworkManager-$pkgver.tar.xz |
19 | nm-policy-hostname.patch | 19 | nm-policy-hostname.patch |
20 | musl-fix-headers.patch | ||
20 | networkmanager.initd" | 21 | networkmanager.initd" |
21 | 22 | ||
22 | _builddir="$srcdir"/NetworkManager-$pkgver | 23 | _builddir="$srcdir"/NetworkManager-$pkgver |
@@ -39,7 +40,10 @@ build() { | |||
39 | --localstatedir=/var \ | 40 | --localstatedir=/var \ |
40 | --enable-ifupdown \ | 41 | --enable-ifupdown \ |
41 | --with-dhcpcd=yes \ | 42 | --with-dhcpcd=yes \ |
43 | --enable-more-warnings=yes \ | ||
42 | || return 1 | 44 | || return 1 |
45 | # ourLDFLAGS confuses the gir-scanner | ||
46 | unset LDFLAGS | ||
43 | make || return 1 | 47 | make || return 1 |
44 | } | 48 | } |
45 | 49 | ||
@@ -57,12 +61,15 @@ package() { | |||
57 | mv "$pkgdir"/usr/lib/locale "$pkgdir"/usr/share/ || return 1 | 61 | mv "$pkgdir"/usr/lib/locale "$pkgdir"/usr/share/ || return 1 |
58 | } | 62 | } |
59 | 63 | ||
60 | md5sums="bad2486578aa9f4d2f5c1c1446e8daf4 NetworkManager-0.9.8.8.tar.xz | 64 | md5sums="aad2558887e25417c52eb2deaade2f85 NetworkManager-0.9.8.10.tar.xz |
61 | e7437269b5eefc6aee3cf081f87d2acb nm-policy-hostname.patch | 65 | e7437269b5eefc6aee3cf081f87d2acb nm-policy-hostname.patch |
66 | 4b39b583fb9aa0b6b7c27e8b8d42ff86 musl-fix-headers.patch | ||
62 | c1c4609f415d7288e223d8c99e2d52d3 networkmanager.initd" | 67 | c1c4609f415d7288e223d8c99e2d52d3 networkmanager.initd" |
63 | sha256sums="8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55 NetworkManager-0.9.8.8.tar.xz | 68 | sha256sums="064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 NetworkManager-0.9.8.10.tar.xz |
64 | 209f3a1737a4fcb1661c851127de430ddb8218c75d1d75c193bf418146d3246c nm-policy-hostname.patch | 69 | 209f3a1737a4fcb1661c851127de430ddb8218c75d1d75c193bf418146d3246c nm-policy-hostname.patch |
70 | dece9a05b8638681995ab5cc40f5ee336cf8076bcb717b6360365f3a59e09ced musl-fix-headers.patch | ||
65 | 3a67ecb96fb34b36b8da93909066a2a355aaadef2e0dda6f2ae1004e2307dc53 networkmanager.initd" | 71 | 3a67ecb96fb34b36b8da93909066a2a355aaadef2e0dda6f2ae1004e2307dc53 networkmanager.initd" |
66 | sha512sums="d65ab18642e7aff09d64ef97bb87324eb10955c71db5896d326f2f9acc340ae185b701405a441998555ac080c95ffafd32dfcbe8c8cca00ecffa64873d0bbd9f NetworkManager-0.9.8.8.tar.xz | 72 | sha512sums="8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 NetworkManager-0.9.8.10.tar.xz |
67 | 45a30a76b9a5df1661ec3afa6d8890f2d56e8e080a8d0584f7f57262b20b6b997b7dfcc34eb0522e673788a584875038af4d47956743b5761f0d981e656e0560 nm-policy-hostname.patch | 73 | 45a30a76b9a5df1661ec3afa6d8890f2d56e8e080a8d0584f7f57262b20b6b997b7dfcc34eb0522e673788a584875038af4d47956743b5761f0d981e656e0560 nm-policy-hostname.patch |
74 | 7a4d31c39981142ead3943922c89b3ec1780b85be31760aec923043192301496ac8f68ded48a757610e0a301df84b725520d2170a1e17687e363c78da1d22fa6 musl-fix-headers.patch | ||
68 | d312bcb4f0d99331e189494bcb9fb1262cf3356e904573f7417b4429a1b8de083b9a6d51605b88d17be14e47ce2e9a3f4ea6e444790c3ffeccfe1c1d3cdd73d9 networkmanager.initd" | 75 | d312bcb4f0d99331e189494bcb9fb1262cf3356e904573f7417b4429a1b8de083b9a6d51605b88d17be14e47ce2e9a3f4ea6e444790c3ffeccfe1c1d3cdd73d9 networkmanager.initd" |
diff --git a/testing/networkmanager/musl-fix-headers.patch b/testing/networkmanager/musl-fix-headers.patch new file mode 100644 index 0000000000..9a713c6ce6 --- /dev/null +++ b/testing/networkmanager/musl-fix-headers.patch | |||
@@ -0,0 +1,78 @@ | |||
1 | --- ./src/nm-device-ethernet.c.orig | ||
2 | +++ ./src/nm-device-ethernet.c | ||
3 | @@ -25,15 +25,16 @@ | ||
4 | #include <netinet/in.h> | ||
5 | #include <string.h> | ||
6 | #include <stdlib.h> | ||
7 | -#include <linux/sockios.h> | ||
8 | -#include <linux/ethtool.h> | ||
9 | #include <sys/ioctl.h> | ||
10 | #include <unistd.h> | ||
11 | -#include <linux/if.h> | ||
12 | #include <errno.h> | ||
13 | #include <netinet/ether.h> | ||
14 | |||
15 | #include <gudev/gudev.h> | ||
16 | + | ||
17 | +#include <linux/sockios.h> | ||
18 | +#include <linux/ethtool.h> | ||
19 | +#include <linux/if.h> | ||
20 | |||
21 | #include "nm-glib-compat.h" | ||
22 | #include "nm-device-ethernet.h" | ||
23 | --- ./src/nm-device.c.orig | ||
24 | +++ ./src/nm-device.c | ||
25 | @@ -27,15 +27,12 @@ | ||
26 | #include <string.h> | ||
27 | #include <unistd.h> | ||
28 | #include <errno.h> | ||
29 | -#include <linux/sockios.h> | ||
30 | -#include <linux/ethtool.h> | ||
31 | #include <sys/ioctl.h> | ||
32 | #include <signal.h> | ||
33 | #include <sys/types.h> | ||
34 | #include <sys/wait.h> | ||
35 | #include <arpa/inet.h> | ||
36 | #include <fcntl.h> | ||
37 | -#include <linux/if.h> | ||
38 | |||
39 | #include "nm-glib-compat.h" | ||
40 | #include "nm-device.h" | ||
41 | @@ -67,6 +64,10 @@ | ||
42 | #include "nm-manager-auth.h" | ||
43 | #include "nm-dbus-glib-types.h" | ||
44 | #include "nm-dispatcher.h" | ||
45 | + | ||
46 | +#include <linux/if.h> | ||
47 | +#include <linux/sockios.h> | ||
48 | +#include <linux/ethtool.h> | ||
49 | |||
50 | static void impl_device_disconnect (NMDevice *device, DBusGMethodInvocation *context); | ||
51 | |||
52 | --- ./src/nm-system.c.orig | ||
53 | +++ ./src/nm-system.c | ||
54 | @@ -40,11 +40,6 @@ | ||
55 | #include <resolv.h> | ||
56 | #include <netdb.h> | ||
57 | #include <glib.h> | ||
58 | -#include <linux/if.h> | ||
59 | -#include <linux/sockios.h> | ||
60 | -#include <linux/if_bonding.h> | ||
61 | -#include <linux/if_vlan.h> | ||
62 | -#include <linux/if_bridge.h> | ||
63 | |||
64 | #include "nm-system.h" | ||
65 | #include "nm-device.h" | ||
66 | @@ -62,6 +57,12 @@ | ||
67 | #include <netlink/route/link.h> | ||
68 | #include <netlink/route/link/bonding.h> | ||
69 | #include <netlink/route/link/vlan.h> | ||
70 | + | ||
71 | +#include <linux/if.h> | ||
72 | +#include <linux/sockios.h> | ||
73 | +#include <linux/if_bonding.h> | ||
74 | +#include <linux/if_vlan.h> | ||
75 | +#include <linux/if_bridge.h> | ||
76 | |||
77 | #if !HAVE_VLAN_FLAG_LOOSE_BINDING | ||
78 | /* Older kernels don't have this flag */ | ||