diff --git a/CP_Packages/Apps/Fortinet_FortiClient.zip b/CP_Packages/Apps/Fortinet_FortiClient.zip deleted file mode 100644 index 8f23009e..00000000 Binary files a/CP_Packages/Apps/Fortinet_FortiClient.zip and /dev/null differ diff --git a/CP_Packages/Network/FortiClient_VPN.zip b/CP_Packages/Network/FortiClient_VPN.zip deleted file mode 100644 index c4a97977..00000000 Binary files a/CP_Packages/Network/FortiClient_VPN.zip and /dev/null differ diff --git a/CP_Source/Apps/Fortinet_FortiClient/README.md b/CP_Source/Apps/Fortinet_FortiClient/README.md deleted file mode 100644 index 83aaf795..00000000 --- a/CP_Source/Apps/Fortinet_FortiClient/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# Fortinet FortiClient (15 April) (In debug testing) - ------ - -## FortiClient GUI Issue - -**NOTE:** FortiClient blank screen on start-up. The window opens with no text. Looking into the issue. - ------ - -| CP Information | | -|-----------------|------------| -| Package | [Fortinet FortiClient](https://anydesk.com/en) - Advanced Endpoint Security | -| Script Name | [forticlient-cp-init-script.sh](build/forticlient-cp-init-script.sh) | -| CP Mount Path | /custom/forticlient | -| CP Size | 500M | -| IGEL OS Version (min) | 11.05.133 | -| Packaging Notes | Details can be found in the build script [build-forticlient-cp.sh](build/build-forticlient-cp.sh) | - -**NOTES:** - -- A reboot is required before the agent can start. - -[userinterface.rccustom.custom_cmd_x11_final](igel/forticlient-profile.xml) - -``` -systemctl enable /custom/forticlient/lib/systemd/system/forticlient-scheduler.service; -systemctl start forticlient-scheduler.service; -pkexec -u user env XAUTHORITY=$XAUTHORITY DISPLAY=$DISPLAY DBUS_SESSION_BUS_ADDRESS=/run/user/777/bus XDG_RUNTIME_DIR=/run/user/777 setsid /opt/forticlient/fortitraylauncher &>/dev/null & - ``` diff --git a/CP_Source/Apps/Fortinet_FortiClient/build/build-forticlient-cp.sh b/CP_Source/Apps/Fortinet_FortiClient/build/build-forticlient-cp.sh deleted file mode 100755 index 3f674391..00000000 --- a/CP_Source/Apps/Fortinet_FortiClient/build/build-forticlient-cp.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -#set -x -#trap read debug - -# Creating an IGELOS CP for FortiClient -## Development machine (Ubuntu 18.04) - -# https://www.fortinet.com/support/product-downloads/linux?msclkid=eab32f74ba6c11ecafb7d89dcf570180 - -sudo curl https://repo.fortinet.com/repo/6.4/ubuntu/DEB-GPG-KEY | sudo apt-key add - -sudo sh -c 'echo "deb [arch=amd64] https://repo.fortinet.com/repo/6.4/ubuntu/ /bionic multiverse" > /etc/apt/sources.list.d/fortinet-stable.list' -sudo apt-get update - -#MISSING_LIBS="forticlient gconf-service gconf-service-backend gconf2-common libappindicator1 libgconf-2-4 libindicator7" -MISSING_LIBS="forticlient libappindicator1 libindicator7" - -sudo apt install unzip -y - -mkdir build_tar -cd build_tar - -for lib in $MISSING_LIBS; do - apt-get download $lib -done - -mkdir -p custom/forticlient - -find . -type f -name "*.deb" | while read LINE -do - dpkg -x "${LINE}" custom/forticlient -done - -mv custom/forticlient/usr/share/applications/ custom/forticlient/usr/share/applications.mime - -mkdir -p custom/forticlient/userhome/.config/FortiClient - -wget https://github.com/IGEL-Community/IGEL-Custom-Partitions/raw/master/CP_Packages/Apps/Fortinet_FortiClient.zip - -unzip Fortinet_FortiClient.zip -d custom -mv custom/target/build/forticlient-cp-init-script.sh custom - -cd custom - -# edit inf file for version number -mkdir getversion -cd getversion -ar -x ../../forticlient*.deb -tar xf control.tar.* -VERSION=$(grep Version control | cut -d " " -f 2) -#echo "Version is: " ${VERSION} -cd .. -sed -i "/^version=/c version=\"${VERSION}\"" target/forticlient.inf -#echo "forticlient.inf file is:" -#cat target/forticlient.inf - -# new build process into zip file -tar cvjf target/forticlient.tar.bz2 forticlient forticlient-cp-init-script.sh -zip -g ../Fortinet_FortiClient.zip target/forticlient.tar.bz2 target/forticlient.inf -zip -d ../Fortinet_FortiClient.zip "target/build/*" "target/igel/*" "target/target/*" -mv ../Fortinet_FortiClient.zip ../../Fortinet_FortiClient-${VERSION}_igel01.zip - -cd ../.. -rm -rf build_tar diff --git a/CP_Source/Apps/Fortinet_FortiClient/build/forticlient-cp-init-script.sh b/CP_Source/Apps/Fortinet_FortiClient/build/forticlient-cp-init-script.sh deleted file mode 100755 index e02a6794..00000000 --- a/CP_Source/Apps/Fortinet_FortiClient/build/forticlient-cp-init-script.sh +++ /dev/null @@ -1,79 +0,0 @@ -#! /bin/bash -#set -x -#trap read debug - -ACTION="custompart-forticlient_${1}" - -# mount point path -MP=$(get custom_partition.mountpoint) - -# custom partition path -CP="${MP}/forticlient" - -# userhome -USER_CONFIG="/userhome/.config/FortiClient" - -# output to systemlog with ID amd tag -LOGGER="logger -it ${ACTION}" - -echo "Starting" | $LOGGER - -case "$1" in -init) - if [ -L ${USER_CONFIG} ]; then - unlink ${USER_CONFIG} - fi - if [ -d ${USER_CONFIG} ]; then - rm -rf ${USER_CONFIG} - fi - # Initial permissions - chown -R root:root "${CP}" | $LOGGER - - # postinst items - pushd . - cd "${CP}" - setfacl --restore ${CP}/opt/forticlient/.acl - popd - chmod 600 ${CP}/etc/forticlient/servers.conf - ln -sf ${CP}/opt/forticlient/gui/FortiClient-linux-x64/FortiClient ${CP}/usr/bin/forticlient - - # Linking files and folders on proper path - find ${CP} | while read LINE - do - DEST=$(echo -n "${LINE}" | sed -e "s|${CP}||g") - if [ ! -z "${DEST}" -a ! -e "${DEST}" ]; then - # Remove the last slash, if it is a dir - [ -d $LINE ] && DEST=$(echo "${DEST}" | sed -e "s/\/$//g") | $LOGGER - if [ ! -z "${DEST}" ]; then - ln -sv "${LINE}" "${DEST}" | $LOGGER - fi - fi - done - - # basic persistency - chown -R user:users "${CP}${USER_CONFIG}" - - # after CP installation run wm_postsetup to activate mimetypes for SSO - if [ -d /run/user/777 ]; then - wm_postsetup - # delay the CP ready notification - sleep 3 - fi - - ldconfig - -;; -stop) - # unlink linked files - find ${CP} | while read LINE - do - DEST=$(echo -n "${LINE}" | sed -e "s|${CP}||g") - unlink $DEST | $LOGGER - done - -;; -esac - -echo "Finished" | $LOGGER - -exit 0 diff --git a/CP_Source/Apps/Fortinet_FortiClient/igel/forticlient-profile.xml b/CP_Source/Apps/Fortinet_FortiClient/igel/forticlient-profile.xml deleted file mode 100755 index 7277852b..00000000 --- a/CP_Source/Apps/Fortinet_FortiClient/igel/forticlient-profile.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - 10688 - Fortinet FortiClient CP - - IGEL OS 11 - 11.05.133.01 - - Fortinet FortiClient - false - false - true - - - true - false - - - systemctl enable /custom/forticlient/lib/systemd/system/forticlient-scheduler.service; -systemctl start forticlient-scheduler.service; - false - - - 500M - false - - - - - [USERNAME] - https://[UMSSERVER]:8443/ums_filetransfer/forticlient.inf - - /custom/forticlient-cp-init-script.sh init - /custom/forticlient-cp-init-script.sh stop - - true - - - 0 - 0 - true - false - false - true - true - false - false - false - none - false - 0 - FortiClient - - forticlient - None - - - true - /opt/forticlient/gui/FortiClient-linux-x64/FortiClient - false - false - false - - true - - - - diff --git a/CP_Source/Apps/Fortinet_FortiClient/target/forticlient.inf b/CP_Source/Apps/Fortinet_FortiClient/target/forticlient.inf deleted file mode 100755 index c90ca699..00000000 --- a/CP_Source/Apps/Fortinet_FortiClient/target/forticlient.inf +++ /dev/null @@ -1,7 +0,0 @@ -[INFO] -[PART] -file="forticlient.tar.bz2" -version="x.x.x" -size="500M" -name="forticlient" -minfw="11.05.133" diff --git a/CP_Source/Network/FortiClient_VPN/README.md b/CP_Source/Network/FortiClient_VPN/README.md index e4b60df6..dac3db1f 100644 --- a/CP_Source/Network/FortiClient_VPN/README.md +++ b/CP_Source/Network/FortiClient_VPN/README.md @@ -1,4 +1,12 @@ -# FortiClient VPN (11 October) +# FortiClient VPN (13 July 2023) + +----- + +## FortiClient GUI Issue + +**NOTE:** FortiClient blank screen on start-up. The window opens with no text. Looking into the issue. + +**WORKAROUND:** Run from the command line `/custom/forticlient/opt/forticlient/forticlient-cli vpn --help` ----- @@ -8,7 +16,7 @@ | Script Name | [forticlient-cp-init-script.sh](build/forticlient-cp-init-script.sh) | | CP Mount Path | /custom/forticlient | | CP Size | 800M | -| IGEL OS Version (min) | 11.07.100 | +| IGEL OS Version (min) | 11.08.230 | | Packaging Notes | Details can be found in the build script [build-forticlient-cp.sh](build/build-forticlient-cp.sh) | ----- diff --git a/CP_Source/Network/FortiClient_VPN/build/build-forticlient-cp.sh b/CP_Source/Network/FortiClient_VPN/build/build-forticlient-cp.sh index 495c19b2..b0d02a5e 100755 --- a/CP_Source/Network/FortiClient_VPN/build/build-forticlient-cp.sh +++ b/CP_Source/Network/FortiClient_VPN/build/build-forticlient-cp.sh @@ -10,15 +10,10 @@ sudo apt install curl -y sudo apt install unzip -y -# FortiClient 6.4 -sudo curl https://repo.fortinet.com/repo/6.4/ubuntu/DEB-GPG-KEY | sudo apt-key add - -sudo sh -c 'echo "deb [arch=amd64] https://repo.fortinet.com/repo/6.4/ubuntu/ /bionic multiverse" > /etc/apt/sources.list.d/forticlient-main.list' -MISSING_LIBS="forticlient gconf-service gconf-service-backend gconf2-common libappindicator1 libgconf-2-4 libindicator7 libdbusmenu-glib4 libdbusmenu-gtk4" - # FortiClient 7.0 -#sudo curl https://repo.fortinet.com/repo/7.0/ubuntu/DEB-GPG-KEY | sudo apt-key add - -#sudo sh -c 'echo "deb [arch=amd64] https://repo.fortinet.com/repo/7.0/ubuntu/ /bionic multiverse" > /etc/apt/sources.list.d/forticlient-main.list' -#MISSING_LIBS="forticlient gconf-service gconf-service-backend gconf2-common libappindicator1 libgconf-2-4 libindicator7 libnss3-tools" +sudo curl https://repo.fortinet.com/repo/7.0/ubuntu/DEB-GPG-KEY | sudo apt-key add - +sudo sh -c 'echo "deb [arch=amd64] https://repo.fortinet.com/repo/7.0/ubuntu/ /bionic multiverse" > /etc/apt/sources.list.d/forticlient-main.list' +MISSING_LIBS="forticlient gconf-service gconf-service-backend gconf2-common libappindicator1 libgconf-2-4 libindicator7 libnss3-tools" sudo apt-get update @@ -40,7 +35,7 @@ done mv ${CP_PATH}/usr/share/applications/ ${CP_PATH}/usr/share/applications.mime mkdir -p -m 755 ${CP_PATH}/var/lib/forticlient -cp ${CP_PATH}/opt/forticlient/.config.db.init /var/lib/forticlient/config.db +cp ${CP_PATH}/opt/forticlient/.config.db.init ${CP_PATH}/var/lib/forticlient/config.db chmod 600 ${CP_PATH}/var/lib/forticlient/config.db mkdir -p ${CP_PATH}/userhome/.pki diff --git a/CP_Source/Network/FortiClient_VPN/igel/forticlient-profile.xml b/CP_Source/Network/FortiClient_VPN/igel/forticlient-profile.xml index 2f6461a6..56660bde 100755 --- a/CP_Source/Network/FortiClient_VPN/igel/forticlient-profile.xml +++ b/CP_Source/Network/FortiClient_VPN/igel/forticlient-profile.xml @@ -5,7 +5,7 @@ FortiClient CP IGEL OS 11 - 11.07.100.01 + 11.08.230.01 FortiClient false @@ -35,34 +35,6 @@ true - - 0 - 0 - true - false - false - true - true - false - false - false - none - false - 0 - FortiClient - - /custom/forticlient/usr/share/icons/hicolor/48x48/apps/forticlient.png - None - - - true - /custom/forticlient/opt/forticlient/gui/FortiClient-linux-x64/FortiClient - false - false - false - - true - diff --git a/CP_Source/Network/FortiClient_VPN/target/forticlient.inf b/CP_Source/Network/FortiClient_VPN/target/forticlient.inf index 22e8af18..a60ea2d5 100755 --- a/CP_Source/Network/FortiClient_VPN/target/forticlient.inf +++ b/CP_Source/Network/FortiClient_VPN/target/forticlient.inf @@ -4,4 +4,4 @@ file="forticlient.tar.bz2" version="x.x.x" size="800M" name="forticlient" -minfw="11.07.100" +minfw="11.08.230"