diff --git a/.gitignore b/.gitignore index b782d4e..162b7fb 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /strongswan-5.2.0.tar.bz2 /strongswan-5.2.0.tar.bz2.md5 /strongswan-5.2.0.tar.bz2.sig +/strongswan-5.2.1dr1.tar.bz2 diff --git a/sources b/sources index 5ba0b9b..52bc0c0 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -5cee4ee1a6ccb74400758b3ace54d46e strongswan-5.2.0.tar.bz2 -946d3a8b2cb18779966b0abba3f955da strongswan-5.2.0.tar.bz2.md5 -e5cc61017455e2777fe4b2fa4f3bf0b1 strongswan-5.2.0.tar.bz2.sig +de5ea29226607a4645b5fd66b2704ece strongswan-5.2.1dr1.tar.bz2 diff --git a/strongswan-5.2.0-json.patch b/strongswan-5.2.0-json.patch deleted file mode 100644 index abd787d..0000000 --- a/strongswan-5.2.0-json.patch +++ /dev/null @@ -1,78 +0,0 @@ -commit fafed376e7f4bb00014a101f0156c475fd964374 -Author: Tobias Brunner -Date: Wed Jul 30 16:01:41 2014 +0200 - - imv-swid: Use pkg-config to check for libjson-c - - The package/library is called libjson-c on recent distributions. - Some like Ubuntu 14.04 provide symlinks with the old name but these - will eventually disappear. Using pkg-config allows us to easily check - for it (with a fallback) and configure the proper compiler flags. - - Fixes #663. - -diff --git a/configure.ac b/configure.ac -index 497240f..695fa45 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -876,8 +876,10 @@ 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!])]) -+ PKG_CHECK_MODULES(json, [json-c], [], -+ [PKG_CHECK_MODULES(json, [json])]) -+ AC_SUBST(json_CFLAGS) -+ AC_SUBST(json_LIBS) - 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..9305484 100644 ---- a/src/libpts/plugins/imv_swid/Makefile.am -+++ b/src/libpts/plugins/imv_swid/Makefile.am -@@ -5,7 +5,7 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src/libpts - - AM_CFLAGS = \ -- $(PLUGIN_CFLAGS) -+ $(PLUGIN_CFLAGS) $(json_CFLAGS) - - imcv_LTLIBRARIES = imv-swid.la - -@@ -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 -+ $(json_LIBS) - - 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..32392cb 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 - --#include -+#include - - 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..a6a8d03 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 - #include - --#include -+#include - - typedef struct imv_swid_state_t imv_swid_state_t; - typedef enum imv_swid_handshake_state_t imv_swid_handshake_state_t; diff --git a/strongswan.spec b/strongswan.spec index 440ef3b..ec058ea 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -4,11 +4,11 @@ # order. # 2) Please use the following define (with a percent sign and the appropriate # prerelease tag): -# define prerelease dr6 +%define prerelease dr1 Name: strongswan -Version: 5.2.0 -Release: 7%{?prerelease:.%{prerelease}}%{?dist} +Version: 5.2.1 +Release: 0.1%{?prerelease:.%{prerelease}}%{?dist} Summary: An OpenSource IPsec-based VPN and TNC solution Group: System Environment/Daemons License: GPLv2+ @@ -16,7 +16,6 @@ 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 @@ -105,7 +104,6 @@ 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 @@ -382,6 +380,9 @@ fi %endif %changelog +* Fri Oct 10 2014 Pavel Šimerda - 5.2.1-1 +- new version 5.2.1dr1 + * Thu Sep 25 2014 Pavel Šimerda - 5.2.0-7 - use upstream patch for json/json-c dependency