aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-06-10 09:45:37 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-06-10 09:45:37 +0000
commit38669b79f3d095361212d17bce6c04b57a19dd42 (patch)
treeb531dfbffb25fe351e5891f6e397d65c5cc7315f
parent6ff8ec0a0ee9ce820b1f78d7da7a8155ad9ca5bf (diff)
downloadaports-38669b79f3d095361212d17bce6c04b57a19dd42.tar.bz2
aports-38669b79f3d095361212d17bce6c04b57a19dd42.tar.xz
testing/networkmanager: upgrade to 0.9.8.2
-rw-r--r--testing/networkmanager/APKBUILD30
-rw-r--r--testing/networkmanager/nm-policy-hostname.patch11
2 files changed, 30 insertions, 11 deletions
diff --git a/testing/networkmanager/APKBUILD b/testing/networkmanager/APKBUILD
index 7e39723e3e..2cce2404c9 100644
--- a/testing/networkmanager/APKBUILD
+++ b/testing/networkmanager/APKBUILD
@@ -1,21 +1,22 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=networkmanager
-pkgver=0.9.2.0
+pkgver=0.9.8.2
_ver=0.9
-pkgrel=1
+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 libnl-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"
makedepends="$depends_dev intltool"
install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$_ver/NetworkManager-$pkgver.tar.bz2
+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
networkmanager.initd"
_builddir="$srcdir"/NetworkManager-$pkgver
@@ -36,7 +37,7 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
- --with-distro=debian \
+ --enable-ifupdown \
--with-dhcpcd=yes \
|| return 1
make || return 1
@@ -49,12 +50,19 @@ package() {
install -m755 -D "$srcdir"/networkmanager.initd \
"$pkgdir"/etc/init.d/networkmanager || return 1
- # stupid make install installs a custom init script, yuck
- rm "$pkgdir"/etc/init.d/NetworkManager \
- "$pkgdir"/usr/lib/*.la \
+ rm "$pkgdir"/usr/lib/*.la \
"$pkgdir"/usr/lib/NetworkManager/*.la \
- "$pkgdir"/usr/lib/pppd/*/nm-pppd-plugin.la
+ "$pkgdir"/usr/lib/pppd/*/nm-pppd-plugin.la || return 1
+
+ mv "$pkgdir"/usr/lib/locale "$pkgdir"/usr/share/ || return 1
}
-md5sums="bc0b00b8a187762d93c50a9706b4c5c3 NetworkManager-0.9.2.0.tar.bz2
+md5sums="7ac4ee1652e77ba064a5e18dc7af7e25 NetworkManager-0.9.8.2.tar.xz
+e7437269b5eefc6aee3cf081f87d2acb nm-policy-hostname.patch
c1c4609f415d7288e223d8c99e2d52d3 networkmanager.initd"
+sha256sums="5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead NetworkManager-0.9.8.2.tar.xz
+209f3a1737a4fcb1661c851127de430ddb8218c75d1d75c193bf418146d3246c nm-policy-hostname.patch
+3a67ecb96fb34b36b8da93909066a2a355aaadef2e0dda6f2ae1004e2307dc53 networkmanager.initd"
+sha512sums="a731b85d267bcbd837960b0b1bec2c8ec0458180a751bce353e763e9fca033dfc8101a1267101dadcc8984138a4b693a198a09c15acd7faab3930f98c8246775 NetworkManager-0.9.8.2.tar.xz
+45a30a76b9a5df1661ec3afa6d8890f2d56e8e080a8d0584f7f57262b20b6b997b7dfcc34eb0522e673788a584875038af4d47956743b5761f0d981e656e0560 nm-policy-hostname.patch
+d312bcb4f0d99331e189494bcb9fb1262cf3356e904573f7417b4429a1b8de083b9a6d51605b88d17be14e47ce2e9a3f4ea6e444790c3ffeccfe1c1d3cdd73d9 networkmanager.initd"
diff --git a/testing/networkmanager/nm-policy-hostname.patch b/testing/networkmanager/nm-policy-hostname.patch
new file mode 100644
index 0000000000..e7a7b01ad7
--- /dev/null
+++ b/testing/networkmanager/nm-policy-hostname.patch
@@ -0,0 +1,11 @@
+--- ./src/nm-policy-hostname.h.orig 2013-06-10 09:31:15.721414505 +0000
++++ ./src/nm-policy-hostname.h 2013-06-10 09:31:46.421718239 +0000
+@@ -22,6 +22,8 @@
+ #ifndef NM_POLICY_HOSTNAME_H
+ #define NM_POLICY_HOSTNAME_H
+
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <glib.h>
+
+ gboolean nm_policy_set_system_hostname (const char *new_hostname, const char *msg);