From 816a60f1a577c8e37f57661563aae700e9395190 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Thu, 24 Mar 2016 10:54:11 +0300 Subject: [PATCH] Drop unused patches --- libstrongswan-plugin.patch | 12 ------------ libstrongswan-settings-debug.patch | 30 ------------------------------ strongswan-pts-ecp-disable.patch | 20 -------------------- 3 files changed, 62 deletions(-) delete mode 100644 libstrongswan-plugin.patch delete mode 100644 libstrongswan-settings-debug.patch delete mode 100644 strongswan-pts-ecp-disable.patch diff --git a/libstrongswan-plugin.patch b/libstrongswan-plugin.patch deleted file mode 100644 index ce0951d..0000000 --- a/libstrongswan-plugin.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp strongswan-5.1.0-patched/src/libstrongswan/plugins/plugin_loader.c strongswan-5.1.0-current/src/libstrongswan/plugins/plugin_loader.c ---- strongswan-5.1.0-patched/src/libstrongswan/plugins/plugin_loader.c 2013-08-06 17:16:36.266031511 -0400 -+++ strongswan-5.1.0-current/src/libstrongswan/plugins/plugin_loader.c 2013-08-06 17:49:15.703354848 -0400 -@@ -353,7 +353,7 @@ static plugin_entry_t *load_plugin(priva - return NULL; - } - } -- handle = dlopen(file, RTLD_LAZY); -+ handle = dlopen(file, RTLD_NOW|RTLD_GLOBAL); - if (handle == NULL) - { - DBG1(DBG_LIB, "plugin '%s' failed to load: %s", name, dlerror()); diff --git a/libstrongswan-settings-debug.patch b/libstrongswan-settings-debug.patch deleted file mode 100644 index 66bca56..0000000 --- a/libstrongswan-settings-debug.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urNp strongswan-5.1.0-patched/src/libstrongswan/utils/settings.c strongswan-5.1.0-current/src/libstrongswan/utils/settings.c ---- strongswan-5.1.0-patched/src/libstrongswan/utils/settings.c 2013-08-06 17:16:36.244031484 -0400 -+++ strongswan-5.1.0-current/src/libstrongswan/utils/settings.c 2013-08-06 17:52:43.272606717 -0400 -@@ -960,7 +960,7 @@ static bool parse_file(linked_list_t *co - { - if (errno == ENOENT) - { -- DBG2(DBG_LIB, "'%s' does not exist, ignored", file); -+ DBG1(DBG_LIB, "'%s' does not exist, ignored", file); - return TRUE; - } - DBG1(DBG_LIB, "failed to stat '%s': %s", file, strerror(errno)); -@@ -1023,7 +1023,7 @@ static bool parse_files(linked_list_t *c - - if (!strlen(pattern)) - { -- DBG2(DBG_LIB, "empty include pattern, ignored"); -+ DBG1(DBG_LIB, "empty include pattern, ignored"); - return TRUE; - } - -@@ -1055,7 +1055,7 @@ static bool parse_files(linked_list_t *c - status = glob(pat, GLOB_ERR, NULL, &buf); - if (status == GLOB_NOMATCH) - { -- DBG2(DBG_LIB, "no files found matching '%s', ignored", pat); -+ DBG1(DBG_LIB, "no files found matching '%s', ignored", pat); - } - else if (status != 0) - { diff --git a/strongswan-pts-ecp-disable.patch b/strongswan-pts-ecp-disable.patch deleted file mode 100644 index 59054eb..0000000 --- a/strongswan-pts-ecp-disable.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urNp strongswan-5.1.0-patched/src/libpts/pts/pts_dh_group.c strongswan-5.1.0-current/src/libpts/pts/pts_dh_group.c ---- strongswan-5.1.0-patched/src/libpts/pts/pts_dh_group.c 2013-08-06 17:16:36.238031476 -0400 -+++ strongswan-5.1.0-current/src/libpts/pts/pts_dh_group.c 2013-08-06 17:44:48.005036651 -0400 -@@ -74,6 +74,16 @@ bool pts_dh_group_probe(pts_dh_group_t * - { - DBG1(DBG_PTS, format2, "mandatory", diffie_hellman_group_names, - ECP_256_BIT); -+ /* Openssl in Fedora does not allow ECP_256 and ECP_384, so lets not die -+ * here. As far as, there is one dh group available, lets continue. It makes -+ * it non-compliant to TCG's PTS standard, but there is no choice right now. -+ * see redhat bz # 319901. -+ */ -+ if(*dh_groups != PTS_DH_GROUP_NONE) -+ { -+ return TRUE; -+ } -+ - } - return FALSE; - }