coova-chilli: update to 1.8

Switch back to tarballs as upstream makes one available.

Remove upstreamed patches.

Signed-off-by: Rosen Penev <redacted>

diff --git a/net/coova-chilli/Makefile b/net/coova-chilli/Makefile
index c0a382c2fba066535f2ff149ed2cd8c1677a9902..109a102944a63127787e16993e4251a82338835f 100644 (file)
--- a/net/coova-chilli/Makefile
+++ b/net/coova-chilli/Makefile
@@ -8,19 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=coova-chilli
-PKG_VERSION:=1.7
+PKG_VERSION:=1.8
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/coova/coova-chilli
-PKG_SOURCE_VERSION:=$(PKG_VERSION)
-PKG_MIRROR_HASH:=adf30c6c61d803770d2f9bcc225e85465edd816396bcf409cc503832cd45c2a3
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://github.com/coova/coova-chilli/releases/download/$(PKG_VERSION)
+PKG_HASH:=d49f531ba4017b3126aec84dc5e9bfb813e0ba772a78eded1db519ebc67d369e
 
 PKG_MAINTAINER:=Jaehoon You <teslamint@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
-PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=0
 
@@ -44,7 +42,7 @@ define Package/coova-chilli
   SUBMENU:=Captive Portals
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+kmod-tun +librt +COOVACHILLI_MINIPORTAL:haserl \
+  DEPENDS:=+kmod-tun +COOVACHILLI_MINIPORTAL:haserl \
   +COOVACHILLI_WOLFSSL:libwolfssl +COOVACHILLI_OPENSSL:libopenssl \
   +COOVACHILLI_JSONINTERFACE:libjson-c
   TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version)

diff --git a/net/coova-chilli/patches/010-kernel510.patch b/net/coova-chilli/patches/010-kernel510.patch
deleted file mode 100644 (file)
index 06981f9..0000000
--- a/net/coova-chilli/patches/010-kernel510.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/linux/xt_coova.c
-+++ b/src/linux/xt_coova.c
-@@ -91,8 +91,12 @@ static DEFINE_MUTEX(coova_mutex);
- 
- #ifdef CONFIG_PROC_FS
- static struct proc_dir_entry *coova_proc_dir;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0)
-+static const struct proc_ops coova_old_fops, coova_mt_fops;
-+#else
- static const struct file_operations coova_old_fops, coova_mt_fops;
- #endif
-+#endif
- 
- static u_int32_t hash_rnd;
- static bool hash_rnd_initted;
-@@ -582,6 +586,14 @@ coova_mt_proc_write(struct file *file, c
-       return size + 1;
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0)
-+static const struct proc_ops coova_mt_fops = {
-+      .proc_open    = coova_seq_open,
-+      .proc_read    = seq_read,
-+      .proc_write   = coova_mt_proc_write,
-+      .proc_release = seq_release_private,
-+};
-+#else
- static const struct file_operations coova_mt_fops = {
-       .open    = coova_seq_open,
-       .read    = seq_read,
-@@ -589,6 +601,7 @@ static const struct file_operations coov
-       .release = seq_release_private,
-       .owner   = THIS_MODULE,
- };
-+#endif
- #endif /* CONFIG_PROC_FS */
- 
- static struct xt_match coova_mt_reg[] __read_mostly = {

diff --git a/net/coova-chilli/patches/030-cyassl-renamed-to-wolfssl.patch b/net/coova-chilli/patches/030-cyassl-renamed-to-wolfssl.patch
deleted file mode 100644 (file)
index 3b60475..0000000
--- a/net/coova-chilli/patches/030-cyassl-renamed-to-wolfssl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/src/md5.h
-+++ b/src/md5.h
-@@ -29,7 +29,7 @@
- #define MD5Final MD5_Final
- 
- #elif HAVE_CYASSL
--#include <cyassl/openssl/md5.h>
-+#include <wolfssl/openssl/md5.h>
- 
- #define MD5Init MD5_Init
- #define MD5Update MD5_Update
---- a/src/ssl.h
-+++ b/src/ssl.h
-@@ -49,13 +49,13 @@ typedef struct {
- #include <string.h>
- 
- #define OPENSSL_NO_ENGINE
--#include <cyassl/options.h>
--#include <cyassl/ssl.h>
--#include <cyassl/openssl/bio.h>
--#include <cyassl/openssl/crypto.h>
--#include <cyassl/openssl/x509.h>
--#include <cyassl/openssl/ssl.h>
--#include <cyassl/openssl/pem.h>
-+#include <wolfssl/options.h>
-+#include <wolfssl/ssl.h>
-+#include <wolfssl/openssl/bio.h>
-+#include <wolfssl/openssl/crypto.h>
-+#include <wolfssl/openssl/x509.h>
-+#include <wolfssl/openssl/ssl.h>
-+#include <wolfssl/openssl/pem.h>
- #endif
- 
- #define OPENSSL_TMPKEY_MAX      4