php8: update to 8.3.14

This fixes:
    - CVE-2024-8932
    - CVE-2024-11236
    - CVE-2024-11236
    - CVE-2024-11234
    - CVE-2024-11233

Upstream changelog:
https://www.php.net/ChangeLog-8.php#8.3.14

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

banIP: release 1.0.1-1

* optimized procd settings for better performance
* made the log monitor working again (even on master with apk migration issues)
* reworked the fetch autodetection function (still broken in master due to apk migration)

Signed-off-by: Dirk Brenken <dev@brenken.org>

syslog-ng: alternative for logread

When the syslog-ng installed it records all messages to /var/log/messages.
This makes the default OpenWrt's ubox /sbin/logread useless and return nothing.

The logread script was added to the syslog-ng as a shim.
It's based on `tail /var/log/messages` and repeats basic options that the ubox logread have.
The script is installed instead of the /sbin/logread and this is causes an error.

Instead install it to /usr/libexec/logread.sh and specify as an alternative /sbin/logread.

The ubox logread also needs to be made as alternative in /usr/libexec/logread-ubox.

So we need to give it a separate name.
The most simple and clear would be logread-shell or just logread.sh.

Suggested-by: Andreas Gnau <andreas.gnau@iopsys.eu>
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>

adblock: release 4.2.3-1

* optimized procd settings for better performance
* reworked autodetection functions (still broken in master due to apk migration)
* made the tld function optional, set 'adb_tld' accordingly (enabled by default)
* reworked count function
* various code improvements

Signed-off-by: Dirk Brenken <dev@brenken.org>

adblock-fast: bugfixes

* properly process dnsmasq instances' confdirs
* working str_replace()
* updated output()
* bugfixes and updates for error messages
* sanitize StevenBlack's hosts file

Signed-off-by: Stan Grishin <stangri@melmac.ca>

qcsuper: Make version apk compatible

Adjust versioning to match apk's semantic rules.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

node: upgrade to 22.11.0 LTS

Upgrade Version 22.11.0 'Jod' (LTS)

Notable Changes

This release marks the transition of Node.js 22.x into Long Term Support (LTS) with the codename 'Jod'. The 22.x release line now moves into "Active LTS" and will remain so until October 2025. After that time, it will move into "Maintenance" until end of life in April 2027.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>

netifyd: Make version apk compatible

Adjust versioning to be compatible with apk's semantic rules.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

oci-runtime-tools: Make version apk compatible

Adjust version to be compatible with apk semantic rules.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

gst1-libav: remove obsolete configuration options

Since the build was switched to meson a couple of years ago gst1-libav
simply uses libffmpeg and the codec configuration previous passed via
CONFIGURE_ARGS is completely ignored. This is misleading as all those
options are still present in menuconfig but don't have any effect.
Remove all dead code from build recipe.

Fixes: de426d431 ("gst1-libav: update to 1.17.1")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

debootstrap: Make version apk compatible

Adjust version to match apk semantic rules.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

network: Add SUBMENU variable for some packages

Add SUBMENU variable for some packages in Network category.
Add title for `dnscrypt-proxy` package.
Shorten TITLE variable for `xray-core` package.

Filesystem:
- cifs-utils

File Transfer:
- onionshare-cli

IP Addresses and Names:
- dnscrypt-proxy2
- family-dns
- https-dns-proxy
- mdns-repeater
- nextdns
- smartdns

Version Control Systems:
- git-lfs

Wireless:
- dawn

Signed-off-by: Ryan Keane <the.ra2.ifv@gmail.com>

nbd: fix compilation with GCC14

Upstream backport.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

hfsprogs: Make version apk compatible

Adjust version to match apk semantic rules.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

ncdu: update to 1.21

Release history:
* Perform tilde expansion on paths in the config file (from 2.7)
* Fix JSON import of escaped UTF-16 surrogate pairs (from 2.7)
* Fix displaying and exporting zero values when extended info is not available (from 2.6)
* Fix JSON export and import of the “other filesystem” flag (from 2.5)

Signed-off-by: John Audia <therealgraysky@proton.me>

speedtest-go: update to 1.7.9

Update speedtest-go version to 1.7.9

