From 222acbf5aeae8887401f0f955f330cc5d3ed3f5e Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Thu, 23 Mar 2017 13:55:51 -0500
Subject: [PATCH] New Libreswan version

- New Libreswan version 3.20
- Use GitHub as primary download source
---
 extras/vpnupgrade.sh        | 6 +++---
 extras/vpnupgrade_centos.sh | 6 +++---
 vpnsetup.sh                 | 6 +++---
 vpnsetup_centos.sh          | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/extras/vpnupgrade.sh b/extras/vpnupgrade.sh
index dfc0c55..ac1b9d3 100644
--- a/extras/vpnupgrade.sh
+++ b/extras/vpnupgrade.sh
@@ -11,7 +11,7 @@
 # know how you have improved it!
 
 # Check https://libreswan.org for the latest version
-swan_ver=3.19
+swan_ver=3.20
 
 ### DO NOT edit below this line ###
 
@@ -139,8 +139,8 @@ apt-get -yq --no-install-recommends install xmlto || exiterr2
 
 # Compile and install Libreswan
 swan_file="libreswan-$swan_ver.tar.gz"
-swan_url1="https://download.libreswan.org/$swan_file"
-swan_url2="https://github.com/libreswan/libreswan/archive/v$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"
 if ! { wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url1" || wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url2"; }; then
   exiterr "Cannot download Libreswan source."
 fi
diff --git a/extras/vpnupgrade_centos.sh b/extras/vpnupgrade_centos.sh
index 3e87990..f906bbe 100644
--- a/extras/vpnupgrade_centos.sh
+++ b/extras/vpnupgrade_centos.sh
@@ -11,7 +11,7 @@
 # know how you have improved it!
 
 # Check https://libreswan.org for the latest version
-swan_ver=3.19
+swan_ver=3.20
 
 ### DO NOT edit below this line ###
 
@@ -131,8 +131,8 @@ fi
 
 # Compile and install Libreswan
 swan_file="libreswan-$swan_ver.tar.gz"
-swan_url1="https://download.libreswan.org/$swan_file"
-swan_url2="https://github.com/libreswan/libreswan/archive/v$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"
 if ! { wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url1" || wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url2"; }; then
   exiterr "Cannot download Libreswan source."
 fi
diff --git a/vpnsetup.sh b/vpnsetup.sh
index e44f766..3caf615 100755
--- a/vpnsetup.sh
+++ b/vpnsetup.sh
@@ -167,10 +167,10 @@ apt-get -yq install fail2ban || exiterr2
 
 bigecho "Compiling and installing Libreswan..."
 
-swan_ver=3.19
+swan_ver=3.20
 swan_file="libreswan-$swan_ver.tar.gz"
-swan_url1="https://download.libreswan.org/$swan_file"
-swan_url2="https://github.com/libreswan/libreswan/archive/v$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"
 if ! { wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url1" || wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url2"; }; then
   exiterr "Cannot download Libreswan source."
 fi
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index 214830e..fb29eee 100755
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -154,10 +154,10 @@ yum -y install fail2ban || exiterr2
 
 bigecho "Compiling and installing Libreswan..."
 
-swan_ver=3.19
+swan_ver=3.20
 swan_file="libreswan-$swan_ver.tar.gz"
-swan_url1="https://download.libreswan.org/$swan_file"
-swan_url2="https://github.com/libreswan/libreswan/archive/v$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"
 if ! { wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url1" || wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url2"; }; then
   exiterr "Cannot download Libreswan source."
 fi