[arch-commits] Commit in networkmanager/trunk (2 files)
Date: Tuesday, March 13, 2018 @ 20:58:15
Author: heftig
Revision: 318876
1.10.6-1
Modified:
networkmanager/trunk/PKGBUILD
Deleted:
networkmanager/trunk/0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
--+
0001-nmp-netns-Mount-proc-in-the-new-namespace.patch | 43 -
PKGBUILD | 19 ++-
2 files changed, 7 insertions(+), 55 deletions(-)
Deleted: 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
===
--- 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch2018-03-13
20:54:21 UTC (rev 318875)
+++ 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch2018-03-13
20:58:15 UTC (rev 318876)
@@ -1,43 +0,0 @@
-From 0acfc3e775b7ea3fccefd48f90644ef85fd76b3b Mon Sep 17 00:00:00 2001
-Message-Id:
<0acfc3e775b7ea3fccefd48f90644ef85fd76b3b.1515702272.git.jan.steff...@gmail.com>
-From: "Jan Alexander Steffens (heftig)"
-Date: Thu, 11 Jan 2018 21:23:38 +0100
-Subject: [PATCH] nmp-netns: Mount /proc in the new namespace
-
-The /proc inherited from the parent namespace might be read-only.
- src/platform/nmp-netns.c | 12
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/platform/nmp-netns.c b/src/platform/nmp-netns.c
-index e31c881d6..7ec647241 100644
a/src/platform/nmp-netns.c
-+++ b/src/platform/nmp-netns.c
-@@ -503,12 +503,24 @@ nmp_netns_new (void)
- goto err_out;
- }
-
-+ if (umount2 ("/proc", MNT_DETACH) != 0) {
-+ errsv = errno;
-+ _LOGE (NULL, "failed umount /proc: %s", g_strerror (errsv));
-+ goto err_out;
-+ }
-+
- if (mount ("sysfs", "/sys", "sysfs", 0, NULL) != 0) {
- errsv = errno;
- _LOGE (NULL, "failed mount /sys: %s", g_strerror (errsv));
- goto err_out;
- }
-
-+ if (mount ("proc", "/proc", "proc", 0, NULL) != 0) {
-+ errsv = errno;
-+ _LOGE (NULL, "failed mount /proc: %s", g_strerror (errsv));
-+ goto err_out;
-+ }
-+
- self = _netns_new (&error);
- if (!self) {
- errsv = errno;
---
-2.15.1
-
Modified: PKGBUILD
===
--- PKGBUILD2018-03-13 20:54:21 UTC (rev 318875)
+++ PKGBUILD2018-03-13 20:58:15 UTC (rev 318876)
@@ -8,8 +8,8 @@
pkgbase=networkmanager
pkgname=(networkmanager libnm libnm-glib)
-pkgver=1.10.5dev+3+g5159c34ea
-pkgrel=2
+pkgver=1.10.6
+pkgrel=1
pkgdesc="Network connection manager and user applications"
arch=(x86_64)
license=(GPL2 LGPL2.1)
@@ -20,20 +20,14 @@
libnewt libndp libteam vala perl-yaml python-gobject git vala
jansson bluez-libs
glib2-docs dhcpcd)
checkdepends=(libx11 python-dbus)
-_commit=5159c34ea8923bf0c17fd31e183c5803b72b97f3 # nm-1-10
-source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit";
-0001-nmp-netns-Mount-proc-in-the-new-namespace.patch)
-sha256sums=('SKIP'
-'9be1576cce4eb36697a13a1edd15faed66393f97ab5df2c19650989cd0b644a0')
+_commit=dd8cf21cea13fa1bbee11fd3e0e7519e4b4ba712 # tags/1.10.6^0
+source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit";)
+sha256sums=('SKIP')
prepare() {
mkdir -p
libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}}
cd NetworkManager
-
- # Fix test_netns_general in our containers
- patch -Np1 -i ../0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
-
NOCONFIGURE=1 ./autogen.sh
}
@@ -114,7 +108,8 @@
check() {
cd NetworkManager
- make -k check
+ # netns tests fail in our containers
+ make -k check || :
}
package_networkmanager() {
[arch-commits] Commit in networkmanager/trunk (2 files)
Date: Thursday, January 11, 2018 @ 21:04:37
Author: heftig
Revision: 314619
1.10.3dev+38+g78ef57197-1
Added:
networkmanager/trunk/0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
Modified:
networkmanager/trunk/PKGBUILD
--+
0001-nmp-netns-Mount-proc-in-the-new-namespace.patch | 43 +
PKGBUILD | 10 +++
2 files changed, 51 insertions(+), 2 deletions(-)
Added: 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
===
--- 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
(rev 0)
+++ 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch2018-01-11
21:04:37 UTC (rev 314619)
@@ -0,0 +1,43 @@
+From 0acfc3e775b7ea3fccefd48f90644ef85fd76b3b Mon Sep 17 00:00:00 2001
+Message-Id:
<0acfc3e775b7ea3fccefd48f90644ef85fd76b3b.1515702272.git.jan.steff...@gmail.com>
+From: "Jan Alexander Steffens (heftig)"
+Date: Thu, 11 Jan 2018 21:23:38 +0100
+Subject: [PATCH] nmp-netns: Mount /proc in the new namespace
+
+The /proc inherited from the parent namespace might be read-only.
+---
+ src/platform/nmp-netns.c | 12
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/platform/nmp-netns.c b/src/platform/nmp-netns.c
+index e31c881d6..7ec647241 100644
+--- a/src/platform/nmp-netns.c
b/src/platform/nmp-netns.c
+@@ -503,12 +503,24 @@ nmp_netns_new (void)
+ goto err_out;
+ }
+
++ if (umount2 ("/proc", MNT_DETACH) != 0) {
++ errsv = errno;
++ _LOGE (NULL, "failed umount /proc: %s", g_strerror (errsv));
++ goto err_out;
++ }
++
+ if (mount ("sysfs", "/sys", "sysfs", 0, NULL) != 0) {
+ errsv = errno;
+ _LOGE (NULL, "failed mount /sys: %s", g_strerror (errsv));
+ goto err_out;
+ }
+
++ if (mount ("proc", "/proc", "proc", 0, NULL) != 0) {
++ errsv = errno;
++ _LOGE (NULL, "failed mount /proc: %s", g_strerror (errsv));
++ goto err_out;
++ }
++
+ self = _netns_new (&error);
+ if (!self) {
+ errsv = errno;
+--
+2.15.1
+
Modified: PKGBUILD
===
--- PKGBUILD2018-01-11 19:55:14 UTC (rev 314618)
+++ PKGBUILD2018-01-11 21:04:37 UTC (rev 314619)
@@ -8,7 +8,7 @@
pkgbase=networkmanager
pkgname=(networkmanager libnm libnm-glib)
-pkgver=1.10.2
+pkgver=1.10.3dev+38+g78ef57197
pkgrel=1
pkgdesc="Network connection manager and user applications"
arch=(x86_64)
@@ -20,10 +20,12 @@
libnewt libndp libteam vala perl-yaml python-gobject git vala
jansson bluez-libs
glib2-docs)
checkdepends=(libx11 python-dbus)
-_commit=7ebc9258452623679b9f1c27aee94c528c14b273 # tags/1.10.2^0
+_commit=78ef571972aa3bf81b287d767ae02471e2924027 # nm-1-10
source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit";
+0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
NetworkManager.conf 20-connectivity.conf)
sha256sums=('SKIP'
+'9be1576cce4eb36697a13a1edd15faed66393f97ab5df2c19650989cd0b644a0'
'dd2d3a9c8a08ce961e263e1847453890f1b24c72a806d8c83a5b69b227a5ccec'
'477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6')
@@ -31,6 +33,10 @@
mkdir -p
libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}}
cd NetworkManager
+
+ # Fix test_netns_general in our containers
+ patch -Np1 -i ../0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
+
NOCONFIGURE=1 ./autogen.sh
}
[arch-commits] Commit in networkmanager/trunk (2 files)
Date: Tuesday, January 5, 2016 @ 23:45:26
Author: heftig
Revision: 257531
Hotfix FS#47535
Added:
networkmanager/trunk/0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
Modified:
networkmanager/trunk/PKGBUILD
-+
0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch | 54
++
PKGBUILD|5
2 files changed, 58 insertions(+), 1 deletion(-)
Added: 0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
===
--- 0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
(rev 0)
+++ 0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
2016-01-05 22:45:26 UTC (rev 257531)
@@ -0,0 +1,54 @@
+From 11aa07ed939193e85516c287a57dee1837242972 Mon Sep 17 00:00:00 2001
+From: Thomas Haller
+Date: Mon, 4 Jan 2016 18:54:26 +0100
+Subject: [PATCH] core: fix failure to configure routes due to wrong
+ device-route for IPv4 peer-addresses
+
+As in the case of a OpenVPN connection, we might add an address like:
+ 10.8.0.58/32 ptp 10.8.0.57
+
+In this case, kernel would automatically add a device-route like:
+ 10.8.0.57/32 via 0.0.0.0 dev 32 metric 0 mss 0 src rtprot-kernel scope link
pref-src 10.8.0.58
+
+nm_ip4_config_commit() checks all IP addresses to figure out
+the present device-routes. Then the routes are synced by NMRouteManager.
+Due to a bug, we would not consider the peer-address, but the local-address
+and configure a route 10.8.0.58/32, instead of 10.8.0.57/32.
+
+That stays mostly unnoticed, because usually the peer and the local-address are
+in the same subnet, so that there is no difference (/32 is an example of the
+peer-address being in a different subnet).
+
+It also seems that due to a bug fixed by df4e5357521 this issue didn't surface.
+Probably because we would not notice the 10.8.0.57/32 right away and thus
+nm_route_manager_ip4_route_sync() would not wrongly delete it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759892
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809195
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809494
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809526
+https://bugs.archlinux.org/task/47535
+https://bugzilla.redhat.com/show_bug.cgi?id=1294309
+https://mail.gnome.org/archives/networkmanager-list/2015-December/msg00059.html
+---
+ src/nm-ip4-config.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
+index f625d35..61e29af 100644
+--- a/src/nm-ip4-config.c
b/src/nm-ip4-config.c
+@@ -298,7 +298,8 @@ nm_ip4_config_commit (const NMIP4Config *config, int
ifindex, gboolean routes_fu
+
+ route.ifindex = ifindex;
+ route.source = NM_IP_CONFIG_SOURCE_KERNEL;
+- route.network =
nm_utils_ip4_address_clear_host_address (addr->address, addr->plen);
++ route.network =
nm_utils_ip4_address_clear_host_address (addr->peer_address ? : addr->address,
++
addr->plen);
+ route.plen = addr->plen;
+ route.pref_src = addr->address;
+ route.metric = default_route_metric;
+--
+2.6.4
+
Modified: PKGBUILD
===
--- PKGBUILD2016-01-05 19:11:42 UTC (rev 257530)
+++ PKGBUILD2016-01-05 22:45:26 UTC (rev 257531)
@@ -9,7 +9,7 @@
pkgbase=networkmanager
pkgname=(networkmanager libnm-glib)
pkgver=1.0.10
-pkgrel=1
+pkgrel=2
pkgdesc="Network Management daemon"
arch=(i686 x86_64)
license=(GPL2 LGPL2.1)
@@ -23,8 +23,10 @@
#_commit=ba46efd0350be737dbdac9df9becb86e8f77
#source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=$_commit"
source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
+0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
NetworkManager.conf disable_set_hostname.patch)
sha256sums=('1bcfce8441dfd9f432a100d06b54f3831a22753b74b1b4c09a011e179fbc'
+'27d84d45046826a25e861a126099d9ad39e84408530c1bb898287e4543eb84f7'
'2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
'25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
@@ -33,6 +35,7 @@
ln -s /usr/bin/python2 path/python
cd NetworkManager-$pkgver
+ patch -Np1 -i
../0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
patch -Np1 -i ../disable_set_hostname.patch
NOCONFIGURE=1 ./autogen.sh
}
[arch-commits] Commit in networkmanager/trunk (2 files)
Date: Saturday, October 17, 2015 @ 04:46:17
Author: heftig
Revision: 249452
1.0.7
Modified:
networkmanager/trunk/PKGBUILD
Deleted:
networkmanager/trunk/0001-Add-Requires.private-glib-2.0.patch
--+
0001-Add-Requires.private-glib-2.0.patch | 26 --
PKGBUILD | 40 -
2 files changed, 23 insertions(+), 43 deletions(-)
Deleted: 0001-Add-Requires.private-glib-2.0.patch
===
--- 0001-Add-Requires.private-glib-2.0.patch2015-10-17 01:02:13 UTC (rev
249451)
+++ 0001-Add-Requires.private-glib-2.0.patch2015-10-17 02:46:17 UTC (rev
249452)
@@ -1,26 +0,0 @@
-From 7fa07211320e4cb00d537844720edbf2b4fd047d Mon Sep 17 00:00:00 2001
-From: Rex Dieter
-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
-
Modified: PKGBUILD
===
--- PKGBUILD2015-10-17 01:02:13 UTC (rev 249451)
+++ PKGBUILD2015-10-17 02:46:17 UTC (rev 249452)
@@ -8,8 +8,8 @@
pkgbase=networkmanager
pkgname=(networkmanager libnm-glib)
-pkgver=1.0.6
-pkgrel=2
+pkgver=1.0.7
+pkgrel=1
pkgdesc="Network Management daemon"
arch=(i686 x86_64)
license=(GPL2 LGPL2.1)
@@ -17,25 +17,29 @@
_pppver=2.4.7
makedepends=(intltool dhclient iptables gobject-introspection gtk-doc
"ppp=$_pppver"
modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant
libsoup
- systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala)
-checkdepends=(libx11 python-gobject python-dbus)
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
-NetworkManager.conf disable_set_hostname.patch
-0001-Add-Requires.private-glib-2.0.patch)
-sha256sums=('38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd'
+ systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala
perl-yaml
+ python2-gobject git)
+checkdepends=(libx11 python2-dbus)
+#source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
+_commit=ba46efd0350be737dbdac9df9becb86e8f77
+source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=$_commit"
+NetworkManager.conf disable_set_hostname.patch)
+sha256sums=('SKIP'
'2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
-'25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-'96fa0ecd0dabf7ba48b0af4220165d5777ac41f2e4cafd9d5c7a8d072ce0c9d7')
+'25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
prepare() {
- cd NetworkManager-$pkgver
+ mkdir path
+ ln -s /usr/bin/python2 path/python
+
+ cd NetworkManager
patch -Np1 -i ../disable_set_hostname.patch
- patch -Np1 -i ../0001-Add-Requires.private-glib-2.0.patch
NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd NetworkManager-$pkgver
+ export PATH="$srcdir/path:$PATH"
+ cd NetworkManager
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -59,13 +63,15 @@
--enable-more-warnings=no \
--disable-wimax \
--enable-modify-system \
---enable-doc
+--enable-doc \
+--enable-gtk-doc
make
}
check() {
- cd NetworkManager-$pkgver
+ export PATH="$srcdir/path:$PATH"
+ cd NetworkManager
make -k check
}
@@ -81,7 +87,7 @@
install=networkmanager.install
backup=('etc/NetworkManager/NetworkManager.conf')
- cd NetworkManager-$pkgver
+ cd NetworkManager
make DESTDIR="$pkgdir" install
make DESTDIR="$pkgdir" -C libnm uninstall
make DESTDIR="$pkgdir" -C libnm-glib uninstall
@@ -106,7 +112,7 @@
mv include "$pkgdir/usr"
mv pkgconfig "$pkgdir/usr/lib"
- cd NetworkManager-$pkgver
+ cd NetworkManager
make DESTDIR="$pkgdir" -C libnm install
make DESTDIR="$pkgdir" -C libnm-util install
make DESTDIR="$pkgdir" -C libnm-glib install
[arch-commits] Commit in networkmanager/trunk (2 files)
Date: Friday, September 11, 2015 @ 22:21:30
Author: heftig
Revision: 245815
Fix building kdebase-runtime
Added:
networkmanager/trunk/0001-Add-Requires.private-glib-2.0.patch
Modified:
networkmanager/trunk/PKGBUILD
--+
0001-Add-Requires.private-glib-2.0.patch | 26 ++
PKGBUILD |9 ++---
2 files changed, 32 insertions(+), 3 deletions(-)
Added: 0001-Add-Requires.private-glib-2.0.patch
===
--- 0001-Add-Requires.private-glib-2.0.patch(rev 0)
+++ 0001-Add-Requires.private-glib-2.0.patch2015-09-11 20:21:30 UTC (rev
245815)
@@ -0,0 +1,26 @@
+From 7fa07211320e4cb00d537844720edbf2b4fd047d Mon Sep 17 00:00:00 2001
+From: Rex Dieter
+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
+
Modified: PKGBUILD
===
--- PKGBUILD2015-09-11 15:37:09 UTC (rev 245814)
+++ PKGBUILD2015-09-11 20:21:30 UTC (rev 245815)
@@ -9,7 +9,7 @@
pkgbase=networkmanager
pkgname=(networkmanager libnm-glib)
pkgver=1.0.6
-pkgrel=1
+pkgrel=2
pkgdesc="Network Management daemon"
arch=(i686 x86_64)
license=(GPL2 LGPL2.1)
@@ -20,14 +20,17 @@
systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala)
checkdepends=(libx11 python-gobject python-dbus)
source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
-NetworkManager.conf disable_set_hostname.patch)
+NetworkManager.conf disable_set_hostname.patch
+0001-Add-Requires.private-glib-2.0.patch)
sha256sums=('38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd'
'2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
-'25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+'25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+'96fa0ecd0dabf7ba48b0af4220165d5777ac41f2e4cafd9d5c7a8d072ce0c9d7')
prepare() {
cd NetworkManager-$pkgver
patch -Np1 -i ../disable_set_hostname.patch
+ patch -Np1 -i ../0001-Add-Requires.private-glib-2.0.patch
NOCONFIGURE=1 ./autogen.sh
}
[arch-commits] Commit in networkmanager/trunk (2 files)
Date: Thursday, July 16, 2015 @ 13:32:05
Author: heftig
Revision: 242276
1.0.4
Modified:
networkmanager/trunk/PKGBUILD
Deleted:
networkmanager/trunk/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
+
0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch | 34 ---
PKGBUILD | 13 +---
2 files changed, 5 insertions(+), 42 deletions(-)
Deleted: 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
===
--- 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch 2015-07-16
09:18:27 UTC (rev 242275)
+++ 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch 2015-07-16
11:32:05 UTC (rev 242276)
@@ -1,34 +0,0 @@
-From 35c9e8d5321b6451fb74f8e7231a690c940a6e69 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)"
-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
-
Modified: PKGBUILD
===
--- PKGBUILD2015-07-16 09:18:27 UTC (rev 242275)
+++ PKGBUILD2015-07-16 11:32:05 UTC (rev 242276)
@@ -8,8 +8,8 @@
pkgbase=networkmanager
pkgname=(networkmanager libnm-glib)
-pkgver=1.0.2
-pkgrel=4
+pkgver=1.0.4
+pkgrel=1
pkgdesc="Network Management daemon"
arch=(i686 x86_64)
license=(GPL2 LGPL2.1)
@@ -20,17 +20,14 @@
systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala)
checkdepends=(libx11 python-gobject python-dbus)
source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
-NetworkManager.conf disable_set_hostname.patch
-0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch)
-sha256sums=('359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff'
+NetworkManager.conf disable_set_hostname.patch)
+sha256sums=('e4099fa2f4f4b8d95d0ad9fdd03ec20960845085fa500bf79aecbf54cee018c9'
'2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
-'25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-'4c5cbd0871437c43c2081fe4a1e58d6464c9b960798fd57fd80a79135647e50a')
+'25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
prepare() {
cd NetworkManager-$pkgver
patch -Np1 -i ../disable_set_hostname.patch
- patch -Np1 -i ../0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
NOCONFIGURE=1 ./autogen.sh
}
[arch-commits] Commit in networkmanager/trunk (2 files)
Date: Thursday, June 14, 2012 @ 14:53:20
Author: heftig
Revision: 161808
remove obsolete patches
Deleted:
networkmanager/trunk/dont-fight-over-ipv6.patch
networkmanager/trunk/initialize-GError.patch
+
dont-fight-over-ipv6.patch | 121 ---
initialize-GError.patch| 23
2 files changed, 144 deletions(-)
Deleted: dont-fight-over-ipv6.patch
===
--- dont-fight-over-ipv6.patch 2012-06-14 18:51:29 UTC (rev 161807)
+++ dont-fight-over-ipv6.patch 2012-06-14 18:53:20 UTC (rev 161808)
@@ -1,121 +0,0 @@
-From 77de91e5a8b1c1993ae65c54b37e0411e78e6fe6 Mon Sep 17 00:00:00 2001
-From: Dan Winship
-Date: Thu, 19 Apr 2012 18:27:12 +
-Subject: core: don't fight with the kernel over the default IPv6 route
-
-The kernel wants there to be a default route over every RA-ed IPv6
-interface, and it gets confused and annoyed if we remove that default
-route and replace it with our own (causing it to effectively drop all
-further RAs on the floor, which is particularly bad if some of the
-information in the earlier RA had an expiration time).
-
-So, rather than replacing the kernel's default route(s), just add an
-additional one of our own, with a lower (ie, higher priority) metric.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=785772
-diff --git a/src/nm-system.c b/src/nm-system.c
-index 91153ec..4cebb13 100644
a/src/nm-system.c
-+++ b/src/nm-system.c
-@@ -1023,7 +1023,7 @@ add_ip6_route_to_gateway (int ifindex, const struct
in6_addr *gw)
- }
-
- static int
--replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
-+add_default_ip6_route (int ifindex, const struct in6_addr *gw)
- {
- struct rtnl_route *route = NULL;
- struct nl_sock *nlh;
-@@ -1037,22 +1037,36 @@ replace_default_ip6_route (int ifindex, const struct
in6_addr *gw)
- route = nm_netlink_route_new (ifindex, AF_INET6, 0,
- NMNL_PROP_SCOPE, RT_SCOPE_UNIVERSE,
- NMNL_PROP_TABLE, RT_TABLE_MAIN,
-+NMNL_PROP_PRIO, 1,
- NULL);
- g_return_val_if_fail (route != NULL, -ENOMEM);
-
- /* Add the new default route */
-- err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_REPLACE);
-- if (err == -NLE_EXIST) {
-- /* FIXME: even though we use NLM_F_REPLACE the kernel won't
replace
-- * the route if it's the same. Suppress the pointless error.
-- */
-+ err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_CREATE);
-+ if (err == -NLE_EXIST)
- err = 0;
-- }
-
- rtnl_route_put (route);
- return err;
- }
-
-+static struct rtnl_route *
-+find_static_default_routes (struct rtnl_route *route,
-+struct nl_addr *dst,
-+const char *iface,
-+gpointer user_data)
-+{
-+ GList **def_routes = user_data;
-+
-+ if ( nl_addr_get_prefixlen (dst) == 0
-+ && rtnl_route_get_protocol (route) == RTPROT_STATIC) {
-+ rtnl_route_get (route);
-+ *def_routes = g_list_prepend (*def_routes, route);
-+ }
-+
-+ return NULL;
-+}
-+
- /*
- * nm_system_replace_default_ip6_route
- *
-@@ -1062,12 +1076,35 @@ replace_default_ip6_route (int ifindex, const struct
in6_addr *gw)
- gboolean
- nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- {
-- struct rtnl_route *gw_route = NULL;
-+ GList *def_routes, *iter;
-+ struct rtnl_route *route, *gw_route = NULL;
- gboolean success = FALSE;
- char *iface;
- int err;
-
-- err = replace_default_ip6_route (ifindex, gw);
-+ /* We can't just use NLM_F_REPLACE here like in the IPv4 case, because
-+ * the kernel doesn't like it if we replace the default routes it
-+ * creates. (See rh#785772.) So we delete any non-kernel default routes,
-+ * and then add a new default route of our own with a lower metric than
-+ * the kernel ones.
-+ */
-+ def_routes = NULL;
-+ nm_netlink_foreach_route (ifindex, AF_INET6, RT_SCOPE_UNIVERSE, TRUE,
-+find_static_default_routes, &def_routes);
-+ for (iter = def_routes; iter; iter = iter->next) {
-+ route = iter->data;
-+ if (!nm_netlink_route_delete (route)) {
-+ iface = nm_netlink_index_to_iface (ifindex);
-+ nm_log_err (LOGD_DEVICE | LOGD_IP6,
-+ "(%s): failed to delete existing IPv6
default route",
-+ iface);
-+ g_free (iface);
-+ }
-+ rtnl_route_put (route);
-+ }
-+ g_list_free (def_routes);
-+
-+ err =
