Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8065 from neheb/patch-4

Browse source 
wavemon: Update to 0.9.0
This commit is contained in:
Rosen Penev 2019-03-30 11:35:43 -07:00 committed by GitHub
commit 6c7e2c9013
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 69 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
net/wavemon/Makefile
View file

@ -8,17 +8,18 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=wavemon PKG_NAME:=wavemon
PKG_VERSION:=0.8.2 PKG_VERSION:=0.9.0
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/uoaerg/wavemon/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/uoaerg/wavemon/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=4199e2ad11a036f4289f5ad42a8b0fe518f2b5ff77447f4c366dbcf3f23e91d5 PKG_HASH:=5823ef9459d6147a457b390b6744a77465584e93d37c2809fa7a0be557070166
PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
PKG_LICENSE:=GPL-2.0+ PKG_LICENSE:=GPL-2.0+
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -39,14 +40,9 @@ define Package/wavemon/description
and higher), e.g. the Lucent Orinoco cards. and higher), e.g. the Lucent Orinoco cards.
endef endef
CONFIGURE_VARS += \ CONFIGURE_ARGS += --without-libcap
ac_cv_lib_cap_cap_get_flag=no \
BUILD_DATE=$(SOURCE_DATE_EPOCH)
TARGET_CFLAGS += -pthread -I$(STAGING_DIR)/usr/include/libnl3 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl3
MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS) -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include"
define Package/wavemon/install define Package/wavemon/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin

62
net/wavemon/patches/010-Scan-screen-resolves-62.patch Normal file
View file

@ -0,0 +1,62 @@
From f6e20c9c6e9b50963caaf5483248d329473a6815 Mon Sep 17 00:00:00 2001
From: Gerrit Renker <Gerrit.Renker@ctl.io>
Date: Mon, 21 Jan 2019 09:23:43 -0700
Subject: [PATCH] Scan screen: resolves #62
---
iw_if.c | 10 ++++++----
iw_if.h | 2 +-
iw_scan.c | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/iw_if.c b/iw_if.c
index c0b0128..d8bacbc 100644
--- a/iw_if.c
+++ b/iw_if.c
@@ -87,11 +87,13 @@ int if_set_down(const char *ifname)
return if_set_up_or_down(ifname, false);
}
-/** Exit handler to restore interface 'down' state on exit via on_exit(3). */
-void if_set_down_on_exit(int rc, void *arg)
+/** Exit handler to restore interface 'down' state on exit via atexit(3). */
+void if_set_down_on_exit(void)
{
- if (if_set_down(arg) < 0) {
- err_msg("unable to restore %s interface state - set down manually", arg);
+ const char *ifname = conf_ifname();
+
+ if (ifname && if_set_down(ifname) < 0) {
+ err_msg("unable to restore %s interface state - set down manually", ifname);
}
}
diff --git a/iw_if.h b/iw_if.h
index 50f5a47..e2199d3 100644
--- a/iw_if.h
+++ b/iw_if.h
@@ -76,7 +76,7 @@ struct if_info {
};
extern bool if_is_up(const char *ifname);
extern int if_set_up(const char *ifname);
-extern void if_set_down_on_exit(int rc, void *arg);
+extern void if_set_down_on_exit(void);
extern void if_getinf(const char *ifname, struct if_info *info);
/**
diff --git a/iw_scan.c b/iw_scan.c
index 18e9e06..e2b3067 100644
--- a/iw_scan.c
+++ b/iw_scan.c
@@ -430,7 +430,7 @@ void *do_scan(void *sr_ptr)
if (if_set_up(conf_ifname()) < 0)
err_sys("Can not bring up interface '%s'", conf_ifname());
- if (on_exit(if_set_down_on_exit, (void *)conf_ifname()) < 0)
+ if (atexit(if_set_down_on_exit) < 0)
snprintf(sr->msg, sizeof(sr->msg), "Warning: unable to restore %s down state on exit", conf_ifname());
break;
}
--
2.17.1