Date: Tuesday, August 23, 2011 @ 02:48:11 Author: ibiru Revision: 136123
archrelease: copy trunk to staging-i686 Added: networkmanager/repos/staging-i686/ networkmanager/repos/staging-i686/NetworkManager.conf (from rev 136122, networkmanager/trunk/NetworkManager.conf) networkmanager/repos/staging-i686/PKGBUILD (from rev 136122, networkmanager/trunk/PKGBUILD) networkmanager/repos/staging-i686/disable_set_hostname.patch (from rev 136122, networkmanager/trunk/disable_set_hostname.patch) networkmanager/repos/staging-i686/networkmanager.install (from rev 136122, networkmanager/trunk/networkmanager.install) ----------------------------+ NetworkManager.conf | 2 + PKGBUILD | 61 +++++++++++++++++++++++++++++++++++++++++++ disable_set_hostname.patch | 19 +++++++++++++ networkmanager.install | 9 ++++++ 4 files changed, 91 insertions(+) Copied: networkmanager/repos/staging-i686/NetworkManager.conf (from rev 136122, networkmanager/trunk/NetworkManager.conf) =================================================================== --- staging-i686/NetworkManager.conf (rev 0) +++ staging-i686/NetworkManager.conf 2011-08-23 06:48:11 UTC (rev 136123) @@ -0,0 +1,2 @@ +[main] +plugins=keyfile Copied: networkmanager/repos/staging-i686/PKGBUILD (from rev 136122, networkmanager/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2011-08-23 06:48:11 UTC (rev 136123) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinxu.org> +# Contri-butor: Wael Nasreddine <gand...@siemens-mobiles.org> +# Contributor: Tor Krill <t...@krill.nu> +# Contributor: Will Rea <sillywi...@gmail.com> +# Contributor: Valentine Sinitsyn <e_...@inbox.ru> + +pkgname=networkmanager +pkgver=0.9.0 +pkgrel=1 +pkgdesc="Network Management daemon" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd') +makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') +optdepends=('modemmanager: for modem management service' + 'dhclient: alternative DHCP/DHCPv6 client' + 'iptables: Connection sharing' + 'dnsmasq: Connection sharing' + 'bluez: Bluetooth support') +options=('!libtool') +backup=('etc/NetworkManager/NetworkManager.conf') +install=networkmanager.install +source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz + NetworkManager.conf disable_set_hostname.patch) +sha256sums=('166db385e5a349dd320f061554a54a9d599eb5bfc8fcbcc836cf5046904c5149' + '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') + +build() { + cd "${srcdir}/NetworkManager-${pkgver}" + + patch -Np1 -i "${srcdir}/disable_set_hostname.patch" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --with-crypto=nss \ + --with-distro=arch \ + --with-dhclient=/usr/sbin/dhclient \ + --with-dhcpcd=/sbin/dhcpcd \ + --with-iptables=/usr/sbin/iptables \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --disable-static \ + --enable-more-warnings=no \ + --disable-wimax + + make +} + +package() { + cd "${srcdir}/NetworkManager-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/" + + rm -rf "${pkgdir}/var/run/" +} Copied: networkmanager/repos/staging-i686/disable_set_hostname.patch (from rev 136122, networkmanager/trunk/disable_set_hostname.patch) =================================================================== --- staging-i686/disable_set_hostname.patch (rev 0) +++ staging-i686/disable_set_hostname.patch 2011-08-23 06:48:11 UTC (rev 136123) @@ -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. + */ Copied: networkmanager/repos/staging-i686/networkmanager.install (from rev 136122, networkmanager/trunk/networkmanager.install) =================================================================== --- staging-i686/networkmanager.install (rev 0) +++ staging-i686/networkmanager.install 2011-08-23 06:48:11 UTC (rev 136123) @@ -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 +}