Merge remote branch 'origin/lithium' into lithium-strongswan5

3 files changed, 18 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 0836483..d8a41b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+vyatta-op-vpn (0.15.0+vyos2+lithium8) unstable; urgency=low
+
+  * vyatta-op-vpn: update dh_gencontrol with new development build flag
+ 
+ -- Alex Harpin <development@landsofshadow.co.uk>  Sat, 20 Jun 2015 07:07:39 +0100
+ 
+vyatta-op-vpn (0.15.0+vyos2+lithium7) unstable; urgency=low
+
+  [ Jason Hendry ]
+  * Bug:540 correct the order of ESP SA array by removing the reverse
+    directive
+     
+  [ Alex Harpin ]
+
+ -- Alex Harpin <development@landsofshadow.co.uk>  Sat, 13 Jun 2015 11:08:07 +0100
+
 vyatta-op-vpn (0.15.0+vyos2+lithium6) unstable; urgency=low
 
   [ Jason Hendry ]
diff --git a/debian/rules b/debian/rules
index 1b0510c..4b68fde 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,7 @@ binary-indep: build install
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	if [ -f "../.VYATTA_DEV_BUILD" ]; then \
+	if [ -f "../.VYOS_DEV_BUILD" ]; then \
 		dh_gencontrol -- -v999.dev; \
 	else \
 		dh_gencontrol; \
diff --git a/lib/OPMode.pm b/lib/OPMode.pm
index f6f372c..5a17836 100644
--- a/lib/OPMode.pm
+++ b/lib/OPMode.pm
@@ -651,7 +651,7 @@ sub process_tunnels{
 
   # For each tunnel, loop through all ESP SA's and extract data from one most recently used
   foreach my $connectid (keys %esp_hash) {
-    foreach my $esp_sa (reverse sort {$esp_hash{$a}{last_used} <=> $esp_hash{$b}{last_used}} keys %{$esp_hash{$connectid}}) {
+    foreach my $esp_sa (sort {$esp_hash{$a}{last_used} <=> $esp_hash{$b}{last_used}} keys %{$esp_hash{$connectid}}) {
       foreach my $data (keys %{$esp_hash{$connectid}{$esp_sa}}) {
         $tunnel_hash{$connectid}->{$data} = $esp_hash{$connectid}{$esp_sa}{$data} if ($data =~ /^_/);
       }