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

apfree-wifidog: Run init script through shellcheck

Browse source 
Also added a patch to fix compilation without deprecated OpenSSL APIs.

Minor Makefile cleanups.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-07-19 00:29:07 -07:00
parent c8734591ca
commit 2accfd1e7a
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
3 changed files with 40 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/apfree-wifidog/Makefile
View file

@ -9,18 +9,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=apfree-wifidog
PKG_VERSION:=3.11.1716
PKG_RELEASE=1
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Dengfeng Liu <liudf0716@gmail.com>
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/liudf0716/apfree_wifidog.git
PKG_SOURCE_VERSION:=$(PKG_VERSION)
PKG_MIRROR_HASH:=76eda57e40b919091281305344bc57fc732a779d7944f57bd5de87914ba127d1
PKG_MAINTAINER:=Dengfeng Liu <liudf0716@gmail.com>
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk

18
net/apfree-wifidog/files/wifidogx.init
View file

@ -50,7 +50,7 @@ prepare_mqtt_conf() {
config_get serveraddr "$cfg" "serveraddr"
config_get serverport "$cfg" "serverport"
[ -z "${serveraddr}" -o -z "${serverport}" ] && return 1
[ -z "${serveraddr}" ] || [ -z "${serverport}" ] && return 1
cat <<-EOF >>${CONFIGFILE}
MQTT {
@ -97,10 +97,10 @@ prepare_wifidog_conf() {
[ -f ${CONFIGFILE} ] && rm -f ${CONFIGFILE}
config_get enable "${cfg}" "disabled" 0
[ "${enable}" = "0" ] || {
if [ "${enable}" = "0" ]; then
echo "wifidogx disabled in /etc/config/wifidogx file, please set disabled to 0 to enable it" >&2
return
}
fi
default_gateway_id=$(sed -e 's/://g' /sys/class/net/br-lan/address)
@ -250,19 +250,19 @@ init_config() {
config_load wifidogx
config_foreach prepare_wifidog_conf wifidog
[ ! -f ${CONFIGFILE} ] && {
if [ ! -f ${CONFIGFILE} ]; then
echo "no wifidogx.conf, exit..." >&2
exit
}
fi
[ -s "${APFREE_CERT}" -a -s "${APFREE_KEY}" ] || {
if [ -s "${APFREE_CERT}" ] && [ -s "${APFREE_KEY}" ]; then
generate_keys
}
fi
[ -s ${APFREE_KEY} -a -s ${APFREE_CERT} ] || {
if [ -s ${APFREE_KEY} ] && [ -s ${APFREE_CERT} ]; then
echo "no cert or key, exit..." >&2
exit
}
fi
config_foreach prepare_mqtt_conf mqtt

18
net/apfree-wifidog/patches/010-openssl-deprecated.patch Normal file
View file

@ -0,0 +1,18 @@
--- a/src/gateway.c
+++ b/src/gateway.c
@@ -78,10 +78,14 @@ openssl_init(void)
ERR_load_crypto_strings();
SSL_load_error_strings();
OpenSSL_add_all_algorithms();
-#endif
debug (LOG_DEBUG, "Using OpenSSL version \"%s\"\nand libevent version \"%s\"\n",
SSLeay_version (SSLEAY_VERSION),
event_get_version ());
+#else
+ debug (LOG_DEBUG, "Using OpenSSL version \"%s\"\nand libevent version \"%s\"\n",
+ OpenSSL_version (OPENSSL_VERSION),
+ event_get_version ());
+#endif
}
static void