Skip to content

Workflows: Reduce Geodata update frequency #4369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 8, 2025

Conversation

KobeArthurScofield
Copy link
Contributor

上游 Loyalsoldier/v2ray-rules-dat 目前每天定时 UTC 22:00 更新一次,不会和 v2fly/domain-list-community 一样随时都可能更新

@iambabyninja
Copy link
Member

@KobeArthurScofield In the latest updates, the v2fly repository has changed the default GEOIP database set v2fly/geoip@9b440f0, and now, instead of the good and accurate MAXMIND databases, which were updated twice a week, we have inaccurate and incomplete DB-IP databases that are updated once a month. I wanted to ask, maybe we should fork the project and bring back the full databases?

@KobeArthurScofield
Copy link
Contributor Author

KobeArthurScofield commented Feb 8, 2025

@KobeArthurScofield In the latest updates, the v2fly repository has changed the default GEOIP database set v2fly/geoip@9b440f0, and now, instead of the good and accurate MAXMIND databases, which were updated twice a week, we have inaccurate and incomplete DB-IP databases that are updated once a month. I wanted to ask, maybe we should fork the project and bring back the full databases?

Maybe we can but I found some problems when I read more from there (v2fly/geoip#108). We have to apply more than the LICENSE, or there will be EULA problems.

@RPRX
Copy link
Member

RPRX commented Feb 8, 2025

或许这个文件别叫 hourly 了,改成定时之类的

@KobeArthurScofield 如果有时间维护,我们可以建一个自己的 geosite & geoip 仓库

@KobeArthurScofield
Copy link
Contributor Author

或许这个文件别叫 hourly 了,改成定时之类的

这样更好,已处理

如果有时间维护,我们可以建一个自己的 geosite & geoip 仓库

geoip 倒是可以,有自动化的情况下问题不大,问题就变成了用哪个做数据源(而且要尽量规避各种 LICENSE EULA 问题)

geosite 其实是收集域名并且在配置里面调用的数据库,这边也维护的话也可以(得有人手 review),但是有预先整理好的数据的情况下能一起用那个也是好的,这个和 geoip 有点不太一样(考虑到 geosite 有地区需求不一样的问题以及配置可交换性的问题),Loyalsoldier 的 domain-list-custom 是 v2fly 的做上游然后调整了部分标签,v2ray-rules-dat 是在 custom 的基础上面再加了几个特殊列表,主要数据还是 v2fly/domain-list-community 那套。真要做的话有自己需求的列表最好,只是最终上游大概率还是 v2fly 的仓库。

@Fangliding
Copy link
Member

翻了一下 还真是 Loyalsoldier 的库是 GPL 3.0 不能并到 xray 来

@RPRX

This comment was marked as outdated.

@RPRX
Copy link
Member

RPRX commented Feb 8, 2025

好像没有这个限制,一起分发不会被传染为 GPL,强依赖才会

@KobeArthurScofield
Copy link
Contributor Author

Loyalsoldier 的库的话,geoip 是 GPL3/CC-BY-SA 4.0,domain-list-custom 是 MIT

@RPRX

This comment was marked as outdated.

@RPRX
Copy link
Member

RPRX commented Feb 8, 2025

也就是说 Xray 的源代码没有强依赖某个 GPL 的 geoip 就没问题,现在这样只算是提供同时下载

@RPRX
Copy link
Member

RPRX commented Feb 8, 2025

虽然即使有强依赖,也可以放一个非 GPL 的,然后指导用户去下载 GPL 的

@Fangliding
Copy link
Member

有点像 强相关 毕竟geosite是默认功能而默认分发的geosite是这个
不过翻了一下那边的gpl是因为某个规则转换器被传染的 数据源有许可限制的只有一个gfwlist不过那个是lgpl

@RPRX
Copy link
Member

RPRX commented Feb 8, 2025

有 geoip 这个功能不等于没 geoip.dat 就跑不起来,这个 geoip.dat 也不一定是 GPL,所以没有对于 GPL 的强依赖

且数据格式协商一致相当于通过接口做了隔离,类似 Linux syscall

总之现在这种做法应该是没问题的,那些打包的也不会有意见,因为它们本来就把 Xray 和 geofiles 视为分开的东西

如果是 AGPL 才可能仍需讨论

@RPRX
Copy link
Member

RPRX commented Feb 8, 2025

重点是“且数据格式协商一致相当于通过接口做了隔离,类似 Linux syscall”

把这个 GPL 的 geoip 理解为 Linux,协商一致的数据格式就相当于 syscall,且针对数据格式是各自实现、不涉及 GPL 传染

最多是提供一起下载,但任何人都能把不同许可证的东西放一起、提供一起下载,所以没有问题

@RPRX RPRX changed the title CI: Reduce Geodata update frequency Workflows: Reduce Geodata update frequency Feb 8, 2025
@RPRX RPRX merged commit db5f18b into XTLS:main Feb 8, 2025
36 checks passed
@KobeArthurScofield KobeArthurScofield deleted the reduce-update-frequency branch February 8, 2025 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants