From patchwork Sat May 20 12:10:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6896 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 4QNjGs4tNNz3wlf for ; Sat, 20 May 2023 12:11:01 +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 4QNjGp3mmvz9T3; Sat, 20 May 2023 12:10:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QNjGp3Bylz300C; Sat, 20 May 2023 12:10:58 +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 4QNjGm6Ftfz2xk4 for ; Sat, 20 May 2023 12:10:56 +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 4QNjGl4GMzz1f8; Sat, 20 May 2023 12:10:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1684584655; 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=Bk3/+xHNC/lvggWs9Nmu8+mgIf4iqO5cWyQ3R4L4GQA=; b=x6/5YKhCv1LWGDL7ygs4kmv2xfgaodm97A8cauRi5T4ZcP3LF+rGk9mKmzND1zjMP6LR7/ /sqsI1pxnkVFI3Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1684584655; 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=Bk3/+xHNC/lvggWs9Nmu8+mgIf4iqO5cWyQ3R4L4GQA=; b=iQPT/Gx8BJXfwpYDsAV9xRJZlbC5Jl3RdakQ1W+prZFdxtRXTQGJv1BCzEq5O73P0Xk14h ZwXofVvpx89jxOL2NUtFaIv6qohKv+Fu4ygyrQWZ9N7JEwF7+foGdCdJQvDkAlPLckO6zP 5NNoqG+QSNIa0/5Oq3vX7RvW3W/EKb0jgpHfjRahchKMIHhdDSnzqBVaeX2i2lXfA9kHZU TXwK5ufSgxKgiWRLxyN92zIy3dgRw7mIrffrovvx7rVjTkIIPXXvo5EPDKIO/5SFCyFCB6 fXC3wcos9h4Y8+DyOIMqJ5NSw36OmSdwMdfv5xEXfGkeQKOF8JrkU+daLzSXeA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] wavemon: Update to version 0.9.4 Date: Sat, 20 May 2023 14:10:48 +0200 Message-Id: <20230520121048.3603390-4-adolf.belka@ipfire.org> In-Reply-To: <20230520121048.3603390-1-adolf.belka@ipfire.org> References: <20230520121048.3603390-1-adolf.belka@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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from version 0.7.5 to 0.9.4 - Update of rootfile - wavemon would not build because it could not find the netlink include files. wavemon was still looking in include/netlink/ as for libnl version 1 but with libnl3 the include files are in include/libnl3/netlink/ - Based on an issue entry in the wavemon github repo I created the patch to force wavemon to look in the correct place. Signed-off-by: Adolf Belka --- config/rootfiles/packages/wavemon | 8 ++--- lfs/wavemon | 32 ++++++++++++++----- ...mon-0.9.4-force-netlink-include-path.patch | 11 +++++++ 3 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 src/patches/wavemon-0.9.4-force-netlink-include-path.patch diff --git a/config/rootfiles/packages/wavemon b/config/rootfiles/packages/wavemon index 4f0fa3c05..3785f5aa9 100644 --- a/config/rootfiles/packages/wavemon +++ b/config/rootfiles/packages/wavemon @@ -2,9 +2,5 @@ usr/bin/wavemon #usr/share/man/man1/wavemon.1 #usr/share/man/man5/wavemonrc.5 #usr/share/wavemon -#usr/share/wavemon/AUTHORS -#usr/share/wavemon/COPYING -#usr/share/wavemon/ChangeLog -#usr/share/wavemon/NEWS -#usr/share/wavemon/README -#usr/share/wavemon/THANKS +#usr/share/wavemon/LICENSE +#usr/share/wavemon/README.md diff --git a/lfs/wavemon b/lfs/wavemon index 2fb8b75b3..265449c4f 100644 --- a/lfs/wavemon +++ b/lfs/wavemon @@ -1,8 +1,24 @@ ############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) 2007-2018 IPFire Team # +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2023 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 ############################################################################### @@ -11,15 +27,15 @@ include Config SUMMARY = An ncurses monitoring application for wireless network devices -VER = 0.7.5 +VER = 0.9.4 THISAPP = wavemon-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = wavemon -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -33,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 144a8aa36e99d39fb155e7afe2322c9446e168c1b009f6d53f149f7cd6c1e723e47a30233c25849b1aa1fd8c601e8d8881062daf3113c2964b0c239a5b110b6c +$(DL_FILE)_BLAKE2 = e07feb16dba86b1a91dc9b7d7df51da1b4498d8ea1a6ca36f6ae1e30e0e0bb09971330a470cde3425e7ae785bbd2819460ac2f1ddc2bc8da3aae29de3356bdbb install : $(TARGET) @@ -66,10 +82,10 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/wavemon-0.9.4-force-netlink-include-path.patch $(UPDATE_AUTOMAKE) cd $(DIR_APP) && ./configure \ - --prefix=/usr - + --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/patches/wavemon-0.9.4-force-netlink-include-path.patch b/src/patches/wavemon-0.9.4-force-netlink-include-path.patch new file mode 100644 index 000000000..5004e567f --- /dev/null +++ b/src/patches/wavemon-0.9.4-force-netlink-include-path.patch @@ -0,0 +1,11 @@ +--- wavemon-0.9.4/Makefile.in.orig 2021-09-18 02:25:37.000000000 +0200 ++++ wavemon-0.9.4/Makefile.in 2023-05-19 23:45:50.170559365 +0200 +@@ -9,7 +9,7 @@ + install-suid-root: exec_perms = 4755 + + CC ?= @CC@ +-CFLAGS ?= @CFLAGS@ @LIBNL3_CLI_CFLAGS@ ++CFLAGS = @CFLAGS@ @LIBNL3_CLI_CFLAGS@ + CPPFLAGS ?= @CPPFLAGS@ + LDFLAGS ?= @LDFLAGS@ + DEFS ?= @DEFS@