From 405e21d16731b2764ab82aaaadcf36a813b105f7 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 10 Oct 2012 12:32:29 +0000
Subject: packages: sort network related packages into package/network/

SVN-Revision: 33688
---
 package/relayd/Makefile            | 44 -----------------
 package/relayd/files/relay.hotplug |  2 -
 package/relayd/files/relay.init    | 97 --------------------------------------
 3 files changed, 143 deletions(-)
 delete mode 100644 package/relayd/Makefile
 delete mode 100644 package/relayd/files/relay.hotplug
 delete mode 100644 package/relayd/files/relay.init

(limited to 'package/relayd')

diff --git a/package/relayd/Makefile b/package/relayd/Makefile
deleted file mode 100644
index db957bdf66..0000000000
--- a/package/relayd/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (C) 2010-2011 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:=relayd
-PKG_VERSION:=2011-10-24
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://nbd.name/relayd.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4e8f1fa4ca2b176500362843a9e57ea5abd4b7a3
-
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/relayd
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE:=Transparent routing / relay daemon
-  DEPENDS:=+libubox
-endef
-
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-
-define Package/relayd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/relayd $(1)/usr/sbin/relayd
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_DATA) ./files/relay.hotplug $(1)/etc/hotplug.d/iface/30-relay
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/relay.init $(1)/etc/init.d/relayd
-endef
-
-$(eval $(call BuildPackage,relayd))
diff --git a/package/relayd/files/relay.hotplug b/package/relayd/files/relay.hotplug
deleted file mode 100644
index afffbfeab8..0000000000
--- a/package/relayd/files/relay.hotplug
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/etc/init.d/relayd enabled && /etc/init.d/relayd start
diff --git a/package/relayd/files/relay.init b/package/relayd/files/relay.init
deleted file mode 100644
index 43ba6e10f4..0000000000
--- a/package/relayd/files/relay.init
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (c) 2011-2012 OpenWrt.org
-START=80
-
-resolve_ifname() {
-	grep -qs "^ *$1:" /proc/net/dev && {
-		append args "-I $1"
-		append ifaces "$1"
-	}
-}
-
-resolve_network() {
-	local ifn
-	fixup_interface "$1"
-	config_get ifn "$1" ifname
-	[ -z "$ifn" ] && return 1
-	resolve_ifname "$ifn"
-}
-
-start_relay() {
-	local cfg="$1"
-
-	local args=""
-	local ifaces=""
-
-	config_get proto "$cfg" proto
-	[[ "$proto" == relay ]] || return 0
-
-	SERVICE_DAEMONIZE=1
-	SERVICE_WRITE_PID=1
-	SERVICE_PID_FILE="/var/run/relay-$cfg.pid"
-	[ -f "$SERVICE_PID_FILE" ] && {
-		if grep -q relayd "/proc/$(cat $SERVICE_PID_FILE)/cmdline"; then
-			return 0
-		else
-			rm -f "$SERVICE_PID_FILE"
-		fi
-	}
-
-	local net networks
-	config_get networks "$cfg" network
-	for net in $networks; do
-		resolve_network "$net" || {
-			return 1
-		}
-	done
-
-	local ifn ifnames
-	config_get ifnames "$cfg" ifname
-	for ifn in $ifnames; do
-		resolve_ifname "$ifn"
-	done
-
-	local ipaddr
-	config_get ipaddr "$cfg" ipaddr
-	[ -n "$ipaddr" ] && append args "-L $ipaddr"
-
-	local gateway
-	config_get gateway "$cfg" gateway
-	[ -n "$gateway" ] && append args "-G $gateway"
-
-	local expiry # = 30
-	config_get expiry "$cfg" expiry
-	[ -n "$expiry" ] && append args "-t $expiry"
-
-	local retry # = 5
-	config_get retry "$cfg" retry
-	[ -n "$retry" ] && append args "-p $retry"
-
-	local table # = 16800
-	config_get table "$cfg" table
-	[ -n "$table" ] && append args "-T $table"
-
-	local fwd_bcast # = 1
-	config_get_bool fwd_bcast "$cfg" forward_bcast 1
-	[ $fwd_bcast -eq 1 ] && append args "-B"
-
-	local fwd_dhcp # = 1
-	config_get_bool fwd_dhcp "$cfg" forward_dhcp 1
-	[ $fwd_dhcp -eq 1 ] && append args "-D"
-
-	service_start /usr/sbin/relayd $args
-}
-
-stop() {
-	for pid in /var/run/relay-*.pid; do
-		SERVICE_PID_FILE="$pid"
-		service_stop /usr/sbin/relayd
-		rm -f "$SERVICE_PID_FILE"
-	done
-}
-
-start() {
-	include /lib/network
-	config_load network
-	config_foreach start_relay interface
-}
-- 
cgit v1.2.3