From c05077a499a1522a105f7d4cf72f64e8e098fe1f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 21 Feb 2021 17:56:33 -0800 Subject: [PATCH] coova-chilli: update to 1.6 Remove usptreamed patches. Switch to AUTORELEASE for simplicity. Signed-off-by: Rosen Penev --- net/coova-chilli/Makefile | 6 +-- net/coova-chilli/patches/200-wolfssl.patch | 53 ------------------- net/coova-chilli/patches/300-sysinfo.patch | 23 -------- .../patches/400-fix-version.patch | 11 ---- 4 files changed, 3 insertions(+), 90 deletions(-) delete mode 100644 net/coova-chilli/patches/200-wolfssl.patch delete mode 100644 net/coova-chilli/patches/300-sysinfo.patch delete mode 100644 net/coova-chilli/patches/400-fix-version.patch diff --git a/net/coova-chilli/Makefile b/net/coova-chilli/Makefile index 094815c25..47c11ad14 100644 --- a/net/coova-chilli/Makefile +++ b/net/coova-chilli/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coova-chilli -PKG_VERSION:=1.5 -PKG_RELEASE:=4 +PKG_VERSION:=1.6 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/coova/coova-chilli/tar.gz/$(PKG_VERSION)? -PKG_HASH:=75e15fd00a870b8a95df1440977c688a05a109f90b57bf679b931101d427d0fb +PKG_HASH:=26b2bead6fd9c18eb736fb0a0f8709922de4e4fedee1122193f82706eb2b9305 PKG_MAINTAINER:=Jaehoon You PKG_LICENSE:=GPL-2.0-or-later diff --git a/net/coova-chilli/patches/200-wolfssl.patch b/net/coova-chilli/patches/200-wolfssl.patch deleted file mode 100644 index dac526dae..000000000 --- a/net/coova-chilli/patches/200-wolfssl.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -397,7 +397,7 @@ AC_ARG_WITH([cyassl], - [AS_HELP_STRING([--with-cyassl], [enable support for cyassl])],[],[with_cyassl=no]) - - AS_IF([test x"$with_cyassl" != xno], -- [AC_CHECK_LIB([cyassl], [CyaSSL_Init], -+ [AC_CHECK_LIB([cyassl], [wolfSSL_Init], - [AC_SUBST([LIBSSL], ["-lcyassl"]) - AC_DEFINE([HAVE_CYASSL], [1], - [Define if you have cyassl]) ---- a/src/ippool.c -+++ b/src/ippool.c -@@ -35,6 +35,7 @@ int ippool_print(int fd, struct ippool_t - char * sep = "-- %-15s ------------------------------------------------------------\n"; - - #define ERR 0 -+#undef USED /* defined in */ - #define USED 1 - #define FREE 2 - #define LIST 3 ---- a/src/md5.h -+++ b/src/md5.h -@@ -35,7 +35,6 @@ - #define MD5Update MD5_Update - #define MD5Final MD5_Final - --typedef struct CYASSL_MD5_CTX MD5_CTX; - #else - - struct MD5Context { ---- a/src/ssl.c -+++ b/src/ssl.c -@@ -131,7 +131,7 @@ _openssl_env_init(openssl_env *env, char - */ - const long options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION; - env->meth = SSLv23_method(); -- env->ctx = SSL_CTX_new(env->meth); -+ env->ctx = SSL_CTX_new((void *)env->meth); - SSL_CTX_set_options(env->ctx, options); - if (_options.sslciphers) { - SSL_CTX_set_cipher_list(env->ctx, _options.sslciphers); ---- a/src/ssl.h -+++ b/src/ssl.h -@@ -48,6 +48,8 @@ typedef struct { - #include - #include - -+#define OPENSSL_NO_ENGINE -+#include - #include - #include - #include diff --git a/net/coova-chilli/patches/300-sysinfo.patch b/net/coova-chilli/patches/300-sysinfo.patch deleted file mode 100644 index 3881d2a74..000000000 --- a/net/coova-chilli/patches/300-sysinfo.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 196b783b5ea7f8d6cf57ddbd41dc1881ef47a1c4 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Wed, 11 Dec 2019 19:33:58 -0800 -Subject: [PATCH] system.h: Fix compilation with kernel 4.19 + musl - - includes , which redefines struct sysinfo, leading to an error. -Define the linux header as included to solve compilation. - -Signed-off-by: Rosen Penev ---- - src/system.h | 1 + - 1 file changed, 1 insertion(+) - ---- a/src/system.h -+++ b/src/system.h -@@ -114,6 +114,7 @@ - - #ifdef HAVE_SYS_SYSINFO_H - #include -+#define _LINUX_SYSINFO_H - #else - #ifdef HAVE_LINUX_SYSINFO_H - #define _LINUX_KERNEL_H diff --git a/net/coova-chilli/patches/400-fix-version.patch b/net/coova-chilli/patches/400-fix-version.patch deleted file mode 100644 index 1f1ef7121..000000000 --- a/net/coova-chilli/patches/400-fix-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -2,7 +2,7 @@ - # Process this file with autoconf to produce a configure script. - - AC_PREREQ([2.59]) --AC_INIT([coova-chilli],[1.4],[https://github.com/coova/coova-chilli/issues]) -+AC_INIT([coova-chilli],[1.5],[https://github.com/coova/coova-chilli/issues]) - AC_CONFIG_SRCDIR([src/chilli.c]) - - AM_INIT_AUTOMAKE