From 0dfd6d9d525cc0cca21f763648421d0c3eed0cba Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 30 Dec 2014 05:28:08 -0600
Subject: add better default config, Makefile codestyle changes

---
 package/radvd/Makefile         | 20 ++++++++++----------
 package/radvd/files/radvd.conf | 30 +++++++++---------------------
 2 files changed, 19 insertions(+), 31 deletions(-)

(limited to 'package')

diff --git a/package/radvd/Makefile b/package/radvd/Makefile
index 9462ea5e1..71c740f34 100644
--- a/package/radvd/Makefile
+++ b/package/radvd/Makefile
@@ -1,12 +1,12 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		radvd
-PKG_VERSION:=		2.5
+PKG_VERSION:=		2.8
 PKG_RELEASE:=		1
-PKG_HASH:=		e04afe29829f920999708bf6c87e77e43b59712764499e614ed80c410f314a43
+PKG_HASH:=		0a1041b2044dafa45882b9fc30badadb7abed76c1a20f6332fecaa53c8440df9
 PKG_DESCR:=		routing advertisement daemon for ipv6
 PKG_SECTION:=		net/ipv6
 PKG_DEPENDS:=		libdaemon
@@ -14,9 +14,9 @@ PKG_BUILDDEP:=		libdaemon check
 PKG_URL:=		http://www.litech.org/radvd/
 PKG_SITES:=		http://v6web.litech.org/radvd/dist/
 
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,RADVD,radvd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RADVD,radvd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--with-configfile=/etc/radvd.conf \
@@ -24,9 +24,9 @@ CONFIGURE_ARGS+=	--with-configfile=/etc/radvd.conf \
 			--with-pidfile=/var/run/radvd.pid
 
 radvd-install:
-	${INSTALL_DIR} ${IDIR_RADVD}/etc ${IDIR_RADVD}/usr/sbin
-	${INSTALL_DATA} ./files/radvd.conf ${IDIR_RADVD}/etc/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/radvd ${IDIR_RADVD}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/radvdump ${IDIR_RADVD}/usr/sbin/
+	$(INSTALL_DIR) $(IDIR_RADVD)/etc $(IDIR_RADVD)/usr/sbin
+	$(INSTALL_DATA) ./files/radvd.conf $(IDIR_RADVD)/etc/
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/radvd $(IDIR_RADVD)/usr/sbin/
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/radvdump $(IDIR_RADVD)/usr/sbin/
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/radvd/files/radvd.conf b/package/radvd/files/radvd.conf
index 603ee5949..4b4a21af5 100644
--- a/package/radvd/files/radvd.conf
+++ b/package/radvd/files/radvd.conf
@@ -1,22 +1,10 @@
-# For more examples, see the radvd documentation.
-
-interface eth0
-{
-	AdvSendAdvert off;
-
-#
-# Disable Mobile IPv6 support
-#
-	AdvHomeAgentFlag off;
-
-#
-# example of a standard prefix
-#
-	prefix fec0:0:0:1::/64
-	{
-		AdvOnLink on;
-		AdvAutonomous on;
-		AdvRouterAddr off;
-	};
-
+interface eth0 {
+        AdvSendAdvert on;
+        MinRtrAdvInterval 3;
+        MaxRtrAdvInterval 10;
+        prefix fec0:0:0:1::/64 {
+                AdvOnLink on;
+                AdvAutonomous on;
+                AdvRouterAddr on;
+        };
 };
-- 
cgit v1.2.3