>>> Executing build step update on 25.1 ABI_FILE=/usr/lib/crt1.o BLOCKSIZE=K CONFIGDIR=/usr/tools/config/25.1 CONFIG_XML=/usr/local/etc/config.xml COREBRANCH=stable/25.1 COREDIR=/usr/core COREENV=CORE_PHP=83 CORE_ABI=25.1 CORE_PYTHON=311 CPUS=8 DEVICEDIR=/usr/tools/device ENV_FILTER=env -i USER=root LOGNAME=root HOME=/root SHELL=/bin/sh BLOCKSIZE=K MAIL= PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin TERM= HOSTTYPE= VENDOR= OSTYPE= MACHTYPE= PWD=/usr/tools/build GROUP= HOST= EDITOR= PAGER= ABI_FILE=/usr/lib/crt1.o EXTRABRANCH= HOME=/root IMAGESDIR=/usr/local/opnsense/build/25.1/amd64/images LANG=C.UTF-8 LOGNAME=root LOGSDIR=/usr/local/opnsense/build/25.1/amd64/logs MAKEFLAGS= SERVER=nightly@pkg.opnsense.org UPLOADDIR=incoming MAKELEVEL=2 META_MODE=normal MM_CHARSET=UTF-8 OLDPWD=/usr/tools PACKAGESDIR=/.pkg PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin PLUGINSBRANCH=stable/25.1 PLUGINSDIR=/usr/plugins PLUGINSENV=PLUGIN_PHP=83 PLUGIN_ABI=25.1 PLUGIN_PYTHON=311 PORTSBRANCH=master PORTSDIR=/usr/ports PORTSENV= PORTSREFBRANCH=main PORTSREFDIR=/usr/freebsd-ports PORTSREFURL=https://git.FreeBSD.org/ports.git PRINT_ENV_SKIP=1 PRODUCT_ABI=25.1 PRODUCT_ADDITIONS= PRODUCT_APACHE=24 PRODUCT_ARCH=amd64 PRODUCT_COMSPEED=115200 PRODUCT_CORE=opnsense PRODUCT_CORES=opnsense opnsense-devel opnsense-business PRODUCT_DEBUG= PRODUCT_DEVEL= PRODUCT_DEVICE_REAL=A10 PRODUCT_GITBASE=https://github.com/opnsense PRODUCT_HOST=amd64 PRODUCT_KERNEL=SMP PRODUCT_LUA=5.4 PRODUCT_MIRROR=https://mirror.fra10.de.leaseweb.net/opnsense PRODUCT_NAME=OPNsense PRODUCT_PERL=5.36 PRODUCT_PHP=83 PRODUCT_PLUGIN=os-* PRODUCT_PLUGINS=os-* PRODUCT_PRIVKEY=/usr/tools/config/25.1/repo.key PRODUCT_PUBKEY=/usr/tools/config/25.1/repo.pub PRODUCT_PYTHON=311 PRODUCT_RELEASE=OPNsense-202504041145 PRODUCT_RUBY=32 PRODUCT_SERVER=nightly@pkg.opnsense.org PRODUCT_SETTINGS=25.1 PRODUCT_SIGNCHK=/usr/tools/scripts/pkg_fingerprint.sh /usr/tools/config/25.1/repo.pub PRODUCT_SIGNCMD=/usr/tools/scripts/pkg_sign.sh /usr/tools/config/25.1/repo.pub /usr/tools/config/25.1/repo.key PRODUCT_SSL=openssl PRODUCT_SUFFIX= PRODUCT_TARGET=amd64 PRODUCT_TYPE=opnsense PRODUCT_UEFI=arm dvd serial vga vm PRODUCT_VERSION=202504041145 PRODUCT_ZFS= PWD=/usr/tools/build SERVER=nightly@pkg.opnsense.org SETSDIR=/usr/local/opnsense/build/25.1/amd64/sets SHELL=/bin/sh SRCABI=FreeBSD:14:amd64 SRCBRANCH=stable/25.1 SRCDIR=/usr/src SRCREVISION=14.2 STAGEDIR=/usr/obj/usr/tools/config/25.1/amd64 STAGEDIRPREFIX=/usr/obj TARGETDIR=/usr/local/opnsense/build/25.1/amd64 TARGETDIRPREFIX=/usr/local/opnsense/build TOOLSBRANCH=master TOOLSDIR=/usr/tools UPLOADDIR=incoming USER=root >>> Running build step: update >>> Passing arguments: (none) >>> Fetching /usr/core: From https://github.com/opnsense/core - [deleted] (none) -> origin/kea-validate-option6 507857f53..4971d4e1c stable/25.1 -> origin/stable/25.1 * [new branch] cert-widget-skip-external-links -> origin/cert-widget-skip-external-links 905b990de..868a74e05 master -> origin/master * [new branch] utils_removal -> origin/utils_removal >>> Updating branch stable/25.1 of /usr/core: Already on 'stable/25.1' Your branch is behind 'origin/stable/25.1' by 9 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Updating 507857f53..4971d4e1c Fast-forward plist | 12 +- src/etc/inc/auth.inc | 67 +++-- src/etc/inc/filter.inc | 4 + src/etc/inc/plugins.inc.d/captiveportal.inc | 172 +++++++++++ src/etc/inc/plugins.inc.d/core.inc | 36 --- src/etc/inc/plugins.inc.d/ipsec.inc | 136 +-------- src/etc/inc/xmlrpc/legacy.inc | 36 +-- src/etc/rc.d/captiveportal | 2 +- src/etc/rc.ipfw | 4 - .../CaptivePortal/Api/AccessController.php | 103 ++++++- .../CaptivePortal/Api/ServiceController.php | 4 +- .../CaptivePortal/Api/SessionController.php | 2 +- .../controllers/OPNsense/IPsec/forms/settings.xml | 132 +++++++++ .../TrafficShaper/Api/ServiceController.php | 39 +-- .../mvc/app/library/OPNsense/Auth/Base.php | 5 + .../app/library/OPNsense/Auth/IAuthConnector.php | 7 + .../mvc/app/library/OPNsense/Auth/Radius.php | 78 ++++- .../app/library/OPNsense/Auth/Services/IPsec.php | 16 +- .../mvc/app/library/OPNsense/Firewall/Plugin.php | 18 +- .../DynamicAliases/CaptivePortalAliases.php | 58 ++++ .../mvc/app/models/OPNsense/IPsec/IPsec.php | 40 ++- .../mvc/app/models/OPNsense/IPsec/IPsec.xml | 84 +++++- .../mvc/app/models/OPNsense/IPsec/Menu/Menu.xml | 4 +- .../models/OPNsense/IPsec/Migrations/M1_0_4.php | 138 +++++++++ .../mvc/app/models/OPNsense/IPsec/Swanctl.php | 21 -- .../app/views/OPNsense/CaptivePortal/index.volt | 5 +- .../mvc/app/views/layout_partials/base_dialog.volt | 3 +- .../mvc/app/views/layout_partials/base_form.volt | 3 +- .../scripts/OPNsense/CaptivePortal/allow.py | 4 +- .../CaptivePortal/cp-background-process.py | 96 ++++-- .../scripts/OPNsense/CaptivePortal/disconnect.py | 11 +- .../htdocs_default/css/bootstrap-theme.min.css | 0 .../htdocs_default/css/bootstrap.min.css | 0 .../CaptivePortal/htdocs_default/css/signin.css | 0 .../CaptivePortal/htdocs_default/exclude.list | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../htdocs_default/images/default-logo.png | Bin 2070 -> 0 bytes .../htdocs_default/images/default-logo.svg | 41 +++ .../htdocs_default/images/favicon.png | Bin 2938 -> 2100 bytes .../CaptivePortal/htdocs_default/index.html | 13 +- .../htdocs_default/js/bootstrap.min.js | 0 .../htdocs_default/js/jquery-1.11.2.min.js | 0 .../scripts/OPNsense/CaptivePortal/lib/db.py | 59 ++-- .../scripts/OPNsense/CaptivePortal/lib/ipfw.py | 188 ------------ .../scripts/OPNsense/CaptivePortal/lib/pf.py | 101 +++++++ .../OPNsense/CaptivePortal/overlay_template.py | 5 - .../CaptivePortal/process_accounting_messages.php | 7 +- .../scripts/OPNsense/CaptivePortal/sql/init.sql | 0 src/opnsense/scripts/shaper/lib/__init__.py | 6 +- src/opnsense/scripts/shaper/setup.sh | 29 ++ .../conf/actions.d/actions_captiveportal.conf | 4 +- .../service/conf/actions.d/actions_ipfw.conf | 8 +- .../service/conf/actions.d/actions_shaper.conf | 11 + .../OPNsense/Captiveportal/lighttpd-zone.conf | 4 +- .../service/templates/OPNsense/IPFW/ipfw.conf | 128 -------- .../service/templates/OPNsense/IPFW/rc.conf.d | 15 +- .../service/templates/OPNsense/Shaper/+TARGETS | 2 + .../service/templates/OPNsense/Shaper/dnctl.conf | 45 +++ .../service/templates/OPNsense/Shaper/rc.conf.d | 13 + src/www/services_router_advertisements.php | 13 +- src/www/system_authservers.php | 19 ++ src/www/vpn_ipsec_mobile.php | 327 +-------------------- src/www/vpn_ipsec_phase1.php | 18 +- 67 files changed, 1346 insertions(+), 1050 deletions(-) create mode 100644 src/etc/inc/plugins.inc.d/captiveportal.inc create mode 100644 src/opnsense/mvc/app/models/OPNsense/Firewall/DynamicAliases/CaptivePortalAliases.php create mode 100644 src/opnsense/mvc/app/models/OPNsense/IPsec/Migrations/M1_0_4.php mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/bootstrap-theme.min.css mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/bootstrap.min.css mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/signin.css mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/exclude.list mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.eot mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.svg mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.ttf mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.woff mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/images/default-logo.png create mode 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/images/default-logo.svg mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/images/favicon.png mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/index.html mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/js/bootstrap.min.js mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/js/jquery-1.11.2.min.js delete mode 100755 src/opnsense/scripts/OPNsense/CaptivePortal/lib/ipfw.py create mode 100755 src/opnsense/scripts/OPNsense/CaptivePortal/lib/pf.py mode change 100644 => 100755 src/opnsense/scripts/OPNsense/CaptivePortal/sql/init.sql create mode 100755 src/opnsense/scripts/shaper/setup.sh create mode 100644 src/opnsense/service/conf/actions.d/actions_shaper.conf create mode 100644 src/opnsense/service/templates/OPNsense/Shaper/+TARGETS create mode 100644 src/opnsense/service/templates/OPNsense/Shaper/dnctl.conf create mode 100644 src/opnsense/service/templates/OPNsense/Shaper/rc.conf.d >>> Fetching /usr/plugins: From https://github.com/opnsense/plugins * [new branch] caddy-cert-conf -> origin/caddy-cert-conf >>> Updating branch stable/25.1 of /usr/plugins: Already on 'stable/25.1' Your branch is up to date with 'origin/stable/25.1'. Already up to date. >>> Fetching /usr/ports: >>> Updating branch master of /usr/ports: Already on 'master' Your branch is up to date with 'origin/master'. Already up to date. >>> Fetching /usr/src: >>> Updating branch stable/25.1 of /usr/src: Already on 'stable/25.1' Your branch is up to date with 'origin/stable/25.1'. Already up to date. >>> Fetching /usr/tools: >>> Updating branch master of /usr/tools: Already on 'master' Your branch is up to date with 'origin/master'. Already up to date. 5.09 real 1.24 user 3.41 sys