[dibbler] add new packet

Dibbler is an IPv6 DHCP package

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>

4 files changed, 94 insertions, 0 deletions

diff --git a/patches/dibbler-0.7.3/fix-compile.patch b/patches/dibbler-0.7.3/fix-compile.patch
new file mode 100644
index 000000000..66a4cf554
--- /dev/null
+++ b/patches/dibbler-0.7.3/fix-compile.patch
@@ -0,0 +1,31 @@
+Fix compilation of dibbler package
+
+A header file is included that is not needed, and even breaks
+compilation on recent kernels. Remove it.
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+---
+ Port-linux/utils.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+ 
+Index: dibbler-0.7.3/Port-linux/utils.c
+===================================================================
+--- dibbler-0.7.3.orig/Port-linux/utils.c
++++ dibbler-0.7.3/Port-linux/utils.c
+@@ -14,6 +14,7 @@
+  * Rani Assaf <rani@magic.metawire.com> 980929:	resolve addresses
+  */
+ 
++#define GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -26,7 +27,7 @@
+ #include <arpa/inet.h>
+ #include <resolv.h>
+ #include <asm/types.h>
+-#include <linux/pkt_sched.h>
++/*#include <linux/pkt_sched.h>*/
+ #include <time.h>
+ #include <sys/time.h>
+ 
diff --git a/patches/dibbler-0.7.3/fix-incremental-build.patch b/patches/dibbler-0.7.3/fix-incremental-build.patch
new file mode 100644
index 000000000..cf56d9684
--- /dev/null
+++ b/patches/dibbler-0.7.3/fix-incremental-build.patch
@@ -0,0 +1,24 @@
+Fix incremental build of dibbler package
+
+The make install fails if the changelog.gz already exists.
+So, the repair incremental builds make sure the changelog.gz
+file does not exist before generating a new one.
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ 
+Index: dibbler-0.7.3/Makefile
+===================================================================
+--- dibbler-0.7.3.orig/Makefile
++++ dibbler-0.7.3/Makefile
+@@ -428,7 +428,7 @@ install: 
+ 	$(INSTALL) -m 644 doc/dibbler-devel.pdf $(INST_DOCDIR)/dibbler/dibbler-devel.pdf
+ 	@echo "[INSTALL] CHANGELOG"
+ 	$(INSTALL) -m 644 CHANGELOG $(INST_DOCDIR)/dibbler/changelog
+-	gzip -9 $(INST_DOCDIR)/dibbler/changelog
++	gzip -f -9 $(INST_DOCDIR)/dibbler/changelog
+ 
+ DIR=`basename $(PWD)`
+ 
diff --git a/patches/dibbler-0.7.3/merge-dns-search.patch b/patches/dibbler-0.7.3/merge-dns-search.patch
new file mode 100644
index 000000000..0792843d8
--- /dev/null
+++ b/patches/dibbler-0.7.3/merge-dns-search.patch
@@ -0,0 +1,36 @@
+Merge DNS search tables between IPv4 and IPv6
+
+Without this patch the IPv4 search tables will be overwritten
+once an IPv6 domain is added. With this patch both tables
+will be merged.
+
+Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+---
+ Port-linux/lowlevel-options-linux.c |   13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+Index: dibbler-0.7.3/Port-linux/lowlevel-options-linux.c
+===================================================================
+--- dibbler-0.7.3.orig/Port-linux/lowlevel-options-linux.c
++++ dibbler-0.7.3/Port-linux/lowlevel-options-linux.c
+@@ -199,11 +199,14 @@ int domain_add(const char* ifname, int i
+ 	return LOWLEVEL_ERROR_FILE;
+     while (fgets(buf,511,f)) {
+ 	if ( (!found) && (strstr(buf, "search")) ) {
+-	    if (strlen(buf))
+-		buf[strlen(buf)-1]=0;
+-	    fprintf(f2, "%s %s\n", buf, domain);
+-	    found = 1;
+-	    continue;
++	    if (!strstr(buf,domain)) {
++		if (strlen(buf))
++		    buf[strlen(buf)-1]=0;
++	        fprintf(f2, "%s %s\n", buf, domain);
++		found = 1;
++		continue;
++	    }
++
+ 	}
+ 	fprintf(f2,"%s",buf);
+     }
diff --git a/patches/dibbler-0.7.3/series b/patches/dibbler-0.7.3/series
new file mode 100644
index 000000000..b492525ad
--- /dev/null
+++ b/patches/dibbler-0.7.3/series
@@ -0,0 +1,3 @@
+merge-dns-search.patch
+fix-compile.patch
+fix-incremental-build.patch