Migrated from AUR

7 files changed, 259 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..4ccbc19b502e
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,71 @@
+pkgbase = networkmanager-noscan
+	pkgdesc = Network Management daemon with Wi-Fi scanning disabled when already connected (improves reliability of the connection in several Wireless cards)
+	pkgver = 1.0.2
+	pkgrel = 3
+	url = http://www.gnome.org/projects/NetworkManager/
+	install = networkmanager.install
+	arch = i686
+	arch = x86_64
+	license = GPL2
+	license = LGPL2.1
+	checkdepends = libx11
+	checkdepends = python-gobject
+	checkdepends = python-dbus
+	makedepends = intltool
+	makedepends = dhcpcd
+	makedepends = dhclient
+	makedepends = iptables
+	makedepends = gobject-introspection
+	makedepends = gtk-doc
+	makedepends = ppp=2.4.7
+	makedepends = modemmanager
+	makedepends = dbus-glib
+	makedepends = iproute2
+	makedepends = libnl
+	makedepends = nss
+	makedepends = polkit
+	makedepends = wpa_supplicant
+	makedepends = dhcp-client
+	makedepends = libsoup
+	makedepends = systemd
+	makedepends = libmm-glib
+	makedepends = rp-pppoe
+	makedepends = libnewt
+	makedepends = libndp
+	makedepends = libteam
+	makedepends = vala
+	depends = libnm-glib
+	depends = iproute2
+	depends = libnl
+	depends = polkit
+	depends = wpa_supplicant
+	depends = dhcp-client
+	depends = libsoup
+	depends = libmm-glib
+	depends = libnewt
+	depends = libndp
+	depends = libteam
+	optdepends = dhclient: DHCPv6 support
+	optdepends = dnsmasq: connection sharing
+	optdepends = bluez: Bluetooth support
+	optdepends = openresolv: resolvconf support
+	optdepends = ppp: dialup connection support
+	optdepends = rp-pppoe: ADSL support
+	optdepends = modemmanager: cellular network support
+	provides = networkmanager
+	conflicts = networkmanager
+	replaces = networkmanager
+	backup = etc/NetworkManager/NetworkManager.conf
+	source = http://ftp.gnome.org/pub/gnome/sources/NetworkManager/1.0/NetworkManager-1.0.2.tar.xz
+	source = NetworkManager.conf
+	source = disable_set_hostname.patch
+	source = disable_wifi_scan_when_connected.patch
+	source = 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
+	sha256sums = 359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff
+	sha256sums = 759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3
+	sha256sums = 25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460
+	sha256sums = c14204de91e8b055982771aa11b57feee2fa42f04eee003e621252b320be1e31
+	sha256sums = 4c5cbd0871437c43c2081fe4a1e58d6464c9b960798fd57fd80a79135647e50a
+
+pkgname = networkmanager-noscan
+
diff --git a/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch b/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
new file mode 100755
index 000000000000..fd05b93a644f
--- /dev/null
+++ b/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
@@ -0,0 +1,34 @@
+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
+
diff --git a/NetworkManager.conf b/NetworkManager.conf
new file mode 100644
index 000000000000..e01e3c52f7e0
--- /dev/null
+++ b/NetworkManager.conf
@@ -0,0 +1,10 @@
+[main]
+plugins=keyfile
+
+## Set static hostname
+#[keyfile]
+#hostname=foobar
+
+## HTTP-based connectivity check
+#[connectivity]
+#uri=http://nmcheck.gnome.org/check_network_status.txt
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..23a231aeb374
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,95 @@
+# $Id: PKGBUILD 229954 2015-01-24 15:30:18Z heftig $
+# Maintainer: Alejandro Perez
+
+pkgbase=networkmanager-noscan
+pkgname=networkmanager-noscan
+provides=networkmanager
+replaces=networkmanager
+conflicts=networkmanager
+
+pkgver=1.0.2
+pkgrel=3
+pkgdesc="Network Management daemon with Wi-Fi scanning disabled when already connected (improves reliability of the connection in several Wireless 
+cards)"
+arch=(i686 x86_64)
+license=(GPL2 LGPL2.1)
+url="http://www.gnome.org/projects/NetworkManager/"
+_pppver=2.4.7
+depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhcp-client libsoup libmm-glib libnewt
+           libndp libteam)
+optdepends=('dhclient: DHCPv6 support'
+              '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')
+makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver"
+             modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant dhcp-client 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 disable_wifi_scan_when_connected.patch 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch)
+sha256sums=('359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff'
+            '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+            'c14204de91e8b055982771aa11b57feee2fa42f04eee003e621252b320be1e31'
+            '4c5cbd0871437c43c2081fe4a1e58d6464c9b960798fd57fd80a79135647e50a')
+
+prepare() {
+  cd NetworkManager-$pkgver
+  patch -Np1 -i ../disable_set_hostname.patch
+  patch -Np1 -i ../disable_wifi_scan_when_connected.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 \
+    --with-dhcpcd=/usr/bin/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
+}
+
+package() {
+  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
+
+  rm -rf "$pkgdir/usr/include"
+  rm -rf "$pkgdir/usr/lib/pkgconfig"
+
+  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+  rm -r "$pkgdir/var/run"
+}
+
diff --git a/disable_set_hostname.patch b/disable_set_hostname.patch
new file mode 100644
index 000000000000..ee95dd0e1c03
--- /dev/null
+++ b/disable_set_hostname.patch
@@ -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.
+ 	 */
diff --git a/disable_wifi_scan_when_connected.patch b/disable_wifi_scan_when_connected.patch
new file mode 100644
index 000000000000..232e7a548895
--- /dev/null
+++ b/disable_wifi_scan_when_connected.patch
@@ -0,0 +1,21 @@
+--- NetworkManager-1.0.0.orig/src/devices/wifi/nm-device-wifi.c	2015-02-09 09:44:12.098688713 +0100
++++ NetworkManager-1.0.0/src/devices/wifi/nm-device-wifi.c	2015-02-09 09:44:45.430954930 +0100
+@@ -1362,15 +1362,13 @@
+ 	case NM_DEVICE_STATE_IP_CHECK:
+ 	case NM_DEVICE_STATE_SECONDARIES:
+ 	case NM_DEVICE_STATE_DEACTIVATING:
+-		/* Don't scan when unusable or activating */
++	case NM_DEVICE_STATE_ACTIVATED:
++		/* Don't scan when unusable, or activating, or activated */
+ 		return FALSE;
+ 	case NM_DEVICE_STATE_DISCONNECTED:
+ 	case NM_DEVICE_STATE_FAILED:
+ 		/* Can always scan when disconnected */
+ 		return TRUE;
+-	case NM_DEVICE_STATE_ACTIVATED:
+-		/* Need to do further checks when activated */
+-		break;
+ 	}
+ 
+ 	/* Don't scan if the supplicant is busy */
+
diff --git a/networkmanager.install b/networkmanager.install
new file mode 100644
index 000000000000..de40c17ed1be
--- /dev/null
+++ b/networkmanager.install
@@ -0,0 +1,9 @@
+post_upgrade() {
+  (( $(vercmp 0.8.3 $2) > 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
+}