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

[Ionut Biru]

    Date: Monday, November 8, 2010 @ 10:51:58
  Author: ibiru
Revision: 98362

upgpkg: networkmanager 0.8.2-2
fix missing directories which broke dhcp connections

Added:
  networkmanager/trunk/create_dirs.patch
Modified:
  networkmanager/trunk/PKGBUILD
Deleted:
  networkmanager/trunk/disable_set_hostname.patch

----------------------------+
 PKGBUILD                   |   11 +++++++---
 create_dirs.patch          |   45 +++++++++++++++++++++++++++++++++++++++++++
 disable_set_hostname.patch |   20 -------------------
 3 files changed, 53 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-08 10:42:25 UTC (rev 98361)
+++ PKGBUILD	2010-11-08 15:51:58 UTC (rev 98362)
@@ -7,7 +7,7 @@
 
 pkgname=networkmanager
 pkgver=0.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,13 +18,17 @@
 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)
+        nm-system-settings.conf create_dirs.patch)
 sha256sums=('58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1'
-            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21')
+            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
+            '2961ce4cf3079edbf27927a67573ce85dad2268f610fd123dd781eb5ba764c12')
 
 build() {
   cd "${srcdir}/NetworkManager-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/create_dirs.patch"
+  autoreconf -fi
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --with-distro=arch --localstatedir=/var \
       --libexecdir=/usr/lib/networkmanager \
@@ -35,4 +39,5 @@
   make
   make DESTDIR="${pkgdir}" install
   install -m644 "${srcdir}/nm-system-settings.conf" "${pkgdir}/etc/NetworkManager/"
+  install -m 0755 test/.libs/nm-online "${pkgdir}/usr/bin/"
 }

Added: create_dirs.patch
===================================================================
--- create_dirs.patch	                        (rev 0)
+++ create_dirs.patch	2010-11-08 15:51:58 UTC (rev 98362)
@@ -0,0 +1,45 @@
+From cbb0d6d116e2d5e844c2c118f2f707d10e6b6fc4 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw at redhat.com>
+Date: Mon, 08 Nov 2010 15:09:54 +0000
+Subject: build: create NM state directory at install time
+
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8c01df0..d7dccaa 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -275,8 +275,10 @@ EXTRA_DIST = \
+ 	$(NetworkManager_DATA)
+ 
+ rundir=$(localstatedir)/run/NetworkManager
++statedir=$(localstatedir)/lib/NetworkManager
+ install-data-hook:
+ 	$(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir)
++	$(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir)
+ 
+ CLEANFILES = $(BUILT_SOURCES)
+ 
+--
+cgit v0.8.3-6-g21f6
+From e8da63889b4124cfe3344e38b0931abf208e98da Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw at redhat.com>
+Date: Mon, 08 Nov 2010 15:07:08 +0000
+Subject: keyfile: create keyfile data directory during install
+
+So distributions don't have to do it.
+---
+diff --git a/system-settings/plugins/keyfile/Makefile.am b/system-settings/plugins/keyfile/Makefile.am
+index 1c1fd4a..c519adc 100644
+--- a/system-settings/plugins/keyfile/Makefile.am
++++ b/system-settings/plugins/keyfile/Makefile.am
+@@ -49,6 +49,8 @@ libnm_settings_plugin_keyfile_la_LIBADD = \
+ 	$(DBUS_LIBS) \
+ 	$(GIO_LIBS)
+ 
++keyfiledir=$(sysconfdir)/NetworkManager/system-connections
++
+ install-data-hook:
+ 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(keyfiledir)
+ 
+--
+cgit v0.8.3-6-g21f6

Deleted: disable_set_hostname.patch
===================================================================
--- disable_set_hostname.patch	2010-11-08 10:42:25 UTC (rev 98361)
+++ disable_set_hostname.patch	2010-11-08 15:51:58 UTC (rev 98362)
@@ -1,20 +0,0 @@
-diff -Nur NetworkManager-0.8.1.orig/src/nm-policy.c NetworkManager-0.8.1/src/nm-policy.c
---- NetworkManager-0.8.1.orig/src/nm-policy.c	2010-07-21 18:48:36.000000000 -0500
-+++ NetworkManager-0.8.1/src/nm-policy.c	2010-08-01 19:48:57.474426178 -0500
-@@ -286,7 +286,7 @@
- 		g_free (configured_hostname);
- 		return;
- 	}
--
-+#if 0
- 	/* Try automatically determined hostname from the best device's IP config */
- 	if (!best)
- 		best = get_best_ip4_device (policy->manager, &best_req);
-@@ -318,6 +318,7 @@
- 		}
- 	}
- 
-+#endif
- 	/* If no automatically-configured hostname, try using the hostname from
- 	 * when NM started up.
- 	 */