rpms-fedora-extras/strongswan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix json-c dependency

Browse Source
This commit is contained in:
Pavel Šimerda
2014-07-29 21:34:18 +02:00
parent 66b5f0bde7
commit 19c1360bdc
2 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
strongswan-5.2.0-json.patch Normal file
View File

@@ -0,0 +1,54 @@
diff --git a/configure.ac b/configure.ac
index 497240f..13faf8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -876,8 +876,8 @@ if test x$tss = xtrousers; then
fi
if test x$imv_swid = xtrue; then
- AC_CHECK_LIB([json],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([JSON library libjson not found])],[])
- AC_CHECK_HEADER([json/json.h],,[AC_MSG_ERROR([JSON header json/json.h not found!])])
+ AC_CHECK_LIB([json-c],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([JSON library libjson not found])],[])
+ AC_CHECK_HEADER([json-c/json.h],,[AC_MSG_ERROR([JSON header json/json.h not found!])])
fi
if test x$dumm = xtrue; then
diff --git a/src/libpts/plugins/imv_swid/Makefile.am b/src/libpts/plugins/imv_swid/Makefile.am
index 77f33e6..547254d 100644
--- a/src/libpts/plugins/imv_swid/Makefile.am
+++ b/src/libpts/plugins/imv_swid/Makefile.am
@@ -13,7 +13,7 @@ imv_swid_la_LIBADD = \
$(top_builddir)/src/libimcv/libimcv.la \
$(top_builddir)/src/libpts/libpts.la \
$(top_builddir)/src/libstrongswan/libstrongswan.la \
- -ljson
+ -ljson-c
imv_swid_la_SOURCES = \
imv_swid.c imv_swid_state.h imv_swid_state.c \
diff --git a/src/libpts/plugins/imv_swid/imv_swid_rest.h b/src/libpts/plugins/imv_swid/imv_swid_rest.h
index 93e3d6a..7566a93 100644
--- a/src/libpts/plugins/imv_swid/imv_swid_rest.h
+++ b/src/libpts/plugins/imv_swid/imv_swid_rest.h
@@ -26,7 +26,7 @@
#include <library.h>
-#include <json/json.h>
+#include <json-c/json.h>
typedef struct imv_swid_rest_t imv_swid_rest_t;
diff --git a/src/libpts/plugins/imv_swid/imv_swid_state.h b/src/libpts/plugins/imv_swid/imv_swid_state.h
index 7ffabfd..1ab7942 100644
--- a/src/libpts/plugins/imv_swid/imv_swid_state.h
+++ b/src/libpts/plugins/imv_swid/imv_swid_state.h
@@ -28,7 +28,7 @@
#include <swid/swid_inventory.h>
#include <library.h>
-#include <json/json.h>
+#include <json-c/json.h>
typedef struct imv_swid_state_t imv_swid_state_t;
typedef enum imv_swid_handshake_state_t imv_swid_handshake_state_t;

7
strongswan.spec
View File

@@ -8,7 +8,7 @@
Name: strongswan
Version: 5.2.0
Release: 1%{?prerelease:.%{prerelease}}%{?dist}
Release: 2%{?prerelease:.%{prerelease}}%{?dist}
Summary: An OpenSource IPsec-based VPN and TNC solution
Group: System Environment/Daemons
License: GPLv2+
@@ -16,6 +16,7 @@ URL: http://www.strongswan.org/
Source0: http://download.strongswan.org/%{name}-%{version}%{?prerelease}.tar.bz2
# Initscript for epel6
Source1: %{name}.sysvinit
Patch0: strongswan-5.2.0-json.patch
# Use RTLD_GLOBAL when loading plugins and link them to libstrongswan
#
# The patch hasn't been accepted upstream because of insufficient
@@ -97,6 +98,7 @@ PT-TLS to support TNC over TLS.
%prep
%setup -q -n %{name}-%{version}%{?prerelease}
%patch0 -p1
#%patch1 -p1
echo "For migration from 4.6 to 5.0 see http://wiki.strongswan.org/projects/strongswan/wiki/CharonPlutoIKEv1" > README.Fedora
@@ -365,6 +367,9 @@ fi
%endif
%changelog
* Tue Jul 29 2014 Pavel Šimerda <psimerda@redhat.com> - 5.2.0-2
- fix json-c dependency
* Tue Jul 15 2014 Avesh Agarwal <avagarwa@redhat.com> - 5.2.0-1
- New upstream release 5.2.0
- The Attestation IMC/IMV pair supports the IMA-NG