- bugfix path: the '-x' option shouldn't be passed to dhclient on start

Changed files:
    dhcdbd-x-bugfix.patch -> 1.1
    dhcdbd.spec -> 1.22

diff --git a/dhcdbd-x-bugfix.patch b/dhcdbd-x-bugfix.patch
new file mode 100644 (file)
index 0000000..85e5964
--- /dev/null
+++ b/dhcdbd-x-bugfix.patch
@@ -0,0 +1,17 @@
+diff -Nurwa dhcdbd-2.8-orig/src/dhcdbd.c dhcdbd-2.8/src/dhcdbd.c
+--- dhcdbd-2.8-orig/src/dhcdbd.c       2006-08-25 21:45:05.000000000 +0200
++++ dhcdbd-2.8/src/dhcdbd.c    2007-10-28 16:08:59.388530456 +0100
+@@ -924,11 +924,13 @@
+                         return -1;
+                 sprintf (dhc_args[arg], "dhc_dbus=%-2u", d_if->dhc_mode);
+ 
++#if 0
+ #if DHCLIENT_EXTENDED_OPTION_ENVIRONMENT > 0
+                 if ((dhc_args[++arg] = (char *) malloc (3)) == 0L)
+                         return -1;
+                 strcpy (dhc_args[arg], "-x");
+ #endif
++#endif
+ 
+                 if ((dhc_args[++arg] = (char *) malloc (3)) == 0L)
+                         return -1;

diff --git a/dhcdbd.spec b/dhcdbd.spec
index 9747bfbbaf47f066c0629c270850601a8e624316..17fc15a8a73e6d01e21f5301b9cfcf82921d7f19 100644 (file)
--- a/dhcdbd.spec
+++ b/dhcdbd.spec
@@ -7,12 +7,13 @@ Summary:      DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, store
 Summary(pl.UTF-8):     Demon DHCP D-BUS (dhcdbd) - sterowanie sesjami dhclient przy użyciu D-BUS, przechowywanie opcji DHCP
 Name:          dhcdbd
 Version:       2.8
-Release:       1
+Release:       2
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://people.redhat.com/dcantrel/dhcdbd/%{name}-%{version}.tar.bz2
 # Source0-md5: c2c5a5c72182c3e88ae62eadb4874fc1
 Source1:       %{name}.init
+Patch0:     %{name}-x-bugfix.patch
 URL:           http://people.redhat.com/dcantrel/dhcdbd/
 BuildRequires: dbus-devel >= 0.33
 BuildRequires: rpmbuild(macros) >= 1.268
@@ -32,6 +33,7 @@ a także przechowuje i przedstawia opcje DHCP.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__make} \