diff --git a/package/lean/apfree_wifidog/Makefile b/package/lean/apfree_wifidog/Makefile deleted file mode 100755 index 8ee8a69a99..0000000000 --- a/package/lean/apfree_wifidog/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=apfree_wifidog -PKG_VERSION:=v2.10.1437 -PKG_RELEASE=1 - - -PKG_LICENSE:=GPL-2.0 -PKG_MAINTAINER:=Dengfeng Liu -PKG_LICENSE_FILES:=COPYING - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://gitee.com/apfree/apfree_wifidog.git -PKG_SOURCE_VERSION:=$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=dc1a052bd61c1224dda9548475c1feda9332c40fc2190ca6e4901d432379b51c - -PKG_INSTALL:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/$(PKG_NAME) - SUBMENU:=Captive Portals - SECTION:=net - CATEGORY:=Network - DEPENDS:=+zlib +iptables-mod-extra +iptables-mod-ipopt +kmod-ipt-nat +iptables-mod-nat-extra \ - +libpthread +libopenssl +@OPENSSL_WITH_EC +@OPENSSL_WITH_DEPRECATED +@OPENSSL_WITH_PSK +libjson-c +ipset +libip4tc +libevent2 +libevent2-openssl \ - +fping +libmosquitto +libuci - TITLE:=Apfree's wireless captive portal solution - URL:=http://www.kunteng.org -endef - -define Package/$(PKG_NAME)/description - The ApFree Wifidog project is a complete and embeddable captive - portal solution for wireless community groups or individuals - who wish to open a free Hotspot while still preventing abuse - of their Internet connection. - It's enhanced wifidog -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/wifidog $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/wdctl $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libhttpd.so* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) ./files/wdping $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/etc - $(INSTALL_DATA) $(PKG_BUILD_DIR)/wifidog-msg.html $(1)/etc/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/wifidog-redir.html $(1)/etc/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/wifidog-redir.html.front $(1)/etc/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/wifidog-redir.html.rear $(1)/etc/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/authserver-offline.html $(1)/etc/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/internet-offline.html $(1)/etc/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/wifidog.init $(1)/etc/init.d/wifidog - $(INSTALL_DIR) $(1)/etc/config - $(CP) ./files/wifidog.conf $(1)/etc/config/wifidog - $(CP) ./files/apfree.* $(1)/etc/ -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) \ No newline at end of file diff --git a/package/lean/apfree_wifidog/files/apfree.ca b/package/lean/apfree_wifidog/files/apfree.ca deleted file mode 100644 index 41a3c091e2..0000000000 --- a/package/lean/apfree_wifidog/files/apfree.ca +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDvTCCAqWgAwIBAgIJAIw1/wUaVzVRMA0GCSqGSIb3DQEBCwUAMHUxCzAJBgNV -BAYTAkNOMQswCQYDVQQIDAJiajEUMBIGA1UECgwLa3VudGVuZy5vcmcxDDAKBgNV -BAsMA3ImZDEUMBIGA1UEAwwLbGl1ZGVuZ2ZlbmcxHzAdBgkqhkiG9w0BCQEWEGxp -dWRmMDcxNkBxcS5jb20wHhcNMTYxMTE3MDY0MTUyWhcNMjYxMTE1MDY0MTUyWjB1 -MQswCQYDVQQGEwJDTjELMAkGA1UECAwCYmoxFDASBgNVBAoMC2t1bnRlbmcub3Jn -MQwwCgYDVQQLDANyJmQxFDASBgNVBAMMC2xpdWRlbmdmZW5nMR8wHQYJKoZIhvcN -AQkBFhBsaXVkZjA3MTZAcXEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEA6y4V4H0wwlXp3SUUsFe5rSfeH51JLW+zYMYZZA4W7kRib1VOe2CcWDxb -rAC+WXYJYcpIfvwis3KnIGhB85e4I0+WO10V/O3CIzJD2ScQbPFKLkJRgjf3uGr5 -iYYXlygO/MxAPFKgUuROXovFO/+j2ZDGdG1JdP67xVSWmmrgDvRTHK7/TWIuZkq6 -bMaUZtRrhIo+jJsPl2TqFPyCQiwTyEOfm1Cbb7xeIvUX/FMzHhFbJgNn2SlJ9s84 -PuSUGGGWmZF9g/yQSCfSUai8UNXPbiH9yWXvIsrwm8OFLOl+d5vit5KRKGgU2I2X -cbUTfMDoO38KqcO0QWmp1vGuhWb0CQIDAQABo1AwTjAdBgNVHQ4EFgQU18zkLjCQ -cwTZlUW9QqMZG+1bbW0wHwYDVR0jBBgwFoAU18zkLjCQcwTZlUW9QqMZG+1bbW0w -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAbJ/OzA+ZkWFJWD+nCYiS -7ElDSOcsV7EJ423OzxqvpGfuDIOmViaj+oMa4oqtwEUhga/gQT0JkXiNsezz3LCZ -3gcwSN3+ZNX1HN0REfUZ8l5ygRL+F1xMHBDWCkNCp/R/25GmzGy6bLXPcMWmqWPC -qbVEHsz/wfCWtgWwNuQFAL6xVSfse1qatJz9i9/zMOiLgiqVXpuoftcUcObCLai7 -X09I1Q0gxeFMSLs0K/zTdA6eIXxFId+bYVoc/twl/yS9f+SDT9pdXIt3AthqF5Om -oSMc++egkCmCUxYv99xk6YOgOzvwvf9EBbRgQ4Xxo5PZ2zb9te54awpFU0Byb5de -jA== ------END CERTIFICATE----- diff --git a/package/lean/apfree_wifidog/files/apfree.crt b/package/lean/apfree_wifidog/files/apfree.crt deleted file mode 100644 index dce42cec23..0000000000 --- a/package/lean/apfree_wifidog/files/apfree.crt +++ /dev/null @@ -1,82 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 10103261736457418066 (0x8c35ff051a573552) - Signature Algorithm: sha256WithRSAEncryption - Issuer: C=CN, ST=bj, O=kunteng.org, OU=r&d, CN=liudengfeng/emailAddress=liudf0716@qq.com - Validity - Not Before: Nov 17 06:48:49 2016 GMT - Not After : Nov 17 06:48:49 2017 GMT - Subject: C=CN, ST=BJ, L=BJ, O=KUNTENG, OU=RD, CN=APFREE - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:d4:9a:a1:2c:ee:37:14:60:87:24:ce:98:7d:b6: - 33:ab:4c:9c:fb:cf:c4:99:e5:20:4f:29:5f:59:9a: - 31:3b:1f:ae:65:9f:8e:3b:de:9f:02:09:b9:e3:44: - 1e:7c:e3:23:0c:d5:81:2d:6e:73:d1:e3:af:a8:5f: - ce:91:44:5a:e2:ef:cb:95:43:3f:b1:d7:3d:ee:f9: - a2:38:b8:3e:21:73:7e:93:ce:fd:41:77:ad:ad:09: - a3:96:03:ac:db:68:56:8a:93:e1:04:5c:94:11:b5: - 3d:55:3d:7e:f7:85:c4:48:20:d8:42:68:7a:6c:18: - 12:7b:d4:d0:f8:d4:27:fa:77:95:6b:19:cf:0e:37: - 3c:e5:44:56:b1:4b:e4:30:b1:7e:91:4e:9f:f5:c2: - ff:fe:6a:8b:9a:2e:de:bd:37:a4:de:5d:9a:d0:30: - 6e:ad:87:c9:b4:2a:57:81:6f:7e:44:e5:9e:a4:4c: - 9a:8e:4c:1c:57:6e:b0:c5:95:4b:dd:b0:00:45:e6: - d0:d4:52:99:c2:c6:71:d7:a5:03:ee:1b:05:fe:b3: - 6c:15:71:45:68:3a:60:b2:cc:e9:9d:8a:30:73:53: - 8c:75:7a:da:80:f6:74:3f:19:64:af:5f:ee:75:e2: - d3:63:8e:57:62:cc:28:54:2b:16:26:03:69:a8:6a: - 63:81 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - 4B:46:E7:5E:26:B0:87:DD:43:01:FE:21:6C:73:FD:8F:9B:DC:C6:1B - X509v3 Authority Key Identifier: - keyid:D7:CC:E4:2E:30:90:73:04:D9:95:45:BD:42:A3:19:1B:ED:5B:6D:6D - - Signature Algorithm: sha256WithRSAEncryption - 41:f6:ae:74:24:fe:f5:0d:3a:50:1c:60:0a:ba:6c:e0:7a:8c: - 44:11:83:b3:13:d5:1b:90:bb:e1:0a:de:a5:41:29:f6:7c:c0: - 27:f9:c5:89:2b:7f:0e:3f:20:09:0b:5a:66:ac:ef:90:8a:8f: - 05:ea:89:ac:26:4a:41:23:88:9a:f7:94:48:00:31:ca:2d:12: - 14:23:bc:7f:2c:ae:04:c1:87:35:8c:10:16:56:c0:95:ec:84: - 80:9e:91:fa:d5:47:c2:03:fe:86:5f:47:90:60:50:a8:33:e2: - 7d:7f:18:cb:ea:a8:05:d7:2d:6e:86:5f:3e:24:6f:c0:a3:22: - f6:8b:0b:29:8a:a0:b8:30:3d:33:e3:26:94:23:36:f3:45:ac: - 70:e7:a5:77:0f:01:65:ed:63:c7:0a:cf:5d:11:48:29:35:ca: - 5f:d2:5e:91:84:f9:69:dc:5e:64:70:44:0a:5a:a9:7c:a3:be: - 60:16:09:74:69:06:93:d7:05:51:20:7c:52:7a:65:fe:70:af: - c8:50:70:de:6d:83:88:14:cb:8b:67:0d:1c:8f:74:c0:a8:c9: - 1b:c2:1f:0b:f3:4f:01:cb:f8:96:c4:f1:b4:38:cf:c1:22:6c: - 82:e1:a9:2d:9d:77:a1:46:04:2c:26:17:43:e2:a9:b3:5b:db: - a3:c5:f1:46 ------BEGIN CERTIFICATE----- -MIIDyjCCArKgAwIBAgIJAIw1/wUaVzVSMA0GCSqGSIb3DQEBCwUAMHUxCzAJBgNV -BAYTAkNOMQswCQYDVQQIDAJiajEUMBIGA1UECgwLa3VudGVuZy5vcmcxDDAKBgNV -BAsMA3ImZDEUMBIGA1UEAwwLbGl1ZGVuZ2ZlbmcxHzAdBgkqhkiG9w0BCQEWEGxp -dWRmMDcxNkBxcS5jb20wHhcNMTYxMTE3MDY0ODQ5WhcNMTcxMTE3MDY0ODQ5WjBX -MQswCQYDVQQGEwJDTjELMAkGA1UECAwCQkoxCzAJBgNVBAcMAkJKMRAwDgYDVQQK -DAdLVU5URU5HMQswCQYDVQQLDAJSRDEPMA0GA1UEAwwGQVBGUkVFMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1JqhLO43FGCHJM6YfbYzq0yc+8/EmeUg -TylfWZoxOx+uZZ+OO96fAgm540QefOMjDNWBLW5z0eOvqF/OkURa4u/LlUM/sdc9 -7vmiOLg+IXN+k879QXetrQmjlgOs22hWipPhBFyUEbU9VT1+94XESCDYQmh6bBgS -e9TQ+NQn+neVaxnPDjc85URWsUvkMLF+kU6f9cL//mqLmi7evTek3l2a0DBurYfJ -tCpXgW9+ROWepEyajkwcV26wxZVL3bAARebQ1FKZwsZx16UD7hsF/rNsFXFFaDpg -sszpnYowc1OMdXragPZ0Pxlkr1/udeLTY45XYswoVCsWJgNpqGpjgQIDAQABo3sw -eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD -ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUS0bnXiawh91DAf4hbHP9j5vcxhswHwYDVR0j -BBgwFoAU18zkLjCQcwTZlUW9QqMZG+1bbW0wDQYJKoZIhvcNAQELBQADggEBAEH2 -rnQk/vUNOlAcYAq6bOB6jEQRg7MT1RuQu+EK3qVBKfZ8wCf5xYkrfw4/IAkLWmas -75CKjwXqiawmSkEjiJr3lEgAMcotEhQjvH8srgTBhzWMEBZWwJXshICekfrVR8ID -/oZfR5BgUKgz4n1/GMvqqAXXLW6GXz4kb8CjIvaLCymKoLgwPTPjJpQjNvNFrHDn -pXcPAWXtY8cKz10RSCk1yl/SXpGE+WncXmRwRApaqXyjvmAWCXRpBpPXBVEgfFJ6 -Zf5wr8hQcN5tg4gUy4tnDRyPdMCoyRvCHwvzTwHL+JbE8bQ4z8EibILhqS2dd6FG -BCwmF0PiqbNb26PF8UY= ------END CERTIFICATE----- diff --git a/package/lean/apfree_wifidog/files/apfree.key b/package/lean/apfree_wifidog/files/apfree.key deleted file mode 100644 index 87f80473a0..0000000000 --- a/package/lean/apfree_wifidog/files/apfree.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEA1JqhLO43FGCHJM6YfbYzq0yc+8/EmeUgTylfWZoxOx+uZZ+O -O96fAgm540QefOMjDNWBLW5z0eOvqF/OkURa4u/LlUM/sdc97vmiOLg+IXN+k879 -QXetrQmjlgOs22hWipPhBFyUEbU9VT1+94XESCDYQmh6bBgSe9TQ+NQn+neVaxnP -Djc85URWsUvkMLF+kU6f9cL//mqLmi7evTek3l2a0DBurYfJtCpXgW9+ROWepEya -jkwcV26wxZVL3bAARebQ1FKZwsZx16UD7hsF/rNsFXFFaDpgsszpnYowc1OMdXra -gPZ0Pxlkr1/udeLTY45XYswoVCsWJgNpqGpjgQIDAQABAoIBAQCBJemQxKh63WRb -DJD/lKXwghq+sOip39DvpZ9Ba/RKCSXEn9ckMUkAUO41y1SF4uiQzEWrVnRO5PP4 -4TI3doGLZ8WQx4gyvSDnQYe00t8TLPiQS2X21f+PpNJVt6fSpKAlkE1Ze++KjkFS -vYeaTwz8D8+vD46GiVz5Ej9bWG1srQpauQoaweUWfqJMdBCg00g9jgNRoenQcs+1 -bD7BteMHnZH3FSeFfGVgz91Ne3FvAFAMmM/xoCoasARAG3qGh9AyDW+xfgVCYy8H -d8m9K4JYpevtOP8FNUNnu98LY4KSVTkgyV+7Roxuw8CCmUvDQDVNFbTcIyYBjz2s -nFDwIniRAoGBAPINrIPPbkKZfssmop8pn2uF/FH54pfs3YS01pu4Vaai8pkRWVL0 -7Vvf9RA+PJOp7TnZ+D+WMh6JqRK2tlPNRM9gVXvxZ6q68vskECLaejpJpGzSmkLs -1zok2fQoQCJkmrJGgdaTjORekThunBJC9B6U9O2J+NwYFebNq+dddRFtAoGBAODa -kpDHPoawI41cYsXXfiZAuWW4gQPtBbR2mdtjJefylWewRlFg5/ybmzfvyRyHKpUg -zL3TuWIROdPkeIQchL2dGyfXjpuc7lB0r+lE7aKv1DaZnKpOp95AU3yalp8qoz/p -fuE2RfItJG+TrFrSksYikTIfTWWhUjUw9lRYReHlAoGBAOrNpOoAUH8+kybShbJM -GB+fy9JhyxOBbKmNGxnXyQ5qx1cA41t7yLz1Fa76EJ1Vm5AhB5X3RwskkuRaZagJ -WZSpaINg/CU8UPSaWSTWNvdP9Laz3XzKb0Yx9VPJr90tJnuFtfHHFEd8DPdnJPL6 -DAGWkbnTu5sVqjlIjldT63pJAoGBAJI684h+W1aCpIxhYccijuLXwvq5VAY2ljg3 -zXWU9Gj1JV8Kj6CK8jQhCoAFTHhmGzZi32QwlmaFp2L7OblJRrZ9vtRZZmAjXgUq -7eA5uIXN7agYnH9RqfBrSyBE9OHMe+CrvJ1Ai5qk6wY5NqTWPyfmASFkpBQNJwZ6 -sihGRCRVAoGAaHHf1jjm3zYva/Z+KGb/e3l5zCVILW8yXQ9xeb4XanyCEAu2jBm6 -xRIRE+3M/S7UCEYFFpWGup96mIMmf+Ke48dl2Y6OW1wV14wK81RWtbo1EcGruINh -3kdY+7uf4QFhagz+E3cRlbDvvrG8eT3Om1/nVcfeCdknCq/dM/5aTfo= ------END RSA PRIVATE KEY----- diff --git a/package/lean/apfree_wifidog/files/wdping b/package/lean/apfree_wifidog/files/wdping deleted file mode 100755 index 1174e1acc0..0000000000 --- a/package/lean/apfree_wifidog/files/wdping +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -IP=$1 -[ -x /usr/sbin/fping ] && { - fping -t 100 -c 1 $IP &> /dev/null && echo 1 || echo 0 -} || { - ping -w 1 -c 1 $IP &> /dev/null && echo 1 || echo 0 -} diff --git a/package/lean/apfree_wifidog/files/wifidog.conf b/package/lean/apfree_wifidog/files/wifidog.conf deleted file mode 100644 index 82850f9759..0000000000 --- a/package/lean/apfree_wifidog/files/wifidog.conf +++ /dev/null @@ -1,17 +0,0 @@ -config wifidog - option gateway_interface 'br-lan' - option auth_server_hostname 'entrance.kunteng.org' - option auth_server_port 80 - option auth_server_path '/wifidog/' - option check_interval 60 - option client_timeout 72000 - option httpd_max_conn 200 - option pool_mode 1 - option thread_number 5 - option queue_size 20 - option wired_passed 0 - -config mqtt 'mqtt' - option mqtt_hostname 'wifidog.kunteng.org' - option mqtt_port '8883' - option mqtt_topic '' diff --git a/package/lean/apfree_wifidog/files/wifidog.init b/package/lean/apfree_wifidog/files/wifidog.init deleted file mode 100644 index d0be3cb04d..0000000000 --- a/package/lean/apfree_wifidog/files/wifidog.init +++ /dev/null @@ -1,248 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006 OpenWrt.org -START=65 - -USE_PROCD=1 -PROG=/usr/bin/wifidog -CONFIGFILE=/tmp/wifidog.conf - -EXTRA_COMMANDS="status" -EXTRA_HELP=" status Print the status of the service" - -service_trigger() { - procd_add_reload_trigger "wifidog" -} - -echo_firewall_rule() { - echo " FirewallRule $1" -} - -prepare_mqtt_conf() { - local cfg=$1 - local serveraddr - local serverport - - config_get serveraddr "$cfg" "serveraddr" - config_get serverport "$cfg" "serverport" - [ -z "$serveraddr" -o -z "$serverport" ] && return 1 - - cat <<-EOF >>$CONFIGFILE - - MQTT { - ServerAddr $serveraddr - ServerPort $serverport - } -EOF - - sed -i -e '/^$/d' $CONFIGFILE -} - -prepare_wifidog_conf() { - local cfg=$1 - local enable - local gateway_id - local gateway_interface - local auth_server_hostname - local auth_server_http_port - local auth_server_path - local auth_server_path_login - local auth_server_path_portal - local auth_server_path_msg - local auth_server_path_ping - local auth_server_path_auth - local delta_traffic - local check_interval - local client_timeout - local httpd_max_conn - local trusted_domains - local js_filter - local trusted_maclist - local untrusted_maclist - local pool_mode - local thread_number - local queue_size - local wired_passed - local trusted_iplist - local trusted_pan_domains - local proxy_port - local no_auth - local apple_cna - local update_domain_interval - local dns_timeout - - [ -f $CONFIGFILE ] && rm $CONFIGFILE - - config_get enable "$cfg" "enable" 1 - [ $enable = "1" ] || return - - local default_gateway_id=`ifconfig br-lan|grep HWaddr|awk '{print $5}'|sed s/://g` - - local external_interface=`uci show network.wan.ifname|cut -d'=' -f 2|sed -e "s/'//g"` - - config_get gateway_id "$cfg" "gateway_id" $default_gateway_id - config_get gateway_interface "$cfg" "gateway_interface" "br-lan" - config_get auth_server_hostname "$cfg" "auth_server_hostname" - config_get auth_server_port "$cfg" "auth_server_port" "80" - config_get auth_server_path "$cfg" "auth_server_path" "/wifidog/" - config_get auth_server_path_login "$cfg" "auth_server_path_login" - config_get auth_server_path_portal "$cfg" "auth_server_path_portal" - config_get auth_server_path_msg "$cfg" "auth_server_path_msg" - config_get auth_server_path_ping "$cfg" "auth_server_path_ping" - config_get auth_server_path_auth "$cfg" "auth_server_path_auth" - config_get delta_traffic "$cfg" "delta_traffic" - config_get check_interval "$cfg" "check_interval" "60" - config_get js_filter "$cfg" "js_filter" 1 - config_get client_timeout "$cfg" "client_timeout" "5" - config_get httpd_max_conn "$cfg" "httpd_max_conn" "200" - config_get trusted_domains "$cfg" "trusted_domains" - config_get trusted_maclist "$cfg" "trusted_maclist" - config_get untrusted_maclist "$cfg" "untrusted_maclist" - config_get pool_mode "$cfg" "pool_mode" 0 - config_get thread_number "$cfg" "thread_number" 20 - config_get queue_size "$cfg" "queue_size" 200 - config_get wired_passed "$cfg" "wired_passed" 1 - config_get trusted_iplist "$cfg" "trusted_iplist" - config_get trusted_pan_domains "$cfg" "trusted_pan_domains" - config_get proxy_port "$cfg" "proxy_port" - config_get no_auth "$cfg" "no_auth" - config_get apple_cna "$cfg" "bypass_apple_cna" - config_get update_domain_interval "$cfg" "update_domain_interval" - config_get dns_timeout "$cfg" "dns_timeout" - - local set_auth_server_path_login=`[ -n "$auth_server_path_login" ] && echo " LoginScriptPathFragment $auth_server_path_login"` - local set_auth_server_path_portal=`[ -n "$auth_server_path_portal" ] && echo " PortalScriptPathFragment $auth_server_path_portal"` - local set_auth_server_path_msg=`[ -n "$auth_server_path_msg" ] && echo " MsgScriptPathFragment $auth_server_path_msg"` - local set_auth_server_path_ping=`[ -n "$auth_server_path_ping" ] && echo " PingScriptPathFragment $auth_server_path_ping"` - local set_auth_server_path_auth=`[ -n "$auth_server_path_auth" ] && echo " AuthScriptPathFragment $auth_server_path_auth"` - local set_delta_traffic=`[ -n "$delta_traffic" ] && echo "DeltaTraffic $delta_traffic"` - local set_trusted_maclist=`[ -n "$trusted_maclist" ] && echo "TrustedMACList $trusted_maclist"` - local set_untrusted_maclist=`[ -n "$untrusted_maclist" ] && echo "UntrustedMACList $untrusted_maclist"` - local set_trusted_domains=`[ -n "$trusted_domains" ] && echo "TrustedDomains $trusted_domains"` - local set_trusted_iplist=`[ -n "$trusted_iplist" ] && echo "TrustedIpList $trusted_iplist"` - local set_trusted_pan_domains=`[ -n "$trusted_pan_domains" ] && echo "TrustedPanDomains" $trusted_pan_domains` - local set_proxy_port=`[ -n "$proxy_port" ] && echo "Proxyport" $proxy_port` - local set_no_auth=`[ -n "$no_auth" ] && echo "NoAuth" $no_auth` - local set_firewall_rule_global=`config_list_foreach "$cfg" "firewall_rule_global" echo_firewall_rule` - local set_firewall_rule_validating_users=`config_list_foreach "$cfg" "firewall_rule_validating_users" echo_firewall_rule` - local set_firewall_rule_known_users=`config_list_foreach "$cfg" "firewall_rule_known_users" echo_firewall_rule` - local set_firewall_rule_auth_is_down=`config_list_foreach "$cfg" "firewall_rule_auth_is_down" echo_firewall_rule` - local set_firewall_rule_unknown_users=`config_list_foreach "$cfg" "firewall_rule_unknown_users" echo_firewall_rule` - local set_firewall_rule_locked_users=`config_list_foreach "$cfg" "firewall_rule_locked_users" echo_firewall_rule` - local set_apple_cna=`[ -n "$apple_cna" ] && echo "BypassAppleCNA" $apple_cna` - local set_update_domain_interval=`[ -n "$update_domain_interval" ] && echo "UpdateDomainInterval" $update_domain_interval` - local set_dns_timeout=`[ -n "$dns_timeout" ] && echo "DNSTimeout" $dns_timeout` - - cat <<-EOF >$CONFIGFILE - GatewayID $gateway_id - GatewayInterface $gateway_interface - Externalinterface $external_interface - - AuthServer { - Hostname $auth_server_hostname - HTTPPort $auth_server_port - Path $auth_server_path - $set_auth_server_path_login - $set_auth_server_path_portal - $set_auth_server_path_msg - $set_auth_server_path_ping - $set_auth_server_path_auth - } - - $set_delta_traffic - CheckInterval $check_interval - ClientTimeout $client_timeout - JsFilter $js_filter - WiredPassed $wired_passed - - HTTPDMaxConn $httpd_max_conn - - PoolMode $pool_mode - ThreadNumber $thread_number - QueueSize $queue_size - - $set_trusted_domains - - $set_untrusted_maclist - - $set_trusted_maclist - - $set_trusted_iplist - - $set_trusted_pan_domains - - $set_proxy_port - - $set_no_auth - - $set_apple_cna - - $set_update_domain_interval - - $set_dns_timeout - - FirewallRuleSet global { - $set_firewall_rule_global - } - - FirewallRuleSet validating-users { - $set_firewall_rule_validating_users - FirewallRule allow to 0.0.0.0/0 - } - - FirewallRuleSet known-users { - $set_firewall_rule_known_users - FirewallRule allow to 0.0.0.0/0 - } - - FirewallRuleSet auth-is-down { - $set_firewall_rule_auth_is_down - } - - FirewallRuleSet unknown-users { - $set_firewall_rule_unknown_users - FirewallRule allow udp port 53 - FirewallRule allow tcp port 53 - FirewallRule allow udp port 67 - FirewallRule allow tcp port 67 - } - - FirewallRuleSet locked-users { - $set_firewall_rule_locked_users - FirewallRule block to 0.0.0.0/0 - } -EOF -} - -init_config() { - config_load wifidog - config_foreach prepare_wifidog_conf wifidog - - [ ! -f $CONFIGFILE ] && { - echo "no wifidog.conf, exit....." - stop - exit - } - - config_foreach prepare_mqtt_conf mqtt -} - -start_service() { - init_config - - procd_open_instance - # -s: log to syslog - # -f: run in foreground - procd_set_param command $PROG -c $CONFIGFILE -f -d 0 - procd_set_param respawn # respawn automatically if something died - procd_set_param file $CONFIGFILE - procd_close_instance -} - -reload_service() { - rc_procd start_service "$@" - return 0 -} - -status() { - /usr/bin/wdctl status -} diff --git a/package/libs/libevent2/Makefile b/package/libs/libevent2/Makefile index 706ba20a23..5d56f37c51 100644 --- a/package/libs/libevent2/Makefile +++ b/package/libs/libevent2/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libevent2 -PKG_VERSION:=2.1.8 +PKG_VERSION:=2.0.22 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=https://github.com/libevent/libevent.git -PKG_SOURCE_VERSION:=release-2.1.8-stable -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/libevent-$(PKG_VERSION)-stable PKG_SOURCE:=libevent-$(PKG_VERSION)-stable.tar.gz +PKG_SOURCE_URL:=@SF/levent +PKG_HASH:=71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=BSD-3-Clause +PKG_CPE_ID:=cpe:/a:libevent_project:libevent PKG_FIXUP:=autoreconf PKG_INSTALL:=1 @@ -30,7 +30,6 @@ define Package/libevent2/Default CATEGORY:=Libraries TITLE:=Event notification URL:=http://www.monkey.org/~provos/libevent/ - DEPENDS+=+libopenssl endef define Package/libevent2/Default/description @@ -84,6 +83,7 @@ endef define Package/libevent2-openssl $(call Package/libevent2/Default) TITLE+= OpenSSL library (version 2.0) + DEPENDS+=+libopenssl endef define Package/libevent2-openssl/description @@ -121,34 +121,34 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent*.{la,a,so} $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent*-2.1.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent*-2.0.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libevent*.pc $(1)/usr/lib/pkgconfig/ endef define Package/libevent2/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-2.1.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-2.0.so.* $(1)/usr/lib/ endef define Package/libevent2-core/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_core-2.1.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_core-2.0.so.* $(1)/usr/lib/ endef define Package/libevent2-extra/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_extra-2.1.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_extra-2.0.so.* $(1)/usr/lib/ endef define Package/libevent2-openssl/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_openssl-2.1.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_openssl-2.0.so.* $(1)/usr/lib/ endef define Package/libevent2-pthreads/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_pthreads-2.1.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_pthreads-2.0.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libevent2))