mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-18 22:16:18 -05:00
fix: remove installed VPN script on uninstall
This commit is contained in:
11 files changed
+74
-5
No files matched your search
@@ -225,7 +225,7 @@ bsd-gpgui-tarball:
|
||||
package-freebsd: BSD_FLAVOR=freebsd
|
||||
package-freebsd: clean-bsd-package
|
||||
test -x "$(GPGUI_BINARY)"
|
||||
mkdir -p .build/freebsd/pkgroot .build/freebsd/artifacts
|
||||
mkdir -p .build/freebsd/pkgroot .build/freebsd/artifacts .build/freebsd/metadata
|
||||
$(MAKE) install-bsd DESTDIR=$(CURDIR)/.build/freebsd/pkgroot PREFIX=$(PREFIX) GPGUI_BINARY="$(GPGUI_BINARY)"
|
||||
find .build/freebsd/pkgroot$(PREFIX) -type f -print | sed 's|^.build/freebsd/pkgroot$(PREFIX)/||' | sort > .build/freebsd/PLIST
|
||||
freebsd_major=$$(freebsd-version -u | sed 's/\..*//'); \
|
||||
@@ -236,8 +236,9 @@ package-freebsd: clean-bsd-package
|
||||
-e "s/@ABI@/FreeBSD:$$freebsd_major:$$freebsd_arch/g" \
|
||||
-e "s/@ARCH@/freebsd:$$freebsd_major:$$freebsd_arch/g" \
|
||||
-e 's|@PREFIX@|$(PREFIX)|g' \
|
||||
packaging/bsd/freebsd/MANIFEST.in > .build/freebsd/+MANIFEST
|
||||
pkg create -r .build/freebsd/pkgroot -M .build/freebsd/+MANIFEST -p .build/freebsd/PLIST -o .build/freebsd/artifacts
|
||||
packaging/bsd/freebsd/MANIFEST.in > .build/freebsd/metadata/+MANIFEST
|
||||
cp packaging/bsd/freebsd/POST_DEINSTALL .build/freebsd/metadata/+POST_DEINSTALL
|
||||
pkg create -r .build/freebsd/pkgroot -M .build/freebsd/metadata -p .build/freebsd/PLIST -o .build/freebsd/artifacts
|
||||
freebsd_arch=$$(uname -m | sed -e 's/x86_64/amd64/' -e 's/arm64/aarch64/'); \
|
||||
mv .build/freebsd/artifacts/$(PKG_NAME)-$(VERSION).pkg .build/freebsd/artifacts/$(PKG_NAME)-$(VERSION)-freebsd-$$freebsd_arch.pkg
|
||||
$(MAKE) bsd-gpgui-tarball BSD_FLAVOR=freebsd GPGUI_BINARY="$(GPGUI_BINARY)"
|
||||
@@ -249,7 +250,11 @@ package-openbsd: clean-bsd-package
|
||||
$(MAKE) install-bsd DESTDIR=$(CURDIR)/.build/openbsd/pkgroot PREFIX=$(PREFIX) GPGUI_BINARY="$(GPGUI_BINARY)"
|
||||
cp packaging/bsd/openbsd/COMMENT .build/openbsd/+COMMENT
|
||||
cp packaging/bsd/openbsd/DESC .build/openbsd/+DESC
|
||||
find .build/openbsd/pkgroot$(PREFIX) -type f -print | sed 's|^.build/openbsd/pkgroot$(PREFIX)/||' | sort > .build/openbsd/PLIST
|
||||
{ \
|
||||
echo '@unexec-delete /bin/rm -f /var/db/gpclient/scripts/vpnc-script /var/db/gpclient/scripts/vpnc-script.metadata || echo "Warning: failed to remove the installed VPN script" >&2'; \
|
||||
echo '@unexec-delete /bin/rmdir /var/db/gpclient/scripts 2>/dev/null || true'; \
|
||||
find .build/openbsd/pkgroot$(PREFIX) -type f -print | sed 's|^.build/openbsd/pkgroot$(PREFIX)/||' | sort; \
|
||||
} > .build/openbsd/PLIST
|
||||
comment=$$(cat .build/openbsd/+COMMENT); \
|
||||
openbsd_arch=$$(uname -m | sed 's/x86_64/amd64/'); \
|
||||
gnome_keyring_pkg=$$(pkg_info -e 'gnome-keyring-*' | sed 's/^inst://' | head -n 1); \
|
||||
@@ -292,6 +297,11 @@ uninstall:
|
||||
rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
|
||||
rm -f $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
|
||||
|
||||
rm -f $(DESTDIR)/var/lib/gpclient/scripts/vpnc-script \
|
||||
$(DESTDIR)/var/lib/gpclient/scripts/vpnc-script.metadata || \
|
||||
echo "Warning: failed to remove the installed VPN script" >&2
|
||||
rmdir $(DESTDIR)/var/lib/gpclient/scripts 2>/dev/null || true
|
||||
|
||||
clean-debian:
|
||||
rm -rf .build/deb
|
||||
|
||||
@@ -398,6 +408,7 @@ init-pkgbuild: clean-pkgbuild tarball
|
||||
|
||||
cp .build/tarball/${PKG}.tar.gz .build/pkgbuild
|
||||
cp packaging/pkgbuild/PKGBUILD.in .build/pkgbuild/PKGBUILD
|
||||
cp packaging/pkgbuild/gp.install .build/pkgbuild/gp.install
|
||||
|
||||
sed -i "s/@PKG_NAME@/$(PKG_NAME)/g" .build/pkgbuild/PKGBUILD
|
||||
sed -i "s/@VERSION@/$(VERSION)/g" .build/pkgbuild/PKGBUILD
|
||||
@@ -414,6 +425,7 @@ init-apk: clean-apk tarball
|
||||
|
||||
cp .build/tarball/${PKG}.tar.gz .build/apk
|
||||
cp packaging/apk/APKBUILD.in .build/apk/APKBUILD
|
||||
cp packaging/apk/post-deinstall .build/apk/$(PKG_NAME).post-deinstall
|
||||
|
||||
sed -i "s/@PKG_NAME@/$(PKG_NAME)/g" .build/apk/APKBUILD
|
||||
sed -i "s/@VERSION@/$(VERSION)/g" .build/apk/APKBUILD
|
||||
|
||||
@@ -283,6 +283,10 @@ After logging back in to GNOME, enable AppIndicator support if needed:
|
||||
gnome-extensions enable [email protected]
|
||||
```
|
||||
|
||||
NixOS does not run an imperative package-uninstall hook when a package is
|
||||
removed from the system configuration. Remove an installed replacement VPN
|
||||
script from the app settings before removing the package.
|
||||
|
||||
### Official Docker Image
|
||||
|
||||
The [official Docker image](https://hub.docker.com/r/yuezk/globalprotect-openconnect) provides the CLI tools on Alpine Linux:
|
||||
|
||||
@@ -47,6 +47,7 @@ makedepends="
|
||||
"
|
||||
source="$pkgname-$pkgver.tar.gz"
|
||||
builddir="$srcdir/$pkgname-$pkgver"
|
||||
install="$pkgname.post-deinstall"
|
||||
options="!check"
|
||||
|
||||
build() {
|
||||
|
||||
Executable
+7
@@ -0,0 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
rm -f \
|
||||
/var/lib/gpclient/scripts/vpnc-script \
|
||||
/var/lib/gpclient/scripts/vpnc-script.metadata ||
|
||||
echo "Warning: failed to remove the installed VPN script" >&2
|
||||
rmdir /var/lib/gpclient/scripts 2>/dev/null || true
|
||||
@@ -14,6 +14,11 @@ post_upgrade() {
|
||||
|
||||
post_remove() {
|
||||
rm -f /usr/bin/gpgui
|
||||
rm -f \
|
||||
/var/lib/gpclient/scripts/vpnc-script \
|
||||
/var/lib/gpclient/scripts/vpnc-script.metadata ||
|
||||
echo "Warning: failed to remove the installed VPN script" >&2
|
||||
rmdir /var/lib/gpclient/scripts 2>/dev/null || true
|
||||
update-mime-database /usr/share/mime
|
||||
update-desktop-database -q
|
||||
}
|
||||
@@ -51,3 +51,8 @@ uninstall:
|
||||
rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256/apps/gpgui.png
|
||||
rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
|
||||
rm -f $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
|
||||
|
||||
rm -f $(DESTDIR)/var/lib/gpclient/scripts/vpnc-script \
|
||||
$(DESTDIR)/var/lib/gpclient/scripts/vpnc-script.metadata || \
|
||||
echo "Warning: failed to remove the installed VPN script" >&2
|
||||
rmdir $(DESTDIR)/var/lib/gpclient/scripts 2>/dev/null || true
|
||||
Executable
+9
@@ -0,0 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
root=${PKG_ROOTDIR:-}
|
||||
|
||||
rm -f \
|
||||
"$root/var/db/gpclient/scripts/vpnc-script" \
|
||||
"$root/var/db/gpclient/scripts/vpnc-script.metadata" ||
|
||||
echo "Warning: failed to remove the installed VPN script" >&2
|
||||
rmdir "$root/var/db/gpclient/scripts" 2>/dev/null || true
|
||||
+12
-1
@@ -2,7 +2,18 @@
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
purge|remove|upgrade)
|
||||
purge|remove)
|
||||
rm -f \
|
||||
/var/lib/gpclient/scripts/vpnc-script \
|
||||
/var/lib/gpclient/scripts/vpnc-script.metadata ||
|
||||
echo "Warning: failed to remove the installed VPN script" >&2
|
||||
rmdir /var/lib/gpclient/scripts 2>/dev/null || true
|
||||
|
||||
# Remove the gpgui binary downloaded at runtime
|
||||
rm -f /usr/bin/gpgui
|
||||
;;
|
||||
|
||||
upgrade)
|
||||
# Remove the gpgui binary downloaded at runtime
|
||||
rm -f /usr/bin/gpgui
|
||||
;;
|
||||
|
||||
@@ -14,6 +14,7 @@ depends=('webkit2gtk-4.1' 'libappindicator-gtk3' 'librsvg' 'libsecret' 'openssl'
|
||||
optdepends=('wmctrl: for window management')
|
||||
|
||||
provides=('globalprotect-openconnect' 'gpclient' 'gpservice' 'gpauth' 'gpgui')
|
||||
install=gp.install
|
||||
|
||||
source=("${_pkgname}-${pkgver}.tar.gz")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
post_remove() {
|
||||
rm -f \
|
||||
/var/lib/gpclient/scripts/vpnc-script \
|
||||
/var/lib/gpclient/scripts/vpnc-script.metadata ||
|
||||
echo "Warning: failed to remove the installed VPN script" >&2
|
||||
rmdir /var/lib/gpclient/scripts 2>/dev/null || true
|
||||
}
|
||||
@@ -50,6 +50,13 @@ A GUI for GlobalProtect VPN, based on OpenConnect, supports the SSO authenticati
|
||||
|
||||
%postun
|
||||
rm -f %{_bindir}/gpgui
|
||||
if [ "$1" -eq 0 ]; then
|
||||
rm -f \
|
||||
/var/lib/gpclient/scripts/vpnc-script \
|
||||
/var/lib/gpclient/scripts/vpnc-script.metadata ||
|
||||
echo "Warning: failed to remove the installed VPN script" >&2
|
||||
rmdir /var/lib/gpclient/scripts 2>/dev/null || :
|
||||
fi
|
||||
|
||||
%build
|
||||
# The injected RUSTFLAGS could fail the build
|
||||
|
||||
Reference in new issue
Block a user