From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] wavemon: Update to version 0.9.4
Date: Sat, 20 May 2023 14:10:48 +0200 [thread overview]
Message-ID: <20230520121048.3603390-4-adolf.belka@ipfire.org> (raw)
In-Reply-To: <20230520121048.3603390-1-adolf.belka@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 5405 bytes --]
- 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 <adolf.belka(a)ipfire.org>
---
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 <info(a)ipfire.org> #
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
+# #
+# 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 <http://www.gnu.org/licenses/>. #
+# #
###############################################################################
+
###############################################################################
# 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@
--
2.40.1
prev parent reply other threads:[~2023-05-20 12:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-20 12:10 [PATCH] stunnel: Update to version 5.69 Adolf Belka
2023-05-20 12:10 ` [PATCH] tmux: Update to version 3.3a Adolf Belka
2023-05-20 12:10 ` [PATCH] transmission: Update to version 4.0.3 Adolf Belka
2023-05-20 12:10 ` Adolf Belka [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230520121048.3603390-4-adolf.belka@ipfire.org \
--to=adolf.belka@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox