The pacman tool got replaced by the sec-updater tool

diff --git a/conf/Makefile.am b/conf/Makefile.am
index 0a4a8597faaeb312d1a8eaf11cf9c4a2ecc41e03..38181db2c2c2e6fd5a75afb52b7dc086f5da97b2 100644 (file)
--- 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 (file)
index dfb4ba2..0000000
--- 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 a901346dd6fd51e03d0f8eef30097fa4c3f5426f..aab8588c5cfc81a003a052c98da723ae952dc0a4 100644 (file)
--- 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 65fadf2de77d77add5bbcd99143ad48c496a31c4..283abdcd52d3d5e15ba49db06f6d7d7536058cd5 100644 (file)
--- 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 (file)
index 3db8c54..0000000
--- a/src/libimcv/plugins/imv_os/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-pacman