From patchwork Sat Mar 19 16:35:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5354 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KLRMW2D20z3xK1 for ; Sat, 19 Mar 2022 16:35:51 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KLRMS1hvSz1cf; Sat, 19 Mar 2022 16:35:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KLRMS04pFz2yTY; Sat, 19 Mar 2022 16:35:48 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KLRMQ436Mz2xWt for ; Sat, 19 Mar 2022 16:35:46 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KLRMM5vJVz5Z for ; Sat, 19 Mar 2022 16:35:43 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1647707744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S59aE5UkHmWNri7JSXwKSilFQsgH5sRoyud31Qb94aI=; b=4u5YBMi1E712dADzqkAc80oQeSMeNhx7KFmqPL3w23aWvrcL0/xRYQ5AkkhrA/15FZsauk U/WsCk+E5lSSyLDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1647707744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S59aE5UkHmWNri7JSXwKSilFQsgH5sRoyud31Qb94aI=; b=HOyrOg7V4deb5fsQg32emEC7eQjAFWNzQeYfErmP2I8XRhP6x0y5t6nfeToAquiwYCRaV5 H2nj2Lsc2e+82jcmAss4mndRHGHRmblCjB8VUAiXyvFx4XzJOpZmmRo1fqnenVE8ih0m5L nDHKEa3Wy9kqX8UePHHZrQCwrX7MNbs4Lo0ZV0vO1Grtf85pyeRAJ3IQZn4nyE6Bu56kMk fW0ztlOJOvjBvRvcnB4SrvK7qy+sEYL1nz0qWg3cTx3VCNhmXl9oRPd5cL0wI/dh/qk6C0 icq4LTntyDB8TlcNhDhLy9+cWly0jgaRg0jT05patMSJvroMFPRUEQhTCrhRew== Message-ID: <4df694f9-ec14-7dcf-381d-ebcc1a751fd1@ipfire.org> Date: Sat, 19 Mar 2022 16:35:35 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] Drop orphaned ovpn-ccd-convert script 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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This script appeared in the rootfiles for Core Updates 65 and 66, being released in late 2012 and early 2013. It is not used elsewhere, and there is no sense in keeping it around on IPFire installations. Should this patch be accepted, a corresponding 'rm' statement is necessary in the update.sh script of the Core Update it will go into. Signed-off-by: Peter Müller Reviewed-by: Adolf Belka --- config/rootfiles/common/aarch64/stage2 | 1 - config/rootfiles/common/armv6l/stage2 | 1 - config/rootfiles/common/x86_64/stage2 | 1 - lfs/stage2 | 1 - src/scripts/ovpn-ccd-convert | 71 -------------------------- 5 files changed, 75 deletions(-) delete mode 100644 src/scripts/ovpn-ccd-convert diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2 index d8dc12a7f..e7eae625c 100644 --- a/config/rootfiles/common/aarch64/stage2 +++ b/config/rootfiles/common/aarch64/stage2 @@ -131,7 +131,6 @@ usr/local/bin/update-location-database #usr/local/src #usr/sbin usr/sbin/openvpn-metrics -usr/sbin/ovpn-ccd-convert #usr/share #usr/share/doc #usr/share/doc/licenses diff --git a/config/rootfiles/common/armv6l/stage2 b/config/rootfiles/common/armv6l/stage2 index 42ce447d1..670a99927 100644 --- a/config/rootfiles/common/armv6l/stage2 +++ b/config/rootfiles/common/armv6l/stage2 @@ -129,7 +129,6 @@ usr/local/bin/update-location-database #usr/local/src #usr/sbin usr/sbin/openvpn-metrics -usr/sbin/ovpn-ccd-convert #usr/share #usr/share/doc #usr/share/doc/licenses diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index 70e6c6e75..d07c264b4 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -131,7 +131,6 @@ usr/local/bin/update-location-database #usr/local/src #usr/sbin usr/sbin/openvpn-metrics -usr/sbin/ovpn-ccd-convert #usr/share #usr/share/doc #usr/share/doc/licenses diff --git a/lfs/stage2 b/lfs/stage2 index 356060a1f..6582a0c1a 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -113,7 +113,6 @@ endif # Move script to correct place. mv -vf /usr/local/bin/openvpn-metrics /usr/sbin/ - mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/ mv -vf /usr/local/bin/captive-cleanup /usr/bin/ # Install firewall scripts. diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert deleted file mode 100644 index 05339af78..000000000 --- a/src/scripts/ovpn-ccd-convert +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 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 . # -# # -############################################################################### - -my %net=(); -my %ovpnconfig=(); -my @serverconf=(); -my $greennet; -my $greensubnet; -my $running='off'; - -require '/var/ipfire/general-functions.pl'; -unless (-d "${General::swroot}/ovpn/ccd") { system("mkdir ${General::swroot}/ovpn/ccd"); } -system ("chown nobody.nobody ${General::swroot}/ovpn/ccd"); -if ( -e "/var/run/openvpn.pid"){ - $running='on'; - system('/usr/local/bin/openvpnctrl', '-k'); -} - -&General::readhash("/var/ipfire/ethernet/settings", \%net); - $greennet=$net{'GREEN_NETADDRESS'}; - $greensubnet=$net{'GREEN_NETMASK'}; -open(FILE,"/var/ipfire/ovpn/server.conf"); - while () { - $_=~s/\s*$//g; - if ($_ ne "route $greennet $greensubnet"){ - push (@serverconf,$_."\n"); - }else{ - print"\nFound ROUTE >>route $greennet $greensubnet<< in server.conf.. Deleted!"; - } - } - -&General::readhasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig); -foreach my $key (keys %ovpnconfig){ - if($ovpnconfig{$key}[32] eq '' && $ovpnconfig{$key}[3] eq 'host'){ - $ovpnconfig{$key}[2] =~ s/ /_/gi; - open ( CCDRWCONF,'>',"/var/ipfire/ovpn/ccd/$ovpnconfig{$key}[2]") or die "Unable to create clientconfigfile $!"; - print CCDRWCONF "# OpenVPN Clientconfig from CCD extension by Copymaster#\n\n"; - print CCDRWCONF "#This client uses the dynamic pool\n\n"; - print CCDRWCONF "\n#Client gets routes to these Networks (behind IPFIRE)\n"; - print CCDRWCONF "push \"route $greennet $greensubnet\"\n"; - close CCDRWCONF; - print"Client $ovpnconfig{$key}[2] converted! \n"; - }else{ - print "Client $ovpnconfig{$key}[2] NOT converted!\n"; - } - $ovpnconfig{$key}[32] = 'dynamic' if ($ovpnconfig{$key}[32] eq ''); -} -&General::writehasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig); -if ($running eq 'on') -{ - system('/usr/local/bin/openvpnctrl', '-s'); -} -system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*");