From 9c8997d54dc9df184bfcedeabf0b3c85cf5e6753 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 10 Oct 2012 12:32:29 +0000
Subject: packages: sort network related packages into package/network/

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33688 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/6in4/Makefile      | 42 ----------------------
 package/6in4/files/6in4.sh | 90 ----------------------------------------------
 2 files changed, 132 deletions(-)
 delete mode 100644 package/6in4/Makefile
 delete mode 100755 package/6in4/files/6in4.sh

(limited to 'package/6in4')

diff --git a/package/6in4/Makefile b/package/6in4/Makefile
deleted file mode 100644
index fdab29086..000000000
--- a/package/6in4/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2010-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=6in4
-PKG_VERSION:=11
-PKG_RELEASE:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/6in4
-  SECTION:=ipv6
-  CATEGORY:=IPv6
-  DEPENDS:=+kmod-ipv6 +kmod-sit
-  TITLE:=IPv6-in-IPv4 configuration support
-  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
-  PKGARCH:=all
-endef
-
-define Package/6in4/description
-Provides support for 6in4 tunnels in /etc/config/network.
-Refer to http://wiki.openwrt.org/doc/uci/network for
-configuration details.
-endef
-
-define Build/Compile
-endef
-
-define Build/Configure
-endef
-
-define Package/6in4/install
-	$(INSTALL_DIR) $(1)/lib/netifd/proto
-	$(INSTALL_BIN) ./files/6in4.sh $(1)/lib/netifd/proto/6in4.sh
-endef
-
-$(eval $(call BuildPackage,6in4))
diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh
deleted file mode 100755
index 71bc68940..000000000
--- a/package/6in4/files/6in4.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-# 6in4.sh - IPv6-in-IPv4 tunnel backend
-# Copyright (c) 2010-2012 OpenWrt.org
-
-[ -n "$INCLUDE_ONLY" ] || {
-	. /lib/functions.sh
-	. /lib/functions/network.sh
-	. ../netifd-proto.sh
-	init_proto "$@"
-}
-
-proto_6in4_setup() {
-	local cfg="$1"
-	local iface="$2"
-	local link="6in4-$cfg"
-
-	local mtu ttl ipaddr peeraddr ip6addr tunnelid username password
-	json_get_vars mtu ttl ipaddr peeraddr ip6addr tunnelid username password
-
-	[ -z "$ip6addr" -o -z "$peeraddr" ] && {
-		proto_notify_error "$cfg" "MISSING_ADDRESS"
-		proto_block_restart "$cfg"
-		return
-	}
-
-	( proto_add_host_dependency "$cfg" 0.0.0.0 )
-
-	[ -z "$ipaddr" ] && {
-		local wanif
-		if ! network_find_wan wanif || ! network_get_ipaddr ipaddr "$wanif"; then
-			proto_notify_error "$cfg" "NO_WAN_LINK"
-			return
-		fi
-	}
-
-	local local6="${ip6addr%%/*}"
-	local mask6="${ip6addr##*/}"
-	[[ "$local6" = "$mask6" ]] && mask6=
-
-	proto_init_update "$link" 1
-	proto_add_ipv6_address "$local6" "$mask6"
-	proto_add_ipv6_route "::" 0
-
-	proto_add_tunnel
-	json_add_string mode sit
-	json_add_int mtu "${mtu:-1280}"
-	json_add_int ttl "${ttl:-64}"
-	json_add_string local "$ipaddr"
-	json_add_string remote "$peeraddr"
-	proto_close_tunnel
-
-	proto_send_update "$cfg"
-
-	[ -n "$tunnelid" -a -n "$username" -a -n "$password" ] && {
-		[ "${#password}" == 32 -a -z "${password//[a-fA-F0-9]/}" ] || {
-			password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
-		}
-
-		local url="http://ipv4.tunnelbroker.net/ipv4_end.php?ip=AUTO&apikey=$username&pass=$password&tid=$tunnelid"
-		local try=0
-		local max=3
-
-		while [ $((++try)) -le $max ]; do
-			wget -qO/dev/null "$url" 2>/dev/null && break
-			sleep 1
-		done
-	}
-}
-
-proto_6in4_teardown() {
-	local cfg="$1"
-}
-
-proto_6in4_init_config() {
-	no_device=1             
-	available=1
-
-	proto_config_add_string "ipaddr"
-	proto_config_add_string "ip6addr"
-	proto_config_add_string "peeraddr"
-	proto_config_add_string "tunnelid"
-	proto_config_add_string "username"
-	proto_config_add_string "password"
-	proto_config_add_int "mtu"
-	proto_config_add_int "ttl"
-}
-
-[ -n "$INCLUDE_ONLY" ] || {
-	add_protocol 6in4
-}
-- 
cgit v1.2.3