From a799227d8ed0cd3ff49d2845183c99e93a45d5bc Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Mon, 30 Sep 2024 14:40:08 +0200 Subject: [PATCH] mcproxy: remove this package Upstream [1] looks dead. The latest commit was pushed 7 years ago. Pull requests are not reviewed so far [2]. [1] https://github.com/mcproxy/mcproxy [2] https://github.com/mcproxy/mcproxy/pull/18 Signed-off-by: Josef Schlehofer --- mcproxy/Makefile | 57 ----- mcproxy/files/mcproxy.conf | 68 ----- mcproxy/files/mcproxy.config | 239 ------------------ mcproxy/files/mcproxy.init | 184 -------------- mcproxy/patches/0001-add-cmake.patch | 54 ---- mcproxy/patches/0002-rm-stoi.patch | 40 --- mcproxy/patches/0003-add-sourcefilter.patch | 181 ------------- mcproxy/patches/0004-add-defs.patch | 11 - .../patches/0005-fix-match-filter-calls.patch | 46 ---- mcproxy/patches/0006-block-ingress.patch | 88 ------- mcproxy/patches/0007-igmpv2-queries.patch | 116 --------- 11 files changed, 1084 deletions(-) delete mode 100644 mcproxy/Makefile delete mode 100644 mcproxy/files/mcproxy.conf delete mode 100644 mcproxy/files/mcproxy.config delete mode 100644 mcproxy/files/mcproxy.init delete mode 100644 mcproxy/patches/0001-add-cmake.patch delete mode 100644 mcproxy/patches/0002-rm-stoi.patch delete mode 100644 mcproxy/patches/0003-add-sourcefilter.patch delete mode 100644 mcproxy/patches/0004-add-defs.patch delete mode 100644 mcproxy/patches/0005-fix-match-filter-calls.patch delete mode 100644 mcproxy/patches/0006-block-ingress.patch delete mode 100644 mcproxy/patches/0007-igmpv2-queries.patch diff --git a/mcproxy/Makefile b/mcproxy/Makefile deleted file mode 100644 index 908b6c03b..000000000 --- a/mcproxy/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2014-2017 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:=mcproxy -PKG_RELEASE:=9 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/mcproxy/mcproxy.git -PKG_SOURCE_DATE:=2017-08-24 -PKG_SOURCE_VERSION:=93b5ace42268160ebbfff4c61818fb15fa2d9b99 -PKG_MIRROR_HASH:=1999a4cd799514816159b2bf496e107231f6affbeb0f75a7298f0731e1320018 - -PKG_MAINTAINER:=Steven Barth -PKG_LICENSE:=GPL-2.0-or-later -PKG_LICENSE_FILES:=COPYING - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/mcproxy - SECTION:=net - CATEGORY:=Network - SUBMENU:=Routing and Redirection - TITLE:=Multicast Proxy for IGMP/MLD - URL:=https://mcproxy.realmv6.org - DEPENDS:=+libpthread +libstdcpp @(!GCC_VERSION_4_4&&!GCC_VERSION_4_6) -endef - -define Package/mcproxy/description - mcproxy is a free & open source implementation of the IGMP/MLD proxy function (see RFC 4605) for Linux systems. - It operates on the kernel tables for multicast routing and allows for multiple instantiations, - as well as dynamically changing downstream interfaces. -endef - -define Package/mcproxy/conffiles -/etc/mcproxy.conf -/etc/config/mcproxy -endef - -define Package/mcproxy/install - $(INSTALL_DIR) $(1)/etc - $(INSTALL_CONF) ./files/mcproxy.conf $(1)/etc/mcproxy.conf - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/mcproxy.config $(1)/etc/config/mcproxy - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/mcproxy.init $(1)/etc/init.d/mcproxy - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/mcproxy-bin $(1)/usr/sbin/mcproxy -endef - -$(eval $(call BuildPackage,mcproxy)) diff --git a/mcproxy/files/mcproxy.conf b/mcproxy/files/mcproxy.conf deleted file mode 100644 index 936cdda17..000000000 --- a/mcproxy/files/mcproxy.conf +++ /dev/null @@ -1,68 +0,0 @@ -###################################### -##-- mcproxy configuration script --## -###################################### - -# Protocol: IGMPv1|IGMPv2|IGMPv3 (IPv4) - MLDv1|MLDv2 (IPv6) -protocol IGMPv3; - -########################################### - -# Proxy Instance: upstream ==> downstream -pinstance A: ap a1 ==> ap a2; -pinstance B: bp b1 ==> bp b2; - -########################################### - -# Tables -table allways { - (*|*) -}; - -table piA_peering_ifs { - ap(*|*) -}; - -table piA_upstreams { - a1(*|*) -}; - -table piB_peering_ifs { - bp(*|*) -}; - -table piB_upstreams { - b1(*|*) -}; - -########################################### - -# Instance Behaviour -pinstance A upstream * in rulematching mutex 10; #or 25ms (u4) -#pinstance A upstream * out rulematching all; #default - -pinstance A upstream ap out blacklist table allways; #(u1) -#pinstance A upstream ap in whitelist table {(*|*)}; #default (u2, u3) - -pinstance A upstream a1 out blacklist table piA_peering_ifs; #(u3_1) -#pinstance A upstream a1 in whitelist table {(*|*)}; #default - -pinstance A downstream ap in blacklist table allways; #(d1) -pinstance A downstream ap out blacklist table piA_upstreams; #(d2, d2_1, d3, d4) - -#pinstance A downstream a2 in whitelist table {(*|*)}; #default -#pinstance A downstream a2 out whitelist table {(*|*)}; #default - -pinstance B upstream * in rulematching mutex 10; #or 25ms (u4) -#pinstance B upstream * out rulematching all; #default - -pinstance B upstream bp out blacklist table allways; #(u1) -#pinstance B upstream bp in whitelist table {(*|*)}; #default (u2, u3) - -pinstance B upstream b1 out blacklist table piB_peering_ifs; #(u3_1) -#pinstance b upstream b1 in whitelist table {(*|*)}; #default - -pinstance B downstream bp in blacklist table allways; #(d1) -pinstance B downstream bp out blacklist table piB_upstreams; #(d2, d2_1, d3, d4) - -#pinstance B downstream b2 in whitelist table {(*|*)}; #default -#pinstance B downstream b2 out whitelist table {(*|*)}; #default diff --git a/mcproxy/files/mcproxy.config b/mcproxy/files/mcproxy.config deleted file mode 100644 index f0287950c..000000000 --- a/mcproxy/files/mcproxy.config +++ /dev/null @@ -1,239 +0,0 @@ -# Use your own MCProxy config file -config mcproxy 'mcproxy_file' - option disabled '1' - option respawn '1' - option file '/etc/mcproxy.conf' - -# Use OpenWrt UCI config -config mcproxy 'mcproxy' - option disabled '1' - option respawn '1' - option protocol 'IGMPv3' - -########################################### - -# Simple configuration examples - -config instance - option disabled '1' - option name 'proxy1' - list upstream 'eth1' - list downstream 'eth0.2' - -config instance - option disabled '1' - option name 'proxy2' - list upstream 'eth0.2' - list downstream 'eth0.4' - list downstream 'br-lan' - -config instance - option disabled '1' - option name 'proxy3' - list upstream 'eth1.2' - list upstream 'eth1.4' - list downstream 'eth0.1' - -########################################### - -# Advanced configuration example - -config instance - option name 'A' - list upstream 'ap' - list upstream 'a1' - list downstream 'ap' - list downstream 'a2' - -config instance - option name 'B' - list upstream 'bp' - list upstream 'b1' - list downstream 'bp' - list downstream 'b2' - -config table - option name 'allways' - list entries '(*|*)' - -config table - option name 'piA_peering_ifs' - list entries 'ap(*|*)' - -config table - option name 'piA_upstreams' - list entries 'a1(*|*)' - -config table - option name 'piB_peering_ifs' - list entries 'bp(*|*)' - -config table - option name 'piB_upstreams' - list entries 'b1(*|*)' - -config behaviour - option instance 'A' - option section 'upstream' - option interface '*' - option direction 'in' - option rulematching 'mutex 10' - -config behaviour - option disabled '1' - option instance 'A' - option section 'upstream' - option interface '*' - option direction 'out' - option rulematching 'all' - -config behaviour - option instance 'A' - option section 'upstream' - option interface 'ap' - option direction 'out' - option table 'allways' - -config behaviour - option disabled '1' - option instance 'A' - option section 'upstream' - option interface 'ap' - option direction 'in' - option whitelist '1' - option table '{(*|*)}' - -config behaviour - option instance 'A' - option section 'upstream' - option interface 'a1' - option direction 'out' - option table 'piA_peering_ifs' - -config behaviour - option disabled '1' - option instance 'A' - option section 'upstream' - option interface 'a1' - option direction 'in' - option whitelist '1' - option table '{(*|*)}' - -config behaviour - option instance 'A' - option section 'downstream' - option interface 'ap' - option direction 'in' - option table 'allways' - -config behaviour - option instance 'A' - option section 'downstream' - option interface 'ap' - option direction 'out' - option table 'piA_upstreams' - -config behaviour - option disabled '1' - option instance 'A' - option section 'downstream' - option interface 'a2' - option direction 'in' - option whitelist '1' - option table '{(*|*)}' - -config behaviour - option disabled '1' - option instance 'A' - option section 'downstream' - option interface 'a2' - option direction 'out' - option whitelist '1' - option table '{(*|*)}' - -config behaviour - option instance 'B' - option section 'upstream' - option interface '*' - option direction 'in' - option rulematching 'mutex 10' - -config behaviour - option disabled '1' - option instance 'B' - option section 'upstream' - option interface '*' - option direction 'out' - option rulematching 'all' - -config behaviour - option instance 'B' - option section 'upstream' - option interface 'bp' - option direction 'out' - option table 'allways' - -config behaviour - option disabled '1' - option instance 'B' - option section 'upstream' - option interface 'bp' - option direction 'in' - option whitelist '1' - option table '{(*|*)}' - -config behaviour - option instance 'B' - option section 'upstream' - option interface 'b1' - option direction 'out' - option table 'piB_peering_ifs' - -config behaviour - option disabled '1' - option instance 'B' - option section 'upstream' - option interface 'b1' - option direction 'in' - option whitelist '1' - option table '{(*|*)}' - -config behaviour - option instance 'B' - option section 'downstream' - option interface 'bp' - option direction 'in' - option table 'allways' - -config behaviour - option instance 'B' - option section 'downstream' - option interface 'bp' - option direction 'out' - option table 'piB_upstreams' - -config behaviour - option disabled '1' - option instance 'B' - option section 'downstream' - option interface 'b2' - option direction 'in' - option whitelist '1' - option table '{(*|*)}' - -config behaviour - option disabled '1' - option instance 'B' - option section 'downstream' - option interface 'b2' - option direction 'out' - option whitelist '1' - option table '{(*|*)}' - -config blocks blocks - # mDNS - list entries '(*|239.255.255.0/24)' - # SSDP - list entries '(*|224.0.0.0/24)' - # SLP - list entries '(*|239.192.0.0/16)' diff --git a/mcproxy/files/mcproxy.init b/mcproxy/files/mcproxy.init deleted file mode 100644 index 60e4c871b..000000000 --- a/mcproxy/files/mcproxy.init +++ /dev/null @@ -1,184 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2014-2015 OpenWrt.org - -START=99 -USE_PROCD=1 - -mcproxy_handle_instances() { - local instance="$1" - local conf_file="$2" - local disabled - local pre="" - local name - local upstreams - local downstreams - - config_get_bool disabled "$instance" 'disabled' '0' - config_get name "$instance" "name" "$instance" - config_get upstreams "$instance" "upstream" - config_get downstreams "$instance" "downstream" - - if [ $disabled -eq 1 ]; then - pre="# " - fi - - local str_up="" - if [ -n "$upstreams" ]; then - local upstream - for upstream in $upstreams; do - str_up="$str_up \"$upstream\"" - done - fi - - local str_down="" - if [ -n "$downstreams" ]; then - local downstream - for downstream in $downstreams; do - str_down="$str_down \"$downstream\"" - done - fi - - if [ ! -z $downstream ]; then - echo -e "${pre}pinstance ${name}:${str_up} ==>${str_down};\n" >> $conf_file - fi -} - -# mcproxy_list_table