diff -Nur kamikaze-svn.orig/package/hipl/Makefile kamikaze-svn/package/hipl/Makefile
--- kamikaze-svn.orig/package/hipl/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ kamikaze-svn/package/hipl/Makefile	2008-07-17 15:09:18.631463636 +0200
@@ -0,0 +1,90 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=hipl--openwrt
+PKG_VERSION:=2.6
+
+PKG_SOURCE:=$(PKG_NAME)--$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://localhost/hipl/
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)--$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/hipl
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libopenssl +libxml2 +libtool +iptables +ipsec-tools +uclibc
+  TITLE:=Host identity protocol
+  URL:=hipl.hiit.fi
+
+endef
+
+CONFIGURE_VARS += \
+	LIBS="-lxml2 -lcrypto -lm -lz" \
+	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/libxml2 -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(TOOLCHAIN_DIR)/include" \
+	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -L$(TOOLCHAIN_DIR)/lib" \
+	OPENWRT="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -L$(TOOLCHAIN_DIR)/lib" \
+	OPENWRT_LIB_STATIC="$(TOOLCHAIN_DIR)/lib/libc.a" \
+	
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
+		./autogen.sh --host=$(GNU_TARGET_NAME) --target=$(GNU_TARGET_NAME) \
+	);
+
+	(cd  $(PKG_BUILD_DIR)/libinet6; test -L include || ln -v -s include_glibc23 include; \
+	);
+
+	(cp $(PKG_BUILD_DIR)/libinet6/include/ifaddrs.h $(STAGING_DIR)/include/ \
+	);
+
+	(cd ..; \
+	);
+
+	$(CONFIGURE_VARS);
+
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--disable-nls \
+		--disable-agent \
+		--enable-midauth \
+		--enable-opendht \
+		--enable-openwrt \
+		--disable-privsep \
+	);
+endef
+
+define Build/Compile
+	($(CONFIGURE_VARS) \
+	$(MAKE) -C $(PKG_BUILD_DIR));
+
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		INSTALL="install -c" \
+		install
+endef
+
+define Package/hipl/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/hip/
+	$(INSTALL_DIR) $(1)/etc/modules.d/
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/include/libipsec
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/sbin/
+
+	$(INSTALL_BIN) ./files/hipl.init $(1)/etc/init.d/hipl
+	$(INSTALL_DATA) ./files/hipl.modules $(1)/etc/modules.d/35-hipl
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/conntest* $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hipsetup* $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libinet6test* $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/listifaces* $(1)/usr/bin/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhip* $(1)/usr/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6* $(1)/usr/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip* $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,hipl))
diff -Nur kamikaze-svn.orig/package/hipl/files/hipl.init kamikaze-svn/package/hipl/files/hipl.init
--- kamikaze-svn.orig/package/hipl/files/hipl.init	1970-01-01 01:00:00.000000000 +0100
+++ kamikaze-svn/package/hipl/files/hipl.init	2008-07-09 15:18:22.673475622 +0200
@@ -0,0 +1,26 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+START=65
+STOP=65
+
+HIPD_OPTS="-bk"
+
+start() {
+	echo -n "Starting hipd"
+	hipd ${HIPD_OPTS}
+	echo "."
+}
+
+restart() {
+	echo -n "Restarting hipd"
+	killall hipd
+	hipd ${HIPD_OPTS}
+	echo "."
+}
+
+stop() {
+	echo -n "Stopping hipd"
+	killall hipd
+	echo "."
+}
diff -Nur kamikaze-svn.orig/package/hipl/files/hipl.modules kamikaze-svn/package/hipl/files/hipl.modules
--- kamikaze-svn.orig/package/hipl/files/hipl.modules	1970-01-01 01:00:00.000000000 +0100
+++ kamikaze-svn/package/hipl/files/hipl.modules	2008-07-09 15:18:22.673475622 +0200
@@ -0,0 +1,17 @@
+hmac
+crypto_null
+sha1
+crypto_hash
+aes
+ipv6
+af_key
+xfrm_user
+ah4
+esp4
+xfrm4_tunnel
+ipcomp
+ah6
+esp6
+tunnel6
+xfrm6_tunnel
+ipcomp6
diff -Nur kamikaze-svn.orig/package/libxml2/Makefile kamikaze-svn/package/libxml2/Makefile
--- kamikaze-svn.orig/package/libxml2/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ kamikaze-svn/package/libxml2/Makefile	2008-06-26 17:25:46.000000000 +0200
@@ -0,0 +1,99 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 7271 2007-05-18 09:43:14Z florian $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libxml2
+PKG_VERSION:=2.6.32
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://xmlsoft.org/sources/ \
+	ftp://fr.rpmfind.net/pub/libxml/
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libxml2
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libpthread +zlib
+  TITLE:=Gnome XML library
+  URL:=http://xmlsoft.org/
+endef
+
+define Build/Configure
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--enable-static \
+		--with-c14n \
+		--with-html \
+		--without-ftp \
+		--without-http \
+		--without-iconv \
+		--without-iso8859x \
+		--with-legacy \
+		--with-output \
+		--with-reader \
+		--with-sax1 \
+		--with-schemas \
+		--with-threads \
+		--with-tree \
+		--with-valid \
+		--with-writer \
+		--with-xinclude \
+		--with-xpath \
+		--with-xptr \
+		--with-zlib \
+		--with-regexp \
+	)
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+endef
+
+define Build/InstallDev
+	mkdir -p $(STAGING_DIR)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/
+	mkdir -p $(STAGING_DIR)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/
+	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(SED) 's,-I$$$${includedir}/libxml2,,g' $(STAGING_DIR)/usr/bin/xml2-config
+	$(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/bin/xml2-config
+	$(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(STAGING_DIR)/usr/bin/xml2-config
+	$(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/bin/xml2-config
+	$(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(STAGING_DIR)/usr/bin/xml2-config
+	$(SED) 's,-I$$$${includedir}/libxml2,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+	$(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+	$(SED)  "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+	$(SED)  "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+endef
+
+define Build/UninstallDev
+	rm -rf \
+		$(STAGING_DIR)/usr/bin/xml2-config \
+		$(STAGING_DIR)/usr/include/libxml2 \
+		$(STAGING_DIR)/usr/lib/libxml2.{a,so*} \
+		$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+endef
+
+define Package/libxml2/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libxml2))