diff options
Diffstat (limited to 'src/ipsec')
| -rw-r--r-- | src/ipsec/Makefile.in | 12 | ||||
| -rw-r--r-- | src/ipsec/ipsec.8 | 4 | ||||
| -rwxr-xr-x | src/ipsec/ipsec.in | 12 |
3 files changed, 3 insertions, 25 deletions
diff --git a/src/ipsec/Makefile.in b/src/ipsec/Makefile.in index bf74828be..04ca97781 100644 --- a/src/ipsec/Makefile.in +++ b/src/ipsec/Makefile.in @@ -200,13 +200,7 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ ipsecdir = @ipsecdir@ -<<<<<<< HEAD -ipsecgid = @ipsecgid@ ipsecgroup = @ipsecgroup@ -ipsecuid = @ipsecuid@ -======= -ipsecgroup = @ipsecgroup@ ->>>>>>> upstream/4.5.1 ipsecuser = @ipsecuser@ libcharon_plugins = @libcharon_plugins@ libdir = @libdir@ @@ -227,6 +221,8 @@ nm_ca_dir = @nm_ca_dir@ oldincludedir = @oldincludedir@ openac_plugins = @openac_plugins@ p_plugins = @p_plugins@ +pcsclite_CFLAGS = @pcsclite_CFLAGS@ +pcsclite_LIBS = @pcsclite_LIBS@ pdfdir = @pdfdir@ piddir = @piddir@ pki_plugins = @pki_plugins@ @@ -245,14 +241,12 @@ sbindir = @sbindir@ scepclient_plugins = @scepclient_plugins@ scripts_plugins = @scripts_plugins@ sharedstatedir = @sharedstatedir@ -<<<<<<< HEAD -======= soup_CFLAGS = @soup_CFLAGS@ soup_LIBS = @soup_LIBS@ ->>>>>>> upstream/4.5.1 srcdir = @srcdir@ strongswan_conf = @strongswan_conf@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/src/ipsec/ipsec.8 b/src/ipsec/ipsec.8 index d0bd9ce70..6f4117be7 100644 --- a/src/ipsec/ipsec.8 +++ b/src/ipsec/ipsec.8 @@ -1,8 +1,4 @@ -<<<<<<< HEAD -.TH IPSEC 8 "2010-05-30" "4.5.0rc1" "strongSwan" -======= .TH IPSEC 8 "2010-05-30" "4.5.1" "strongSwan" ->>>>>>> upstream/4.5.1 .SH NAME ipsec \- invoke IPsec utilities .SH SYNOPSIS diff --git a/src/ipsec/ipsec.in b/src/ipsec/ipsec.in index 0f619d087..2ea0ef798 100755 --- a/src/ipsec/ipsec.in +++ b/src/ipsec/ipsec.in @@ -65,11 +65,7 @@ case "$1" in echo " rereadsecrets|rereadgroups" echo " rereadcacerts|rereadaacerts|rereadocspcerts" echo " rereadacerts|rereadcrls|rereadall" -<<<<<<< HEAD - echo " purgeocsp|purgeike" -======= echo " purgeocsp|purgecrls|purgecerts|purgeike" ->>>>>>> upstream/4.5.1 echo " scencrypt|scdecrypt <value> [--inbase <base>] [--outbase <base>] [--keyid <id>]" echo " openac" echo " pluto" @@ -195,19 +191,11 @@ rereadall|purgeocsp) fi exit "$rc" ;; -<<<<<<< HEAD -purgeike) - rc=7 - if [ -e $IPSEC_CHARON_PID ] - then - $IPSEC_STROKE purgeike -======= purgeike|purgecrls|purgecerts) rc=7 if [ -e $IPSEC_CHARON_PID ] then $IPSEC_STROKE "$1" ->>>>>>> upstream/4.5.1 rc="$?" fi exit "$rc" |