1
0
mirror of synced 2025-02-07 15:59:25 +03:00

Use Libreswan 3.22

- Use Libreswan 3.22 instead of 3.23 due to an issue with connecting
  multiple IPsec/XAuth VPN clients from behind the same NAT
- Ref: c982502 0cf01c0
This commit is contained in:
hwdsl2 2018-06-06 00:40:09 -05:00
parent f838fcfe12
commit 1ff393b91c
4 changed files with 54 additions and 22 deletions

View File

@ -11,7 +11,7 @@
# know how you have improved it!
# Check https://libreswan.org for the latest version
SWAN_VER=3.23
SWAN_VER=3.22
### DO NOT edit below this line ###
@ -78,6 +78,15 @@ This is intended for use on servers running an older version of Libreswan.
EOF
if [ "$SWAN_VER" = "3.23" ]; then
cat <<'EOF'
WARNING: Libreswan 3.23 has an issue with connecting multiple IPsec/XAuth
VPN clients from behind the same NAT (e.g. home router).
Do not upgrade to 3.23 if your use cases include the above.
EOF
fi
cat <<'EOF'
IMPORTANT NOTES:
@ -141,6 +150,7 @@ fi
/bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
tar xzf "$swan_file" && /bin/rm -f "$swan_file"
cd "libreswan-$SWAN_VER" || exit 1
[ "$SWAN_VER" = "3.22" ] && sed -i '/^#define LSWBUF_CANARY/s/-2$/((char) -2)/' include/lswlog.h
sed -i '/docker-targets\.mk/d' Makefile
cat > Makefile.inc.local <<'EOF'
WERROR_CFLAGS =
@ -179,15 +189,20 @@ echo
echo "Libreswan $SWAN_VER was installed successfully! "
echo
case "$SWAN_VER" in
3.2[3-9])
cat <<'EOF'
Note: Users upgrading to Libreswan 3.23 or newer should edit
"/etc/ipsec.conf" and replace these two lines:
modecfgdns1=DNS_SERVER_1
modecfgdns2=DNS_SERVER_2
with a single line like this:
modecfgdns="DNS_SERVER_1, DNS_SERVER_2"
Then run "service ipsec restart".
NOTE: Users upgrading to Libreswan 3.23 or newer should edit
"/etc/ipsec.conf" and replace these two lines:
modecfgdns1=DNS_SERVER_1
modecfgdns2=DNS_SERVER_2
with a single line like this:
modecfgdns="DNS_SERVER_1, DNS_SERVER_2"
Then run "service ipsec restart".
EOF
;;
esac
}

View File

@ -11,7 +11,7 @@
# know how you have improved it!
# Check https://libreswan.org for the latest version
SWAN_VER=3.23
SWAN_VER=3.22
### DO NOT edit below this line ###
@ -69,6 +69,15 @@ This is intended for use on servers running an older version of Libreswan.
EOF
if [ "$SWAN_VER" = "3.23" ]; then
cat <<'EOF'
WARNING: Libreswan 3.23 has an issue with connecting multiple IPsec/XAuth
VPN clients from behind the same NAT (e.g. home router).
Do not upgrade to 3.23 if your use cases include the above.
EOF
fi
cat <<'EOF'
IMPORTANT NOTES:
@ -143,6 +152,7 @@ fi
/bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
tar xzf "$swan_file" && /bin/rm -f "$swan_file"
cd "libreswan-$SWAN_VER" || exit 1
[ "$SWAN_VER" = "3.22" ] && sed -i '/^#define LSWBUF_CANARY/s/-2$/((char) -2)/' include/lswlog.h
sed -i '/docker-targets\.mk/d' Makefile
cat > Makefile.inc.local <<'EOF'
WERROR_CFLAGS =
@ -180,15 +190,20 @@ echo
echo "Libreswan $SWAN_VER was installed successfully! "
echo
case "$SWAN_VER" in
3.2[3-9])
cat <<'EOF'
Note: Users upgrading to Libreswan 3.23 or newer should edit
"/etc/ipsec.conf" and replace these two lines:
modecfgdns1=DNS_SERVER_1
modecfgdns2=DNS_SERVER_2
with a single line like this:
modecfgdns="DNS_SERVER_1, DNS_SERVER_2"
Then run "service ipsec restart".
NOTE: Users upgrading to Libreswan 3.23 or newer should edit
"/etc/ipsec.conf" and replace these two lines:
modecfgdns1=DNS_SERVER_1
modecfgdns2=DNS_SERVER_2
with a single line like this:
modecfgdns="DNS_SERVER_1, DNS_SERVER_2"
Then run "service ipsec restart".
EOF
;;
esac
}

View File

@ -196,7 +196,7 @@ apt-get -yq install fail2ban || exiterr2
bigecho "Compiling and installing Libreswan..."
SWAN_VER=3.23
SWAN_VER=3.22
swan_file="libreswan-$SWAN_VER.tar.gz"
swan_url1="https://github.com/libreswan/libreswan/archive/v$SWAN_VER.tar.gz"
swan_url2="https://download.libreswan.org/$swan_file"
@ -206,7 +206,7 @@ fi
/bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
tar xzf "$swan_file" && /bin/rm -f "$swan_file"
cd "libreswan-$SWAN_VER" || exit 1
sed -i '/docker-targets\.mk/d' Makefile
sed -i '/^#define LSWBUF_CANARY/s/-2$/((char) -2)/' include/lswlog.h
cat > Makefile.inc.local <<'EOF'
WERROR_CFLAGS =
USE_DNSSEC = false
@ -273,7 +273,8 @@ conn xauth-psk
auto=add
leftsubnet=0.0.0.0/0
rightaddresspool=$XAUTH_POOL
modecfgdns="$DNS_SRV1, $DNS_SRV2"
modecfgdns1=$DNS_SRV1
modecfgdns2=$DNS_SRV2
leftxauthserver=yes
rightxauthclient=yes
leftmodecfgserver=yes

View File

@ -184,7 +184,7 @@ yum -y install fail2ban || exiterr2
bigecho "Compiling and installing Libreswan..."
SWAN_VER=3.23
SWAN_VER=3.22
swan_file="libreswan-$SWAN_VER.tar.gz"
swan_url1="https://github.com/libreswan/libreswan/archive/v$SWAN_VER.tar.gz"
swan_url2="https://download.libreswan.org/$swan_file"
@ -194,7 +194,7 @@ fi
/bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
tar xzf "$swan_file" && /bin/rm -f "$swan_file"
cd "libreswan-$SWAN_VER" || exit 1
sed -i '/docker-targets\.mk/d' Makefile
sed -i '/^#define LSWBUF_CANARY/s/-2$/((char) -2)/' include/lswlog.h
cat > Makefile.inc.local <<'EOF'
WERROR_CFLAGS =
USE_DNSSEC = false
@ -258,7 +258,8 @@ conn xauth-psk
auto=add
leftsubnet=0.0.0.0/0
rightaddresspool=$XAUTH_POOL
modecfgdns="$DNS_SRV1, $DNS_SRV2"
modecfgdns1=$DNS_SRV1
modecfgdns2=$DNS_SRV2
leftxauthserver=yes
rightxauthclient=yes
leftmodecfgserver=yes