update doc and pkg
Some checks failed
CrossCompiling / Build (push) Has been cancelled
CodeCoverage / g3statsd test (push) Has been cancelled
CodeCoverage / lib unit test (push) Has been cancelled
CodeCoverage / g3proxy test (push) Has been cancelled
CodeCoverage / g3bench test (push) Has been cancelled
Linux-CI / Build (push) Has been cancelled
Linux-CI / Clippy (push) Has been cancelled
Linux-CI / Build vendored (push) Has been cancelled
Linux-CI / Build with OpenSSL Async Job (push) Has been cancelled
MacOS-CI / Build (push) Has been cancelled
MacOS-CI / Build vendored (push) Has been cancelled
StaticLinking / musl (push) Has been cancelled
StaticLinking / msvc (push) Has been cancelled
Windows-CI / Build (push) Has been cancelled
Windows-CI / Build vendored (push) Has been cancelled

This commit is contained in:
Zhang Jingqiang 2025-06-25 14:26:24 +08:00 committed by Zhang Jingqiang
parent 01ff5f681e
commit 8c8d368132
5 changed files with 13 additions and 18 deletions

4
Cargo.lock generated
View file

@ -385,9 +385,9 @@ dependencies = [
[[package]]
name = "bumpalo"
version = "3.18.1"
version = "3.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
[[package]]
name = "bytemuck"

View file

@ -133,6 +133,7 @@ apt-get install libssl-dev libc-ares-dev
apt-get install lua5.4-dev
apt-get install libpython3-dev
apt-get install python3-toml python3-requests python3-pycurl python3-semver python3-socks python3-dnspyton
apt-get install python3-maxminddb python3-location
apt-get install python3-sphinx python3-sphinx-rtd-theme
apt-get install lsb-release dpkg-dev debhelper
```
@ -156,6 +157,7 @@ dnf install curl jq xz tar
dnf install openssl-devel c-ares-devel lua-devel
dnf install python3-devel
dnf install python3-toml python3-requests python3-pycurl python3-semver
dnf install python3-maxminddb
dnf install python3-sphinx python3-sphinx_rtd_theme
dnf install rpmdevtools rpm-build
```
@ -340,6 +342,7 @@ requests
semver
PySocks
dnspython
maxminddb
```
## Document Tools

View file

@ -69,7 +69,8 @@ The following vendors are supported:
- [Maxmind](https://www.maxmind.com/en/geoip-databases)
1. Download the GeoLite2 database mmdb file. See https://dev.maxmind.com/geoip/geolite2-free-geolocation-data/.
2. Convert by using g3iploc-db
2. Install [MaxMind DB Python Module](https://github.com/maxmind/MaxMind-DB-Reader-python).
3. Convert by using [geoip-dump](../scripts/geoip-dump) scripts
```shell
python3 geoip_dump_country.py --maxmind -i GeoLite2-Country.mmdb -o g3-country.csv.gz
@ -79,7 +80,8 @@ The following vendors are supported:
- [IPinfo](https://ipinfo.io/)
1. Download the database mmdb file. See https://ipinfo.io/developers/database-download#getting-started.
2. Convert by using g3iploc-db
2. Install [MaxMind DB Python Module](https://github.com/maxmind/MaxMind-DB-Reader-python).
3. Convert by using [geoip-dump](../scripts/geoip-dump) scripts
```shell
python3 geoip_dump_country.py --ipinfo -i ipinfo_lite.mmdb -o g3-country.csv.gz
@ -90,7 +92,8 @@ The following vendors are supported:
1. Download the database file location.db.xz from https://www.ipfire.org/location/install.
2. Extract location.db
3. Convert by using g3iploc-db
3. Install [libloc Python binding module](https://www.ipfire.org/location/how-to-use/python).
4. Convert by using [geoip-dump](../scripts/geoip-dump) scripts
```shell
python3 geoip_dump_country.py --ipfire -i location.db -o g3-country.csv.gz

View file

@ -1,6 +1,6 @@
/*
* SPDX-License-Identifier: Apache-2.0
* Copyright 2023-2025 ByteDance and/or its affiliates.
* Copyright 2023 ByteDance and/or its affiliates.
*/
///

View file

@ -11,19 +11,8 @@ cd "${SCRIPT_DIR}"
cat << EOF > ../../../lib/g3-geoip-types/src/country/iso_generated.rs
/*
* SPDX-License-Identifier: Apache-2.0
* Copyright 2023 ByteDance and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
///