From cf5fd5ad67aa2500858eab67c178b1f555597ccba6365052d5799657569856a7 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Mon, 29 Aug 2011 15:14:08 +0000 Subject: [PATCH] Accepting request 79600 from home:elvigia:branches:network:vpn - BuildRequires libselinux-devel - Use SSL_MODE_RELEASE_BUFFERS to keep memory usage low, sent upstream as https://community.openvpn.net/openvpn/ticket/157 OBS-URL: https://build.opensuse.org/request/show/79600 OBS-URL: https://build.opensuse.org/package/show/network:vpn/openvpn?expand=0&rev=27 --- ...SL_MODE_RELEASE_BUFFERS-if-available.patch | 31 +++++++++++++++++++ openvpn.changes | 7 +++++ openvpn.spec | 3 ++ 3 files changed, 41 insertions(+) create mode 100644 0001-Use-SSL_MODE_RELEASE_BUFFERS-if-available.patch diff --git a/0001-Use-SSL_MODE_RELEASE_BUFFERS-if-available.patch b/0001-Use-SSL_MODE_RELEASE_BUFFERS-if-available.patch new file mode 100644 index 0000000..874f842 --- /dev/null +++ b/0001-Use-SSL_MODE_RELEASE_BUFFERS-if-available.patch @@ -0,0 +1,31 @@ +From db33132094f4748ccc63aadbfa4b7446bb95b350 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= +Date: Sat, 20 Aug 2011 18:12:28 -0400 +Subject: [PATCH] Use SSL_MODE_RELEASE_BUFFERS if available +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + +Signed-off-by: Cristian Rodríguez +--- + ssl.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/ssl.c b/ssl.c +index ea7b204..459e66c 100644 +--- a/ssl.c ++++ b/ssl.c +@@ -2073,6 +2073,9 @@ init_ssl (const struct options *options) + } + + /* Set SSL options */ ++#ifdef SSL_MODE_RELEASE_BUFFERS ++ SSL_CTX_set_mode (ctx, SSL_MODE_RELEASE_BUFFERS); ++#endif + SSL_CTX_set_session_cache_mode (ctx, SSL_SESS_CACHE_OFF); + SSL_CTX_set_options (ctx, SSL_OP_SINGLE_DH_USE); + +-- +1.7.4.1 + diff --git a/openvpn.changes b/openvpn.changes index 30fcd01..07213ad 100644 --- a/openvpn.changes +++ b/openvpn.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 23 15:41:00 UTC 2011 - crrodriguez@opensuse.org + +- BuildRequires libselinux-devel +- Use SSL_MODE_RELEASE_BUFFERS to keep memory usage low, sent + upstream as https://community.openvpn.net/openvpn/ticket/157 + ------------------------------------------------------------------- Mon Jul 11 14:38:45 UTC 2011 - mt@suse.de diff --git a/openvpn.spec b/openvpn.spec index fc23c0a..e850aef 100644 --- a/openvpn.spec +++ b/openvpn.spec @@ -38,9 +38,11 @@ Source4: client-netconfig.up Source5: client-netconfig.down Patch1: %{name}-2.1-plugin-man.dif Patch2: %{name}-2.1-plugin-build.dif +Patch3: 0001-Use-SSL_MODE_RELEASE_BUFFERS-if-available.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: lzo-devel openssl-devel BuildRequires: iproute2 pam-devel +BuildRequires: libselinux-devel %if 0%{?suse_version} > 1030 BuildRequires: pkcs11-helper-devel Requires: pkcs11-helper @@ -129,6 +131,7 @@ Authors: %setup -q -n %{name}-%{upstream_version} %patch1 -p0 %patch2 -p0 +%patch3 -p1 sed -e "s|@PLUGIN_DIR@|%{plugin_dir}|g" \ -e "s|@PLUGIN_LIBDIR@|%{plugin_libdir}|g" \ -e "s|@PLUGIN_DOCDIR@|%{_defaultdocdir}/%{name}|g" \