[gnome-ostree] manifest: Patch isc-dhcp to delete config file

[Colin Walters <walters src gnome org>]

commit 78dde4ce6f9e358132a6278495eb0041f829450e
Author: Colin Walters <walters verbum org>
Date:   Mon Feb 11 05:13:46 2013 -0500

    manifest: Patch isc-dhcp to delete config file
    
    It breaks NetworkManager.

 manifest.json                       |    3 ++-
 patches/isc-dhcp-no-conf-file.patch |   23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 0518189..1776430 100644
--- a/manifest.json
+++ b/manifest.json
@@ -383,7 +383,8 @@
 		 "patches": ["isc-dhcp-autogen.patch",
 		             "isc-dhcp-delete-configure.patch",
 			     "isc-dhcp-no-builddir.patch",
-		             "isc-dhcp-no-werror.patch"]},
+		             "isc-dhcp-no-werror.patch",
+			     "isc-dhcp-no-conf-file.patch"]},
 
 		{"src": "git:git://w1.fi/srv/git/hostap.git",
 		 "tag": "b80eb89d8e21eb699d847bec226d897d9e92e0b8",
diff --git a/patches/isc-dhcp-no-conf-file.patch b/patches/isc-dhcp-no-conf-file.patch
new file mode 100644
index 0000000..68073cf
--- /dev/null
+++ b/patches/isc-dhcp-no-conf-file.patch
@@ -0,0 +1,23 @@
+From 90794bf1931ecd90a2a473ec9379579535c2a207 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Mon, 11 Feb 2013 05:02:54 -0500
+Subject: [PATCH] Don't install dhclient.conf
+
+The sample config file here is full of odd crap, and actually
+breaks NetworkManager.  Just don't install it.
+---
+ client/Makefile.am |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/client/Makefile.am b/client/Makefile.am
+index 57c6ac9..4bb1234 100644
+--- a/client/Makefile.am
++++ b/client/Makefile.am
+@@ -1,4 +1,3 @@
+-dist_sysconf_DATA = dhclient.conf
+ sbin_PROGRAMS = dhclient
+ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
+ 		   scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
+-- 
+1.7.1
+