initial version

7 files changed, 293 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..9496d7c412bc
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,54 @@
+pkgbase = networkmanager-consolekit
+	pkgdesc = NetworkManager with ConsoleKit support for non-systemd systems
+	pkgver = 1.0.2
+	pkgrel = 1
+	url = http://www.gnome.org/projects/NetworkManager/
+	install = networkmanager.install
+	arch = i686
+	arch = x86_64
+	license = GPL
+	license = LGPL2.1
+	makedepends = intltool
+	makedepends = iptables
+	makedepends = gobject-introspection
+	makedepends = gtk-doc
+	makedepends = ppp=2.4.7
+	makedepends = modemmanager
+	makedepends = rp-pppoe
+	makedepends = vala
+	depends = libnm-glib>=1.0.2
+	depends = iproute2
+	depends = libnl
+	depends = polkit-consolekit
+	depends = consolekit
+	depends = wpa_supplicant
+	depends = dhclient
+	depends = libsoup
+	depends = libmm-glib
+	depends = libnewt
+	depends = libndp
+	depends = libteam
+	optdepends = modemmanager: for modem management service
+	optdepends = dhcpcd: alternative DHCP client; does not support DHCPv6
+	optdepends = iptables: connection sharing
+	optdepends = dnsmasq: connection sharing
+	optdepends = bluez: bluetooth support
+	optdepends = openresolv: resolvconf support
+	optdepends = ppp: dialup connection support
+	provides = networkmanager=1.0.2
+	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 = networkmanager.rc
+	source = 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
+	sha256sums = 359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff
+	sha256sums = 2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b
+	sha256sums = 25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460
+	sha256sums = e39a2a0401518abd1d1d060200e2ca0f0854cdc49a5cb286919be177a7cd90fc
+	sha256sums = 4c5cbd0871437c43c2081fe4a1e58d6464c9b960798fd57fd80a79135647e50a
+
+pkgname = networkmanager-consolekit
+
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 100644
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..66822962823b
--- /dev/null
+++ b/NetworkManager.conf
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..51388998b0a4
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,104 @@
+# Maintainer: Alexey D. <lq07829icatm@rambler.ru>
+# Contributor: DaZ <daz.root+arch@gmail.coM>
+# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinxu.org>
+# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
+# Contributor: Tor Krill <tor@krill.nu>
+# Contributor: Will Rea <sillywilly@gmail.com>
+# Contributor: Valentine Sinitsyn <e_val@inbox.ru>
+
+pkgname=networkmanager-consolekit
+_pkgname=NetworkManager
+pkgver=1.0.2
+pkgrel=1
+_pppver=2.4.7
+pkgdesc="NetworkManager with ConsoleKit support for non-systemd systems"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL2.1')
+url="http://www.gnome.org/projects/$_pkgname/"
+depends=("libnm-glib>=${pkgver}" 'iproute2' 'libnl' 'polkit-consolekit' 'consolekit' 
+         'wpa_supplicant' 'dhclient' 'libsoup' 'libmm-glib' 'libnewt' 'libndp' 
+         'libteam')
+makedepends=('intltool' 'iptables' 'gobject-introspection' 'gtk-doc' 
+             "ppp=$_pppver" 'modemmanager' 'rp-pppoe' 'vala')
+optdepends=('modemmanager: for modem management service'
+            'dhcpcd: alternative DHCP client; does not support DHCPv6'
+            'iptables: connection sharing'
+            'dnsmasq: connection sharing'
+            'bluez: bluetooth support'
+            'openresolv: resolvconf support'
+            'ppp: dialup connection support')
+provides=("networkmanager=$pkgver")
+replaces=('networkmanager')
+conflicts=('networkmanager')
+backup=('etc/NetworkManager/NetworkManager.conf')
+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 
+        networkmanager.rc
+        0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
+        )
+sha256sums=('359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff'
+            '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+            'e39a2a0401518abd1d1d060200e2ca0f0854cdc49a5cb286919be177a7cd90fc'
+            '4c5cbd0871437c43c2081fe4a1e58d6464c9b960798fd57fd80a79135647e50a')
+
+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
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $_pkgname-$pkgver
+
+  AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
+  ./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-kernel-firmware-dir=/usr/lib/firmware \
+    --with-session-tracking=ck \
+    --disable-static \
+    --enable-more-warnings=no \
+    --disable-wimax \
+    --enable-modify-system \
+    --enable-doc
+
+  make
+}
+
+package() {
+  cd $_pkgname-$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 -D -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/NetworkManager.conf"
+  install -D -m755 "${srcdir}/networkmanager.rc"   "${pkgdir}/etc/rc.d/networkmanager"
+
+  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/networkmanager.install b/networkmanager.install
new file mode 100644
index 000000000000..f9da4feb19e9
--- /dev/null
+++ b/networkmanager.install
@@ -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
+}
diff --git a/networkmanager.rc b/networkmanager.rc
new file mode 100644
index 000000000000..1e803e87b2a3
--- /dev/null
+++ b/networkmanager.rc
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+NETWORKMANAGER_BIN=/usr/bin/NetworkManager
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID $NETWORKMANAGER_BIN`
+case "$1" in
+	start)
+		ck_daemon dbus && /etc/rc.d/dbus start
+
+		stat_busy "Starting NetworkManager"
+		[ ! -d /var/run/NetworkManager ] && install -d /var/run/NetworkManager
+		if [ -z "$PID" ]; then
+			$NETWORKMANAGER_BIN
+		fi
+		if [ ! -z "$PID" -o $? -gt 0 ]; then
+			stat_fail
+		else
+			add_daemon networkmanager
+			stat_done
+		fi
+		;;
+	stop)
+		stat_busy "Stopping NetworkManager"
+			[ ! -z "$PID" ] && kill $PID &> /dev/null
+		if [ $? -gt 0 ]; then
+			stat_fail
+		else
+			rm_daemon networkmanager
+			stat_done
+		fi
+		;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+	sleep)
+		/usr/bin/dbus-send --system \
+		--dest=org.freedesktop.NetworkManager \
+		--type=method_call \
+		/org/freedesktop/NetworkManager \
+		org.freedesktop.NetworkManager.sleep
+		;;
+	wake)
+		/usr/bin/dbus-send --system \
+		--dest=org.freedesktop.NetworkManager \
+		--type=method_call \
+		/org/freedesktop/NetworkManager \
+		org.freedesktop.NetworkManager.wake
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart|sleep|wake}"
+		;;
+esac
+exit 0
+