mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] dibbler: version bump to 0.8.2
@ 2012-05-28 12:43 Bart vdr. Meulen
  2012-06-01 13:17 ` Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Bart vdr. Meulen @ 2012-05-28 12:43 UTC (permalink / raw)
  To: ptxdist

From: "Bart vdr. Meulen" <bartvdrmeulen@gmail.com>

Bump version to 0.8.2

Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
---
 ...e-DNS-search-tables-between-IPv4-and-IPv6.patch |   38 --------------------
 .../0002-Fix-compilation-of-dibbler-package.patch  |   33 -----------------
 ...-Fix-incremental-build-of-dibbler-package.patch |   26 --------------
 patches/dibbler-0.7.3/series                       |    6 ----
 ...e-DNS-search-tables-between-IPv4-and-IPv6.patch |   38 ++++++++++++++++++++
 .../0002-Fix-compilation-of-dibbler-package.patch  |   24 +++++++++++++
 patches/dibbler-0.8.2/series                       |    2 ++
 rules/dibbler.make                                 |   37 ++++---------------
 8 files changed, 70 insertions(+), 134 deletions(-)
 delete mode 100644 patches/dibbler-0.7.3/0001-Merge-DNS-search-tables-between-IPv4-and-IPv6.patch
 delete mode 100644 patches/dibbler-0.7.3/0002-Fix-compilation-of-dibbler-package.patch
 delete mode 100644 patches/dibbler-0.7.3/0003-Fix-incremental-build-of-dibbler-package.patch
 delete mode 100644 patches/dibbler-0.7.3/series
 create mode 100644 patches/dibbler-0.8.2/0001-Merge-DNS-search-tables-between-IPv4-and-IPv6.patch
 create mode 100644 patches/dibbler-0.8.2/0002-Fix-compilation-of-dibbler-package.patch
 create mode 100644 patches/dibbler-0.8.2/series

diff --git a/patches/dibbler-0.7.3/0001-Merge-DNS-search-tables-between-IPv4-and-IPv6.patch b/patches/dibbler-0.7.3/0001-Merge-DNS-search-tables-between-IPv4-and-IPv6.patch
deleted file mode 100644
index 499d713..0000000
--- a/patches/dibbler-0.7.3/0001-Merge-DNS-search-tables-between-IPv4-and-IPv6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Remy Bohmer <linux@bohmer.net>
-Date: Sat, 29 Oct 2011 19:10:22 +0200
-Subject: [PATCH] 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 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/Port-linux/lowlevel-options-linux.c b/Port-linux/lowlevel-options-linux.c
-index d5be379..929b24b 100644
---- a/Port-linux/lowlevel-options-linux.c
-+++ b/Port-linux/lowlevel-options-linux.c
-@@ -199,11 +199,14 @@ int domain_add(const char* ifname, int ifaceid, const char* domain) {
- 	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/0002-Fix-compilation-of-dibbler-package.patch b/patches/dibbler-0.7.3/0002-Fix-compilation-of-dibbler-package.patch
deleted file mode 100644
index 4233f33..0000000
--- a/patches/dibbler-0.7.3/0002-Fix-compilation-of-dibbler-package.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Remy Bohmer <linux@bohmer.net>
-Date: Sat, 29 Oct 2011 19:10:22 +0200
-Subject: [PATCH] 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 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/Port-linux/utils.c b/Port-linux/utils.c
-index 4bdda71..14a27f5 100644
---- a/Port-linux/utils.c
-+++ b/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/0003-Fix-incremental-build-of-dibbler-package.patch b/patches/dibbler-0.7.3/0003-Fix-incremental-build-of-dibbler-package.patch
deleted file mode 100644
index d16bf96..0000000
--- a/patches/dibbler-0.7.3/0003-Fix-incremental-build-of-dibbler-package.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Remy Bohmer <linux@bohmer.net>
-Date: Sat, 29 Oct 2011 19:10:22 +0200
-Subject: [PATCH] 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 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b8895c1..48707a5 100644
---- a/Makefile
-+++ b/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/series b/patches/dibbler-0.7.3/series
deleted file mode 100644
index ac06e0d..0000000
--- a/patches/dibbler-0.7.3/series
+++ /dev/null
@@ -1,6 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Merge-DNS-search-tables-between-IPv4-and-IPv6.patch
-0002-Fix-compilation-of-dibbler-package.patch
-0003-Fix-incremental-build-of-dibbler-package.patch
-# c03b14c2db733e30fd4b10bdf2bf29af  - git-ptx-patches magic
diff --git a/patches/dibbler-0.8.2/0001-Merge-DNS-search-tables-between-IPv4-and-IPv6.patch b/patches/dibbler-0.8.2/0001-Merge-DNS-search-tables-between-IPv4-and-IPv6.patch
new file mode 100644
index 0000000..e1f4a60
--- /dev/null
+++ b/patches/dibbler-0.8.2/0001-Merge-DNS-search-tables-between-IPv4-and-IPv6.patch
@@ -0,0 +1,38 @@
+From: Remy Bohmer <linux@bohmer.net>
+Date: Sat, 29 Oct 2011 19:10:22 +0200
+Subject: [PATCH] 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.8.2/Port-linux/lowlevel-options-linux.c
+===================================================================
+--- dibbler-0.8.2.orig/Port-linux/lowlevel-options-linux.c
++++ dibbler-0.8.2/Port-linux/lowlevel-options-linux.c
+@@ -204,11 +204,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.8.2/0002-Fix-compilation-of-dibbler-package.patch b/patches/dibbler-0.8.2/0002-Fix-compilation-of-dibbler-package.patch
new file mode 100644
index 0000000..f90507b
--- /dev/null
+++ b/patches/dibbler-0.8.2/0002-Fix-compilation-of-dibbler-package.patch
@@ -0,0 +1,24 @@
+From: Remy Bohmer <linux@bohmer.net>
+Date: Sat, 29 Oct 2011 19:10:22 +0200
+Subject: [PATCH] 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 |    1 -
+ 1 file changed, 1 deletion(-)
+ 
+Index: dibbler-0.8.2/Port-linux/utils.c
+===================================================================
+--- dibbler-0.8.2.orig/Port-linux/utils.c
++++ dibbler-0.8.2/Port-linux/utils.c
+@@ -29,7 +29,6 @@
+ #include <arpa/inet.h>
+ #include <limits.h>
+ #include <asm/types.h>
+-#include <linux/pkt_sched.h>
+ #include <time.h>
+ #include <sys/time.h>
+ #include "utils.h"
diff --git a/patches/dibbler-0.8.2/series b/patches/dibbler-0.8.2/series
new file mode 100644
index 0000000..24a38c9
--- /dev/null
+++ b/patches/dibbler-0.8.2/series
@@ -0,0 +1,2 @@
+0001-Merge-DNS-search-tables-between-IPv4-and-IPv6.patch
+0002-Fix-compilation-of-dibbler-package.patch
diff --git a/rules/dibbler.make b/rules/dibbler.make
index e170cd2..1e53027 100644
--- a/rules/dibbler.make
+++ b/rules/dibbler.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_DIBBLER) += dibbler
 #
 # Paths and names
 #
-DIBBLER_VERSION	:= 0.7.3
-DIBBLER_MD5	:= 39be72da38c2e6d33fd43a2811a276b1
+DIBBLER_VERSION	:= 0.8.2
+DIBBLER_MD5	:= 313044c95af3091607127a05c338d8ec
 DIBBLER		:= dibbler-$(DIBBLER_VERSION)
 DIBBLER_SUFFIX	:= tar.gz
-DIBBLER_URL	:= http://klub.com.pl/dhcpv6/dibbler/$(DIBBLER)-src.$(DIBBLER_SUFFIX)
+DIBBLER_URL	:= http://klub.com.pl/dhcpv6/dibbler/$(DIBBLER).$(DIBBLER_SUFFIX)
 DIBBLER_SOURCE	:= $(SRCDIR)/$(DIBBLER)-src.$(DIBBLER_SUFFIX)
 DIBBLER_DIR	:= $(BUILDDIR)/$(DIBBLER)
 DIBBLER_LICENSE	:= GPLv2
@@ -36,32 +36,9 @@ $(DIBBLER_SOURCE):
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
-
-DIBBLER_MAKE_ENV := $(CROSS_ENV_CC) $(CROSS_ENV_CXX)
-DIBBLER_MAKE_OPT := CHOST=$(PTXCONF_GNU_TARGET)
-DIBBLER_MAKE_PAR := NO
-
-#
-# autoconf
-#
-# Remove the pre-configure of a sub-component, so configure is
-# called in make for correct cross-compilation
-$(STATEDIR)/dibbler.prepare:
-	@$(call targetinfo)
-	@rm -f $(DIBBLER_DIR)/poslib/config.h
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-DIBBLER_INSTALL_OPT := \
-	INST_WORKDIR=$(DIBBLER_PKGDIR)/var/lib/dibbler \
-	INST_MANDIR=$(DIBBLER_PKGDIR)/usr/share/man \
-	INST_DOCDIR=$(DIBBLER_PKGDIR)/usr/share/doc \
-	INST_BINDIR=$(DIBBLER_PKGDIR)/usr/sbin \
-	INST_CONFDIR=$(DIBBLER_PKGDIR)/etc/dibbler \
-	install
+DIBBLER_PATH	:= PATH=$(CROSS_PATH)
+DIBBLER_ENV	:= $(CROSS_ENV)
+DIBBLER_AUTOCONF := $(CROSS_AUTOCONF_USR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -83,7 +60,6 @@ $(STATEDIR)/dibbler.targetinstall:
 ifdef PTXCONF_DIBBLER_SERVER
 	@$(call install_copy, dibbler, 0, 0, 0755, -, /usr/sbin/dibbler-server)
 	@$(call install_copy, dibbler, 0, 0, 0644, -, /etc/dibbler/server.conf)
-	@$(call install_alternative, dibbler, 0, 0, 0644, /etc/dibbler/server-stateless.conf)
 endif
 
 ifdef PTXCONF_DIBBLER_SERVER_STARTSCRIPT
@@ -99,7 +75,6 @@ endif
 ifdef PTXCONF_DIBBLER_CLIENT
 	@$(call install_copy, dibbler, 0, 0, 0755, -, /usr/sbin/dibbler-client)
 	@$(call install_alternative, dibbler, 0, 0, 0644, /etc/dibbler/client.conf)
-	@$(call install_alternative, dibbler, 0, 0, 0644, /etc/dibbler/client-stateless.conf)
 endif
 
 ifdef PTXCONF_DIBBLER_CLIENT_STARTSCRIPT
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-06-01 13:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-28 12:43 [ptxdist] [PATCH] dibbler: version bump to 0.8.2 Bart vdr. Meulen
2012-06-01 13:17 ` Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox