gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-10 04:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

coova-chilli: update to 1.7

Browse Source 
Swith to local tarballs for smaller size.

Some patches were merged upstream.

Switch to static instead of attribute constructor. Simpler.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2025-08-20 12:22:53 -07:00
committed by Josef Schlehofer
parent e7a4667175
commit b1bb4533ef
4 changed files with 8 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/coova-chilli/Makefile
View File

@@ -8,12 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=coova-chilli
PKG_VERSION:=1.6
PKG_RELEASE:=13
PKG_VERSION:=1.7
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/coova/coova-chilli/tar.gz/$(PKG_VERSION)?
PKG_HASH:=26b2bead6fd9c18eb736fb0a0f8709922de4e4fedee1122193f82706eb2b9305
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/coova/coova-chilli
PKG_SOURCE_VERSION:=$(PKG_VERSION)
PKG_MIRROR_HASH:=adf30c6c61d803770d2f9bcc225e85465edd816396bcf409cc503832cd45c2a3
PKG_MAINTAINER:=Jaehoon You <teslamint@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later

4
net/coova-chilli/patches/010-kernel510.patch
View File

@@ -13,7 +13,7 @@
static u_int32_t hash_rnd;
static bool hash_rnd_initted;
@@ -577,6 +581,14 @@ coova_mt_proc_write(struct file *file, c
@@ -582,6 +586,14 @@ coova_mt_proc_write(struct file *file, c
return size + 1;
}
@@ -28,7 +28,7 @@
static const struct file_operations coova_mt_fops = {
.open = coova_seq_open,
.read = seq_read,
@@ -584,6 +596,7 @@ static const struct file_operations coov
@@ -589,6 +601,7 @@ static const struct file_operations coov
.release = seq_release_private,
.owner = THIS_MODULE,
};

34
net/coova-chilli/patches/011-kernel517.patch
View File

@@ -1,34 +0,0 @@
From: John Thomson <git@johnthomson.fastmail.com.au>
Date: 21 Oct 2022 13:00:00 +1000
Subject: [PATCH] xt_coova: fix kernel>=5.17
Linux kernel 5.17 removed PDE_DATA, and replaced it with pde_data [0]
[0]: https://github.com/torvalds/linux/commit/359745d78351c6f5442435f81549f0207ece28aa
Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au>
--- a/src/linux/xt_coova.c
+++ b/src/linux/xt_coova.c
@@ -470,7 +470,9 @@ static int coova_seq_open(struct inode *
if (st == NULL)
return -ENOMEM;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
+ st->table = pde_data(inode);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
st->table = PDE_DATA(inode);
#else
st->table = pde->data;
@@ -482,7 +484,9 @@ static ssize_t
coova_mt_proc_write(struct file *file, const char __user *input,
size_t size, loff_t *loff)
{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
+ struct coova_table *t = pde_data(file_inode(file));
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
struct coova_table *t = PDE_DATA(file_inode(file));
#else
const struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);

22
net/coova-chilli/patches/040-gcc15.patch
View File

@@ -1,22 +0,0 @@
--- a/src/chilli.c
+++ b/src/chilli.c
@@ -7867,7 +7867,7 @@ int chilli_main(int argc, char **argv) {
*/
#ifdef ENABLE_CHILLIQUERY
- cmdsock_shutdown();
+ cmdsock_shutdown(cmdsock);
#endif
#ifdef ENABLE_CHILLIREDIR
--- a/src/chilli.h
+++ b/src/chilli.h
@@ -266,7 +266,7 @@ int cmdsock_init(void);
int cmdsock_port_init(void);
-void cmdsock_shutdown();
+void cmdsock_shutdown(int s);
time_t mainclock_tick(void);
time_t mainclock_now(void);