From patchwork Mon May 17 21:56:50 2021 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: 4330 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 "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FkXzB5MMHz3wbb for ; Mon, 17 May 2021 21:56:54 +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 4FkXzB2bqkz1TW; Mon, 17 May 2021 21:56:54 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FkXzB2Hzwz2yTb; Mon, 17 May 2021 21:56:54 +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 "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FkXz90ynHz2xF1 for ; Mon, 17 May 2021 21:56:53 +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)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FkXz76kwWz1L0 for ; Mon, 17 May 2021 21:56:51 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1621288612; 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: in-reply-to:in-reply-to:references:references; bh=A5ULon9fRiFW3xDTwsdHKh20ZnaScuahPKOMSgxFVFE=; b=7NvpgZozqZMwyFj47pPuscxrS1AsLP7sKRsV8bIeccHpdt35G/CW9nqJQPXFkvZt8wzyEH 3mNX269BeiEi39Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1621288612; 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: in-reply-to:in-reply-to:references:references; bh=A5ULon9fRiFW3xDTwsdHKh20ZnaScuahPKOMSgxFVFE=; b=RJ4q1X1ABxrKvQ5hJZTBltQkpd7r2V4g0r0ZXnxyZ6f89WnwbKfhNOIqDsmtkgbRNFRkx0 wYF9oE6dtYuaEvoBUoFB4RNt2uQpYt7rCVkAK1KX1nFEM616i3vqYomqzIy7T6EK6fV5nK S9L02113LOzbUxMjXP0aPsquEPWYZtZ3HjPVhMPkaEnwuxTPhiq1atHV02jCV8mAJusY86 DpMAZtVLZRFEUgTq2o2OsXgfreQvVdmacu2xPjXAraJ80YaG3ugBw1cN9HVaCYrTU2P1Gu EuK4gT0630Zk0utNfnoiYLZizcpoZNivHJpt33hbZ+dx4m4sWO3a4u49VPLiJg== Subject: [PATCH v2 04/11] Drop orphaned dependency "libsrtp" To: development@lists.ipfire.org References: <52820aff-40b7-1aae-17a8-34c97276fe60@ipfire.org> <44b9848d-7f27-2258-4115-daa395ad9e8c@ipfire.org> <695af3d4-68c4-a1f8-2fd8-4008eb3f9b31@ipfire.org> <35d26ef9-e2d2-95fd-9320-79e056e28202@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: <7cf1c835-9ac7-6f5c-5b07-a0ebba6dd93f@ipfire.org> Date: Mon, 17 May 2021 23:56:50 +0200 MIME-Version: 1.0 In-Reply-To: <35d26ef9-e2d2-95fd-9320-79e056e28202@ipfire.org> Content-Language: en-US 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 was solely needed by Asterisk and is no longer used anymore. Signed-off-by: Peter Müller --- config/rootfiles/packages/libsrtp | 41 --------------- lfs/libsrtp | 84 ------------------------------- make.sh | 1 - 3 files changed, 126 deletions(-) delete mode 100644 config/rootfiles/packages/libsrtp delete mode 100644 lfs/libsrtp diff --git a/config/rootfiles/packages/libsrtp b/config/rootfiles/packages/libsrtp deleted file mode 100644 index 3ee2e3b64..000000000 --- a/config/rootfiles/packages/libsrtp +++ /dev/null @@ -1,41 +0,0 @@ -#usr/include/srtp -#usr/include/srtp/aes.h -#usr/include/srtp/aes_cbc.h -#usr/include/srtp/aes_gcm_ossl.h -#usr/include/srtp/aes_icm.h -#usr/include/srtp/aes_icm_ossl.h -#usr/include/srtp/alloc.h -#usr/include/srtp/auth.h -#usr/include/srtp/cipher.h -#usr/include/srtp/config.h -#usr/include/srtp/crypto.h -#usr/include/srtp/crypto_kernel.h -#usr/include/srtp/crypto_math.h -#usr/include/srtp/crypto_types.h -#usr/include/srtp/cryptoalg.h -#usr/include/srtp/datatypes.h -#usr/include/srtp/ekt.h -#usr/include/srtp/err.h -#usr/include/srtp/getopt_s.h -#usr/include/srtp/gf2_8.h -#usr/include/srtp/hmac.h -#usr/include/srtp/integers.h -#usr/include/srtp/kernel_compat.h -#usr/include/srtp/key.h -#usr/include/srtp/null_auth.h -#usr/include/srtp/null_cipher.h -#usr/include/srtp/prng.h -#usr/include/srtp/rand_source.h -#usr/include/srtp/rdb.h -#usr/include/srtp/rdbx.h -#usr/include/srtp/rtp.h -#usr/include/srtp/rtp_priv.h -#usr/include/srtp/sha1.h -#usr/include/srtp/srtp.h -#usr/include/srtp/srtp_priv.h -#usr/include/srtp/stat.h -#usr/include/srtp/ut_sim.h -#usr/include/srtp/xfm.h -usr/lib/libsrtp.so -usr/lib/libsrtp.so.1 -#usr/lib/pkgconfig/libsrtp.pc diff --git a/lfs/libsrtp b/lfs/libsrtp deleted file mode 100644 index 25508f863..000000000 --- a/lfs/libsrtp +++ /dev/null @@ -1,84 +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 = 1.5.4 -THISAPP = libsrtp-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libsrtp -PAK_VER = 3 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 64a9580f86a9c3e1c4986e944e6a5a84 - -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) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make uninstall && make $(MAKETUNING) shared_library - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 463e029c7..289b833e8 100755 --- a/make.sh +++ b/make.sh @@ -1517,7 +1517,6 @@ buildipfire() { lfsmake2 nut lfsmake2 watchdog lfsmake2 libpri - lfsmake2 libsrtp lfsmake2 usb_modeswitch lfsmake2 usb_modeswitch_data lfsmake2 zerofree