From patchwork Wed Feb 12 09:34:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2786 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZJ03jCXz3xYL for ; Wed, 12 Feb 2020 09:35:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHs11fpz12G; Wed, 12 Feb 2020 09:35:21 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHr4gKYz2yyB; Wed, 12 Feb 2020 09:35:20 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHk1TjHz2yZn for ; Wed, 12 Feb 2020 09:35:14 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHj6HNDz11l; Wed, 12 Feb 2020 09:35:13 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PnySO/egNavhVaQ0he1HwMPC5gUqm+viUO0mwCn5tk4=; b=nS4k0HGf8ZGbUYqsiXFhAcwNCvRBkXE3+1dcA6/yf+s5+OXgL2y7ixapBqf8v5j+RYMtWu DPSkOX+chkQIaXDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PnySO/egNavhVaQ0he1HwMPC5gUqm+viUO0mwCn5tk4=; b=FC8L8uFCm2/BAWX914v4YE6R8nKzUErnpLKArJLuEAzUi8TzZ9cT0isHxCta26ROTrArJI xBJGYFin7Ps2oTTbL4ekeg0++AM6YlwYjatwq9u6dJk37x7bGwalJEIMY67rNaFafecPBr VQzBKXfA4wmnzGhaktjznqEwhWiKEVU9Gj2H7ZQRQy7P5YZkGDVmWskC/HMZ3kMrCaplGo K++/If5P+8HoiJ7cNcISYpWHgx73dhAZaE7bgEdGj4URWuRbB06i5RQOXApHpx4tfz1Lxa qDMIJy1kliUt7mnwWNDst++q58vDaO0pRgYhANna2yfxeWtNr4LgGTtb05pW/w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 10/14] Drop rtpproxy Date: Wed, 12 Feb 2020 09:34:49 +0000 Message-Id: <20200212093453.5732-11-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This probably has only been used by me and we do not need it any more. Signed-off-by: Michael Tremer --- config/rootfiles/packages/rtpproxy | 5 -- lfs/rtpproxy | 87 ------------------------------ make.sh | 1 - src/initscripts/packages/rtpproxy | 66 ----------------------- src/paks/rtpproxy/install.sh | 29 ---------- src/paks/rtpproxy/uninstall.sh | 27 ---------- src/paks/rtpproxy/update.sh | 26 --------- 7 files changed, 241 deletions(-) delete mode 100644 config/rootfiles/packages/rtpproxy delete mode 100644 lfs/rtpproxy delete mode 100755 src/initscripts/packages/rtpproxy delete mode 100644 src/paks/rtpproxy/install.sh delete mode 100644 src/paks/rtpproxy/uninstall.sh delete mode 100644 src/paks/rtpproxy/update.sh diff --git a/config/rootfiles/packages/rtpproxy b/config/rootfiles/packages/rtpproxy deleted file mode 100644 index 6fcc1e44c..000000000 --- a/config/rootfiles/packages/rtpproxy +++ /dev/null @@ -1,5 +0,0 @@ -etc/rc.d/init.d/rtpproxy -usr/bin/makeann -usr/bin/rtpproxy -#usr/bin/rtpproxy_debug -#usr/share/man/man8/rtpproxy.8 diff --git a/lfs/rtpproxy b/lfs/rtpproxy deleted file mode 100644 index 204f44bca..000000000 --- a/lfs/rtpproxy +++ /dev/null @@ -1,87 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2.0.0 - -THISAPP = rtpproxy-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = rtpproxy -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 8d36fcc1dd93994ac5376d145f19ac73 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - #install initscripts - $(call INSTALL_INITSCRIPT,rtpproxy) - @rm -rf $(DIR_APP) - @$(POSTBUILD) - diff --git a/make.sh b/make.sh index 5ac026e94..247cdb001 100755 --- a/make.sh +++ b/make.sh @@ -1597,7 +1597,6 @@ buildipfire() { lfsmake2 frr lfsmake2 dmidecode lfsmake2 mcelog - lfsmake2 rtpproxy lfsmake2 util-macros lfsmake2 libpciaccess lfsmake2 libyajl diff --git a/src/initscripts/packages/rtpproxy b/src/initscripts/packages/rtpproxy deleted file mode 100755 index 3ea72f5f0..000000000 --- a/src/initscripts/packages/rtpproxy +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/rtpproxy -# -# Description : -# -# Authors : -# -# Version : 00.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - -PORT_MIN=10000 -PORT_MAX=10100 -SOCKET="/var/run/rtpproxy.sock" -LISTEN="${GREEN_ADDRESS}" -CUSTOM_ARGS="" - -PIDFILE="/var/run/rtpproxy.pid" - -if [ -r "/etc/sysconfig/rtpproxy" ]; then - . /etc/sysconfig/rtpproxy -fi - -case "${1}" in - start) - boot_mesg "Starting rtpproxy..." - loadproc /usr/bin/rtpproxy -u nobody -p ${PIDFILE} \ - -m ${PORT_MIN} -M ${PORT_MAX} -s ${SOCKET} \ - -l ${LISTEN} ${CUSTOM_ARGS} - ;; - - stop) - boot_mesg "Stopping rtpproxy..." - killproc /usr/bin/rtpproxy - ;; - - reload) - boot_mesg "Reloading rtpproxy..." - reloadproc /usr/bin/rtpproxy - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - ;; - - status) - statusproc /usr/bin/rtpproxy - ;; - - *) - echo "Usage: ${0} {start|stop|reload|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/rtpproxy diff --git a/src/paks/rtpproxy/install.sh b/src/paks/rtpproxy/install.sh deleted file mode 100644 index 02a521998..000000000 --- a/src/paks/rtpproxy/install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -start_service ${NAME} -ln -svf ../init.d/rtpproxy /etc/rc.d/rc0.d/K00rtpproxy -ln -svf ../init.d/rtpproxy /etc/rc.d/rc3.d/S99rtpproxy -ln -svf ../init.d/rtpproxy /etc/rc.d/rc6.d/K00rtpproxy diff --git a/src/paks/rtpproxy/uninstall.sh b/src/paks/rtpproxy/uninstall.sh deleted file mode 100644 index e9076d104..000000000 --- a/src/paks/rtpproxy/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} -remove_files -rm -rf /etc/rc.d/rc*.d/*rtpproxy diff --git a/src/paks/rtpproxy/update.sh b/src/paks/rtpproxy/update.sh deleted file mode 100644 index 89c40d0d7..000000000 --- a/src/paks/rtpproxy/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh