From f46e18cffc76c0bd7839c53b45b14ac1bd2d17ae Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Thu, 28 Sep 2017 00:15:08 -0500
Subject: [PATCH] Skip building manpages

- Skip building manpages for Libreswan
- No longer need/install "xmlto" package
- Reduce Libreswan compilation time by ~30%
---
 extras/vpnupgrade.sh        | 3 +--
 extras/vpnupgrade_centos.sh | 4 ++--
 vpnsetup.sh                 | 3 +--
 vpnsetup_centos.sh          | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/extras/vpnupgrade.sh b/extras/vpnupgrade.sh
index bb9aaec..e3b1137 100644
--- a/extras/vpnupgrade.sh
+++ b/extras/vpnupgrade.sh
@@ -128,7 +128,6 @@ apt-get -yq install libnss3-dev libnspr4-dev pkg-config libpam0g-dev \
   libcap-ng-dev libcap-ng-utils libselinux1-dev \
   libcurl4-nss-dev flex bison gcc make \
   libunbound-dev libnss3-tools libevent-dev || exiterr2
-apt-get -yq --no-install-recommends install xmlto || exiterr2
 
 # Compile and install Libreswan
 swan_file="libreswan-$swan_ver.tar.gz"
@@ -147,7 +146,7 @@ EOF
 if [ "$(packaging/utils/lswan_detect.sh init)" = "systemd" ]; then
   apt-get -yq install libsystemd-dev || exiterr2
 fi
-make -s programs && make -s install
+make -s base && make -s install-base
 
 # Verify the install and clean up
 cd /opt/src || exiterr "Cannot enter /opt/src."
diff --git a/extras/vpnupgrade_centos.sh b/extras/vpnupgrade_centos.sh
index e44887f..7030d17 100644
--- a/extras/vpnupgrade_centos.sh
+++ b/extras/vpnupgrade_centos.sh
@@ -119,7 +119,7 @@ yum -y install epel-release || exiterr2
 yum -y install nss-devel nspr-devel pkgconfig pam-devel \
   libcap-ng-devel libselinux-devel \
   curl-devel flex bison gcc make \
-  fipscheck-devel unbound-devel xmlto || exiterr2
+  fipscheck-devel unbound-devel || exiterr2
 
 # Install libevent2 and systemd-devel
 if grep -qs "release 6" /etc/redhat-release; then
@@ -143,7 +143,7 @@ cat > Makefile.inc.local <<'EOF'
 WERROR_CFLAGS =
 USE_DNSSEC = false
 EOF
-make -s programs && make -s install
+make -s base && make -s install-base
 
 # Verify the install and clean up
 cd /opt/src || exiterr "Cannot enter /opt/src."
diff --git a/vpnsetup.sh b/vpnsetup.sh
index 773fcc7..bb89b3f 100755
--- a/vpnsetup.sh
+++ b/vpnsetup.sh
@@ -168,7 +168,6 @@ apt-get -yq install libnss3-dev libnspr4-dev pkg-config libpam0g-dev \
   libcap-ng-dev libcap-ng-utils libselinux1-dev \
   libcurl4-nss-dev flex bison gcc make \
   libunbound-dev libnss3-tools libevent-dev || exiterr2
-apt-get -yq --no-install-recommends install xmlto || exiterr2
 apt-get -yq install ppp xl2tpd || exiterr2
 
 bigecho "Installing Fail2Ban to protect SSH..."
@@ -194,7 +193,7 @@ EOF
 if [ "$(packaging/utils/lswan_detect.sh init)" = "systemd" ]; then
   apt-get -yq install libsystemd-dev || exiterr2
 fi
-make -s programs && make -s install
+make -s base && make -s install-base
 
 # Verify the install and clean up
 cd /opt/src || exiterr "Cannot enter /opt/src."
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index 2bee99d..e294341 100755
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -157,7 +157,7 @@ bigecho "Installing packages required for the VPN..."
 yum -y install nss-devel nspr-devel pkgconfig pam-devel \
   libcap-ng-devel libselinux-devel \
   curl-devel flex bison gcc make \
-  fipscheck-devel unbound-devel xmlto || exiterr2
+  fipscheck-devel unbound-devel || exiterr2
 yum -y install ppp xl2tpd || exiterr2
 
 if grep -qs "release 6" /etc/redhat-release; then
@@ -188,7 +188,7 @@ cat > Makefile.inc.local <<'EOF'
 WERROR_CFLAGS =
 USE_DNSSEC = false
 EOF
-make -s programs && make -s install
+make -s base && make -s install-base
 
 # Verify the install and clean up
 cd /opt/src || exiterr "Cannot enter /opt/src."