aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2017-11-15 12:18:17 +0100
committerTobias Brunner <tobias@strongswan.org>2017-11-15 12:18:17 +0100
commit7f1d944bc94d8eb668f53cd7b80896b01bbb72d0 (patch)
treee64c327ae8e77b093fd7f670022843bbb2f4f23e
parent851e51d1cfb8cb1a0919697b18f1d721fda6e2a8 (diff)
downloadstrongswan-7f1d944bc94d8eb668f53cd7b80896b01bbb72d0.tar.bz2
strongswan-7f1d944bc94d8eb668f53cd7b80896b01bbb72d0.tar.xz
The pacman tool got replaced by the sec-updater tool
-rw-r--r--conf/Makefile.am1
-rw-r--r--conf/options/pacman.opt7
-rw-r--r--configure.ac2
-rw-r--r--src/ipsec/_ipsec.in2
-rw-r--r--src/libimcv/plugins/imv_os/.gitignore1
5 files changed, 2 insertions, 11 deletions
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