Signed-off-by: TeleostNaCl Dai <teleostnacl@gmail.com>

rtty: update to 8.1.3

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>

borgbackup: update to 1.4.0

Signed-off-by: Finn Landweber <finn@landweber.xyz>

tayga: fix compilation with GCC14

Header is needed for musl.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

httping: fix compilation with full NLS

-lintl is needed.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

python-setuptools-scm: update to 8.1.0

Signed-off-by: Finn Landweber <finn@landweber.xyz>

openwisp-monitoring: update to 0.2.1

Signed-off-by: Gagan Deep <pandafy.dev@gmail.com>

iperf3: fix crashing with musl

Upstream backport.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

owut: update to 2024.11.20

Bug fixes:
    efahl/owut@d7affce owut: deal with package list filtering
    efahl/owut@38a3916 owut: fix what_provides function
Issues:
    efahl/owut@42cd86c owut: better EFI target handling
Enhancements:
    efahl/owut@cb51617 readme: better instructions

Signed-off-by: Eric Fahlgren <ericfahlgren@gmail.com>

yq: Update to 4.44.5

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

alist: Bump to 3.39.2

Change Github repository owner from `alist-org` to `AlistGo`.
web-dist 3.39.2:
- No significant changes.
Release notes in links below.

Close: #25405
Link: https://github.com/AlistGo/alist/releases/tag/v3.39.2
Link: https://github.com/AlistGo/alist-web/compare/3.39.0...3.39.2
Signed-off-by: Ryan Keane <the.ra2.ifv@gmail.com>

qbee-agent: bump version to 2024.45

Signed-off-by: Jon Henrik Bjørnstad <jonhenrik@qbee.io>

rclone: Bump to 1.68.2

Release notes in links below.

Link: https://rclone.org/changelog/#v1-68-2-2024-11-15
Signed-off-by: Ryan Keane <the.ra2.ifv@gmail.com>

hev-socks5-tunnel: update to 2.7.5

Signed-off-by: Ray Wang <r@hev.cc>

hev-socks5-tproxy: update to 2.5.8

Signed-off-by: Ray Wang <r@hev.cc>

hev-socks5-server: update to 2.6.9

Signed-off-by: Ray Wang <r@hev.cc>

strongswan: Add support for EAP-MSCHAPv2 authentication

Support for EAP-MSCHAPv2 authentication scheme is added.

Different from the previously supported schemes, this one is
usually asymmetric in the way that server auth method (pubkey) is
different from the client auth method (eap-mschapv2).
The code handles this asymmetry automatically.

A new UCI config section mschapv2_secrets is added where the user
can specify the EAP identities and their passwords that are
accepted by the server. AFAIK, there is no way to select which
EAP IDs should be accepted by which remote, except setting
`eap_id` to something different than `%any`. But `eap_id`
does not support template matching, so either only a single
identity or all can be configured for one remote. This is why
the EAP identities are not subsections of remotes, but are
a standalone section.

Signed-off-by: Martin Pecka <peci1@seznam.cz>
Signed-off-by: Martin Pecka <peckama2@fel.cvut.cz>

strongswan: Fix pools to be only generated once

Before this commit, if a user configures multiple remotes in UCI,
each remote generates one output section of pools.
This doesn't hurt because swanctl just merges all of them,
but it is apparently not needed to have N copies of the same.

This commit changes the behavior to only create one pools
section at the end of the generated swanctl config.

Signed-off-by: Martin Pecka <peci1@seznam.cz>
Signed-off-by: Martin Pecka <peckama2@fel.cvut.cz>

strongswan: Add support for send_cert option

This option is required by some clients, e.g. iOS.

Signed-off-by: Martin Pecka <peci1@seznam.cz>

kafs-client: Make version apk compatible

Adjust version to compatible with apk's semantic rules.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

v2ray-core: Bump to 5.22.0

Shorten TITLE variable to fix missing title in ncurses menu.
Release notes and changes logs in the link below.

Link: https://github.com/v2fly/v2ray-core/releases/tag/v5.22.0
Link: https://github.com/v2fly/v2ray-core/compare/v5.21.0...v5.22.0
Signed-off-by: Ryan Keane <the.ra2.ifv@gmail.com>

