commit strongswan for openSUSE:11.4

Hello community, here is the log from the commit of package strongswan for openSUSE:11.4 checked in at Fri Mar 25 17:39:59 CET 2011. -------- --- old-versions/11.4/all/strongswan/strongswan.changes 2010-11-22 10:12:07.000000000 +0100 +++ 11.4/strongswan/strongswan.changes 2011-03-14 11:54:21.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 14 10:49:46 UTC 2011 - mt@suse.de + +- Applied git patch fixing memory cleanup if no DHCP transaction + were found for an OFFER. Causes charon to kill itself and be + restarted by ipsec starter (bnc#679170). + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/strongswan Destination is old-versions/11.4/UPDATES/all/strongswan calling whatdependson for 11.4-i586 New: ---- strongswan-4.5.0-no-dhcp-mem-cleanup.bnc679170.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strongswan.spec ++++++ --- /var/tmp/diff_new_pack.KxAxd5/_old 2011-03-25 17:39:47.000000000 +0100 +++ /var/tmp/diff_new_pack.KxAxd5/_new 2011-03-25 17:39:47.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package strongswan (Version 4.5.0) +# spec file for package strongswan # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ %define with_nm 0%{suse_version} >= 1110 %define with_tests 0 Version: 4.5.0 -Release: 2 +Release: 6.<RELEASE7> License: GPLv2+ Group: Productivity/Networking/Security Summary: OpenSource IPsec-based VPN Solution @@ -43,6 +43,7 @@ Source3: %{name}-%{version}-rpmlintrc Source4: README.SUSE Patch1: %{name}_modprobe_syslog.patch +Patch2: %{name}-4.5.0-no-dhcp-mem-cleanup.bnc679170.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison flex gmp-devel gperf pkg-config BuildRequires: libcap-devel @@ -245,6 +246,7 @@ %prep %setup -q -n %{name}-%{upstream_version} %patch1 -p0 +%patch2 -p1 sed -e 's|@libexecdir@|%_libexecdir|g' \ < $RPM_SOURCE_DIR/strongswan.init.in \ > strongswan.init ++++++ strongswan-4.5.0-no-dhcp-mem-cleanup.bnc679170.patch ++++++

From 17951d171237713b8cbed73e0a49385c0eaf7fcc Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Wed, 12 Jan 2011 15:17:08 +0100 Subject: [PATCH] Fixed memory cleanup if no DHCP transaction found for an OFFER

--- src/libcharon/plugins/dhcp/dhcp_socket.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libcharon/plugins/dhcp/dhcp_socket.c b/src/libcharon/plugins/dhcp/dhcp_socket.c index e1e83d6..8851c1b 100644 --- a/src/libcharon/plugins/dhcp/dhcp_socket.c +++ b/src/libcharon/plugins/dhcp/dhcp_socket.c @@ -459,7 +459,7 @@ static void handle_offer(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen) { dhcp_transaction_t *transaction = NULL; enumerator_t *enumerator; - host_t *offer, *server; + host_t *offer, *server = NULL; offer = host_create_from_chunk(AF_INET, chunk_from_thing(dhcp->your_address), 0); @@ -500,7 +500,7 @@ static void handle_offer(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen) chunk_create((char*)&option->data[pos], 4)); } } - if (option->type == DHCP_SERVER_ID && option->len == 4) + if (!server && option->type == DHCP_SERVER_ID && option->len == 4) { server = host_create_from_chunk(AF_INET, chunk_create(option->data, 4), DHCP_SERVER_PORT); @@ -515,12 +515,11 @@ static void handle_offer(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen) } DBG1(DBG_CFG, "received DHCP OFFER %H from %H", offer, server); transaction->set_address(transaction, offer->clone(offer)); - transaction->set_server(transaction, server->clone(server)); + transaction->set_server(transaction, server); } this->mutex->unlock(this->mutex); this->condvar->broadcast(this->condvar); offer->destroy(offer); - server->destroy(server); } /** -- 1.7.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org