Backport vendored openconnect and HIP flow

This commit is contained in:
Kevin Yue committed 2026-04-18 20:21:10 +08:00
1 parent 51c55376e8
commit f754a7f3c7
30 files changed
+2634 -23

No files matched your search

+6
View File
@@ -10,6 +10,9 @@ install:
install -Dm755 artifacts/usr/bin/gpgui $(DESTDIR)/usr/bin/gpgui; \
fi
install -Dm755 artifacts/usr/libexec/gpclient/vpnc-script $(DESTDIR)/usr/libexec/gpclient/vpnc-script
install -Dm755 artifacts/usr/libexec/gpclient/hipreport.sh $(DESTDIR)/usr/libexec/gpclient/hipreport.sh
# Install the disconnect hooks
install -Dm755 artifacts/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down
install -Dm755 artifacts/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook
@@ -30,6 +33,9 @@ uninstall:
rm -f $(DESTDIR)/usr/bin/gpgui-helper
rm -f $(DESTDIR)/usr/bin/gpgui
rm -f $(DESTDIR)/usr/libexec/gpclient/vpnc-script
rm -f $(DESTDIR)/usr/libexec/gpclient/hipreport.sh
rm -f $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down
rm -f $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook
+12 -3
View File
@@ -4,20 +4,29 @@ Priority: optional
Maintainer: Kevin Yue <[email protected]>
Standards-Version: 4.1.4
Build-Depends: debhelper (>= 9),
autoconf,
automake,
libtool,
patch,
pkg-config,
jq (>= 1),
make (>= 4),
libxml2,
zlib1g-dev,
liblz4-dev,
libp11-kit-dev,
nettle-dev,
libgnutls28-dev,
libgmp-dev,
libsecret-1-0,
libayatana-appindicator3-1,
gnome-keyring,
libwebkit2gtk-4.0-dev,
libopenconnect-dev (>= 8.20),@RUST@
libssl-dev,@RUST@
Homepage: https://github.com/yuezk/GlobalProtect-openconnect
Package: globalprotect-openconnect
Architecture: any
Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends}, openconnect (>=8.20), libxml2, libsecret-1-0, libayatana-appindicator3-1, gnome-keyring
Depends: ${misc:Depends}, ${shlibs:Depends}, libsecret-1-0, libayatana-appindicator3-1, gnome-keyring
Description: A GUI for GlobalProtect VPN
A GUI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method.
+1
View File
@@ -2,6 +2,7 @@
export OFFLINE = @OFFLINE@
export BUILD_FE = 0
export LIBXML2_STATIC = 1
%:
dh $@ --no-parallel
+28
View File
@@ -0,0 +1,28 @@
#!/bin/sh
# Wrapper for gpclient hip
LOGFILE="/tmp/gpclient-hipreport.log"
LINUX_GPCLIENT_BIN="/usr/bin/gpclient"
HOMEBREW_GPCLIENT_BIN="/opt/homebrew/bin/gpclient"
GPCLIENT_BIN="${GPCLIENT_BIN:-}"
if [ -n "$GPCLIENT_BIN" ] && [ -x "$GPCLIENT_BIN" ]; then
:
elif [ -x "$LINUX_GPCLIENT_BIN" ]; then
GPCLIENT_BIN="$LINUX_GPCLIENT_BIN"
elif [ -x "$HOMEBREW_GPCLIENT_BIN" ]; then
GPCLIENT_BIN="$HOMEBREW_GPCLIENT_BIN"
else
echo "Error: gpclient binary not found." > "$LOGFILE"
exit 1
fi
HIP_REPORT_OUTPUT=$("$GPCLIENT_BIN" hip "$@" 2> "$LOGFILE")
STATUS=$?
if [ $STATUS -ne 0 ]; then
exit $STATUS
fi
printf '%s\n' "$HIP_REPORT_OUTPUT"
File diff suppressed because it is too large. Load diff
+3 -3
View File
@@ -8,8 +8,8 @@ pkgdesc="A GUI for GlobalProtect VPN, based on OpenConnect, supports the SSO aut
arch=('x86_64' 'aarch64')
url="https://github.com/yuezk/GlobalProtect-openconnect"
license=('GPL3')
makedepends=('make' 'pkg-config' 'rust' 'cargo' 'jq' 'webkit2gtk' 'curl' 'wget' 'file' 'openssl' 'appmenu-gtk-module' 'gtk3' 'libappindicator-gtk3' 'librsvg' 'libvips' 'libayatana-appindicator' 'openconnect' 'libsecret')
depends=('openconnect>=8.20' webkit2gtk libappindicator-gtk3 libayatana-appindicator libsecret libxml2)
makedepends=('make' 'pkg-config' 'rust' 'cargo' 'jq' 'webkit2gtk' 'curl' 'wget' 'file' 'openssl' 'appmenu-gtk-module' 'gtk3' 'libappindicator-gtk3' 'librsvg' 'libvips' 'libayatana-appindicator' 'libsecret' 'autoconf' 'automake' 'libtool')
depends=('webkit2gtk' 'libappindicator-gtk3' 'libayatana-appindicator' 'libsecret' 'gnutls' 'lz4' 'nettle' 'libp11-kit' 'gmp')
optdepends=('wmctrl: for window management')
provides=('globalprotect-openconnect' 'gpclient' 'gpservice' 'gpauth' 'gpgui')
@@ -25,7 +25,7 @@ build() {
# Must unset the CFLAGS, otherwise the build fails
unset CFLAGS
make build OFFLINE=@OFFLINE@ BUILD_FE=0
make build OFFLINE=@OFFLINE@ BUILD_FE=0 LIBXML2_STATIC=1
}
package() {
@@ -13,17 +13,26 @@ BuildRequires: rust
BuildRequires: cargo
BuildRequires: jq
BuildRequires: pkg-config
BuildRequires: openconnect-devel
BuildRequires: libtool
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: openssl-devel
BuildRequires: zlib-devel
BuildRequires: lz4-devel
BuildRequires: p11-kit-devel
BuildRequires: nettle-devel
BuildRequires: gnutls-devel
BuildRequires: gmp-devel
BuildRequires: wget
BuildRequires: file
BuildRequires: perl
BuildRequires: (webkit2gtk4.0-devel or webkit2gtk3-soup2-devel)
BuildRequires: (webkit2gtk4.0-devel or webkit2gtk3-devel or webkit2gtk3-soup2-devel)
BuildRequires: (libappindicator-gtk3-devel or libappindicator3-1)
BuildRequires: (librsvg2-devel or librsvg-devel)
Requires: openconnect >= 8.20, (libayatana-appindicator or libappindicator-gtk3)
Requires: (libayatana-appindicator or libappindicator-gtk3)
Conflicts: globalprotect-openconnect-snapshot
%global debug_package %{nil}
@@ -40,7 +49,7 @@ rm -f %{_bindir}/gpgui
%build
# The injected RUSTFLAGS could fail the build
unset RUSTFLAGS
make build OFFLINE=@OFFLINE@ BUILD_FE=0
make build OFFLINE=@OFFLINE@ BUILD_FE=0 LIBXML2_STATIC=1
%install
%make_install
@@ -48,6 +57,8 @@ make build OFFLINE=@OFFLINE@ BUILD_FE=0
%files
%defattr(-,root,root)
%{_bindir}/*
%{_libexecdir}/gpclient/vpnc-script
%{_libexecdir}/gpclient/hipreport.sh
%{_datadir}/applications/gpgui.desktop
%{_datadir}/icons/hicolor/32x32/apps/gpgui.png
%{_datadir}/icons/hicolor/128x128/apps/gpgui.png
@@ -62,6 +73,8 @@ make build OFFLINE=@OFFLINE@ BUILD_FE=0
/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down
/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook
%dir %{_libexecdir}
%dir %{_libexecdir}/gpclient
%dir %{_datadir}/icons/hicolor
%dir %{_datadir}/icons/hicolor/32x32
%dir %{_datadir}/icons/hicolor/32x32/apps