micropython-lib: update to 1.24.0

* update micropython-lib to hash for 1.24.0

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>

micropython-lib: update to 1.23.0 and fix compile on external mbedtls3

* update micropython-lib to hash for 1.23.0
* remove micropython-lib unix-uffi patches

Co-authored-by: Jeffery To <jeffery.to@gmail.com>
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>

sox: Remove wavpack (explicitly) from build
     Remove myself as maintainer

Signed-off-by: Ted Hess <thess@kitschensync.net>

netdiscover: Make version apk compatible

Adjust version to be compatible with apk's semantic rules.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

lua-curl-v3: Make version apk compatible

Adjust version to apk's semantic rules.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

mptcpd: update to version 0.13

Changes since v0.12:
 7fb6416 tests: fix segfault with no /etc/protocols (#286)
 0dddc42 README: Update branch references in badge URLs
 5eea3f4 github: Update branch names for actions
 b102523 scripts: get debug info for bug reports
 334bb9c Make listening socket creation optional. (#297)
 a4e7b65 {etc,man}: improve check_route address notification flag documentation (#301)
 ffa276f Support ELL 0.68 l_netlink_message API. (#303)
 269f10a gh: daily validation of the ELL compatibility (#308)
 824ff8c Support listener events (#304)
 5d9f33a Some clean-ups (#305)
 05a08bf lib: switch to v4.0.1: only added items (#306)
 3702487 scripts: debug: also print system info (#307)
 5d8db15 ell: only include 'ell/ell.h' header (#309)
 772afe9 AUTHORS: Update e-mail addresses.
 0c36dba mptcpd 0.13

Drop backported patches which are part of the release.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

ell: update to version 0.70

 c8f4dbc util: Add l_memcpy
 e5007ce unit: Add l_memcpy test
 373b828 Release 0.70

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

svox: Make version apk compatible

Adjust PKG_VERSION to be compatible with apk's semantic rules.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

owfs: Make version apk compatible

Adjust version to be compatible with apk's semanting versioning.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

lua-openssl: Make version apk compatible

Make version compatible with apk.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

pagekitec: Make version apk compatible

Make PKG_VERSION compatible with apk by dropping the C char,
simplifying Makefile also otherwise. Also remove unnecessary
variables.

Refresh patches (just cosmetics for CI).

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luv: Make version apk compatible

Make version apk compatible.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

rtklib: Make version apk compatible

Make version compatible with the apk package manager.
Add short explanation about rtklib purpose to the menu item.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

gphoto2: fix compilation with GCC14

Upstream backports.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

pdns-recursor: update to 5.1.3

Signed-off-by: Peter van Dijk <peter.van.dijk@powerdns.com>

banIP: update to 1.0.0-10

* minimal fix to support all download utilities in currently broken apk snapshots
  (see https://github.com/openwrt/openwrt/issues/16907 for details)

Signed-off-by: Dirk Brenken <dev@brenken.org>

atop: fix compilation with full NLS

nls.mk is missing.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

openvpn-easy-rsa: Bump to 3.2.1 release

Bump openvpn-easy-rsa to 3.2.1 release. All patch automatically
refreshed.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

perl: perlmod: make version apk compatible

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

git: use symbolic link

The following error occurs when CONFIG_USE_APK is set.

```
ln /mnt/gl-mt6000-main/openwrt/build_dir/target-aarch64_cortex-a53_musl/git-2.46.2/.pkgdir/git/usr/lib/git-core/git /mnt/gl-mt6000-main/openwrt/build_dir/target-aarch64_cortex-a53_musl/git-2.46.2/.pkgdir/git/usr/bin/git
ln /mnt/gl-mt6000-main/openwrt/build_dir/target-aarch64_cortex-a53_musl/git-2.46.2/.pkgdir/git/usr/lib/git-core/git-shell /mnt/gl-mt6000-main/openwrt/build_dir/target-aarch64_cortex-a53_musl/git-2.46.2/.pkgdir/git/usr/bin/git-shell
touch /mnt/gl-mt6000-main/openwrt/build_dir/target-aarch64_cortex-a53_musl/git-2.46.2/.pkgdir/git.installed
mkdir -p /mnt/gl-mt6000-main/openwrt/staging_dir/target-aarch64_cortex-a53_musl/root-mediatek/stamp
SHELL= flock /mnt/gl-mt6000-main/openwrt/tmp/.root-copy.flock -c 'cp -fpR /mnt/gl-mt6000-main/openwrt/build_dir/target-aarch64_cortex-a53_musl/git-2.46.2/.pkgdir/git/. /mnt/gl-mt6000-main/openwrt/staging_dir/target-aarch64_cortex-a53_musl/root-mediatek/'
cp: '/mnt/gl-mt6000-main/openwrt/build_dir/target-aarch64_cortex-a53_musl/git-2.46.2/.pkgdir/git/./usr/bin/git' and '/mnt/gl-mt6000-main/openwrt/staging_dir/target-aarch64_cortex-a53_musl/root-mediatek/./usr/bin/git' are the same file
cp: '/mnt/gl-mt6000-main/openwrt/build_dir/target-aarch64_cortex-a53_musl/git-2.46.2/.pkgdir/git/./usr/bin/git-shell' and '/mnt/gl-mt6000-main/openwrt/staging_dir/target-aarch64_cortex-a53_musl/root-mediatek/./usr/bin/git-shell' are the same file
make[2]: *** [Makefile:167: /mnt/gl-mt6000-main/openwrt/staging_dir/target-aarch64_cortex-a53_musl/root-mediatek/stamp/.git_installed] Error 1
```
Use $(LN) instead of ln and use relative paths.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>

dnsproxy: Update to 0.73.3

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

golang: Update to 1.23.3

go1.23.3 (released 2024-11-06) includes fixes to the linker,
the runtime, and the net/http, os, and syscall packages.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

vala: update to 0.56.17

vala now sort of depends on gobject-introspection. In order to avoid
adding, override GI_GIRDIR to avoid depending on goject-introspection.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

ntfs-3g: APK version compliance.
         Remove libfuse/int hint from name.
         Remove myself as maintainer

Signed-off-by: Ted Hess <thess@kitschensync.net>

xdg-dbus-proxy: add package

xdg-dbus-proxy is a filtering proxy for D-Bus connections. It is used to
allow partial access to D-Bus form sandboxed processes, eg. when using
bubblewrap.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

bubblewrap: add package

Bubblewrap is a container tool for security sandboxes.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

libmanette: add package

libmanette offers painless access to game controllers, from any
programming language and with little dependencies.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

unifdef: add package

The unifdef utility selectively processes conditional C preprocessor #if
and #ifdef directives. It is required to build WebKit ports.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

lpac: fix compilation with GCC14

Parameter is not void but void pointer.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

libdbi-drivers: fix compilation with GCC14

Patch from Alpine Linux.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

tinc: support apk version semantics

See: #23706

Signed-off-by: Robert Marko <robimarko@gmail.com>

openocd: fix version for APK compatibility

Need to get rid of the v.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

modemmanager: bump PKG_RELEASE

Bump PKG_RELEASE by one.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

modemmanager: check during SIM unlocking whether initialization has been completed

After the SIM has been successfully unlocked, it is initialized. This can
take longer on some modems, so we must wait until the modem is ready to
execute the next commands.

Otherwise the modem cannot be enabled and aborts with the following
error message:

error: couldn't enable the modem: 'GDBus.Error:org.freedesktop.ModemManager1.Error.Core.WrongState: modem in initializing state'

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

modemmanager: reset to 'no' plmn if nothing is configured

If a configured 'plmn' is deleted from the configuration between a connection
setup, it will continue to be used because the modem remembers it.

Therefore, the 'plmn' stored in the modem must be deleted when a new
connection is established if it is no longer in the configuration.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

modemmanager: swap plmn and technology set command in the proto

In the current implementation of the modemmanager 'proto', if a 'plmn' and a
'technology' is configured, the 'plmn' is set first and then second the
'technology' on a 'proto' setup.

However, this is problematic if a 'technology' has already been set in an
earlier run. It is possible, that this previously set 'technology' is not
available at the current location, as the modem remembers the setting.

To fix this, first set the technology and then the plmn.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

modemmanager: move plmn registration into own function

To improve the code, the setting of the 'plmn' is moved to separate function.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

modemmanager: rename function modemmanager_check_state to modemmanager_check_sim_state

This is a preparation commit for a new function.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

modemmanager: move initial eps settings after modem enable

This settings are needed before any other mmcli command is executed.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

modemmanager: add log file if syslog is set to DEBUG

If the ModemManager is started with debug, all outputs are written to the
system log. To simplify debugging, a logging file is now created under
'/var/log/mm.log' in this case. This simplifies error analysis.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

owut: update to 2024.11.14

Bug fixes:
    efahl/owut@3b5e7bb owut: remove factory image types from image candidates

Signed-off-by: Eric Fahlgren <ericfahlgren@gmail.com>

libesmtp: fix compilation with GCC14

_GNU_SOURCE is needed for some functions.

Removed now pointless libpthread depedency.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

hplip: update to 3.24.4

Added patch fixing compilation with GCC14.

Remove outdated patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

dmapd: update to 0.0.96

Fixes compilation with GCC14.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

mdnsresponder: add missing header

Fixes compilation with GCC14.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

avrdude: fix compilation with full NLS

nls.mk is needed.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

libgudev: fix compilation with full NLS

nls.mk is needed.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

knxd: bump to new version 0.14.67

Signed-off-by: Othmar Truniger <github@truniger.ch>

lcdgrilo: update to 0.0.13

Signed-off-by: W. Michael Petullo <mike@flyn.org>

btrfs-progs: add "btrfs device scan" before overlay/extroot

If users choose to build OpenWrt with btrfs included
and want to use a btrfs RAID for overlay/extroot,
then devices need to be scanned *before* mounting overlay/extroot.
If not, btrfs won't find all RAID drives and fail to mount.

This commit:
- creates a duplicate (symlink) of the btrfs scan script so that it runs
  both before and after overlay/extroot mount,
- changes the scan command to not depend on blkid (-d),
- outputs the scan results to kernel log to show what's being detected,
  as the system logger is not yet running.

Signed-off-by: Marius Dinu <m95d+git@psihoexpert.ro>

ocserv: Use default value for log-level in conf

This commit comments out the `log-level` line in the template
config file to use default value from upstream, default should be 2.

Signed-off-by: Ryan Keane <the.ra2.ifv@gmail.com>

haproxy: update to v3.0.6

- Update haproxy PKG_VERSION and PKG_HASH
- See changes: http://git.haproxy.org/?p=haproxy-3.0.git;a=shortlog

Signed-off-by: Christian Lachner <gladiac@gmail.com>

cloudflared: Update to 2024.11.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

v2ray-geodata: Update to latest version

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

xray-core: Update to 24.11.11

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

ntpd: Supports apk version semantics

See: https://github.com/openwrt/packages/issues/23706

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>

ruby: include JSON modules in host build

Ruby JSON modules are used to build WebKitGTK.
Include them in the host build.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

gst1-plugins-bad: package play and player libraries

Create packages for the libgstplay and libgstplayer.
Introduce InstallDev to allow using and detecting libraries which are
part of the 'bad' set by other packages.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

gst1-plugins-base: build OpenGL library and plugin

Requires packages video feed.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

libgudev: add package

Add GObject udev wrapper library used by gstreamer.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

hwdata: package pnp.ids and add InstallDev section

Make sure hwdata can be used by other packages during build by
adding InstallDev section which includes pkgconfig as well as
all types of IDs.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

ipmitool: update to 1.8.19

Remove all patches as they are upstreamed.

Switch upstream as it moved.

Need autoreconf now. Add PKG_INSTALL and PKG_BUILD_PARALLEL for
consistency between pachages.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

luajit: fix built for apk naming requirements

Like wolfssl[1], adjust version for apk by removing the hyphen.

1. https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=be952e98bc1d768a0da5b84e59a6e7c04a1cdab8

Build system: x86/64
Build-tested: x86/64/AMD Cezanne
Run-tested: x86/64/AMD Cezanne

Signed-off-by: John Audia <therealgraysky@proton.me>

privoxy: adjust version for apk

Signed-off-by: xiao bo <peterwillcn@gmail.com>