[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

SVN-Revision: 22639

diff --git a/ipv6/miredo/Makefile b/ipv6/miredo/Makefile
index a678d14e799c76fcfef796d621cad8fd76937ec3..387ccd5cb0603aafb838f82111b99e3e347da480 100644 (file)
--- 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 e5aca5f2685bc217e18578684c823b30fd24320c..d18dc19ee10b05904d69512ef013cf218049626c 100644 (file)
--- 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 74406fb672680d51772c07ce019a8e079b96fbb8..c44e80151b40f582e631058d2d1dbeae40f05ff6 100644 (file)
--- 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() {