mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
009ca981d5
* feat: initial conan support * feat: add awg-go and awg-apple recipes * feat: macos full feature conan build, except ss and cloak * feat: conan android initial support * fix: android libssh fixes * conan: android additional recipes and fixes * feat: openvpn add support android * fix: awg android connection establish * conan: apple full-featured support * chore: bump min macos version * chore: get rid of manual deploy recursive copying * conan: beautify makefile-based recipes * conan: add geosite.dat and geoip.dat * conan: use lib linking instead of QT_EXTRA_LIBS for OVPN * conan: address lack of SONAME of libck-ovpn-plugin.so correctly * conan: windows initial support * conan: make awg-windows and wintun be interpret as exes * conan: fix version for v2ray-rules-dat * feat: conan and platform bootstrap rework in cmake * feat: 16kb support for Android * chore(conan): recipes cleanup * feat: support of drivers for windows * feat: support full-featured cmake install * chore: exclude qtkeychain from the target build * fix: install for apple systems * fix: provide flags for cloak plugin for openvpn-pt-android * chore: bump android deps for 16kb support * feat(conan): patch cloak to properly provide env for golang * chore: remove redundant hint from conan find * feat: linux <-> conan features * feat: linux initial packaging support * feat: linux cpack support * feat: cpack windows full-featured build * feat: productbuild cpack support * feat: rework CI/CD for macos * feat: rework CI/CD for Linux * fix: libncap automake args * fix: CI/CD correct QT paths * fix: windows rework CI/CD * fix: windows artifact upload * chore: remove MacOS-old from build targets * feat: add conan to all mobile and NE builds * feat: support default amnezia conan remote * fix: use Release instead of release on Android * feat: get rid of 3rd-prebuilt * feat: conan CI/CD upload * fix: CI/CD change windows toolset versions * fix: remove MSVC version from CI/CD * feat: conan CI/CD add Release and Debug build types * feat: add multiple xcode versions for conan CI/CD * fix: correct conan CI/CD clang versions * feat: separate prebuilt baking, and add some for NE * feat: rework keychain on ios/macos even more * fix: add desktop Qt for iOS * feat: add QT_HOST_PATH to build.sh * fix: add deploy definition to cmake * fix: android adjustments for toolchains and CI/CD * fix: add needs for Android CI/CD * fix: Android CI/CD use android-28 * fix: modernize translations, and CI/CD fixes * fix: gradle min sdk compilation error * fix: CI/CD add installers to all jobs * fix: parse android platform more precisely * fix: adjust aab path in CI/CD * feat: CI/CD do not execute artifact build if there is nothing changed * fix: CI/CD use common jobs even if previous were failed * fix: Apple CI/CD use set-key-partition-list for keychains * fix: Apple CI/CD do not specify any keychain (use default) * fix: build aab as a different step in build script * chore: beautify build.sh script * feat: CI/CD build separate APKs per ABI * fix: Android CI/CD upload artifact in separate steps * chore: recipes cleanup * feat: add hints for conan on MacOS * fix: add main.cpp and tests back to CMakeLists.txt * chore: xrayProtocol codestyle changes * fix: openssl set proper X509 request version * fix: make openvpn protocol rely only on client while configuring * chore: get rid of old scripts * chore: readme update describing build process more precisely * feat: windows build script add multiprocessing capabilities * chore: bump Qt version in README * feat: add generator option and use Ninja by default in CI/CD for linux/macos --------- Co-authored-by: NickVs2015 <nv@amnezia.org>
72 lines
2.1 KiB
Bash
Executable File
72 lines
2.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
#
|
|
# Parses DHCP options from openvpn to update resolv.conf
|
|
# To use set as 'up' and 'down' script in your openvpn *.conf:
|
|
# up /etc/openvpn/update-resolv-conf
|
|
# down /etc/openvpn/update-resolv-conf
|
|
#
|
|
# Used snippets of resolvconf script by Thomas Hood <jdthood@yahoo.co.uk>
|
|
# and Chris Hanson
|
|
# Licensed under the GNU GPL. See /usr/share/common-licenses/GPL.
|
|
# 07/2013 colin@daedrum.net Fixed intent name
|
|
# 05/2006 chlauber@bnc.ch
|
|
#
|
|
# Example envs set from openvpn:
|
|
# foreign_option_1='dhcp-option DNS 193.43.27.132'
|
|
# foreign_option_2='dhcp-option DNS 193.43.27.133'
|
|
# foreign_option_3='dhcp-option DOMAIN be.bnc.ch'
|
|
# foreign_option_4='dhcp-option DOMAIN-SEARCH bnc.local'
|
|
|
|
## The 'type' builtins will look for file in $PATH variable, so we set the
|
|
## PATH below. You might need to directly set the path to 'resolvconf'
|
|
## manually if it still doesn't work, i.e.
|
|
## RESOLVCONF=/usr/sbin/resolvconf
|
|
export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
|
|
RESOLVCONF=$(type -p resolvconf)
|
|
|
|
case $script_type in
|
|
|
|
up)
|
|
for optionname in ${!foreign_option_*} ; do
|
|
option="${!optionname}"
|
|
echo $option
|
|
part1=$(echo "$option" | cut -d " " -f 1)
|
|
if [ "$part1" == "dhcp-option" ] ; then
|
|
part2=$(echo "$option" | cut -d " " -f 2)
|
|
part3=$(echo "$option" | cut -d " " -f 3)
|
|
if [ "$part2" == "DNS" ] ; then
|
|
IF_DNS_NAMESERVERS="$IF_DNS_NAMESERVERS $part3"
|
|
fi
|
|
if [[ "$part2" == "DOMAIN" || "$part2" == "DOMAIN-SEARCH" ]] ; then
|
|
IF_DNS_SEARCH="$IF_DNS_SEARCH $part3"
|
|
fi
|
|
fi
|
|
done
|
|
R=""
|
|
if [ "$IF_DNS_SEARCH" ]; then
|
|
R="search "
|
|
for DS in $IF_DNS_SEARCH ; do
|
|
R="${R} $DS"
|
|
done
|
|
R="${R}
|
|
"
|
|
fi
|
|
|
|
for NS in $IF_DNS_NAMESERVERS ; do
|
|
R="${R}nameserver $NS
|
|
"
|
|
done
|
|
#echo -n "$R" | $RESOLVCONF -x -p -a "${dev}"
|
|
echo -n "$R" | $RESOLVCONF -x -a "${dev}.inet"
|
|
;;
|
|
down)
|
|
$RESOLVCONF -d "${dev}.inet"
|
|
;;
|
|
esac
|
|
|
|
# Workaround / jm@epiclabs.io
|
|
# force exit with no errors. Due to an apparent conflict with the Network Manager
|
|
# $RESOLVCONF sometimes exits with error code 6 even though it has performed the
|
|
# action correctly and OpenVPN shuts down.
|
|
exit 0
|