From 339aff67f8494d5cd78804512733e4d9a7547f42 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 14 Aug 2010 14:20:10 +0000
Subject: [PATCH] [packages] miredo: various fixes and cleanup  * force use of
 shared libraries, remove obsolete configure args  * add a miredo-common
 package for shared libraries (libteredo & libtun) (closes: #7761)  * install
 config file in /etc/miredo/ (default) instead of /etc/  * use default config
 file location in initscripts, remove useless ipv6 & tun modules loading in
 start functions  * use PKG_INSTALL  * bump release number

git-svn-id: svn://svn.openwrt.org/openwrt/packages@22639 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 ipv6/miredo/Makefile                 | 41 +++++++++++++++++-----------
 ipv6/miredo/files/miredo-server.init |  4 +--
 ipv6/miredo/files/miredo.init        |  4 +--
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/ipv6/miredo/Makefile b/ipv6/miredo/Makefile
index a678d14e7..387ccd5cb 100644
--- a/ipv6/miredo/Makefile
+++ b/ipv6/miredo/Makefile
@@ -9,51 +9,57 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miredo
 PKG_VERSION:=1.1.7
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=http://www.remlab.net/files/miredo/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_MD5SUM:=4fb5e7df6a6255528e4c5380401ad3ea
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/miredo/Default
   SECTION:=ipv6
   CATEGORY:=IPv6
-  DEPENDS:=+libpthread +uclibcxx +kmod-ipv6 +kmod-tun
   SUBMENU:=miredo: Teredo (IPv6 tunneling over UDP through NAT)
   URL:=http://www.simphalempin.com/dev/miredo/
 endef
 
+define Package/miredo-common
+$(call Package/miredo/Default)
+  TITLE:=Teredo (IPv6 tunneling over UDP through NAT) shared libraries
+  DEPENDS+= +libpthread +uclibcxx +kmod-ipv6 +kmod-tun
+endef
+
 define Package/miredo-server
 $(call Package/miredo/Default)
   TITLE:=Teredo (IPv6 tunneling over UDP through NAT) server daemon
+  DEPENDS+= +miredo-common
 endef
 
 define Package/miredo-server/conffiles
-/etc/miredo-server.conf
+/etc/miredo/miredo-server.conf
 endef
 
 define Package/miredo-client
 $(call Package/miredo/Default)
   TITLE:=Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon
+  DEPENDS+= +miredo-common
 endef
 
 define Package/miredo-client/conffiles
-/etc/miredo.conf
+/etc/miredo/miredo.conf
 endef
 
 CONFIGURE_ARGS += \
-	--disable-shared \
+	--enable-shared \
 	--enable-static \
 	--with-gnu-ld \
 	--disable-rpath \
 	--disable-chroot \
 	--enable-teredo-client \
-	--enable-teredo-relay \
-	--enable-teredo-server \
 	--enable-miredo-user=root \
 	--without-Judy \
 
@@ -63,16 +69,18 @@ CONFIGURE_VARS += \
 	LIBS="-nodefaultlibs -luClibc++ -lm" \
 	ac_cv_file__proc_self_maps=yes\
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CXXLINK="\$$$$(LINK)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+# XXX: override (:=), don't append (+=)
+MAKE_FLAGS := \
+	CXXLINK="\$$$$(LINK)" \
+
+define Package/miredo-common/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{teredo,tun6}.so.* $(1)/usr/lib/
 endef
 
 define Package/miredo-server/install
-	$(INSTALL_DIR) $(1)/etc/
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/doc/miredo/examples/miredo-server.conf $(1)/etc/miredo-server.conf
+	$(INSTALL_DIR) $(1)/etc/miredo
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/doc/miredo/examples/miredo-server.conf $(1)/etc/miredo/miredo-server.conf
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/miredo-server.init $(1)/etc/init.d/miredo-server
 	$(INSTALL_DIR) $(1)/usr/sbin
@@ -80,13 +88,14 @@ define Package/miredo-server/install
 endef
 
 define Package/miredo-client/install	
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/doc/miredo/examples/miredo.conf $(1)/etc/miredo.conf
+	$(INSTALL_DIR) $(1)/etc/miredo
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/doc/miredo/examples/miredo.conf $(1)/etc/miredo/miredo.conf
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/miredo.init $(1)/etc/init.d/miredo
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/miredo $(1)/usr/sbin/
 endef
 
+$(eval $(call BuildPackage,miredo-common))
 $(eval $(call BuildPackage,miredo-server))
 $(eval $(call BuildPackage,miredo-client))
diff --git a/ipv6/miredo/files/miredo-server.init b/ipv6/miredo/files/miredo-server.init
index e5aca5f26..d18dc19ee 100644
--- a/ipv6/miredo/files/miredo-server.init
+++ b/ipv6/miredo/files/miredo-server.init
@@ -5,9 +5,7 @@ START=50
 PID_F=/var/run/miredo-server.pid
 
 start() {
-	insmod ipv6 2>/dev/null
-	insmod tun 2>/dev/null
-	miredo-server -c /etc/miredo-server.conf
+	miredo-server
 }
 
 stop() {
diff --git a/ipv6/miredo/files/miredo.init b/ipv6/miredo/files/miredo.init
index 74406fb67..c44e80151 100644
--- a/ipv6/miredo/files/miredo.init
+++ b/ipv6/miredo/files/miredo.init
@@ -5,9 +5,7 @@ START=50
 PID_F=/var/run/miredo.pid
 
 start() {
-	insmod ipv6 2>/dev/null
-	insmod tun 2>/dev/null
-	miredo -c /etc/miredo.conf
+	miredo
 }
 
 stop() {