[arch-commits] Commit in networkmanager/repos (18 files)
Jan Steffens
heftig at archlinux.org
Wed May 6 19:29:30 UTC 2015
Date: Wednesday, May 6, 2015 @ 21:29:30
Author: heftig
Revision: 238558
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
networkmanager/repos/extra-i686/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
(from rev 238557, networkmanager/trunk/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch)
networkmanager/repos/extra-i686/NetworkManager.conf
(from rev 238557, networkmanager/trunk/NetworkManager.conf)
networkmanager/repos/extra-i686/PKGBUILD
(from rev 238557, networkmanager/trunk/PKGBUILD)
networkmanager/repos/extra-i686/disable_set_hostname.patch
(from rev 238557, networkmanager/trunk/disable_set_hostname.patch)
networkmanager/repos/extra-i686/networkmanager.install
(from rev 238557, networkmanager/trunk/networkmanager.install)
networkmanager/repos/extra-x86_64/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
(from rev 238557, networkmanager/trunk/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch)
networkmanager/repos/extra-x86_64/NetworkManager.conf
(from rev 238557, networkmanager/trunk/NetworkManager.conf)
networkmanager/repos/extra-x86_64/PKGBUILD
(from rev 238557, networkmanager/trunk/PKGBUILD)
networkmanager/repos/extra-x86_64/disable_set_hostname.patch
(from rev 238557, networkmanager/trunk/disable_set_hostname.patch)
networkmanager/repos/extra-x86_64/networkmanager.install
(from rev 238557, networkmanager/trunk/networkmanager.install)
Deleted:
networkmanager/repos/extra-i686/NetworkManager.conf
networkmanager/repos/extra-i686/PKGBUILD
networkmanager/repos/extra-i686/disable_set_hostname.patch
networkmanager/repos/extra-i686/networkmanager.install
networkmanager/repos/extra-x86_64/NetworkManager.conf
networkmanager/repos/extra-x86_64/PKGBUILD
networkmanager/repos/extra-x86_64/disable_set_hostname.patch
networkmanager/repos/extra-x86_64/networkmanager.install
-------------------------------------------------------------------------+
/NetworkManager.conf | 26 +
/PKGBUILD | 228 ++++++++++
/disable_set_hostname.patch | 38 +
/networkmanager.install | 18
extra-i686/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch | 34 +
extra-i686/NetworkManager.conf | 14
extra-i686/PKGBUILD | 112 ----
extra-i686/disable_set_hostname.patch | 19
extra-i686/networkmanager.install | 15
extra-x86_64/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch | 34 +
extra-x86_64/NetworkManager.conf | 14
extra-x86_64/PKGBUILD | 112 ----
extra-x86_64/disable_set_hostname.patch | 19
extra-x86_64/networkmanager.install | 15
14 files changed, 378 insertions(+), 320 deletions(-)
Copied: networkmanager/repos/extra-i686/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch (from rev 238557, networkmanager/trunk/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch)
===================================================================
--- extra-i686/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch (rev 0)
+++ extra-i686/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch 2015-05-06 19:29:30 UTC (rev 238558)
@@ -0,0 +1,34 @@
+From 35c9e8d5321b6451fb74f8e7231a690c940a6e69 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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
+
Deleted: extra-i686/NetworkManager.conf
===================================================================
--- extra-i686/NetworkManager.conf 2015-05-06 19:19:07 UTC (rev 238557)
+++ extra-i686/NetworkManager.conf 2015-05-06 19:29:30 UTC (rev 238558)
@@ -1,14 +0,0 @@
-[main]
-plugins=keyfile
-dhcp=dhclient
-dns=default
-rc-manager=none
-
-## Set static hostname
-#[keyfile]
-#hostname=foobar
-
-## HTTP-based connectivity check
-#[connectivity]
-#uri=http://nmcheck.gnome.org/check_network_status.txt
-#interval=100
Copied: networkmanager/repos/extra-i686/NetworkManager.conf (from rev 238557, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- extra-i686/NetworkManager.conf (rev 0)
+++ extra-i686/NetworkManager.conf 2015-05-06 19:29:30 UTC (rev 238558)
@@ -0,0 +1,13 @@
+[main]
+plugins=keyfile
+dhcp=dhclient
+dns=default
+
+## Set static hostname
+#[keyfile]
+#hostname=foobar
+
+## HTTP-based connectivity check
+#[connectivity]
+#uri=http://nmcheck.gnome.org/check_network_status.txt
+#interval=100
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-05-06 19:19:07 UTC (rev 238557)
+++ extra-i686/PKGBUILD 2015-05-06 19:29:30 UTC (rev 238558)
@@ -1,112 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Jan de Groot <jgc at archlinxu.org>
-# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
-# Contributor: Tor Krill <tor at krill.nu>
-# Contributor: Will Rea <sillywilly at gmail.com>
-# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
-
-pkgbase=networkmanager
-pkgname=(networkmanager libnm-glib)
-pkgver=1.0.2
-pkgrel=2
-pkgdesc="Network Management daemon"
-arch=(i686 x86_64)
-license=(GPL2 LGPL2.1)
-url="http://www.gnome.org/projects/NetworkManager/"
-_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 libmm-glib rp-pppoe libnewt libndp libteam vala)
-checkdepends=(libx11 python-gobject python-dbus)
-#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
- NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff'
- '9cf2cc3f55f20e6bb4fddb335311d124991c4c65633a2b3d638c66f41333ae11'
- '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
-
-prepare() {
- cd NetworkManager-$pkgver
- patch -Np1 -i ../disable_set_hostname.patch
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd NetworkManager-$pkgver
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --libexecdir=/usr/lib/networkmanager \
- --with-crypto=nss \
- --with-dhclient=/usr/bin/dhclient \
- --without-dhcpcd \
- --with-dnsmasq=/usr/bin/dnsmasq \
- --with-iptables=/usr/bin/iptables \
- --with-systemdsystemunitdir=/usr/lib/systemd/system \
- --with-udev-dir=/usr/lib/udev \
- --with-resolvconf=/usr/bin/resolvconf \
- --with-pppd=/usr/bin/pppd \
- --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
- --with-pppoe=/usr/bin/pppoe \
- --with-kernel-firmware-dir=/usr/lib/firmware \
- --with-session-tracking=systemd \
- --with-modem-manager-1 \
- --disable-static \
- --enable-more-warnings=no \
- --disable-wimax \
- --enable-modify-system \
- --enable-doc
-
- make
-}
-
-check() {
- cd NetworkManager-$pkgver
- make -k check
-}
-
-package_networkmanager() {
- depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhclient libsoup libmm-glib libnewt
- libndp libteam)
- optdepends=('dnsmasq: connection sharing'
- 'bluez: Bluetooth support'
- 'openresolv: resolvconf support'
- 'ppp: dialup connection support'
- 'rp-pppoe: ADSL support'
- 'modemmanager: cellular network support')
- install=networkmanager.install
- backup=('etc/NetworkManager/NetworkManager.conf')
-
- cd NetworkManager-$pkgver
- make DESTDIR="$pkgdir" install
- make DESTDIR="$pkgdir" -C libnm uninstall
- make DESTDIR="$pkgdir" -C libnm-glib uninstall
- make DESTDIR="$pkgdir" -C libnm-util uninstall
- make DESTDIR="$pkgdir" -C vapi uninstall
-
- # Some stuff to move is left over
- mv "$pkgdir/usr/include" ..
- mv "$pkgdir/usr/lib/pkgconfig" ..
-
- install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
- install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
-
- rm -r "$pkgdir/var/run"
-}
-
-package_libnm-glib() {
- pkgdesc="NetworkManager library"
- depends=(libsystemd nss dbus-glib libutil-linux)
-
- install -d "$pkgdir/usr/lib"
- mv include "$pkgdir/usr"
- mv pkgconfig "$pkgdir/usr/lib"
-
- cd NetworkManager-$pkgver
- make DESTDIR="$pkgdir" -C libnm install
- make DESTDIR="$pkgdir" -C libnm-util install
- make DESTDIR="$pkgdir" -C libnm-glib install
- make DESTDIR="$pkgdir" -C vapi install
-}
Copied: networkmanager/repos/extra-i686/PKGBUILD (from rev 238557, networkmanager/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-05-06 19:29:30 UTC (rev 238558)
@@ -0,0 +1,114 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinxu.org>
+# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+# Contributor: Tor Krill <tor at krill.nu>
+# Contributor: Will Rea <sillywilly at gmail.com>
+# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
+
+pkgbase=networkmanager
+pkgname=(networkmanager libnm-glib)
+pkgver=1.0.2
+pkgrel=3
+pkgdesc="Network Management daemon"
+arch=(i686 x86_64)
+license=(GPL2 LGPL2.1)
+url="http://www.gnome.org/projects/NetworkManager/"
+_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 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'
+ '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
+ '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+ '4c5cbd0871437c43c2081fe4a1e58d6464c9b960798fd57fd80a79135647e50a')
+
+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
+}
+
+build() {
+ cd NetworkManager-$pkgver
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib/networkmanager \
+ --with-crypto=nss \
+ --with-dhclient=/usr/bin/dhclient \
+ --without-dhcpcd \
+ --with-dnsmasq=/usr/bin/dnsmasq \
+ --with-iptables=/usr/bin/iptables \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --with-udev-dir=/usr/lib/udev \
+ --with-resolvconf=/usr/bin/resolvconf \
+ --with-pppd=/usr/bin/pppd \
+ --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
+ --with-pppoe=/usr/bin/pppoe \
+ --with-kernel-firmware-dir=/usr/lib/firmware \
+ --with-session-tracking=systemd \
+ --with-modem-manager-1 \
+ --disable-static \
+ --enable-more-warnings=no \
+ --disable-wimax \
+ --enable-modify-system \
+ --enable-doc
+
+ make
+}
+
+check() {
+ cd NetworkManager-$pkgver
+ make -k check
+}
+
+package_networkmanager() {
+ depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhclient libsoup libmm-glib libnewt
+ libndp libteam)
+ optdepends=('dnsmasq: connection sharing'
+ 'bluez: Bluetooth support'
+ 'openresolv: resolvconf support'
+ 'ppp: dialup connection support'
+ 'rp-pppoe: ADSL support'
+ 'modemmanager: cellular network support')
+ install=networkmanager.install
+ backup=('etc/NetworkManager/NetworkManager.conf')
+
+ cd NetworkManager-$pkgver
+ make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C libnm uninstall
+ make DESTDIR="$pkgdir" -C libnm-glib uninstall
+ make DESTDIR="$pkgdir" -C libnm-util uninstall
+ make DESTDIR="$pkgdir" -C vapi uninstall
+
+ # Some stuff to move is left over
+ mv "$pkgdir/usr/include" ..
+ mv "$pkgdir/usr/lib/pkgconfig" ..
+
+ install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+ install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+ rm -r "$pkgdir/var/run"
+}
+
+package_libnm-glib() {
+ pkgdesc="NetworkManager library"
+ depends=(libsystemd nss dbus-glib libutil-linux)
+
+ install -d "$pkgdir/usr/lib"
+ mv include "$pkgdir/usr"
+ mv pkgconfig "$pkgdir/usr/lib"
+
+ cd NetworkManager-$pkgver
+ make DESTDIR="$pkgdir" -C libnm install
+ make DESTDIR="$pkgdir" -C libnm-util install
+ make DESTDIR="$pkgdir" -C libnm-glib install
+ make DESTDIR="$pkgdir" -C vapi install
+}
Deleted: extra-i686/disable_set_hostname.patch
===================================================================
--- extra-i686/disable_set_hostname.patch 2015-05-06 19:19:07 UTC (rev 238557)
+++ extra-i686/disable_set_hostname.patch 2015-05-06 19:29:30 UTC (rev 238558)
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000
-@@ -302,6 +302,7 @@
- return;
- }
-
-+#if 0
- /* Try automatically determined hostname from the best device's IP config */
- if (!best4)
- best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- }
- }
-
-+#endif
- /* If no automatically-configured hostname, try using the hostname from
- * when NM started up.
- */
Copied: networkmanager/repos/extra-i686/disable_set_hostname.patch (from rev 238557, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- extra-i686/disable_set_hostname.patch (rev 0)
+++ extra-i686/disable_set_hostname.patch 2015-05-06 19:29:30 UTC (rev 238558)
@@ -0,0 +1,19 @@
+diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
+--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000
++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000
+@@ -302,6 +302,7 @@
+ return;
+ }
+
++#if 0
+ /* Try automatically determined hostname from the best device's IP config */
+ if (!best4)
+ best4 = get_best_ip4_device (policy->manager, &best_req4);
+@@ -356,6 +357,7 @@
+ }
+ }
+
++#endif
+ /* If no automatically-configured hostname, try using the hostname from
+ * when NM started up.
+ */
Deleted: extra-i686/networkmanager.install
===================================================================
--- extra-i686/networkmanager.install 2015-05-06 19:19:07 UTC (rev 238557)
+++ extra-i686/networkmanager.install 2015-05-06 19:29:30 UTC (rev 238558)
@@ -1,15 +0,0 @@
-post_upgrade() {
- (( $(vercmp $2 0.8.3) < 0 )) && cat <<MSG
-ATTENTION:
- /etc/NetworkManager/nm-system-settings.conf has been replaced
- by /etc/NetworkManager/NetworkManager.conf. Make sure you move
- any custom settings to the new config file.
-MSG
- (( $(vercmp $2 1.0.2-2) < 0 )) && cat <<MSG
-ATTENTION:
- NetworkManager does not automatically use resolvconf for managing resolv.conf
- anymore. If you were depending on the use of resolvconf (probably not), then
- set rc-manager=resolvconf in /etc/NetworkManager/NetworkManager.conf.
-MSG
- true
-}
Copied: networkmanager/repos/extra-i686/networkmanager.install (from rev 238557, networkmanager/trunk/networkmanager.install)
===================================================================
--- extra-i686/networkmanager.install (rev 0)
+++ extra-i686/networkmanager.install 2015-05-06 19:29:30 UTC (rev 238558)
@@ -0,0 +1,9 @@
+post_upgrade() {
+ (( $(vercmp $2 0.8.3) < 0 )) && cat <<MSG
+ATTENTION:
+ /etc/NetworkManager/nm-system-settings.conf has been replaced
+ by /etc/NetworkManager/NetworkManager.conf. Make sure you move
+ any custom settings to the new config file.
+MSG
+ true
+}
Copied: networkmanager/repos/extra-x86_64/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch (from rev 238557, networkmanager/trunk/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch)
===================================================================
--- extra-x86_64/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch (rev 0)
+++ extra-x86_64/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch 2015-05-06 19:29:30 UTC (rev 238558)
@@ -0,0 +1,34 @@
+From 35c9e8d5321b6451fb74f8e7231a690c940a6e69 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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
+
Deleted: extra-x86_64/NetworkManager.conf
===================================================================
--- extra-x86_64/NetworkManager.conf 2015-05-06 19:19:07 UTC (rev 238557)
+++ extra-x86_64/NetworkManager.conf 2015-05-06 19:29:30 UTC (rev 238558)
@@ -1,14 +0,0 @@
-[main]
-plugins=keyfile
-dhcp=dhclient
-dns=default
-rc-manager=none
-
-## Set static hostname
-#[keyfile]
-#hostname=foobar
-
-## HTTP-based connectivity check
-#[connectivity]
-#uri=http://nmcheck.gnome.org/check_network_status.txt
-#interval=100
Copied: networkmanager/repos/extra-x86_64/NetworkManager.conf (from rev 238557, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- extra-x86_64/NetworkManager.conf (rev 0)
+++ extra-x86_64/NetworkManager.conf 2015-05-06 19:29:30 UTC (rev 238558)
@@ -0,0 +1,13 @@
+[main]
+plugins=keyfile
+dhcp=dhclient
+dns=default
+
+## Set static hostname
+#[keyfile]
+#hostname=foobar
+
+## HTTP-based connectivity check
+#[connectivity]
+#uri=http://nmcheck.gnome.org/check_network_status.txt
+#interval=100
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-05-06 19:19:07 UTC (rev 238557)
+++ extra-x86_64/PKGBUILD 2015-05-06 19:29:30 UTC (rev 238558)
@@ -1,112 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Jan de Groot <jgc at archlinxu.org>
-# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
-# Contributor: Tor Krill <tor at krill.nu>
-# Contributor: Will Rea <sillywilly at gmail.com>
-# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
-
-pkgbase=networkmanager
-pkgname=(networkmanager libnm-glib)
-pkgver=1.0.2
-pkgrel=2
-pkgdesc="Network Management daemon"
-arch=(i686 x86_64)
-license=(GPL2 LGPL2.1)
-url="http://www.gnome.org/projects/NetworkManager/"
-_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 libmm-glib rp-pppoe libnewt libndp libteam vala)
-checkdepends=(libx11 python-gobject python-dbus)
-#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
- NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff'
- '9cf2cc3f55f20e6bb4fddb335311d124991c4c65633a2b3d638c66f41333ae11'
- '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
-
-prepare() {
- cd NetworkManager-$pkgver
- patch -Np1 -i ../disable_set_hostname.patch
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd NetworkManager-$pkgver
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --libexecdir=/usr/lib/networkmanager \
- --with-crypto=nss \
- --with-dhclient=/usr/bin/dhclient \
- --without-dhcpcd \
- --with-dnsmasq=/usr/bin/dnsmasq \
- --with-iptables=/usr/bin/iptables \
- --with-systemdsystemunitdir=/usr/lib/systemd/system \
- --with-udev-dir=/usr/lib/udev \
- --with-resolvconf=/usr/bin/resolvconf \
- --with-pppd=/usr/bin/pppd \
- --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
- --with-pppoe=/usr/bin/pppoe \
- --with-kernel-firmware-dir=/usr/lib/firmware \
- --with-session-tracking=systemd \
- --with-modem-manager-1 \
- --disable-static \
- --enable-more-warnings=no \
- --disable-wimax \
- --enable-modify-system \
- --enable-doc
-
- make
-}
-
-check() {
- cd NetworkManager-$pkgver
- make -k check
-}
-
-package_networkmanager() {
- depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhclient libsoup libmm-glib libnewt
- libndp libteam)
- optdepends=('dnsmasq: connection sharing'
- 'bluez: Bluetooth support'
- 'openresolv: resolvconf support'
- 'ppp: dialup connection support'
- 'rp-pppoe: ADSL support'
- 'modemmanager: cellular network support')
- install=networkmanager.install
- backup=('etc/NetworkManager/NetworkManager.conf')
-
- cd NetworkManager-$pkgver
- make DESTDIR="$pkgdir" install
- make DESTDIR="$pkgdir" -C libnm uninstall
- make DESTDIR="$pkgdir" -C libnm-glib uninstall
- make DESTDIR="$pkgdir" -C libnm-util uninstall
- make DESTDIR="$pkgdir" -C vapi uninstall
-
- # Some stuff to move is left over
- mv "$pkgdir/usr/include" ..
- mv "$pkgdir/usr/lib/pkgconfig" ..
-
- install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
- install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
-
- rm -r "$pkgdir/var/run"
-}
-
-package_libnm-glib() {
- pkgdesc="NetworkManager library"
- depends=(libsystemd nss dbus-glib libutil-linux)
-
- install -d "$pkgdir/usr/lib"
- mv include "$pkgdir/usr"
- mv pkgconfig "$pkgdir/usr/lib"
-
- cd NetworkManager-$pkgver
- make DESTDIR="$pkgdir" -C libnm install
- make DESTDIR="$pkgdir" -C libnm-util install
- make DESTDIR="$pkgdir" -C libnm-glib install
- make DESTDIR="$pkgdir" -C vapi install
-}
Copied: networkmanager/repos/extra-x86_64/PKGBUILD (from rev 238557, networkmanager/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-05-06 19:29:30 UTC (rev 238558)
@@ -0,0 +1,114 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinxu.org>
+# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+# Contributor: Tor Krill <tor at krill.nu>
+# Contributor: Will Rea <sillywilly at gmail.com>
+# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
+
+pkgbase=networkmanager
+pkgname=(networkmanager libnm-glib)
+pkgver=1.0.2
+pkgrel=3
+pkgdesc="Network Management daemon"
+arch=(i686 x86_64)
+license=(GPL2 LGPL2.1)
+url="http://www.gnome.org/projects/NetworkManager/"
+_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 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'
+ '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
+ '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+ '4c5cbd0871437c43c2081fe4a1e58d6464c9b960798fd57fd80a79135647e50a')
+
+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
+}
+
+build() {
+ cd NetworkManager-$pkgver
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib/networkmanager \
+ --with-crypto=nss \
+ --with-dhclient=/usr/bin/dhclient \
+ --without-dhcpcd \
+ --with-dnsmasq=/usr/bin/dnsmasq \
+ --with-iptables=/usr/bin/iptables \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --with-udev-dir=/usr/lib/udev \
+ --with-resolvconf=/usr/bin/resolvconf \
+ --with-pppd=/usr/bin/pppd \
+ --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
+ --with-pppoe=/usr/bin/pppoe \
+ --with-kernel-firmware-dir=/usr/lib/firmware \
+ --with-session-tracking=systemd \
+ --with-modem-manager-1 \
+ --disable-static \
+ --enable-more-warnings=no \
+ --disable-wimax \
+ --enable-modify-system \
+ --enable-doc
+
+ make
+}
+
+check() {
+ cd NetworkManager-$pkgver
+ make -k check
+}
+
+package_networkmanager() {
+ depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhclient libsoup libmm-glib libnewt
+ libndp libteam)
+ optdepends=('dnsmasq: connection sharing'
+ 'bluez: Bluetooth support'
+ 'openresolv: resolvconf support'
+ 'ppp: dialup connection support'
+ 'rp-pppoe: ADSL support'
+ 'modemmanager: cellular network support')
+ install=networkmanager.install
+ backup=('etc/NetworkManager/NetworkManager.conf')
+
+ cd NetworkManager-$pkgver
+ make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C libnm uninstall
+ make DESTDIR="$pkgdir" -C libnm-glib uninstall
+ make DESTDIR="$pkgdir" -C libnm-util uninstall
+ make DESTDIR="$pkgdir" -C vapi uninstall
+
+ # Some stuff to move is left over
+ mv "$pkgdir/usr/include" ..
+ mv "$pkgdir/usr/lib/pkgconfig" ..
+
+ install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+ install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+ rm -r "$pkgdir/var/run"
+}
+
+package_libnm-glib() {
+ pkgdesc="NetworkManager library"
+ depends=(libsystemd nss dbus-glib libutil-linux)
+
+ install -d "$pkgdir/usr/lib"
+ mv include "$pkgdir/usr"
+ mv pkgconfig "$pkgdir/usr/lib"
+
+ cd NetworkManager-$pkgver
+ make DESTDIR="$pkgdir" -C libnm install
+ make DESTDIR="$pkgdir" -C libnm-util install
+ make DESTDIR="$pkgdir" -C libnm-glib install
+ make DESTDIR="$pkgdir" -C vapi install
+}
Deleted: extra-x86_64/disable_set_hostname.patch
===================================================================
--- extra-x86_64/disable_set_hostname.patch 2015-05-06 19:19:07 UTC (rev 238557)
+++ extra-x86_64/disable_set_hostname.patch 2015-05-06 19:29:30 UTC (rev 238558)
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000
-@@ -302,6 +302,7 @@
- return;
- }
-
-+#if 0
- /* Try automatically determined hostname from the best device's IP config */
- if (!best4)
- best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- }
- }
-
-+#endif
- /* If no automatically-configured hostname, try using the hostname from
- * when NM started up.
- */
Copied: networkmanager/repos/extra-x86_64/disable_set_hostname.patch (from rev 238557, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- extra-x86_64/disable_set_hostname.patch (rev 0)
+++ extra-x86_64/disable_set_hostname.patch 2015-05-06 19:29:30 UTC (rev 238558)
@@ -0,0 +1,19 @@
+diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
+--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000
++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000
+@@ -302,6 +302,7 @@
+ return;
+ }
+
++#if 0
+ /* Try automatically determined hostname from the best device's IP config */
+ if (!best4)
+ best4 = get_best_ip4_device (policy->manager, &best_req4);
+@@ -356,6 +357,7 @@
+ }
+ }
+
++#endif
+ /* If no automatically-configured hostname, try using the hostname from
+ * when NM started up.
+ */
Deleted: extra-x86_64/networkmanager.install
===================================================================
--- extra-x86_64/networkmanager.install 2015-05-06 19:19:07 UTC (rev 238557)
+++ extra-x86_64/networkmanager.install 2015-05-06 19:29:30 UTC (rev 238558)
@@ -1,15 +0,0 @@
-post_upgrade() {
- (( $(vercmp $2 0.8.3) < 0 )) && cat <<MSG
-ATTENTION:
- /etc/NetworkManager/nm-system-settings.conf has been replaced
- by /etc/NetworkManager/NetworkManager.conf. Make sure you move
- any custom settings to the new config file.
-MSG
- (( $(vercmp $2 1.0.2-2) < 0 )) && cat <<MSG
-ATTENTION:
- NetworkManager does not automatically use resolvconf for managing resolv.conf
- anymore. If you were depending on the use of resolvconf (probably not), then
- set rc-manager=resolvconf in /etc/NetworkManager/NetworkManager.conf.
-MSG
- true
-}
Copied: networkmanager/repos/extra-x86_64/networkmanager.install (from rev 238557, networkmanager/trunk/networkmanager.install)
===================================================================
--- extra-x86_64/networkmanager.install (rev 0)
+++ extra-x86_64/networkmanager.install 2015-05-06 19:29:30 UTC (rev 238558)
@@ -0,0 +1,9 @@
+post_upgrade() {
+ (( $(vercmp $2 0.8.3) < 0 )) && cat <<MSG
+ATTENTION:
+ /etc/NetworkManager/nm-system-settings.conf has been replaced
+ by /etc/NetworkManager/NetworkManager.conf. Make sure you move
+ any custom settings to the new config file.
+MSG
+ true
+}
More information about the arch-commits
mailing list