From c982502ad4dc1c42eae7e75db1d424bc7f9c6eb5 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Mon, 29 Jan 2018 01:22:24 -0600
Subject: [PATCH] Upgrade Libreswan to 3.23

- Remove 'docker-targets.mk' from Makefile to avoid git errors
  during compilation
---
 extras/vpnupgrade.sh        | 8 ++++----
 extras/vpnupgrade_centos.sh | 4 ++--
 vpnsetup.sh                 | 4 ++--
 vpnsetup_centos.sh          | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extras/vpnupgrade.sh b/extras/vpnupgrade.sh
index 27f2b88..ef4f02b 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.22
+SWAN_VER=3.23
 
 ### DO NOT edit below this line ###
 
@@ -51,10 +51,10 @@ if ! /usr/local/sbin/ipsec --version 2>/dev/null | grep -q "Libreswan"; then
   exiterr "This script requires Libreswan already installed."
 fi
 
-if [ "$SWAN_VER" = "3.22" ]; then
+if [ "$SWAN_VER" != "3.21" ]; then
   if grep -qs raspbian /etc/os-release; then
     echo "Note: For Raspberry Pi systems, this script will install Libreswan"
-    echo "version 3.21 instead of 3.22, to avoid some recent bugs."
+    echo "version 3.21 instead of $SWAN_VER, to avoid some recent bugs."
     echo
     printf "Do you wish to continue? [y/N] "
     read -r response
@@ -161,7 +161,7 @@ fi
 /bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
 tar xzf "$swan_file" && /bin/rm -f "$swan_file"
 cd "libreswan-$SWAN_VER" || exiterr "Cannot enter Libreswan source dir."
-[ "$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 =
 USE_DNSSEC = false
diff --git a/extras/vpnupgrade_centos.sh b/extras/vpnupgrade_centos.sh
index 1e44f5b..30961ee 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.22
+SWAN_VER=3.23
 
 ### DO NOT edit below this line ###
 
@@ -143,7 +143,7 @@ fi
 /bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
 tar xzf "$swan_file" && /bin/rm -f "$swan_file"
 cd "libreswan-$SWAN_VER" || exiterr "Cannot enter Libreswan source dir."
-[ "$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 =
 USE_DNSSEC = false
diff --git a/vpnsetup.sh b/vpnsetup.sh
index a8527e6..a1790c9 100755
--- a/vpnsetup.sh
+++ b/vpnsetup.sh
@@ -178,7 +178,7 @@ apt-get -yq install fail2ban || exiterr2
 bigecho "Compiling and installing Libreswan..."
 
 if ! grep -qs raspbian /etc/os-release; then
-  SWAN_VER=3.22
+  SWAN_VER=3.23
 else
   SWAN_VER=3.21
 fi
@@ -191,7 +191,7 @@ fi
 /bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
 tar xzf "$swan_file" && /bin/rm -f "$swan_file"
 cd "libreswan-$SWAN_VER" || exiterr "Cannot enter Libreswan source dir."
-[ "$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 =
 USE_DNSSEC = false
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index 0c8121a..ae7e9bb 100755
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -168,7 +168,7 @@ yum -y install fail2ban || exiterr2
 
 bigecho "Compiling and installing Libreswan..."
 
-SWAN_VER=3.22
+SWAN_VER=3.23
 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"
@@ -178,7 +178,7 @@ fi
 /bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
 tar xzf "$swan_file" && /bin/rm -f "$swan_file"
 cd "libreswan-$SWAN_VER" || exiterr "Cannot enter Libreswan source dir."
-[ "$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 =
 USE_DNSSEC = false