networkmanager: update to 1.0.6

This commit is contained in:
Jeff Huang 2015-09-16 11:04:24 +00:00
parent a7092ecf5b
commit 00e02272ce
3 changed files with 35 additions and 44 deletions

View File

@ -0,0 +1,26 @@
From 7fa07211320e4cb00d537844720edbf2b4fd047d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Thu, 27 Aug 2015 11:13:40 -0500
Subject: [PATCH] Add Requires.private: glib-2.0
since commit 6f616d4c4b04d5478f60d0311317bc84c5459ea to nm-version.h
a dependency to glib was added, but this wasn't reflected in pkg-config
deps... until now.
---
NetworkManager.pc.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/NetworkManager.pc.in b/NetworkManager.pc.in
index 877c344..a0557ee 100644
--- a/NetworkManager.pc.in
+++ b/NetworkManager.pc.in
@@ -9,5 +9,6 @@ configdir=@sysconfdir@/NetworkManager
Name: NetworkManager
Description: System for maintaining active network connection
Requires:
+Requires.private: glib-2.0
Version: @VERSION@
Cflags: -I${includedir}/NetworkManager
--
1.9.3

View File

@ -1,34 +0,0 @@
From 35c9e8d5321b6451fb74f8e7231a690c940a6e69 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Wed, 6 May 2015 20:49:57 +0200
Subject: [PATCH] dns: Fix falling back in the resolv.conf methods
---
src/dns-manager/nm-dns-manager.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
index 2f8ceab..eade2a0 100644
--- a/src/dns-manager/nm-dns-manager.c
+++ b/src/dns-manager/nm-dns-manager.c
@@ -782,13 +782,16 @@ update_dns (NMDnsManager *self,
#ifdef NETCONFIG_PATH
if (success == FALSE) {
+ g_clear_error (error);
success = dispatch_netconfig (searches, nameservers,
nis_domain, nis_servers, error);
}
#endif
- if (success == FALSE)
+ if (success == FALSE) {
+ g_clear_error (error);
success = update_resolv_conf (searches, nameservers, error);
+ }
/* signal that resolv.conf was changed */
if (success)
--
2.4.0

View File

@ -1,16 +1,15 @@
# maintainer: Martín González kote[at]chakra-project[dot]org>
pkgname=networkmanager
_pkgname=NetworkManager
pkgver=1.0.2
pkgrel=3
pkgver=1.0.6
pkgrel=1
_pppver=2.4.7
pkgdesc="Network Management daemon"
arch=('x86_64')
license=('GPL')
url="http://www.gnome.org/projects/NetworkManager/"
depends=('dbus-glib' 'iproute2' 'libndp' 'libnl' 'nss' 'polkit' 'systemd' 'libgudev' 'wpa_supplicant' "ppp=${_pppver}" 'dhclient' 'libsoup' 'modemmanager' 'libnewt' 'libteam')
makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'rp-pppoe')
depends=('dbus-glib' 'iproute2' 'libndp' 'libnl' 'nss' 'polkit' 'systemd' 'libgudev' 'wpa_supplicant'
"ppp=${_pppver}" 'dhclient' 'libsoup' 'modemmanager' 'libnewt' 'libteam')
makedepends=('intltool' 'iptables' 'gobject-introspection' 'rp-pppoe')
optdepends=('dhcpcd: Alternative dhcp support'
'dnsmasq: connection sharing'
'bluez: Bluetooth support'
@ -23,16 +22,16 @@ install=networkmanager.install
source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz"
'NetworkManager.conf'
'disable_set_hostname.patch'
'0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch')
md5sums=('5a4899f89edcbdd1ac46d2d947e8d6eb'
'0001-Add-Requires.private-glib-2.0.patch')
md5sums=('00f5f9ec69725a9f9b99366853c6f73e'
'1653159d6634fb62d3a5c548b7a56151'
'6b5415350c04304a28d29294441a07ae'
'096f138fc7dae0a8f0af0a8b262251a4')
'0c131ffb866516af61b0401033493efb')
prepare() {
cd $_pkgname-$pkgver
patch -Np1 -i ../disable_set_hostname.patch
patch -Np1 -i ../0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
patch -Np1 -i ../0001-Add-Requires.private-glib-2.0.patch
}
build() {