From 968e77119702765f9ec2859718bfa0fa443b2591 Mon Sep 17 00:00:00 2001
From: Jason Hendry <jhendry@mintel.com>
Date: Thu, 9 Apr 2015 09:36:11 +0100
Subject: Bug:540 correct the order of ESP SA array by removing the reverse
 directive

---
 lib/OPMode.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/OPMode.pm b/lib/OPMode.pm
index fb62cbb..f871533 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 =~ /^_/);
       }
-- 
cgit v1.2.3


From 4831ea779d82461051c330ff7e7062175cbe9d61 Mon Sep 17 00:00:00 2001
From: Alex Harpin <development@landsofshadow.co.uk>
Date: Sat, 13 Jun 2015 11:08:41 +0100
Subject: 0.15.0+vyos2+lithium7

---
 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0836483..1037e27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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 ]
-- 
cgit v1.2.3


From 0335e01323a083743c2ae7e135ef5dbf4c4b2ee9 Mon Sep 17 00:00:00 2001
From: Alex Harpin <development@landsofshadow.co.uk>
Date: Sat, 20 Jun 2015 07:06:57 +0100
Subject: vyatta-op-vpn: update dh_gencontrol with new development build flag

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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; \
-- 
cgit v1.2.3


From 0ec07e891b0191b24185ea09c6f33f6502597df6 Mon Sep 17 00:00:00 2001
From: Alex Harpin <development@landsofshadow.co.uk>
Date: Sat, 20 Jun 2015 07:08:03 +0100
Subject: 0.15.0+vyos2+lithium8

---
 debian/changelog | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1037e27..d8a41b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
+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
+  * Bug:540 correct the order of ESP SA array by removing the reverse
+    directive
      
   [ Alex Harpin ]
 
-- 
cgit v1.2.3