From 8f220b11c0dc3c0b50013d71d3336701e523b28b Mon Sep 17 00:00:00 2001
From: Kevin Yue
Date: Thu, 30 Sep 2021 17:28:56 +0800
Subject: [PATCH] update packaging
---
.github/FUNDING.yml | 2 +
.github/workflows/build.yml | 352 +++++++
.github/workflows/{main.yml => pr.yml} | 20 +-
.github/workflows/pre-release.yml | 2 -
.gitignore | 4 +-
.vscode/settings.json | 3 +
3rdparty/qt-unix-signals/CMakeLists.txt | 2 +-
CMakeLists.txt | 10 +-
GPClient/CMakeLists.txt | 24 +-
GPClient/com.yuezk.qt.gpclient.desktop | 11 -
GPClient/com.yuezk.qt.gpclient.desktop.in | 12 +
... => com.yuezk.qt.gpclient.metainfo.xml.in} | 2 +-
...GPClient.svg => com.yuezk.qt.gpclient.svg} | 2 +-
GPClient/resources.qrc | 2 +-
GPClient/samlloginwindow.cpp | 2 +-
GPService/CMakeLists.txt | 20 +-
...vice => com.yuezk.qt.GPService.service.in} | 2 +-
GPService/gpservice.cpp | 3 +-
...gpservice.service => gpservice.service.in} | 2 +-
PKGBUILD.template | 33 -
README.md | 3 +
VERSION_SUFFIX | 0
debian/changelog | 44 +-
debian/control | 2 +-
debian/copyright | 989 +-----------------
debian/rules | 12 +-
debian/watch | 4 +-
packaging/aur/PKGBUILD | 33 +
packaging/aur/PKGBUILD-git | 35 +
packaging/flatpak/com.yuezk.qt.gpclient.yml | 26 +
.../obs/globalprotect-openconnect-rpmlintrc | 1 +
.../obs/globalprotect-openconnect.changes | 5 +
packaging/obs/globalprotect-openconnect.spec | 96 ++
packaging/rpm/README.md | 5 -
packaging/rpm/entrypoint.sh | 21 -
packaging/rpm/globalprotect-openconnect.spec | 39 -
scripts/_archive-all.sh | 26 +
scripts/build.sh | 7 +
scripts/bump-version.sh | 2 +-
scripts/install.sh | 5 +-
scripts/ppa-publish.sh | 53 +
scripts/prepare-packaging.sh | 40 +
scripts/release-archive-all.sh | 3 +
scripts/release.sh | 13 +
scripts/snapshot-archive-all.sh | 17 +
scripts/snapshot-version.sh | 3 +
snap/snapcraft.yaml | 24 +-
version.h.in | 2 +-
48 files changed, 828 insertions(+), 1192 deletions(-)
create mode 100644 .github/FUNDING.yml
create mode 100644 .github/workflows/build.yml
rename .github/workflows/{main.yml => pr.yml} (68%)
delete mode 100644 GPClient/com.yuezk.qt.gpclient.desktop
create mode 100644 GPClient/com.yuezk.qt.gpclient.desktop.in
rename GPClient/{com.yuezk.qt.gpclient.metainfo.xml => com.yuezk.qt.gpclient.metainfo.xml.in} (96%)
rename GPClient/{com.yuezk.qt.GPClient.svg => com.yuezk.qt.gpclient.svg} (99%)
rename GPService/dbus/{com.yuezk.qt.GPService.service => com.yuezk.qt.GPService.service.in} (67%)
rename GPService/systemd/{gpservice.service => gpservice.service.in} (79%)
delete mode 100644 PKGBUILD.template
create mode 100644 VERSION_SUFFIX
create mode 100644 packaging/aur/PKGBUILD
create mode 100644 packaging/aur/PKGBUILD-git
create mode 100644 packaging/flatpak/com.yuezk.qt.gpclient.yml
create mode 100644 packaging/obs/globalprotect-openconnect-rpmlintrc
create mode 100644 packaging/obs/globalprotect-openconnect.changes
create mode 100644 packaging/obs/globalprotect-openconnect.spec
delete mode 100644 packaging/rpm/README.md
delete mode 100755 packaging/rpm/entrypoint.sh
delete mode 100644 packaging/rpm/globalprotect-openconnect.spec
create mode 100755 scripts/_archive-all.sh
create mode 100755 scripts/build.sh
create mode 100755 scripts/ppa-publish.sh
create mode 100755 scripts/prepare-packaging.sh
create mode 100755 scripts/release-archive-all.sh
create mode 100644 scripts/release.sh
create mode 100755 scripts/snapshot-archive-all.sh
create mode 100755 scripts/snapshot-version.sh
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..75c8f61
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+ko_fi: yuezk
+custom: ["https://buymeacoffee.com/yuezk", "https://paypal.me/zongkun"]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..8dcd464
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,352 @@
+name: Build
+
+on:
+ push:
+ branches:
+ - master
+ - develop
+ paths-ignore:
+ - LICENSE
+ - "*.md"
+ - .vscode
+ workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+ build:
+ strategy:
+ matrix:
+ os: [ubuntu-18.04, ubuntu-20.04]
+
+ runs-on: ${{ matrix.os }}
+
+ steps:
+ # Checkout repository and submodules
+ - uses: actions/checkout@v2
+ with:
+ submodules: recursive
+
+ - name: Build
+ run: |
+ ./scripts/install-ubuntu.sh
+
+ snapshot-archive-all:
+ if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
+ needs: build
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ submodules: recursive
+ fetch-depth: 0
+
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install git-archive-all
+
+ - name: Archive all
+ run: |
+ ./scripts/snapshot-archive-all.sh
+
+ - uses: actions/upload-artifact@v2
+ with:
+ name: snapshot-source-code
+ path: ./artifacts/*
+
+ snapshot-ppa:
+ if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
+ needs: snapshot-archive-all
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/download-artifact@v2
+ with:
+ name: snapshot-source-code
+ path: artifacts
+
+ - name: Import GPG key
+ id: import_gpg
+ uses: crazy-max/ghaction-import-gpg@v4
+ with:
+ gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
+ passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }}
+
+ - name: Install dependencies
+ run: |
+ sudo apt update
+ sudo apt install debmake debhelper cmake \
+ libqt5websockets5-dev qtbase5-dev qtwebengine5-dev
+
+ - name: Build deb package for 18.04
+ run: |
+ cd $GITHUB_WORKSPACE/artifacts
+ mkdir build-18.04
+ cp *.tar.gz build-18.04 && cd build-18.04
+ tar xf *.tar.gz
+ cd globalprotect-openconnect-*/
+
+ PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \
+ PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 18.04
+
+ - name: Build deb package for 20.04
+ run: |
+ cd $GITHUB_WORKSPACE/artifacts
+ mkdir build-20.04
+ cp *.tar.gz build-20.04 && cd build-20.04
+ tar xf *.tar.gz
+ cd globalprotect-openconnect-*/
+
+ PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \
+ PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 20.04
+
+ - name: Build deb package for 21.04
+ run: |
+ cd $GITHUB_WORKSPACE/artifacts
+ mkdir build-21.04
+ cp *.tar.gz build-21.04 && cd build-21.04
+ tar xf *.tar.gz
+ cd globalprotect-openconnect-*/
+
+ PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \
+ PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 21.04
+
+ - name: Build deb package for 21.10
+ run: |
+ cd $GITHUB_WORKSPACE/artifacts
+ mkdir build-21.10
+ cp *.tar.gz build-21.10 && cd build-21.10
+ tar xf *.tar.gz
+ cd globalprotect-openconnect-*/
+
+ PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \
+ PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 21.10
+
+ snapshot-aur:
+ if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
+ needs: snapshot-archive-all
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/download-artifact@v2
+ with:
+ name: snapshot-source-code
+ path: artifacts
+
+ - name: Publish AUR package
+ env:
+ VERSION: $(cat ./artifacts/VERSION)
+ uses: yuezk/github-actions-deploy-aur@update-pkgver
+ with:
+ pkgname: globalprotect-openconnect-git
+ pkgbuild: ./artifacts/aur/PKGBUILD
+ assets: ./artifacts/aur/*.tar.gz
+ update_pkgver: true
+ commit_username: ${{ secrets.AUR_USERNAME }}
+ commit_email: ${{ secrets.AUR_EMAIL }}
+ ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+ commit_message: 'Snapshot release: git#${{ github.sha }}'
+
+ snapshot-obs:
+ if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
+ needs: snapshot-archive-all
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/download-artifact@v2
+ with:
+ name: snapshot-source-code
+ path: artifacts
+
+ - uses: yuezk/publish-obs-package@main
+ with:
+ project: home:yuezk
+ package: globalprotect-openconnect-snapshot
+ username: yuezk
+ password: ${{ secrets.OBS_PASSWORD }}
+ files: ./artifacts/obs/*
+
+ snapshot-snap:
+ if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
+ needs: snapshot-archive-all
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/download-artifact@v2
+ with:
+ name: snapshot-source-code
+ path: artifacts
+
+ - name: Extract source code
+ run: |
+ mkdir snap-source
+ tar xvf ./artifacts/globalprotect-openconnect-*tar.gz \
+ --directory snap-source \
+ --strip 1
+
+ - uses: snapcore/action-build@v1
+ id: build
+ with:
+ path: ./snap-source
+
+ - uses: snapcore/action-publish@v1
+ with:
+ store_login: ${{ secrets.SNAPSTORE_LOGIN }}
+ snap: ${{ steps.build.outputs.snap }}
+ release: edge
+
+ release-archive-all:
+ if: startsWith(github.ref, 'refs/tags/v')
+ needs: build
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ submodules: recursive
+ fetch-depth: 0
+
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install git-archive-all
+
+ - name: Archive all
+ run: |
+ ./scripts/release-archive-all.sh
+
+ - uses: actions/upload-artifact@v2
+ with:
+ name: release-source-code
+ path: ./artifacts/*
+
+ release-ppa:
+ if: startsWith(github.ref, 'refs/tags/v')
+ needs: release-archive-all
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/download-artifact@v2
+ with:
+ name: release-source-code
+ path: artifacts
+
+ - name: Import GPG key
+ id: import_gpg
+ uses: crazy-max/ghaction-import-gpg@v4
+ with:
+ gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
+ passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }}
+
+ - name: Install dependencies
+ run: |
+ sudo apt update
+ sudo apt install debmake debhelper cmake \
+ libqt5websockets5-dev qtbase5-dev qtwebengine5-dev
+
+ - name: Build deb package for 18.04
+ run: |
+ cd $GITHUB_WORKSPACE/artifacts
+ mkdir build-18.04
+ cp *.tar.gz build-18.04 && cd build-18.04
+ tar xf *.tar.gz
+ cd globalprotect-openconnect-*/
+
+ PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \
+ PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 18.04 --stable
+
+ - name: Build deb package for 20.04
+ run: |
+ cd $GITHUB_WORKSPACE/artifacts
+ mkdir build-20.04
+ cp *.tar.gz build-20.04 && cd build-20.04
+ tar xf *.tar.gz
+ cd globalprotect-openconnect-*/
+
+ PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \
+ PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 20.04 --stable
+
+ - name: Build deb package for 21.04
+ run: |
+ cd $GITHUB_WORKSPACE/artifacts
+ mkdir build-21.04
+ cp *.tar.gz build-21.04 && cd build-21.04
+ tar xf *.tar.gz
+ cd globalprotect-openconnect-*/
+
+ PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \
+ PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 21.04 --stable
+
+ - name: Build deb package for 21.10
+ run: |
+ cd $GITHUB_WORKSPACE/artifacts
+ mkdir build-21.10
+ cp *.tar.gz build-21.10 && cd build-21.10
+ tar xf *.tar.gz
+ cd globalprotect-openconnect-*/
+
+ PPA_GPG_PASSPHRASE=${{ secrets.PPA_GPG_PASSPHRASE }} \
+ PPA_GPG_KEYID=${{ steps.import_gpg.outputs.keyid }} ./scripts/ppa-publish.sh 21.10 --stable
+
+ release-aur:
+ if: startsWith(github.ref, 'refs/tags/v')
+ needs: release-archive-all
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/download-artifact@v2
+ with:
+ name: release-source-code
+ path: artifacts
+
+ - name: Publish AUR package
+ env:
+ VERSION: $(cat ./artifacts/VERSION)
+ uses: yuezk/github-actions-deploy-aur@update-pkgver
+ with:
+ pkgname: globalprotect-openconnect
+ pkgbuild: ./artifacts/aur/PKGBUILD
+ assets: ./artifacts/aur/*.tar.gz
+ update_pkgver: true
+ commit_username: ${{ secrets.AUR_USERNAME }}
+ commit_email: ${{ secrets.AUR_EMAIL }}
+ ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+ commit_message: 'Release ${{ github.ref }}'
+
+ release-obs:
+ if: startsWith(github.ref, 'refs/tags/v')
+ needs: release-archive-all
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/download-artifact@v2
+ with:
+ name: release-source-code
+ path: artifacts
+
+ - uses: yuezk/publish-obs-package@main
+ with:
+ project: home:yuezk
+ package: globalprotect-openconnect
+ username: yuezk
+ password: ${{ secrets.OBS_PASSWORD }}
+ files: ./artifacts/obs/*
+
+ release-github:
+ if: startsWith(github.ref, 'refs/tags/v')
+ needs:
+ - release-ppa
+ - release-aur
+ - release-obs
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/download-artifact@v2
+ with:
+ name: release-source-code
+ path: artifacts
+ - uses: softprops/action-gh-release@v1
+ with:
+ files: |
+ ./artifacts/*.tar.gz
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/pr.yml
similarity index 68%
rename from .github/workflows/main.yml
rename to .github/workflows/pr.yml
index 2d720e6..d10a034 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/pr.yml
@@ -1,18 +1,10 @@
-name: Build
+name: PR Build
on:
- push:
- branches:
- - master
- - dev
- paths-ignore:
- - LICENSE
- - "*.md"
- - .vscode
pull_request:
branches:
- master
- - dev
+ - develop
paths-ignore:
- LICENSE
- "*.md"
@@ -22,7 +14,11 @@ on:
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
build:
- runs-on: ubuntu-18.04
+ strategy:
+ matrix:
+ os: [ubuntu-18.04, ubuntu-20.04]
+
+ runs-on: ${{ matrix.os }}
steps:
# Checkout repository and submodules
@@ -30,6 +26,6 @@ jobs:
with:
submodules: recursive
- - name: Build & Install
+ - name: Build
run: |
./scripts/install-ubuntu.sh
\ No newline at end of file
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index a19eb21..bff4033 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -38,7 +38,6 @@ jobs:
--force-submodules \
--prefix=globalprotect-openconnect-${{ steps.vars.outputs.VERSION }}/ \
./globalprotect-openconnect-${{ steps.vars.outputs.VERSION }}.full.tar.gz
-
- name: "Debian Packaging"
run: |
sudo apt update
@@ -48,7 +47,6 @@ jobs:
tar xf *.tar.gz
cd globalprotect-openconnect-${{ steps.vars.outputs.VERSION }}
fakeroot dpkg-buildpackage -uc -us -sa
-
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.gitignore b/.gitignore
index 44c2114..213fc0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,11 @@
# Binaries
-gpclient
-gpservice
-
*.rpm
*.gz
*.snap
.DS_Store
build-debian
build
+artifacts
.cmake
diff --git a/.vscode/settings.json b/.vscode/settings.json
index fab9481..3efe05c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,7 @@
{
+ "files.watcherExclude": {
+ "**/artifacts/**": true,
+ },
"files.associations": {
"qregularexpression": "cpp",
"qfileinfo": "cpp",
diff --git a/3rdparty/qt-unix-signals/CMakeLists.txt b/3rdparty/qt-unix-signals/CMakeLists.txt
index 0745620..148155c 100644
--- a/3rdparty/qt-unix-signals/CMakeLists.txt
+++ b/3rdparty/qt-unix-signals/CMakeLists.txt
@@ -9,6 +9,6 @@ set(CMAKE_AUTOMOC ON)
find_package(Qt5 REQUIRED COMPONENTS Core)
-add_library(QtSignals sigwatch.cpp)
+add_library(QtSignals STATIC sigwatch.cpp)
target_include_directories(QtSignals INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(QtSignals Qt5::Core)
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fce7253..39a6fd4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,9 +7,17 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
-file(READ "VERSION" ver)
+file(STRINGS "VERSION" ver)
+file(STRINGS "VERSION_SUFFIX" VERSION_SUFFIX)
project(GlobalProtect-openconnect VERSION ${ver} LANGUAGES CXX)
+# Set the CMAKE_INSTALL_PREFIX to /usr if not specified
+if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "The default install prefix" FORCE)
+endif()
+
+message(STATUS "CMAKE_INSTALL_PREFIX was set to: ${CMAKE_INSTALL_PREFIX}")
+
configure_file(version.h.in version.h)
find_package(Qt5 REQUIRED COMPONENTS
diff --git a/GPClient/CMakeLists.txt b/GPClient/CMakeLists.txt
index e429632..9c52cdd 100644
--- a/GPClient/CMakeLists.txt
+++ b/GPClient/CMakeLists.txt
@@ -4,6 +4,9 @@ project(GPClient)
set(gpclient_GENERATED_SOURCES)
+configure_file(com.yuezk.qt.gpclient.desktop.in com.yuezk.qt.gpclient.desktop)
+configure_file(com.yuezk.qt.gpclient.metainfo.xml.in com.yuezk.qt.gpclient.metainfo.xml)
+
qt5_add_dbus_interface(
gpclient_GENERATED_SOURCES
${CMAKE_BINARY_DIR}/com.yuezk.qt.GPService.xml
@@ -40,10 +43,9 @@ add_3rdparty(
GIT_TAG v3.3.0
CMAKE_ARGS
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
-DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
-DCMAKE_PREFIX_PATH=$ENV{CMAKE_PREFIX_PATH}
- -DCMAKE_INCLUDE_PATH=$ENV{CMAKE_INCLUDE_PATH}
- -DCMAKE_LIBRARY_PATH=$ENV{CMAKE_LIBRARY_PATH}
-DQAPPLICATION_CLASS=QApplication
)
@@ -51,7 +53,10 @@ add_3rdparty(
plog
GIT_REPOSITORY https://github.com/SergiusTheBest/plog.git
GIT_TAG 1.1.5
- CMAKE_ARGS -DPLOG_BUILD_SAMPLES=OFF
+ CMAKE_ARGS
+ -DPLOG_BUILD_SAMPLES=OFF
+ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
)
ExternalProject_Get_Property(SingleApplication-${PROJECT_NAME} SOURCE_DIR BINARY_DIR)
@@ -82,10 +87,13 @@ target_link_libraries(gpclient
QtSignals
)
+if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)
+ target_compile_options(gpclient PUBLIC "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
+endif()
+
target_compile_definitions(gpclient PUBLIC QAPPLICATION_CLASS=QApplication)
-install(TARGETS gpclient DESTINATION "/usr/bin")
-install(FILES com.yuezk.qt.gpclient.metainfo.xml DESTINATION "/usr/share/metainfo")
-install(FILES com.yuezk.qt.gpclient.desktop DESTINATION "/usr/share/applications")
-install(FILES com.yuezk.qt.GPClient.svg DESTINATION "/usr/share/icons/hicolor/scalable/apps")
-install(FILES com.yuezk.qt.GPClient.svg DESTINATION "/usr/share/pixmaps")
+install(TARGETS gpclient DESTINATION bin)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.yuezk.qt.gpclient.metainfo.xml" DESTINATION share/metainfo)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.yuezk.qt.gpclient.desktop" DESTINATION share/applications)
+install(FILES "com.yuezk.qt.gpclient.svg" DESTINATION share/icons/hicolor/scalable/apps)
diff --git a/GPClient/com.yuezk.qt.gpclient.desktop b/GPClient/com.yuezk.qt.gpclient.desktop
deleted file mode 100644
index 6d47342..0000000
--- a/GPClient/com.yuezk.qt.gpclient.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-
-Type=Application
-Version=1.0.0
-Name=GlobalProtect VPN
-Comment=GlobalProtect VPN client, supports SAML auth mode
-Exec=/usr/bin/gpclient
-Icon=com.yuezk.qt.GPClient
-Categories=Network;VPN;Utility;Qt;
-Keywords=GlobalProtect;Openconnect;SAML;connection;VPN;
-StartupWMClass=gpclient
diff --git a/GPClient/com.yuezk.qt.gpclient.desktop.in b/GPClient/com.yuezk.qt.gpclient.desktop.in
new file mode 100644
index 0000000..803e7c1
--- /dev/null
+++ b/GPClient/com.yuezk.qt.gpclient.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+
+Type=Application
+Version=1.0
+Name=GlobalProtect VPN
+Comment=A GlobalProtect VPN client (GUI) for Linux based on OpenConnect and built with Qt5, supports SAML auth mode.
+GenericName=GlobalProtect VPN client, supports SAML auth mode
+Categories=Network;Dialup;
+Exec=@CMAKE_INSTALL_PREFIX@/bin/gpclient
+Icon=com.yuezk.qt.gpclient
+Keywords=GlobalProtect;Openconnect;SAML;connection;VPN;
+StartupWMClass=gpclient
diff --git a/GPClient/com.yuezk.qt.gpclient.metainfo.xml b/GPClient/com.yuezk.qt.gpclient.metainfo.xml.in
similarity index 96%
rename from GPClient/com.yuezk.qt.gpclient.metainfo.xml
rename to GPClient/com.yuezk.qt.gpclient.metainfo.xml.in
index c39df8e..3af48ab 100644
--- a/GPClient/com.yuezk.qt.gpclient.metainfo.xml
+++ b/GPClient/com.yuezk.qt.gpclient.metainfo.xml.in
@@ -37,7 +37,7 @@
- /usr/bin/gpclient
+ @CMAKE_INSTALL_PREFIX@/bin/gpclient
com.yuezk.qt.GPService
\ No newline at end of file
diff --git a/GPClient/com.yuezk.qt.GPClient.svg b/GPClient/com.yuezk.qt.gpclient.svg
similarity index 99%
rename from GPClient/com.yuezk.qt.GPClient.svg
rename to GPClient/com.yuezk.qt.gpclient.svg
index ee0ebd3..bccc611 100644
--- a/GPClient/com.yuezk.qt.GPClient.svg
+++ b/GPClient/com.yuezk.qt.gpclient.svg
@@ -16,7 +16,7 @@
viewBox="0 0 96 96"
style="enable-background:new 0 0 96 96;"
xml:space="preserve"
- sodipodi:docname="com.yuezk.qt.GPClient.svg"
+ sodipodi:docname="com.yuezk.qt.gpclient.svg"
inkscape:version="0.92.4 5da689c313, 2019-01-14">image/svg+xml
- com.yuezk.qt.GPClient.svg
+ com.yuezk.qt.gpclient.svg
connected.png
pending.png
not_connected.png
diff --git a/GPClient/samlloginwindow.cpp b/GPClient/samlloginwindow.cpp
index 70d58b4..e01682b 100644
--- a/GPClient/samlloginwindow.cpp
+++ b/GPClient/samlloginwindow.cpp
@@ -9,7 +9,7 @@ SAMLLoginWindow::SAMLLoginWindow(QWidget *parent)
: QDialog(parent)
, webView(new EnhancedWebView(this))
{
- setWindowTitle("GlobalProtect SAML Login");
+ setWindowTitle("GlobalProtect Login");
setModal(true);
resize(700, 550);
diff --git a/GPService/CMakeLists.txt b/GPService/CMakeLists.txt
index 8786f8e..2fbc440 100644
--- a/GPService/CMakeLists.txt
+++ b/GPService/CMakeLists.txt
@@ -4,6 +4,9 @@ project(GPService)
set(gpservice_GENERATED_SOURCES)
+configure_file(dbus/com.yuezk.qt.GPService.service.in dbus/com.yuezk.qt.GPService.service)
+configure_file(systemd/gpservice.service.in systemd/gpservice.service)
+
# generate the dbus xml definition
qt5_generate_dbus_interface(
gpservice.h
@@ -30,10 +33,9 @@ add_3rdparty(
GIT_TAG v3.3.0
CMAKE_ARGS
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
-DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
-DCMAKE_PREFIX_PATH=$ENV{CMAKE_PREFIX_PATH}
- -DCMAKE_INCLUDE_PATH=$ENV{CMAKE_INCLUDE_PATH}
- -DCMAKE_LIBRARY_PATH=$ENV{CMAKE_LIBRARY_PATH}
-DQAPPLICATION_CLASS=QCoreApplication
)
@@ -60,7 +62,13 @@ target_link_libraries(gpservice
target_compile_definitions(gpservice PUBLIC QAPPLICATION_CLASS=QCoreApplication)
-install(TARGETS gpservice DESTINATION "/usr/bin")
-install(FILES "dbus/com.yuezk.qt.GPService.conf" DESTINATION "/usr/share/dbus-1/system.d" )
-install(FILES "dbus/com.yuezk.qt.GPService.service" DESTINATION "/usr/share/dbus-1/system-services")
-install(FILES "systemd/gpservice.service" DESTINATION "/etc/systemd/system")
+install(TARGETS gpservice DESTINATION bin)
+install(FILES "dbus/com.yuezk.qt.GPService.conf" DESTINATION share/dbus-1/system.d )
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dbus/com.yuezk.qt.GPService.service" DESTINATION share/dbus-1/system-services)
+
+if("$ENV{DEBIAN_PACKAGE}")
+ # Install the systemd unit files to /lib/systemd/system for debian package
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/systemd/gpservice.service" DESTINATION /lib/systemd/system)
+else()
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/systemd/gpservice.service" DESTINATION lib/systemd/system)
+endif()
diff --git a/GPService/dbus/com.yuezk.qt.GPService.service b/GPService/dbus/com.yuezk.qt.GPService.service.in
similarity index 67%
rename from GPService/dbus/com.yuezk.qt.GPService.service
rename to GPService/dbus/com.yuezk.qt.GPService.service.in
index d004440..ac21bea 100644
--- a/GPService/dbus/com.yuezk.qt.GPService.service
+++ b/GPService/dbus/com.yuezk.qt.GPService.service.in
@@ -1,5 +1,5 @@
[D-BUS Service]
Name=com.yuezk.qt.GPService
-Exec=/usr/bin/gpservice
+Exec=@CMAKE_INSTALL_PREFIX@/bin/gpservice
User=root
SystemdService=gpservice.service
diff --git a/GPService/gpservice.cpp b/GPService/gpservice.cpp
index 6fd2e24..f290c90 100644
--- a/GPService/gpservice.cpp
+++ b/GPService/gpservice.cpp
@@ -115,12 +115,13 @@ void GPService::connect(QString server, QString username, QString passwd, QStrin
<< "--protocol=gp"
<< splitCommand(extraArgs)
<< "-u" << username
- << "-C" << passwd
+ << "--cookie-on-stdin"
<< server;
log("Start process with arugments: " + args.join(" "));
openconnect->start(bin, args);
+ openconnect->write((passwd + "\n").toUtf8());
}
bool GPService::isValidVersion(QString &bin) {
diff --git a/GPService/systemd/gpservice.service b/GPService/systemd/gpservice.service.in
similarity index 79%
rename from GPService/systemd/gpservice.service
rename to GPService/systemd/gpservice.service.in
index a0ce0fa..29beb08 100644
--- a/GPService/systemd/gpservice.service
+++ b/GPService/systemd/gpservice.service.in
@@ -5,7 +5,7 @@ Description=GlobalProtect openconnect DBus service
Environment="LANG=en_US.utf8"
Type=dbus
BusName=com.yuezk.qt.GPService
-ExecStart=/usr/bin/gpservice
+ExecStart=@CMAKE_INSTALL_PREFIX@/bin/gpservice
[Install]
WantedBy=multi-user.target
diff --git a/PKGBUILD.template b/PKGBUILD.template
deleted file mode 100644
index 4456ab7..0000000
--- a/PKGBUILD.template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Keinv Yue
-
-pkgname=globalprotect-openconnect
-_gitname=GlobalProtect-openconnect
-pkgver={PKG_VERSION}
-pkgrel=1
-pkgdesc="A GlobalProtect VPN client (GUI) for Linux based on Openconnect and built with Qt5, supports SAML auth mode."
-arch=(x86_64 aarch64)
-url="https://github.com/yuezk/${_gitname}"
-license=('GPL3')
-depends=('openconnect>=8.0.0' qt5-base qt5-webengine qt5-websockets)
-makedepends=(g++ make)
-source=(
- "${_gitname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
-)
-
-sha256sums=(
- '{SOURCE_SHA}'
-);
-
-prepare() {
-}
-
-build() {
- cd "$srcdir/${_gitname}-${pkgver}"
- ./cmakew -B build
- MAKEFLAGS=-j$(nproc) ./cmakew --build build
-}
-
-package() {
- cd "$srcdir/${_gitname}-${pkgver}"
- make DESTDIR="$pkgdir/" install -C build
-}
diff --git a/README.md b/README.md
index 7246916..732f68a 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,9 @@ A GlobalProtect VPN client (GUI) for Linux based on Openconnect and built with Q
+
+
+
## Features
- Similar user experience as the official client in macOS.
diff --git a/VERSION_SUFFIX b/VERSION_SUFFIX
new file mode 100644
index 0000000..e69de29
diff --git a/debian/changelog b/debian/changelog
index a125256..619cf41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,47 +1,5 @@
-globalprotect-openconnect (1.3.0-1ppa1) bionic; urgency=medium
+globalprotect-openconnect (1.3.0-1) unstable; urgency=medium
* Bump version to 1.3.0
-- Kevin Yue Thu, 09 Jul 2020 10:13:46 +0800
-
-globalprotect-openconnect (1.2.7-1ppa1) bionic; urgency=medium
-
- * Update dependencies
-
- -- Kevin Yue Tue, 09 Jun 2020 22:13:46 +0800
-
-globalprotect-openconnect (1.2.6-1ppa1) bionic; urgency=medium
-
- * Add qt5-default dependency
-
- -- Kevin Yue Tue, 09 Jun 2020 22:05:57 +0800
-
-globalprotect-openconnect (1.2.5-1ppa1) bionic; urgency=medium
-
- * Update version
-
- -- Kevin Yue Mon, 08 Jun 2020 23:24:06 +0800
-
-globalprotect-openconnect (1.2.4-1ppa5) bionic; urgency=medium
-
- * Update dependencies
-
- -- Kevin Yue Mon, 08 Jun 2020 23:13:44 +0800
-
-globalprotect-openconnect (1.2.4-1ppa2) bionic; urgency=medium
-
- * Update dependencies
-
- -- Kevin Yue Mon, 08 Jun 2020 22:39:07 +0800
-
-globalprotect-openconnect (1.2.4-1ppa1) bionic; urgency=medium
-
- * Initial release.
-
- -- Kevin Yue Sun, 07 Jun 2020 19:00:25 +0800
-
-globalprotect-openconnect (1.2.4-1) UNRELEASED; urgency=low
-
- * Initial release of debian package
-
- -- Amit Joshi <> Fri, 29 May 2020 21:52:59 -0400
diff --git a/debian/control b/debian/control
index 99ede16..9a49920 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: globalprotect-openconnect
Section: net
Priority: optional
Maintainer: Kevin Yue
-Build-Depends: debhelper (>=11~), qtbase5-dev, qttools5-dev (>=5.9), libqt5websockets5-dev (>=5.9), qtwebengine5-dev (>=5.9)
+Build-Depends: cmake (>=3.10), debhelper (>=11~), qtbase5-dev, libqt5websockets5-dev (>=5.9), qtwebengine5-dev (>=5.9)
Standards-Version: 4.1.4
Homepage: https://github.com/yuezk/GlobalProtect-openconnect
diff --git a/debian/copyright b/debian/copyright
index ee89e2f..bdc7b6a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,982 +1,15 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: globalprotect-openconnect
-Source: https://github.com/yuezk/GlobalProtect-openconnect
-#
-# Please double check copyright with the licensecheck(1) command.
+Files: *
+Copyright: 1975-present Kevin Yue
+License: GPL-3+
-Files: .gitignore
- .gitmodules
- GPClient/GPClient.pro
- GPClient/Makefile
- GPClient/cdpcommand.cpp
- GPClient/cdpcommand.h
- GPClient/cdpcommand.o
- GPClient/cdpcommandmanager.cpp
- GPClient/cdpcommandmanager.h
- GPClient/cdpcommandmanager.o
- GPClient/com.yuezk.qt.gpclient.desktop
- GPClient/connected.png
- GPClient/enhancedwebview.cpp
- GPClient/enhancedwebview.h
- GPClient/enhancedwebview.o
- GPClient/gatewayauthenticator.cpp
- GPClient/gatewayauthenticator.h
- GPClient/gatewayauthenticator.o
- GPClient/gpclient
- GPClient/gpclient.cpp
- GPClient/gpclient.h
- GPClient/gpclient.o
- GPClient/gpgateway.cpp
- GPClient/gpgateway.h
- GPClient/gpgateway.o
- GPClient/gphelper.cpp
- GPClient/gphelper.h
- GPClient/gphelper.o
- GPClient/gpservice_interface.cpp
- GPClient/gpservice_interface.h
- GPClient/gpservice_interface.o
- GPClient/loginparams.cpp
- GPClient/loginparams.h
- GPClient/loginparams.o
- GPClient/main.cpp
- GPClient/main.o
- GPClient/moc_cdpcommand.cpp
- GPClient/moc_cdpcommand.o
- GPClient/moc_cdpcommandmanager.cpp
- GPClient/moc_cdpcommandmanager.o
- GPClient/moc_enhancedwebview.cpp
- GPClient/moc_enhancedwebview.o
- GPClient/moc_gatewayauthenticator.cpp
- GPClient/moc_gatewayauthenticator.o
- GPClient/moc_gpclient.cpp
- GPClient/moc_gpclient.o
- GPClient/moc_gpservice_interface.cpp
- GPClient/moc_gpservice_interface.o
- GPClient/moc_normalloginwindow.cpp
- GPClient/moc_normalloginwindow.o
- GPClient/moc_portalauthenticator.cpp
- GPClient/moc_portalauthenticator.o
- GPClient/moc_predefs.h
- GPClient/moc_samlloginwindow.cpp
- GPClient/moc_samlloginwindow.o
- GPClient/moc_singleapplication.cpp
- GPClient/moc_singleapplication.o
- GPClient/moc_singleapplication_p.cpp
- GPClient/moc_singleapplication_p.o
- GPClient/normalloginwindow.cpp
- GPClient/normalloginwindow.h
- GPClient/normalloginwindow.o
- GPClient/not_connected.png
- GPClient/pending.png
- GPClient/portalauthenticator.cpp
- GPClient/portalauthenticator.h
- GPClient/portalauthenticator.o
- GPClient/portalconfigresponse.cpp
- GPClient/portalconfigresponse.h
- GPClient/portalconfigresponse.o
- GPClient/preloginresponse.cpp
- GPClient/preloginresponse.h
- GPClient/preloginresponse.o
- GPClient/qrc_resources.cpp
- GPClient/qrc_resources.o
- GPClient/radio_selected.png
- GPClient/radio_unselected.png
- GPClient/samlloginwindow.cpp
- GPClient/samlloginwindow.h
- GPClient/samlloginwindow.o
- GPClient/singleapplication.o
- GPClient/singleapplication_p.o
- GPClient/ui_gpclient.h
- GPClient/ui_normalloginwindow.h
- GPService/GPService.pro
- GPService/Makefile
- GPService/dbus/com.yuezk.qt.GPService.service
- GPService/gpservice
- GPService/gpservice.cpp
- GPService/gpservice.h
- GPService/gpservice.o
- GPService/gpservice_adaptor.cpp
- GPService/gpservice_adaptor.h
- GPService/gpservice_adaptor.o
- GPService/main.cpp
- GPService/main.o
- GPService/moc_gpservice.cpp
- GPService/moc_gpservice.o
- GPService/moc_gpservice_adaptor.cpp
- GPService/moc_gpservice_adaptor.o
- GPService/moc_predefs.h
- GPService/moc_sigwatch.cpp
- GPService/moc_singleapplication.cpp
- GPService/moc_singleapplication.o
- GPService/moc_singleapplication_p.cpp
- GPService/moc_singleapplication_p.o
- GPService/sigwatch.o
- GPService/singleapplication.o
- GPService/singleapplication_p.o
- GPService/systemd/gpservice.service
- GlobalProtect-openconnect.pro
- Makefile
- README.md
- plog/.appveyor.yml
- plog/.circleci/config.yml
- plog/.cirrus.yml
- plog/.editorconfig
- plog/.git
- plog/.gitignore
- plog/.travis.yml
- plog/CMakeLists.txt
- plog/README.md
- plog/include/plog/Appenders/AndroidAppender.h
- plog/include/plog/Appenders/ColorConsoleAppender.h
- plog/include/plog/Appenders/ConsoleAppender.h
- plog/include/plog/Appenders/DebugOutputAppender.h
- plog/include/plog/Appenders/EventLogAppender.h
- plog/include/plog/Appenders/IAppender.h
- plog/include/plog/Appenders/RollingFileAppender.h
- plog/include/plog/Converters/NativeEOLConverter.h
- plog/include/plog/Converters/UTF8Converter.h
- plog/include/plog/Formatters/CsvFormatter.h
- plog/include/plog/Formatters/FuncMessageFormatter.h
- plog/include/plog/Formatters/MessageOnlyFormatter.h
- plog/include/plog/Formatters/TxtFormatter.h
- plog/include/plog/Init.h
- plog/include/plog/Log.h
- plog/include/plog/Logger.h
- plog/include/plog/Record.h
- plog/include/plog/Severity.h
- plog/include/plog/Util.h
- plog/include/plog/WinApi.h
- plog/samples/Android/CMakeLists.txt
- plog/samples/Android/jni/Application.mk
- plog/samples/Android/jni/Sample.cpp
- plog/samples/CMakeLists.txt
- plog/samples/Chained/CMakeLists.txt
- plog/samples/Chained/ChainedApp/Main.cpp
- plog/samples/Chained/ChainedLib/Main.cpp
- plog/samples/ColorConsole/CMakeLists.txt
- plog/samples/ColorConsole/Main.cpp
- plog/samples/CustomAppender/CMakeLists.txt
- plog/samples/CustomAppender/Main.cpp
- plog/samples/CustomConverter/CMakeLists.txt
- plog/samples/CustomConverter/Main.cpp
- plog/samples/CustomFormatter/CMakeLists.txt
- plog/samples/CustomFormatter/Main.cpp
- plog/samples/CustomType/CMakeLists.txt
- plog/samples/CustomType/Main.cpp
- plog/samples/DebugOutput/CMakeLists.txt
- plog/samples/DebugOutput/Main.cpp
- plog/samples/Demo/CMakeLists.txt
- plog/samples/Demo/Customer.h
- plog/samples/Demo/Main.cpp
- plog/samples/Demo/MyClass.cpp
- plog/samples/Demo/MyClass.h
- plog/samples/EventLog/CMakeLists.txt
- plog/samples/EventLog/Main.cpp
- plog/samples/Facilities/CMakeLists.txt
- plog/samples/Facilities/Main.cpp
- plog/samples/Hello/CMakeLists.txt
- plog/samples/Hello/Main.cpp
- plog/samples/Library/CMakeLists.txt
- plog/samples/Library/LibraryApp/Main.cpp
- plog/samples/Library/LibraryLib/Lib.cpp
- plog/samples/MultiAppender/CMakeLists.txt
- plog/samples/MultiAppender/Main.cpp
- plog/samples/MultiInstance/CMakeLists.txt
- plog/samples/MultiInstance/Main.cpp
- plog/samples/ObjectiveC/CMakeLists.txt
- plog/samples/ObjectiveC/Main.mm
- plog/samples/Performance/CMakeLists.txt
- plog/samples/Performance/Main.cpp
- plog/samples/SetFileName/CMakeLists.txt
- plog/samples/SetFileName/Main.cpp
- plog/samples/Shared/CMakeLists.txt
- plog/samples/Shared/SharedApp/Main.cpp
- plog/samples/Shared/SharedLib/Main.cpp
- plog/samples/SkipNativeEOL/CMakeLists.txt
- plog/samples/SkipNativeEOL/Main.cpp
- plog/samples/UtcTime/CMakeLists.txt
- plog/samples/UtcTime/Main.cpp
- screenshot.png
- singleapplication/.git
- singleapplication/.github/FUNDING.yml
- singleapplication/.github/workflows/build-cmake.yml
- singleapplication/.gitignore
- singleapplication/CHANGELOG.md
- singleapplication/CMakeLists.txt
- singleapplication/README.md
- singleapplication/Windows.md
- singleapplication/examples/basic/CMakeLists.txt
- singleapplication/examples/basic/basic.pro
- singleapplication/examples/basic/main.cpp
- singleapplication/examples/calculator/CMakeLists.txt
- singleapplication/examples/calculator/button.cpp
- singleapplication/examples/calculator/button.h
- singleapplication/examples/calculator/calculator.cpp
- singleapplication/examples/calculator/calculator.h
- singleapplication/examples/calculator/calculator.pro
- singleapplication/examples/calculator/main.cpp
- singleapplication/examples/sending_arguments/CMakeLists.txt
- singleapplication/examples/sending_arguments/main.cpp
- singleapplication/examples/sending_arguments/messagereceiver.cpp
- singleapplication/examples/sending_arguments/messagereceiver.h
- singleapplication/examples/sending_arguments/sending_arguments.pro
- singleapplication/singleapplication.pri
-Copyright: __NO_COPYRIGHT_NOR_LICENSE__
-License: __NO_COPYRIGHT_NOR_LICENSE__
+Files: 3rdparty/plog
+Copyright: 2016 Sergey Podobry (sergey.podobry at gmail.com)
+License: MPL-2.0
-Files: GPService/sigwatch.cpp
- GPService/sigwatch.h
- singleapplication/singleapplication.cpp
- singleapplication/singleapplication.h
+Files: 3rdparty/qt-unix-signals
Copyright: 2014 Simon Knopp
- 2015-2018 Itay Grudev
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
+License: MIT
-Files: singleapplication/singleapplication_p.cpp
- singleapplication/singleapplication_p.h
-Copyright: 2015-2018 Itay Grudev
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- .
- W A R N I N G !!!
-
-Files: plog/samples/Android/jni/Android.mk
-Copyright: 2009 The Android Open Source Project
-License: Apache-2.0
- 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.
- .
- On Debian systems, the complete text of the Apache License Version 2.0
- can be found in `/usr/share/common-licenses/Apache-2.0'.
-
-#----------------------------------------------------------------------------
-# xml and html files (skipped):
-# GPService/gpservice.xml
-# GPService/dbus/com.yuezk.qt.GPService.conf
-# GPClient/com.yuezk.qt.GPClient.svg
-# GPClient/gpclient.ui
-# GPClient/normalloginwindow.ui
-# GPClient/resources.qrc
-
-#----------------------------------------------------------------------------
-# Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following
-# license/copyright files.
-
-#----------------------------------------------------------------------------
-# License file: LICENSE
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
- .
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
- .
- Preamble
- .
- The GNU General Public License is a free, copyleft license for
- software and other kinds of works.
- .
- The licenses for most software and other practical works are designed
- to take away your freedom to share and change the works. By contrast,
- the GNU General Public License is intended to guarantee your freedom to
- share and change all versions of a program--to make sure it remains free
- software for all its users. We, the Free Software Foundation, use the
- GNU General Public License for most of our software; it applies also to
- any other work released this way by its authors. You can apply it to
- your programs, too.
- .
- When we speak of free software, we are referring to freedom, not
- price. Our General Public Licenses are designed to make sure that you
- have the freedom to distribute copies of free software (and charge for
- them if you wish), that you receive source code or can get it if you
- want it, that you can change the software or use pieces of it in new
- free programs, and that you know you can do these things.
- .
- To protect your rights, we need to prevent others from denying you
- these rights or asking you to surrender the rights. Therefore, you have
- certain responsibilities if you distribute copies of the software, or if
- you modify it: responsibilities to respect the freedom of others.
- .
- For example, if you distribute copies of such a program, whether
- gratis or for a fee, you must pass on to the recipients the same
- freedoms that you received. You must make sure that they, too, receive
- or can get the source code. And you must show them these terms so they
- know their rights.
- .
- Developers that use the GNU GPL protect your rights with two steps:
- (1) assert copyright on the software, and (2) offer you this License
- giving you legal permission to copy, distribute and/or modify it.
- .
- For the developers' and authors' protection, the GPL clearly explains
- that there is no warranty for this free software. For both users' and
- authors' sake, the GPL requires that modified versions be marked as
- changed, so that their problems will not be attributed erroneously to
- authors of previous versions.
- .
- Some devices are designed to deny users access to install or run
- modified versions of the software inside them, although the manufacturer
- can do so. This is fundamentally incompatible with the aim of
- protecting users' freedom to change the software. The systematic
- pattern of such abuse occurs in the area of products for individuals to
- use, which is precisely where it is most unacceptable. Therefore, we
- have designed this version of the GPL to prohibit the practice for those
- products. If such problems arise substantially in other domains, we
- stand ready to extend this provision to those domains in future versions
- of the GPL, as needed to protect the freedom of users.
- .
- Finally, every program is threatened constantly by software patents.
- States should not allow patents to restrict development and use of
- software on general-purpose computers, but in those that do, we wish to
- avoid the special danger that patents applied to a free program could
- make it effectively proprietary. To prevent this, the GPL assures that
- patents cannot be used to render the program non-free.
- .
- The precise terms and conditions for copying, distribution and
- modification follow.
- .
- TERMS AND CONDITIONS
- .
- 0. Definitions.
- .
- "This License" refers to version 3 of the GNU General Public License.
- .
- "Copyright" also means copyright-like laws that apply to other kinds of
- works, such as semiconductor masks.
- .
- "The Program" refers to any copyrightable work licensed under this
- License. Each licensee is addressed as "you". "Licensees" and
- "recipients" may be individuals or organizations.
- .
- To "modify" a work means to copy from or adapt all or part of the work
- in a fashion requiring copyright permission, other than the making of an
- exact copy. The resulting work is called a "modified version" of the
- earlier work or a work "based on" the earlier work.
- .
- A "covered work" means either the unmodified Program or a work based
- on the Program.
- .
- To "propagate" a work means to do anything with it that, without
- permission, would make you directly or secondarily liable for
- infringement under applicable copyright law, except executing it on a
- computer or modifying a private copy. Propagation includes copying,
- distribution (with or without modification), making available to the
- public, and in some countries other activities as well.
- .
- To "convey" a work means any kind of propagation that enables other
- parties to make or receive copies. Mere interaction with a user through
- a computer network, with no transfer of a copy, is not conveying.
- .
- An interactive user interface displays "Appropriate Legal Notices"
- to the extent that it includes a convenient and prominently visible
- feature that (1) displays an appropriate copyright notice, and (2)
- tells the user that there is no warranty for the work (except to the
- extent that warranties are provided), that licensees may convey the
- work under this License, and how to view a copy of this License. If
- the interface presents a list of user commands or options, such as a
- menu, a prominent item in the list meets this criterion.
- .
- 1. Source Code.
- .
- The "source code" for a work means the preferred form of the work
- for making modifications to it. "Object code" means any non-source
- form of a work.
- .
- A "Standard Interface" means an interface that either is an official
- standard defined by a recognized standards body, or, in the case of
- interfaces specified for a particular programming language, one that
- is widely used among developers working in that language.
- .
- The "System Libraries" of an executable work include anything, other
- than the work as a whole, that (a) is included in the normal form of
- packaging a Major Component, but which is not part of that Major
- Component, and (b) serves only to enable use of the work with that
- Major Component, or to implement a Standard Interface for which an
- implementation is available to the public in source code form. A
- "Major Component", in this context, means a major essential component
- (kernel, window system, and so on) of the specific operating system
- (if any) on which the executable work runs, or a compiler used to
- produce the work, or an object code interpreter used to run it.
- .
- The "Corresponding Source" for a work in object code form means all
- the source code needed to generate, install, and (for an executable
- work) run the object code and to modify the work, including scripts to
- control those activities. However, it does not include the work's
- System Libraries, or general-purpose tools or generally available free
- programs which are used unmodified in performing those activities but
- which are not part of the work. For example, Corresponding Source
- includes interface definition files associated with source files for
- the work, and the source code for shared libraries and dynamically
- linked subprograms that the work is specifically designed to require,
- such as by intimate data communication or control flow between those
- subprograms and other parts of the work.
- .
- The Corresponding Source need not include anything that users
- can regenerate automatically from other parts of the Corresponding
- Source.
- .
- The Corresponding Source for a work in source code form is that
- same work.
- .
- 2. Basic Permissions.
- .
- All rights granted under this License are granted for the term of
- copyright on the Program, and are irrevocable provided the stated
- conditions are met. This License explicitly affirms your unlimited
- permission to run the unmodified Program. The output from running a
- covered work is covered by this License only if the output, given its
- content, constitutes a covered work. This License acknowledges your
- rights of fair use or other equivalent, as provided by copyright law.
- .
- You may make, run and propagate covered works that you do not
- convey, without conditions so long as your license otherwise remains
- in force. You may convey covered works to others for the sole purpose
- of having them make modifications exclusively for you, or provide you
- with facilities for running those works, provided that you comply with
- the terms of this License in conveying all material for which you do
- not control copyright. Those thus making or running the covered works
- for you must do so exclusively on your behalf, under your direction
- and control, on terms that prohibit them from making any copies of
- your copyrighted material outside their relationship with you.
- .
- Conveying under any other circumstances is permitted solely under
- the conditions stated below. Sublicensing is not allowed; section 10
- makes it unnecessary.
- .
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
- .
- No covered work shall be deemed part of an effective technological
- measure under any applicable law fulfilling obligations under article
- 11 of the WIPO copyright treaty adopted on 20 December 1996, or
- similar laws prohibiting or restricting circumvention of such
- measures.
- .
- When you convey a covered work, you waive any legal power to forbid
- circumvention of technological measures to the extent such circumvention
- is effected by exercising rights under this License with respect to
- the covered work, and you disclaim any intention to limit operation or
- modification of the work as a means of enforcing, against the work's
- users, your or third parties' legal rights to forbid circumvention of
- technological measures.
- .
- 4. Conveying Verbatim Copies.
- .
- You may convey verbatim copies of the Program's source code as you
- receive it, in any medium, provided that you conspicuously and
- appropriately publish on each copy an appropriate copyright notice;
- keep intact all notices stating that this License and any
- non-permissive terms added in accord with section 7 apply to the code;
- keep intact all notices of the absence of any warranty; and give all
- recipients a copy of this License along with the Program.
- .
- You may charge any price or no price for each copy that you convey,
- and you may offer support or warranty protection for a fee.
- .
- 5. Conveying Modified Source Versions.
- .
- You may convey a work based on the Program, or the modifications to
- produce it from the Program, in the form of source code under the
- terms of section 4, provided that you also meet all of these conditions:
- .
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
- .
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
- .
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
- .
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
- .
- A compilation of a covered work with other separate and independent
- works, which are not by their nature extensions of the covered work,
- and which are not combined with it such as to form a larger program,
- in or on a volume of a storage or distribution medium, is called an
- "aggregate" if the compilation and its resulting copyright are not
- used to limit the access or legal rights of the compilation's users
- beyond what the individual works permit. Inclusion of a covered work
- in an aggregate does not cause this License to apply to the other
- parts of the aggregate.
- .
- 6. Conveying Non-Source Forms.
- .
- You may convey a covered work in object code form under the terms
- of sections 4 and 5, provided that you also convey the
- machine-readable Corresponding Source under the terms of this License,
- in one of these ways:
- .
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
- .
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
- .
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
- .
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
- .
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
- .
- A separable portion of the object code, whose source code is excluded
- from the Corresponding Source as a System Library, need not be
- included in conveying the object code work.
- .
- A "User Product" is either (1) a "consumer product", which means any
- tangible personal property which is normally used for personal, family,
- or household purposes, or (2) anything designed or sold for incorporation
- into a dwelling. In determining whether a product is a consumer product,
- doubtful cases shall be resolved in favor of coverage. For a particular
- product received by a particular user, "normally used" refers to a
- typical or common use of that class of product, regardless of the status
- of the particular user or of the way in which the particular user
- actually uses, or expects or is expected to use, the product. A product
- is a consumer product regardless of whether the product has substantial
- commercial, industrial or non-consumer uses, unless such uses represent
- the only significant mode of use of the product.
- .
- "Installation Information" for a User Product means any methods,
- procedures, authorization keys, or other information required to install
- and execute modified versions of a covered work in that User Product from
- a modified version of its Corresponding Source. The information must
- suffice to ensure that the continued functioning of the modified object
- code is in no case prevented or interfered with solely because
- modification has been made.
- .
- If you convey an object code work under this section in, or with, or
- specifically for use in, a User Product, and the conveying occurs as
- part of a transaction in which the right of possession and use of the
- User Product is transferred to the recipient in perpetuity or for a
- fixed term (regardless of how the transaction is characterized), the
- Corresponding Source conveyed under this section must be accompanied
- by the Installation Information. But this requirement does not apply
- if neither you nor any third party retains the ability to install
- modified object code on the User Product (for example, the work has
- been installed in ROM).
- .
- The requirement to provide Installation Information does not include a
- requirement to continue to provide support service, warranty, or updates
- for a work that has been modified or installed by the recipient, or for
- the User Product in which it has been modified or installed. Access to a
- network may be denied when the modification itself materially and
- adversely affects the operation of the network or violates the rules and
- protocols for communication across the network.
- .
- Corresponding Source conveyed, and Installation Information provided,
- in accord with this section must be in a format that is publicly
- documented (and with an implementation available to the public in
- source code form), and must require no special password or key for
- unpacking, reading or copying.
- .
- 7. Additional Terms.
- .
- "Additional permissions" are terms that supplement the terms of this
- License by making exceptions from one or more of its conditions.
- Additional permissions that are applicable to the entire Program shall
- be treated as though they were included in this License, to the extent
- that they are valid under applicable law. If additional permissions
- apply only to part of the Program, that part may be used separately
- under those permissions, but the entire Program remains governed by
- this License without regard to the additional permissions.
- .
- When you convey a copy of a covered work, you may at your option
- remove any additional permissions from that copy, or from any part of
- it. (Additional permissions may be written to require their own
- removal in certain cases when you modify the work.) You may place
- additional permissions on material, added by you to a covered work,
- for which you have or can give appropriate copyright permission.
- .
- Notwithstanding any other provision of this License, for material you
- add to a covered work, you may (if authorized by the copyright holders of
- that material) supplement the terms of this License with terms:
- .
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
- .
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
- .
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
- .
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
- .
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
- .
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
- .
- All other non-permissive additional terms are considered "further
- restrictions" within the meaning of section 10. If the Program as you
- received it, or any part of it, contains a notice stating that it is
- governed by this License along with a term that is a further
- restriction, you may remove that term. If a license document contains
- a further restriction but permits relicensing or conveying under this
- License, you may add to a covered work material governed by the terms
- of that license document, provided that the further restriction does
- not survive such relicensing or conveying.
- .
- If you add terms to a covered work in accord with this section, you
- must place, in the relevant source files, a statement of the
- additional terms that apply to those files, or a notice indicating
- where to find the applicable terms.
- .
- Additional terms, permissive or non-permissive, may be stated in the
- form of a separately written license, or stated as exceptions;
- the above requirements apply either way.
- .
- 8. Termination.
- .
- You may not propagate or modify a covered work except as expressly
- provided under this License. Any attempt otherwise to propagate or
- modify it is void, and will automatically terminate your rights under
- this License (including any patent licenses granted under the third
- paragraph of section 11).
- .
- However, if you cease all violation of this License, then your
- license from a particular copyright holder is reinstated (a)
- provisionally, unless and until the copyright holder explicitly and
- finally terminates your license, and (b) permanently, if the copyright
- holder fails to notify you of the violation by some reasonable means
- prior to 60 days after the cessation.
- .
- Moreover, your license from a particular copyright holder is
- reinstated permanently if the copyright holder notifies you of the
- violation by some reasonable means, this is the first time you have
- received notice of violation of this License (for any work) from that
- copyright holder, and you cure the violation prior to 30 days after
- your receipt of the notice.
- .
- Termination of your rights under this section does not terminate the
- licenses of parties who have received copies or rights from you under
- this License. If your rights have been terminated and not permanently
- reinstated, you do not qualify to receive new licenses for the same
- material under section 10.
- .
- 9. Acceptance Not Required for Having Copies.
- .
- You are not required to accept this License in order to receive or
- run a copy of the Program. Ancillary propagation of a covered work
- occurring solely as a consequence of using peer-to-peer transmission
- to receive a copy likewise does not require acceptance. However,
- nothing other than this License grants you permission to propagate or
- modify any covered work. These actions infringe copyright if you do
- not accept this License. Therefore, by modifying or propagating a
- covered work, you indicate your acceptance of this License to do so.
- .
- 10. Automatic Licensing of Downstream Recipients.
- .
- Each time you convey a covered work, the recipient automatically
- receives a license from the original licensors, to run, modify and
- propagate that work, subject to this License. You are not responsible
- for enforcing compliance by third parties with this License.
- .
- An "entity transaction" is a transaction transferring control of an
- organization, or substantially all assets of one, or subdividing an
- organization, or merging organizations. If propagation of a covered
- work results from an entity transaction, each party to that
- transaction who receives a copy of the work also receives whatever
- licenses to the work the party's predecessor in interest had or could
- give under the previous paragraph, plus a right to possession of the
- Corresponding Source of the work from the predecessor in interest, if
- the predecessor has it or can get it with reasonable efforts.
- .
- You may not impose any further restrictions on the exercise of the
- rights granted or affirmed under this License. For example, you may
- not impose a license fee, royalty, or other charge for exercise of
- rights granted under this License, and you may not initiate litigation
- (including a cross-claim or counterclaim in a lawsuit) alleging that
- any patent claim is infringed by making, using, selling, offering for
- sale, or importing the Program or any portion of it.
- .
- 11. Patents.
- .
- A "contributor" is a copyright holder who authorizes use under this
- License of the Program or a work on which the Program is based. The
- work thus licensed is called the contributor's "contributor version".
- .
- A contributor's "essential patent claims" are all patent claims
- owned or controlled by the contributor, whether already acquired or
- hereafter acquired, that would be infringed by some manner, permitted
- by this License, of making, using, or selling its contributor version,
- but do not include claims that would be infringed only as a
- consequence of further modification of the contributor version. For
- purposes of this definition, "control" includes the right to grant
- patent sublicenses in a manner consistent with the requirements of
- this License.
- .
- Each contributor grants you a non-exclusive, worldwide, royalty-free
- patent license under the contributor's essential patent claims, to
- make, use, sell, offer for sale, import and otherwise run, modify and
- propagate the contents of its contributor version.
- .
- In the following three paragraphs, a "patent license" is any express
- agreement or commitment, however denominated, not to enforce a patent
- (such as an express permission to practice a patent or covenant not to
- sue for patent infringement). To "grant" such a patent license to a
- party means to make such an agreement or commitment not to enforce a
- patent against the party.
- .
- If you convey a covered work, knowingly relying on a patent license,
- and the Corresponding Source of the work is not available for anyone
- to copy, free of charge and under the terms of this License, through a
- publicly available network server or other readily accessible means,
- then you must either (1) cause the Corresponding Source to be so
- available, or (2) arrange to deprive yourself of the benefit of the
- patent license for this particular work, or (3) arrange, in a manner
- consistent with the requirements of this License, to extend the patent
- license to downstream recipients. "Knowingly relying" means you have
- actual knowledge that, but for the patent license, your conveying the
- covered work in a country, or your recipient's use of the covered work
- in a country, would infringe one or more identifiable patents in that
- country that you have reason to believe are valid.
- .
- If, pursuant to or in connection with a single transaction or
- arrangement, you convey, or propagate by procuring conveyance of, a
- covered work, and grant a patent license to some of the parties
- receiving the covered work authorizing them to use, propagate, modify
- or convey a specific copy of the covered work, then the patent license
- you grant is automatically extended to all recipients of the covered
- work and works based on it.
- .
- A patent license is "discriminatory" if it does not include within
- the scope of its coverage, prohibits the exercise of, or is
- conditioned on the non-exercise of one or more of the rights that are
- specifically granted under this License. You may not convey a covered
- work if you are a party to an arrangement with a third party that is
- in the business of distributing software, under which you make payment
- to the third party based on the extent of your activity of conveying
- the work, and under which the third party grants, to any of the
- parties who would receive the covered work from you, a discriminatory
- patent license (a) in connection with copies of the covered work
- conveyed by you (or copies made from those copies), or (b) primarily
- for and in connection with specific products or compilations that
- contain the covered work, unless you entered into that arrangement,
- or that patent license was granted, prior to 28 March 2007.
- .
- Nothing in this License shall be construed as excluding or limiting
- any implied license or other defenses to infringement that may
- otherwise be available to you under applicable patent law.
- .
- 12. No Surrender of Others' Freedom.
- .
- If conditions are imposed on you (whether by court order, agreement or
- otherwise) that contradict the conditions of this License, they do not
- excuse you from the conditions of this License. If you cannot convey a
- covered work so as to satisfy simultaneously your obligations under this
- License and any other pertinent obligations, then as a consequence you may
- not convey it at all. For example, if you agree to terms that obligate you
- to collect a royalty for further conveying from those to whom you convey
- the Program, the only way you could satisfy both those terms and this
- License would be to refrain entirely from conveying the Program.
- .
- 13. Use with the GNU Affero General Public License.
- .
- Notwithstanding any other provision of this License, you have
- permission to link or combine any covered work with a work licensed
- under version 3 of the GNU Affero General Public License into a single
- combined work, and to convey the resulting work. The terms of this
- License will continue to apply to the part which is the covered work,
- but the special requirements of the GNU Affero General Public License,
- section 13, concerning interaction through a network will apply to the
- combination as such.
- .
- 14. Revised Versions of this License.
- .
- The Free Software Foundation may publish revised and/or new versions of
- the GNU General Public License from time to time. Such new versions will
- be similar in spirit to the present version, but may differ in detail to
- address new problems or concerns.
- .
- Each version is given a distinguishing version number. If the
- Program specifies that a certain numbered version of the GNU General
- Public License "or any later version" applies to it, you have the
- option of following the terms and conditions either of that numbered
- version or of any later version published by the Free Software
- Foundation. If the Program does not specify a version number of the
- GNU General Public License, you may choose any version ever published
- by the Free Software Foundation.
- .
- If the Program specifies that a proxy can decide which future
- versions of the GNU General Public License can be used, that proxy's
- public statement of acceptance of a version permanently authorizes you
- to choose that version for the Program.
- .
- Later license versions may give you additional or different
- permissions. However, no additional obligations are imposed on any
- author or copyright holder as a result of your choosing to follow a
- later version.
- .
- 15. Disclaimer of Warranty.
- .
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
- APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
- HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
- OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
- IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
- ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- .
- 16. Limitation of Liability.
- .
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
- WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
- THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
- GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
- USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
- DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
- PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
- EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGES.
- .
- 17. Interpretation of Sections 15 and 16.
- .
- If the disclaimer of warranty and limitation of liability provided
- above cannot be given local legal effect according to their terms,
- reviewing courts shall apply local law that most closely approximates
- an absolute waiver of all civil liability in connection with the
- Program, unless a warranty or assumption of liability accompanies a
- copy of the Program in return for a fee.
- .
- END OF TERMS AND CONDITIONS
- .
- How to Apply These Terms to Your New Programs
- .
- If you develop a new program, and you want it to be of the greatest
- possible use to the public, the best way to achieve this is to make it
- free software which everyone can redistribute and change under these terms.
- .
- To do so, attach the following notices to the program. It is safest
- to attach them to the start of each source file to most effectively
- state the exclusion of warranty; and each file should have at least
- the "copyright" line and a pointer to where the full notice is found.
- .
-
- Copyright (C)
- .
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
- .
- Also add information on how to contact you by electronic and paper mail.
- .
- If the program does terminal interaction, make it output a short
- notice like this when it starts in an interactive mode:
- .
- Copyright (C)
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
- .
- The hypothetical commands `show w' and `show c' should show the appropriate
- parts of the General Public License. Of course, your program's commands
- might be different; for a GUI interface, you would use an "about box".
- .
- You should also get your employer (if you work as a programmer) or school,
- if any, to sign a "copyright disclaimer" for the program, if necessary.
- For more information on this, and how to apply and follow the GNU GPL, see
- .
- .
- The GNU General Public License does not permit incorporating your program
- into proprietary programs. If your program is a subroutine library, you
- may consider it more useful to permit linking proprietary applications with
- the library. If this is what you want to do, use the GNU Lesser General
- Public License instead of this License. But first, please read
- .
+Files: 3rdparty/SingleApplication
+Copyright: Itay Grudev 2015 - 2020
+License: MIT
diff --git a/debian/rules b/debian/rules
index 87a6727..6637bfa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEBIAN_PACKAGE=1
+
%:
- dh $@
-
-override_dh_auto_install:
- dh_auto_install -- prefix=/usr
-
-#override_dh_install:
-# dh_install --list-missing -X.pyc -X.pyo
+ dh $@
+override_dh_installsystemd:
+ dh_installsystemd gpservice.service
diff --git a/debian/watch b/debian/watch
index fde9f8c..1459ccd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=4
-opts="mode=git" https://github.com/yuezk/GlobalProtect-openconnect.git \
- refs/tags/v([\d\.]+) debian uupdate
+opts="mode=git,pgpmode=gittag" \
+https://github.com/yuezk/GlobalProtect-openconnect.git refs/tags/v([\d\.]+)
diff --git a/packaging/aur/PKGBUILD b/packaging/aur/PKGBUILD
new file mode 100644
index 0000000..80a944d
--- /dev/null
+++ b/packaging/aur/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Keinv Yue
+
+pkgname=globalprotect-openconnect
+pkgver=0
+pkgrel=1
+pkgdesc="A GlobalProtect VPN client (GUI) for Linux based on Openconnect and built with Qt5, supports SAML auth mode."
+arch=(x86_64 aarch64)
+url="https://github.com/yuezk/GlobalProtect-openconnect"
+license=('GPL3')
+depends=('openconnect>=8.0.0' qt5-base qt5-webengine qt5-websockets)
+makedepends=(cmake)
+provides=('gpclient' 'gpservice')
+
+source=("${pkgname}.tar.gz")
+sha256sums=('SKIP')
+
+pkgver() {
+ cd $srcdir/$pkgname-*/
+ cat VERSION VERSION_SUFFIX
+}
+
+build() {
+ cd $srcdir/$pkgname-*/
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_CXX_FLAGS_RELEASE=-s
+ make -j$(nproc) -C build
+}
+
+package() {
+ cd $srcdir/$pkgdir-*/
+ make DESTDIR="$pkgdir/" install -C build
+}
diff --git a/packaging/aur/PKGBUILD-git b/packaging/aur/PKGBUILD-git
new file mode 100644
index 0000000..7c54257
--- /dev/null
+++ b/packaging/aur/PKGBUILD-git
@@ -0,0 +1,35 @@
+# Maintainer: Keinv Yue
+
+pkgname=globalprotect-openconnect-git
+_pkgname=globalprotect-openconnect
+pkgver=0
+pkgrel=1
+pkgdesc="A GlobalProtect VPN client (GUI) for Linux based on Openconnect and built with Qt5, supports SAML auth mode. (development version)"
+arch=(x86_64 aarch64)
+url="https://github.com/yuezk/GlobalProtect-openconnect"
+license=('GPL3')
+depends=('openconnect>=8.0.0' qt5-base qt5-webengine qt5-websockets)
+makedepends=(cmake)
+conflicts=('globalprotect-openconnect')
+provides=('gpclient' 'gpservice')
+
+source=("${_pkgname}.tar.gz")
+sha256sums=('SKIP')
+
+pkgver() {
+ cd $srcdir/$_pkgname-*/
+ cat VERSION VERSION_SUFFIX
+}
+
+build() {
+ cd $srcdir/${_pkgname}-*/
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_CXX_FLAGS_RELEASE=-s
+ make -j$(nproc) -C build
+}
+
+package() {
+ cd $srcdir/${_pkgname}-*/
+ make DESTDIR="$pkgdir/" install -C build
+}
diff --git a/packaging/flatpak/com.yuezk.qt.gpclient.yml b/packaging/flatpak/com.yuezk.qt.gpclient.yml
new file mode 100644
index 0000000..5384727
--- /dev/null
+++ b/packaging/flatpak/com.yuezk.qt.gpclient.yml
@@ -0,0 +1,26 @@
+app-id: com.yuezk.qt.gpclient
+base: io.qt.qtwebengine.BaseApp
+base-version: '5.15'
+runtime: org.kde.Platform
+runtime-version: '5.15'
+sdk: org.kde.Sdk
+command: gpclient
+finish-args:
+ - --share=network
+ - --share=ipc
+ - --socket=x11
+ - --socket=wayland
+ - --filesystem=host
+ - --device=dri
+ - --talk-name=org.kde.StatusNotifierWatcher
+ - --own-name=org.kde.*
+ - --system-own-name=com.yuezk.qt.GPService
+modules:
+ - name: gpclient
+ buildsystem: cmake
+ config-opts:
+ - -DCMAKE_BUILD_TYPE=Release
+ - -DCMAKE_CXX_FLAGS_RELEASE=-s
+ sources:
+ - type: archive
+ path: globalprotect-openconnect.tar.gz
diff --git a/packaging/obs/globalprotect-openconnect-rpmlintrc b/packaging/obs/globalprotect-openconnect-rpmlintrc
new file mode 100644
index 0000000..a43b389
--- /dev/null
+++ b/packaging/obs/globalprotect-openconnect-rpmlintrc
@@ -0,0 +1 @@
+setBadness('suse-dbus-unauthorized-service', 0)
\ No newline at end of file
diff --git a/packaging/obs/globalprotect-openconnect.changes b/packaging/obs/globalprotect-openconnect.changes
new file mode 100644
index 0000000..cb57bd7
--- /dev/null
+++ b/packaging/obs/globalprotect-openconnect.changes
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Thu Jul 9 02:13:46 UTC 2020 - k3vinyue@gmail.com - 1.3.0
+
+- Update to 1.3.0
+ * Bump version to 1.3.0
diff --git a/packaging/obs/globalprotect-openconnect.spec b/packaging/obs/globalprotect-openconnect.spec
new file mode 100644
index 0000000..508a96d
--- /dev/null
+++ b/packaging/obs/globalprotect-openconnect.spec
@@ -0,0 +1,96 @@
+Name: globalprotect-openconnect
+Version: 1.3.3
+Release: 1
+Summary: A GlobalProtect VPN client powered by OpenConnect
+Group: Productivity/Networking/PPP
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+License: GPL-3.0
+URL: https://github.com/yuezk/GlobalProtect-openconnect
+Source0: %{name}.tar.gz
+BuildRequires: cmake cmake(Qt5) cmake(Qt5Gui) cmake(Qt5WebEngine) cmake(Qt5WebSockets) cmake(Qt5DBus)
+BuildRequires: systemd-rpm-macros
+Requires: openconnect >= 8.0
+Conflicts: globalprotect-openconnect-snapshot
+
+
+%global debug_package %{nil}
+
+%description
+A GlobalProtect VPN client (GUI) for Linux based on OpenConnect and built with Qt5, supports SAML auth mode.
+
+
+%prep
+%autosetup -n "globalprotect-openconnect-%{version}"
+
+
+%pre
+
+%if 0%{?suse_version}
+ %service_add_pre gpservice.service
+%endif
+
+
+%post
+
+%if 0%{?suse_version}
+ %service_add_post gpservice.service
+%else
+ %systemd_post gpservice.service
+%endif
+
+
+%preun
+
+%if 0%{?suse_version}
+ %service_del_preun gpservice.service
+%else
+ %systemd_preun gpservice.service
+%endif
+
+
+%postun
+
+%if 0%{?suse_version}
+ %service_del_postun gpservice.service
+%else
+ %systemd_postun gpservice.service
+%endif
+
+
+%build
+
+%cmake -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_CXX_FLAGS_RELEASE=-s
+
+%if 0%{?fedora_version} && 0%{?fedora_version} <= 32
+ %make_build
+%else
+ %cmake_build
+%endif
+
+
+%install
+
+%if 0%{?fedora_version} && 0%{?fedora_version} <= 32
+ %make_install
+%else
+ %cmake_install
+%endif
+
+%files
+%defattr(-,root,root)
+%{_unitdir}/gpservice.service
+%{_bindir}/gpclient
+%{_bindir}/gpservice
+%{_datadir}/applications/com.yuezk.qt.gpclient.desktop
+%{_datadir}/dbus-1/system-services/com.yuezk.qt.GPService.service
+%{_datadir}/dbus-1/system.d/com.yuezk.qt.GPService.conf
+%{_datadir}/icons/hicolor/scalable/apps/com.yuezk.qt.gpclient.svg
+%{_datadir}/metainfo/com.yuezk.qt.gpclient.metainfo.xml
+
+%dir %{_datadir}/icons/hicolor
+%dir %{_datadir}/icons/hicolor/scalable
+%dir %{_datadir}/icons/hicolor/scalable/apps
+
+%changelog
diff --git a/packaging/rpm/README.md b/packaging/rpm/README.md
deleted file mode 100644
index 13ecbc6..0000000
--- a/packaging/rpm/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## Command
-
-```sh
-docker run --rm -it -v ${PWD}:/rpm --workdir=/rpm --entrypoint ./entrypoint.sh centos:8
-```
diff --git a/packaging/rpm/entrypoint.sh b/packaging/rpm/entrypoint.sh
deleted file mode 100755
index 5261bd0..0000000
--- a/packaging/rpm/entrypoint.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash -e
-
-# Install the build tools
-dnf install -y epel-release
-rpm --import http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8
-dnf install -y make rpm-build rpm-devel rpmlint rpmdevtools
-
-# Install the build dependencies
-dnf install -y qt5-qtbase-devel qt5-qtwebengine-devel qt5-qtwebsockets-devel
-
-# Prepare the RPM build environment
-rpmdev-setuptree
-cp *.spec $HOME/rpmbuild/SPECS/
-cp *.tar.gz $HOME/rpmbuild/SOURCES/
-
-# Build
-rpmbuild -ba $HOME/rpmbuild/SPECS/globalprotect-openconnect.spec
-
-# Copy the package to the current directory
-cp $HOME/rpmbuild/RPMS/x86_64/globalprotect-openconnect-*.rpm .
-cp $HOME/rpmbuild/SRPMS/globalprotect-openconnect-*.src.rpm .
diff --git a/packaging/rpm/globalprotect-openconnect.spec b/packaging/rpm/globalprotect-openconnect.spec
deleted file mode 100644
index 56e5e7e..0000000
--- a/packaging/rpm/globalprotect-openconnect.spec
+++ /dev/null
@@ -1,39 +0,0 @@
-Name: globalprotect-openconnect
-Version: 1.3.0+SNAPSHOT20210829120923
-Release: 1
-Summary: A GlobalProtect VPN client powered by OpenConnect
-
-License: GPLv3
-URL: https://github.com/yuezk/GlobalProtect-openconnect
-Source0: %{url}/releases/download/latest/globalprotect-openconnect_%{version}.full.tar.gz
-
-BuildRequires: qt5-qtbase-devel qt5-qtwebengine-devel qt5-qtwebsockets-devel
-Requires: qt5-qtbase >= 5.12 qt5-qtwebengine >= 5.12 qt5-qtwebsockets >= 5.12 openconnect >= 8.0
-
-%global debug_package %{nil}
-
-%description
-A GlobalProtect VPN client (GUI) for Linux based on OpenConnect and built with Qt5, supports SAML auth mode.
-
-
-%prep
-%autosetup
-
-
-%build
-qmake-qt5 CONFIG+=release
-%make_build
-
-
-%install
-INSTALL_ROOT=${RPM_BUILD_ROOT} %make_install
-
-
-%files
-/etc/systemd/system/gpservice.service
-/usr/bin/gpclient
-/usr/bin/gpservice
-/usr/share/applications/com.yuezk.qt.gpclient.desktop
-/usr/share/dbus-1/system-services/com.yuezk.qt.GPService.service
-/usr/share/dbus-1/system.d/com.yuezk.qt.GPService.conf
-/usr/share/pixmaps/com.yuezk.qt.GPClient.svg
diff --git a/scripts/_archive-all.sh b/scripts/_archive-all.sh
new file mode 100755
index 0000000..971854c
--- /dev/null
+++ b/scripts/_archive-all.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -e
+
+VERSION=$(cat VERSION VERSION_SUFFIX)
+
+rm -rf ./artifacts && mkdir -p ./artifacts/{obs,aur,flatpak}
+
+# Add the version file
+echo $VERSION > ./artifacts/VERSION
+
+# Archive the source code
+git-archive-all \
+ --force-submodules \
+ --prefix=globalprotect-openconnect-${VERSION}/ \
+ ./artifacts/globalprotect-openconnect-${VERSION}.tar.gz
+
+# Prepare the OBS package
+cp -r ./packaging/obs ./artifacts
+cp ./artifacts/*.tar.gz ./artifacts/obs/globalprotect-openconnect.tar.gz
+
+# Prepare the AUR package
+cp ./packaging/aur/PKGBUILD ./artifacts/aur
+cp ./artifacts/*.tar.gz ./artifacts/aur/globalprotect-openconnect.tar.gz
+
+# Prepare the flatpak package
+cp ./packaging/flatpak/com.yuezk.qt.gpclient.yml ./artifacts/flatpak
+cp ./artifacts/*.tar.gz ./artifacts/flatpak/globalprotect-openconnect.tar.gz
\ No newline at end of file
diff --git a/scripts/build.sh b/scripts/build.sh
new file mode 100755
index 0000000..fd67bf8
--- /dev/null
+++ b/scripts/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+./cmakew -B build \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_CXX_FLAGS_RELEASE=-s
+
+MAKEFLAGS=-j$(nproc) ./cmakew --build build
\ No newline at end of file
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index 7130bb1..c3d04f8 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -444,7 +444,7 @@ do-versionfile
# do-changelog
# do-branch
do-commit
-tag "${V_USR_INPUT}" "${REL_NOTE}"
+# tag "${V_USR_INPUT}" "${REL_NOTE}"
do-push
echo -e "\n${S_LIGHT}––––––"
diff --git a/scripts/install.sh b/scripts/install.sh
index 672c0a1..0a6543d 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -1,9 +1,10 @@
#!/bin/bash -e
-./cmakew -B build -DCMAKE_BUILD_TYPE=Release
-MAKEFLAGS=-j$(nproc) ./cmakew --build build
+./scripts/build.sh
+
sudo ./cmakew --install build
+sudo systemctl enable gpservice.service
sudo systemctl daemon-reload
sudo systemctl restart gpservice.service
diff --git a/scripts/ppa-publish.sh b/scripts/ppa-publish.sh
new file mode 100755
index 0000000..090debb
--- /dev/null
+++ b/scripts/ppa-publish.sh
@@ -0,0 +1,53 @@
+#!/bin/bash -e
+
+VERSION="$(cat VERSION VERSION_SUFFIX)"
+OLD_REVISION="1"
+
+PPA_REPO="ppa:yuezk/globalprotect-openconnect-snapshot"
+
+while [[ $# -gt 0 ]]; do
+ key="$1"
+
+ case $key in
+ --stable)
+ PPA_REPO="ppa:yuezk/globalprotect-openconnect"
+ shift
+ ;;
+ "18.04")
+ DISTRIBUTION="18.04"
+ DISTRIBUTION_NAME="bionic"
+ shift
+ ;;
+ "20.04")
+ DISTRIBUTION="20.04"
+ DISTRIBUTION_NAME="focal"
+ shift
+ ;;
+ "21.04")
+ DISTRIBUTION="21.04"
+ DISTRIBUTION_NAME="hirsute"
+ shift
+ ;;
+ "21.10")
+ DISTRIBUTION="21.10"
+ DISTRIBUTION_NAME="impish"
+ shift
+ ;;
+ *)
+ echo "Unkown options $key"
+ exit 1
+ ;;
+ esac
+done
+
+[ -z $DISTRIBUTION ] && echo "The distribuation is required" && exit 1;
+
+NEW_REVISION="ppa1~ubuntu${DISTRIBUTION}"
+
+sed -i"" "1s/${VERSION}-${OLD_REVISION}/${VERSION}-${NEW_REVISION}/;1s/unstable/${DISTRIBUTION_NAME}/" debian/changelog
+debmake
+debuild -S -sa \
+ -k"${PPA_GPG_KEYID}" \
+ -p"gpg --batch --passphrase ${PPA_GPG_PASSPHRASE} --pinentry-mode loopback"
+
+dput $PPA_REPO ../globalprotect-openconnect_${VERSION}-${NEW_REVISION}_source.changes
diff --git a/scripts/prepare-packaging.sh b/scripts/prepare-packaging.sh
new file mode 100755
index 0000000..0243a7f
--- /dev/null
+++ b/scripts/prepare-packaging.sh
@@ -0,0 +1,40 @@
+#!/bin/bash -e
+
+OLD_VERSION=$(git tag --sort=-v:refname --list "v[0-9]*" | head -n 1 | cut -c 2-)
+NEW_VERSION="$(cat VERSION)"
+FULL_VERSION="$(cat VERSION VERSION_SUFFIX)"
+HISTORY_ENTRIES=$(git log --format=" * %s" v${OLD_VERSION}.. | cat -n | sort -uk2 | sort -n | cut -f2-)
+
+function update_debian_changelog() {
+ local OLD_CHANGELOG=$(cat debian/changelog)
+
+ cat > debian/changelog <<-EOF
+ globalprotect-openconnect (${FULL_VERSION}-1) unstable; urgency=medium
+
+ ${HISTORY_ENTRIES}
+
+ -- Kevin Yue $(date -R)
+
+ ${OLD_CHANGELOG}
+ EOF
+}
+
+function update_rpm_changelog() {
+ local OLD_CHANGELOG=$(cat packaging/obs/globalprotect-openconnect.changes)
+
+ cat > packaging/obs/globalprotect-openconnect.changes <<-EOF
+ -------------------------------------------------------------------
+ $(LC_ALL=en.US date -u "+%a %b %e %T %Z %Y") - k3vinyue@gmail.com - ${FULL_VERSION}
+
+ - Update to ${FULL_VERSION}
+ ${HISTORY_ENTRIES}
+
+ ${OLD_CHANGELOG}
+ EOF
+}
+
+# Update rpm version
+sed -i"" -re "s/(Version:\s+).+/\1${FULL_VERSION}/" packaging/obs/globalprotect-openconnect.spec
+
+update_rpm_changelog
+update_debian_changelog
diff --git a/scripts/release-archive-all.sh b/scripts/release-archive-all.sh
new file mode 100755
index 0000000..396e6f7
--- /dev/null
+++ b/scripts/release-archive-all.sh
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+./scripts/_archive-all.sh
\ No newline at end of file
diff --git a/scripts/release.sh b/scripts/release.sh
new file mode 100644
index 0000000..b62d52f
--- /dev/null
+++ b/scripts/release.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+VERSION=$(cat VERSION)
+
+# Clear the VERSION_SUFFIX
+cat /dev/null > VERSION_SUFFIX
+
+# Update packaging, e.g., version, changelog, etc.
+./scripts/prepare-packaging.sh
+
+# Commit the changes
+git commit -m "Release ${VERSION}" .
+git tag v$VERSION -a -m "Release ${VERSION}"
\ No newline at end of file
diff --git a/scripts/snapshot-archive-all.sh b/scripts/snapshot-archive-all.sh
new file mode 100755
index 0000000..e6df108
--- /dev/null
+++ b/scripts/snapshot-archive-all.sh
@@ -0,0 +1,17 @@
+#!/bin/bash -e
+
+./scripts/snapshot-version.sh
+./scripts/prepare-packaging.sh
+./scripts/_archive-all.sh
+
+# Update the OBS packaging
+mv ./artifacts/obs/globalprotect-openconnect.tar.gz ./artifacts/obs/globalprotect-openconnect-snapshot.tar.gz
+mv ./artifacts/obs/globalprotect-openconnect.spec ./artifacts/obs/globalprotect-openconnect-snapshot.spec
+mv ./artifacts/obs/globalprotect-openconnect.changes ./artifacts/obs/globalprotect-openconnect-snapshot.changes
+mv ./artifacts/obs/globalprotect-openconnect-rpmlintrc ./artifacts/obs/globalprotect-openconnect-snapshot-rpmlintrc
+sed -i"" -re "s/(Name:\s+).+/\1globalprotect-openconnect-snapshot/" \
+ -re "s/(Conflicts:\s+).+/\1globalprotect-openconnect/" \
+ ./artifacts/obs/globalprotect-openconnect-snapshot.spec
+
+# Update the AUR package
+cp ./packaging/aur/PKGBUILD-git ./artifacts/aur/PKGBUILD
\ No newline at end of file
diff --git a/scripts/snapshot-version.sh b/scripts/snapshot-version.sh
new file mode 100755
index 0000000..cf62ac0
--- /dev/null
+++ b/scripts/snapshot-version.sh
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+git describe --tags --match "v$(cat VERSION)" | sed -r -e 's/v([^-]+)-/+snapshot/' -e 's/-/./' > VERSION_SUFFIX
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 6355cf0..71c6cd4 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,15 +1,8 @@
name: globalprotect-openconnect
base: core18
-version: 'test'
-grade: devel
-confinement: devmode # use 'strict' once you have the right plugs and slots
+confinement: strict
compression: lzo
-contact: k3vinyue@gmail.com
-donation: https://www.buymeacoffee.com/yuezk
-issues: https://github.com/yuezk/GlobalProtect-openconnect/issues
-source-code: https://github.com/yuezk/GlobalProtect-openconnect
-website: https://github.com/yuezk/GlobalProtect-openconnect
license: GPL-3.0
adopt-info: application
@@ -40,6 +33,7 @@ plugs:
apps:
gpservice:
+ common-id: com.yuezk.qt.gpservice
daemon: simple
command: usr/bin/gpservice
command-chain:
@@ -69,6 +63,19 @@ apps:
parts:
application:
+ override-pull: |
+ snapcraftctl pull
+
+ VERSION=$(cat VERSION VERSION_SUFFIX)
+ GRADE="stable"
+
+ if echo "$VERSION" | grep -q "snapshot"
+ then
+ GRADE="devel"
+ fi
+
+ snapcraftctl set-version "$VERSION"
+ snapcraftctl set-grade "$GRADE"
parse-info:
- usr/share/metainfo/com.yuezk.qt.gpclient.metainfo.xml
plugin: cmake
@@ -81,4 +88,5 @@ parts:
- openconnect
- libatm1
configflags:
+ - -DCMAKE_INSTALL_PREFIX=/usr
- -DCMAKE_BUILD_TYPE=Release
\ No newline at end of file
diff --git a/version.h.in b/version.h.in
index e275553..bee27db 100644
--- a/version.h.in
+++ b/version.h.in
@@ -1 +1 @@
-#define VERSION "@GlobalProtect-openconnect_VERSION@"
\ No newline at end of file
+#define VERSION "@GlobalProtect-openconnect_VERSION@@VERSION_SUFFIX@"