From 70feac5f484304006a0a15a85ecc25d959ad9054d3e1d69925c02f4adce6c5b8 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 23 Sep 2009 19:18:20 +0000 Subject: [PATCH] Accepting request 20845 from network Copy from network/strongswan based on submit request 20845 from user mtomaschewski OBS-URL: https://build.opensuse.org/request/show/20845 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/strongswan?expand=0&rev=17 --- strongswan-4.3.4-load_secrets-dbgmsg-fix.diff | 21 +++++++++++++++++++ strongswan.changes | 5 +++++ strongswan.spec | 4 +++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 strongswan-4.3.4-load_secrets-dbgmsg-fix.diff diff --git a/strongswan-4.3.4-load_secrets-dbgmsg-fix.diff b/strongswan-4.3.4-load_secrets-dbgmsg-fix.diff new file mode 100644 index 0000000..5f902f9 --- /dev/null +++ b/strongswan-4.3.4-load_secrets-dbgmsg-fix.diff @@ -0,0 +1,21 @@ +From: Marius Tomaschewski +Date: Fri, 4 Sep 2009 11:36:36 +0200 +Subject: [PATCH] fixed open failure debug message in load_secrets + + +diff --git a/src/charon/plugins/stroke/stroke_cred.c b/src/charon/plugins/stroke/stroke_cred.c +index 68df7f0..80e3954 100644 +--- a/src/charon/plugins/stroke/stroke_cred.c ++++ b/src/charon/plugins/stroke/stroke_cred.c +@@ -709,7 +709,7 @@ static void load_secrets(private_stroke_cred_t *this, char *file, int level) + fd = fopen(file, "r"); + if (fd == NULL) + { +- DBG1(DBG_CFG, "opening secrets file '%s' failed"); ++ DBG1(DBG_CFG, "opening secrets file '%s' failed", file); + return; + } + +-- +1.6.0.2 + diff --git a/strongswan.changes b/strongswan.changes index 573e07f..b4bd037 100644 --- a/strongswan.changes +++ b/strongswan.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 4 12:56:59 CEST 2009 - mt@suse.de + +- Fixed open failure debug message in load_secrets + ------------------------------------------------------------------- Thu Sep 3 23:44:37 CEST 2009 - mt@suse.de diff --git a/strongswan.spec b/strongswan.spec index e907fef..0e2028d 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -22,7 +22,7 @@ Name: strongswan %define upstream_version 4.3.4 %define strongswan_docdir %{_docdir}/%{name} Version: 4.3.4 -Release: 2 +Release: 3 License: GPL v2 or later Group: Productivity/Networking/Security Summary: StrongSwan -- OpenSource IPsec-based VPN Solution @@ -39,6 +39,7 @@ Source2: %{name}.init.in Source3: %{name}-%{version}-rpmlintrc Patch1: %{name}_modprobe_syslog.patch Patch2: %{name}-4.3.4-load_secrets-lock-fix.diff +Patch3: %{name}-4.3.4-load_secrets-dbgmsg-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison flex gmp-devel gperf pkg-config BuildRequires: libcap-devel @@ -131,6 +132,7 @@ Authors: %setup -q -n %{name}-%{upstream_version} %patch1 -p0 %patch2 -p1 +%patch3 -p1 sed -e 's|@libexecdir@|%_libexecdir|g' \ < $RPM_SOURCE_DIR/strongswan.init.in \ > strongswan.init