From 7f1d944bc94d8eb668f53cd7b80896b01bbb72d0 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 15 Nov 2017 12:18:17 +0100
Subject: The pacman tool got replaced by the sec-updater tool

---
 conf/Makefile.am                      | 1 -
 conf/options/pacman.opt               | 7 -------
 configure.ac                          | 2 +-
 src/ipsec/_ipsec.in                   | 2 +-
 src/libimcv/plugins/imv_os/.gitignore | 1 -
 5 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 conf/options/pacman.opt
 delete mode 100644 src/libimcv/plugins/imv_os/.gitignore

diff --git a/conf/Makefile.am b/conf/Makefile.am
index 0a4a8597f..38181db2c 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -18,7 +18,6 @@ options = \
 	options/imv_policy_manager.opt \
 	options/manager.opt \
 	options/medsrv.opt \
-	options/pacman.opt \
 	options/pki.opt \
 	options/pool.opt \
 	options/scepclient.opt \
diff --git a/conf/options/pacman.opt b/conf/options/pacman.opt
deleted file mode 100644
index dfb4ba2b1..000000000
--- a/conf/options/pacman.opt
+++ /dev/null
@@ -1,7 +0,0 @@
-pacman.database =
-	Database URI for the database that stores the package information. If it
-	contains a password, make sure to adjust the permissions of the config file
-	accordingly.
-
-pacman.load =
-	Plugins to load in package manager.
diff --git a/configure.ac b/configure.ac
index a901346dd..aab8588c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1782,7 +1782,7 @@ AM_COND_IF([USE_CHARON], [strongswan_options=${strongswan_options}" charon charo
 AM_COND_IF([USE_FILE_CONFIG], [strongswan_options=${strongswan_options}" starter"])
 AM_COND_IF([USE_IMV_ATTESTATION], [strongswan_options=${strongswan_options}" attest"])
 AM_COND_IF([USE_IMCV], [strongswan_options=${strongswan_options}" imcv"])
-AM_COND_IF([USE_IMV_OS], [strongswan_options=${strongswan_options}" pacman"])
+AM_COND_IF([USE_IMV_SWIMA], [strongswan_options=${strongswan_options}" sec-updater"])
 AM_COND_IF([USE_LIBTNCCS], [strongswan_options=${strongswan_options}" tnc"])
 AM_COND_IF([USE_MANAGER], [strongswan_options=${strongswan_options}" manager"])
 AM_COND_IF([USE_MEDSRV], [strongswan_options=${strongswan_options}" medsrv"])
diff --git a/src/ipsec/_ipsec.in b/src/ipsec/_ipsec.in
index 65fadf2de..283abdcd5 100644
--- a/src/ipsec/_ipsec.in
+++ b/src/ipsec/_ipsec.in
@@ -310,7 +310,7 @@ aikgen|pki)
 	command_dir="$IPSEC_BINDIR"
 	# fall through
 	;;
-attest|conftest|dumm|irdumm|pacman|pool|pt-tls-client|scepclient|stroke|\
+attest|conftest|dumm|irdumm|pool|pt-tls-client|scepclient|stroke|\
 duplicheck|error-notify|imv_policy_manager|load-tester|lookip|whitelist|\
 _updown|_imv_policy)
 	# fall through
diff --git a/src/libimcv/plugins/imv_os/.gitignore b/src/libimcv/plugins/imv_os/.gitignore
deleted file mode 100644
index 3db8c54a8..000000000
--- a/src/libimcv/plugins/imv_os/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-pacman
-- 
cgit v1.2.3