[arch-commits] Commit in networkmanager/trunk (5 files)

[Jan Steffens]

    Date: Tuesday, November 30, 2010 @ 12:40:50
  Author: heftig
Revision: 101685

upgpkg: networkmanager 0.8.3-0.20101130
Update to a pre-0.8.3 version

Added:
  networkmanager/trunk/NetworkManager.conf
    (from rev 100592, networkmanager/trunk/nm-system-settings.conf)
  networkmanager/trunk/networkmanager.install
Modified:
  networkmanager/trunk/PKGBUILD
Deleted:
  networkmanager/trunk/dhcpcd.patch
  networkmanager/trunk/nm-system-settings.conf

-------------------------+
 NetworkManager.conf     |    2 ++
 PKGBUILD                |   30 +++++++++++++-----------------
 dhcpcd.patch            |   21 ---------------------
 networkmanager.install  |    8 ++++++++
 nm-system-settings.conf |    2 --
 5 files changed, 23 insertions(+), 40 deletions(-)

Copied: networkmanager/trunk/NetworkManager.conf (from rev 100592, networkmanager/trunk/nm-system-settings.conf)
===================================================================
--- NetworkManager.conf	                        (rev 0)
+++ NetworkManager.conf	2010-11-30 17:40:50 UTC (rev 101685)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-30 17:06:02 UTC (rev 101684)
+++ PKGBUILD	2010-11-30 17:40:50 UTC (rev 101685)
@@ -6,38 +6,34 @@
 # Contributor: Valentine Sinitsyn <e_val at inbox.ru>
 
 pkgname=networkmanager
-pkgver=0.8.2
-pkgrel=6
+pkgver=0.8.3
+pkgrel=0.20101130
 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' 'autoconf' 'dhclient' 'iptables')
+makedepends=('intltool' 'dhclient' 'iptables')
 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/nm-system-settings.conf')
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
-        nm-system-settings.conf create_dirs.patch dhcpcd.patch disable_set_hostname.patch)
-sha256sums=('58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1'
-            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '2961ce4cf3079edbf27927a67573ce85dad2268f610fd123dd781eb5ba764c12'
-            '528b0bd28565da4711b1f57632352db29401e57e1d88bcefe1624709f9fbf044'
-            '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553')
+backup=('etc/NetworkManager/NetworkManager.conf')
+install=networkmanager.install
+#source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
+source=(http://mirrors.kernel.org/archlinux/other/networkmanager/NetworkManager-$pkgver-$pkgrel.tar.bz2
+        NetworkManager.conf disable_set_hostname.patch)
+md5sums=('1d4b43ab6789df72e8ac81905bb64662'
+         '1653159d6634fb62d3a5c548b7a56151'
+         'b7deda5bb47b3df0eb42782eabbaefe7')
 
 build() {
   cd "${srcdir}/NetworkManager-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/create_dirs.patch"
-  patch -Np1 -i "${srcdir}/dhcpcd.patch"
   patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
 
-  autoreconf -fi
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -58,6 +54,6 @@
   cd "${srcdir}/NetworkManager-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  install -m644 "${srcdir}/nm-system-settings.conf" "${pkgdir}/etc/NetworkManager/"
-  install -m 0755 test/.libs/nm-online "${pkgdir}/usr/bin/"
+  install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/"
+  install -m0755 test/.libs/nm-online "${pkgdir}/usr/bin/"
 }

Deleted: dhcpcd.patch
===================================================================
--- dhcpcd.patch	2010-11-30 17:06:02 UTC (rev 101684)
+++ dhcpcd.patch	2010-11-30 17:40:50 UTC (rev 101685)
@@ -1,21 +0,0 @@
-commit 3992c7db507d586ffeffa214edc4b9a399b8b396
-Author: Dan Williams <dcbw at redhat.com>
-Date:   Thu Nov 18 16:30:00 2010 -0600
-
-    dhcpcd: prevent dhcpcd from messing with routing (bgo #634983)
-    
-    Since NM is already handling that.
-
-diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
-index 378a97b..4fb703c 100644
---- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
-+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
-@@ -128,6 +128,8 @@ real_ip4_start (NMDHCPClient *client,
- 
- 	g_ptr_array_add (argv, (gpointer) "-L");	/* Disable built-in IPv4LL since we use avahi-autoipd */
- 
-+	g_ptr_array_add (argv, (gpointer) "-G");	/* Let NM handle routing */
-+
- 	g_ptr_array_add (argv, (gpointer) "-c");	/* Set script file */
- 	g_ptr_array_add (argv, (gpointer) ACTION_SCRIPT_PATH );
- 

Added: networkmanager.install
===================================================================
--- networkmanager.install	                        (rev 0)
+++ networkmanager.install	2010-11-30 17:40:50 UTC (rev 101685)
@@ -0,0 +1,8 @@
+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
+}

Deleted: nm-system-settings.conf
===================================================================
--- nm-system-settings.conf	2010-11-30 17:06:02 UTC (rev 101684)
+++ nm-system-settings.conf	2010-11-30 17:40:50 UTC (rev 101685)
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile