Ubuntu
ipsec-tools package

Merge lp:~gandelman-a/ubuntu/oneiric/ipsec-tools/lp877891 into lp:ubuntu/oneiric/ipsec-tools

  1. Oneiric (11.10)
  2. lp877891
  3. Merge into oneiric
Proposed by Adam Gandelman
Status: Approved
Approved by: Stéphane Graber
Approved revision: 30
Proposed branch: lp:~gandelman-a/ubuntu/oneiric/ipsec-tools/lp877891
Merge into: lp:ubuntu/oneiric/ipsec-tools
Diff against target: 28 lines (+9/-1)
2 files modified
debian/changelog (+7/-0)
debian/racoon-tool.pl (+2/-1)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/oneiric/ipsec-tools/lp877891
Reviewer Review Type Date Requested Status
Luke Yelavich (community) Approve
Ubuntu branches Pending
Review via email: mp+80372@code.launchpad.net

Description of the change

Backports a fix from recent Debian package which fixes kernel version parsing on 3.x kernels and correctly finds and loads crypto modules on oneiric.

To post a comment you must log in.
Revision history for this message
Luke Yelavich (themuso) wrote :

Uploaded, thanks for your work.

review: Approve
Reply
Revision history for this message
Stéphane Graber (stgraber) wrote :

Marking as approved as Luke uploaded it.

Reply

Unmerged revisions

30. By Adam Gandelman

debian/racoon-tool.pl: Backport a fix to correctly determine module
extension for 3.x kernels. (LP: #877891)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-06 08:06:28 +0000
3+++ debian/changelog 2011-10-25 19:03:26 +0000
4@@ -1,3 +1,10 @@
5+ipsec-tools (1:0.8.0-3ubuntu1.1) oneiric-proposed; urgency=low
6+
7+ * debian/racoon-tool.pl: Backport a fix to correctly determine module
8+ extension for 3.x kernels. (LP: #877891)
9+
10+ -- Adam Gandelman <adamg@canonical.com> Tue, 25 Oct 2011 11:12:16 -0700
11+
12 ipsec-tools (1:0.8.0-3ubuntu1) oneiric; urgency=low
13
14 * Merge from debian unstable (LP: #787114), remaining changes:
15
16=== modified file 'debian/racoon-tool.pl'
17--- debian/racoon-tool.pl 2010-01-03 17:58:13 +0000
18+++ debian/racoon-tool.pl 2011-10-25 19:03:26 +0000
19@@ -64,7 +64,8 @@
20 $modpath_key = "$modpath/kernel/net/key";
21 $modpath_crypto = "$modpath/kernel/crypto";
22 $modpath_zlib = "$modpath/kernel/lib/zlib_deflate";
23-$modext = ( $kver =~ /^2\.6\./ ? ".ko" : ".o" );
24+# Backport fix for 3.x kernels. LP: #877891
25+$modext = ( $kver =~ /^2\.6\.|^3\./ ? ".ko" : ".o" );
26 $progname = basename($0, "");
27 $proc_ipv4 = "/proc/sys/net/ipv4";
28 $proc_ipv6 = "/proc/sys/net/ipv6";

Subscribers

People subscribed via source and target branches