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 /testing | |
| parent | 28648190fd6f9d06d4db3f636dd91af48f293158 (diff) | |
| download | aports-cd796398d0d21f805a296900cc1f67f3e991ff9c.tar.bz2 aports-cd796398d0d21f805a296900cc1f67f3e991ff9c.tar.xz | |
testing/networkmanager: upgrade to 0.9.8.10
Diffstat (limited to 'testing')
| -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 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=networkmanager -pkgver=0.9.8.8 +pkgver=0.9.8.10 _ver=0.9 -pkgrel=2 +pkgrel=0 pkgdesc="network management tool" url="http://projects.gnome.org/NetworkManager/" arch="all" license="GPL" depends="dhcpcd iptables dbus" -depends_dev="dbus-glib-dev udev-dev libnl3-dev util-linux-dev +depends_dev="dbus-glib-dev udev-dev libnl3-dev util-linux-dev polkit-dev ppp-dev zlib-dev libiconv-dev wireless-tools-dev nss-dev nspr-dev gobject-introspection-dev" makedepends="$depends_dev intltool" @@ -17,6 +17,7 @@ install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$_ver/NetworkManager-$pkgver.tar.xz nm-policy-hostname.patch + musl-fix-headers.patch networkmanager.initd" _builddir="$srcdir"/NetworkManager-$pkgver @@ -39,7 +40,10 @@ build() { --localstatedir=/var \ --enable-ifupdown \ --with-dhcpcd=yes \ + --enable-more-warnings=yes \ || return 1 + # ourLDFLAGS confuses the gir-scanner + unset LDFLAGS make || return 1 } @@ -57,12 +61,15 @@ package() { mv "$pkgdir"/usr/lib/locale "$pkgdir"/usr/share/ || return 1 } -md5sums="bad2486578aa9f4d2f5c1c1446e8daf4 NetworkManager-0.9.8.8.tar.xz +md5sums="aad2558887e25417c52eb2deaade2f85 NetworkManager-0.9.8.10.tar.xz e7437269b5eefc6aee3cf081f87d2acb nm-policy-hostname.patch +4b39b583fb9aa0b6b7c27e8b8d42ff86 musl-fix-headers.patch c1c4609f415d7288e223d8c99e2d52d3 networkmanager.initd" -sha256sums="8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55 NetworkManager-0.9.8.8.tar.xz +sha256sums="064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 NetworkManager-0.9.8.10.tar.xz 209f3a1737a4fcb1661c851127de430ddb8218c75d1d75c193bf418146d3246c nm-policy-hostname.patch +dece9a05b8638681995ab5cc40f5ee336cf8076bcb717b6360365f3a59e09ced musl-fix-headers.patch 3a67ecb96fb34b36b8da93909066a2a355aaadef2e0dda6f2ae1004e2307dc53 networkmanager.initd" -sha512sums="d65ab18642e7aff09d64ef97bb87324eb10955c71db5896d326f2f9acc340ae185b701405a441998555ac080c95ffafd32dfcbe8c8cca00ecffa64873d0bbd9f NetworkManager-0.9.8.8.tar.xz +sha512sums="8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 NetworkManager-0.9.8.10.tar.xz 45a30a76b9a5df1661ec3afa6d8890f2d56e8e080a8d0584f7f57262b20b6b997b7dfcc34eb0522e673788a584875038af4d47956743b5761f0d981e656e0560 nm-policy-hostname.patch +7a4d31c39981142ead3943922c89b3ec1780b85be31760aec923043192301496ac8f68ded48a757610e0a301df84b725520d2170a1e17687e363c78da1d22fa6 musl-fix-headers.patch 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 @@ +--- ./src/nm-device-ethernet.c.orig ++++ ./src/nm-device-ethernet.c +@@ -25,15 +25,16 @@ + #include <netinet/in.h> + #include <string.h> + #include <stdlib.h> +-#include <linux/sockios.h> +-#include <linux/ethtool.h> + #include <sys/ioctl.h> + #include <unistd.h> +-#include <linux/if.h> + #include <errno.h> + #include <netinet/ether.h> + + #include <gudev/gudev.h> ++ ++#include <linux/sockios.h> ++#include <linux/ethtool.h> ++#include <linux/if.h> + + #include "nm-glib-compat.h" + #include "nm-device-ethernet.h" +--- ./src/nm-device.c.orig ++++ ./src/nm-device.c +@@ -27,15 +27,12 @@ + #include <string.h> + #include <unistd.h> + #include <errno.h> +-#include <linux/sockios.h> +-#include <linux/ethtool.h> + #include <sys/ioctl.h> + #include <signal.h> + #include <sys/types.h> + #include <sys/wait.h> + #include <arpa/inet.h> + #include <fcntl.h> +-#include <linux/if.h> + + #include "nm-glib-compat.h" + #include "nm-device.h" +@@ -67,6 +64,10 @@ + #include "nm-manager-auth.h" + #include "nm-dbus-glib-types.h" + #include "nm-dispatcher.h" ++ ++#include <linux/if.h> ++#include <linux/sockios.h> ++#include <linux/ethtool.h> + + static void impl_device_disconnect (NMDevice *device, DBusGMethodInvocation *context); + +--- ./src/nm-system.c.orig ++++ ./src/nm-system.c +@@ -40,11 +40,6 @@ + #include <resolv.h> + #include <netdb.h> + #include <glib.h> +-#include <linux/if.h> +-#include <linux/sockios.h> +-#include <linux/if_bonding.h> +-#include <linux/if_vlan.h> +-#include <linux/if_bridge.h> + + #include "nm-system.h" + #include "nm-device.h" +@@ -62,6 +57,12 @@ + #include <netlink/route/link.h> + #include <netlink/route/link/bonding.h> + #include <netlink/route/link/vlan.h> ++ ++#include <linux/if.h> ++#include <linux/sockios.h> ++#include <linux/if_bonding.h> ++#include <linux/if_vlan.h> ++#include <linux/if_bridge.h> + + #if !HAVE_VLAN_FLAG_LOOSE_BINDING + /* Older kernels don't have this flag */ |