From 3549ff5508cded583bafd7588d69f69f11a0eb9f Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Fri, 9 Aug 2019 13:59:10 +0200
Subject: T1571: fix the grep expression in "run show log vpn *".

---
 templates/show/log/vpn/all/node.def   | 2 +-
 templates/show/log/vpn/ipsec/node.def | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/show/log/vpn/all/node.def b/templates/show/log/vpn/all/node.def
index 7ede375..84fe22f 100644
--- a/templates/show/log/vpn/all/node.def
+++ b/templates/show/log/vpn/all/node.def
@@ -1,2 +1,2 @@
 help: Show log for ALL
-run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e pluto -e xl2tpd -e pptpd -e ppp
+run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e charon -e xl2tpd -e pptpd -e ppp
diff --git a/templates/show/log/vpn/ipsec/node.def b/templates/show/log/vpn/ipsec/node.def
index 6dc4fbf..3ac34bd 100644
--- a/templates/show/log/vpn/ipsec/node.def
+++ b/templates/show/log/vpn/ipsec/node.def
@@ -1,2 +1,2 @@
 help: Show log for IPSEC
-run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e pluto
+run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e charon
-- 
cgit v1.2.3


From 6557cf2648618315aa90aa66e45bd9ffc1251c18 Mon Sep 17 00:00:00 2001
From: UnicronNL <kim.sidney@gmail.com>
Date: Wed, 14 Aug 2019 15:51:57 +0200
Subject: update Jenkins file for equuleus

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 563ead2..11b1b0e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
             docker {
               label 'jessie-amd64'
               args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp'
-              image 'higebu/vyos-build:current'
+              image 'higebu/vyos-build:equuleus'
             }
 
           }
@@ -27,7 +27,7 @@ mv ../*.deb /tmp/$GIT_BRANCH/packages/'''
           agent {
             docker {
               label 'jessie-amd64'
-              image 'vyos-build-armhf:current'
+              image 'vyos-build-armhf:equuleus'
               args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp'
             }
 
@@ -48,7 +48,7 @@ mv ../*.deb /tmp/$GIT_BRANCH/packages/'''
             docker {
               label 'jessie-amd64'
               args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp'
-              image 'vyos-build-arm64:current'
+              image 'vyos-build-arm64:equuleus'
             }
 
           }
-- 
cgit v1.2.3


From d0ea8db97d3b26bf004c0d1285fad009ed9ef1da Mon Sep 17 00:00:00 2001
From: jjakob <jernej.jakob@gmail.com>
Date: Sat, 7 Sep 2019 22:14:44 +0200
Subject: T1604: run bash builtin "set" as-is in _vyatta_op_run

---
 functions/interpreter/vyatta-op-run | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/functions/interpreter/vyatta-op-run b/functions/interpreter/vyatta-op-run
index b0f72ae..ee4cb1c 100644
--- a/functions/interpreter/vyatta-op-run
+++ b/functions/interpreter/vyatta-op-run
@@ -155,6 +155,14 @@ _vyatta_op_conv_run_cmd ()
 
 _vyatta_op_run ()
 {
+    # if run with bash builtin "set -/+*" run set and return
+    # this happens when a different completion script runs eval "set ..."
+    # (VyOS T1604)
+    if [[ "$1" == "set" && "$2" =~ ^(-|\+).* ]]; then
+      set "${@:2}"
+      return
+    fi
+
     local -i estat
     local tpath=$vyatta_op_templates
     local restore_shopts=$( shopt -p extglob nullglob | tr \\n \; )
-- 
cgit v1.2.3


From 61d641154b78cfa0ee564ed91a49994b23acb081 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 28 Sep 2019 12:58:24 +0200
Subject: Jenkins: import Pipeline from vyos-1x commit bd00ec7

---
 Jenkinsfile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a77701b..b11267e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -96,12 +96,7 @@ pipeline {
             steps {
                 script {
                     dir('build') {
-                        sh """
-                            #!/bin/bash
-                            sudo apt-get -o Acquire::Check-Valid-Until=false update
-                            sudo mk-build-deps -i -r -t \'apt-get --no-install-recommends -yq\' debian/control
-                            dpkg-buildpackage -b -us -uc -tc
-                        """
+                        sh "dpkg-buildpackage -b -us -uc -tc"
                     }
                 }
             }
-- 
cgit v1.2.3