Merge remote-tracking branch 'upstream/current' into current

.gitmodules

@@ -74,10 +74,6 @@
 	path = packages/vyatta-cluster
 	url = https://github.com/vyos/vyatta-cluster.git
 	branch = current
-[submodule "packages/vyatta-vrrp"]
-	path = packages/vyatta-vrrp
-	url = https://github.com/vyos/vyatta-vrrp.git
-	branch = current
 [submodule "packages/vyatta-eventwatch"]
 	path = packages/vyatta-eventwatch
 	url = https://github.com/vyos/vyatta-eventwatch.git
@@ -130,10 +126,6 @@
 	path = packages/vyatta-ravpn
 	url = https://github.com/vyos/vyatta-ravpn.git
 	branch = current
-[submodule "packages/vyos-pppoe-server"]
-	path = packages/vyos-pppoe-server
-	url = https://github.com/vyos/vyos-pppoe-server.git
-	branch = current
 [submodule "packages/vyos-nhrp"]
 	path = packages/vyos-nhrp
 	url = https://github.com/vyos/vyos-nhrp.git
@@ -193,3 +185,12 @@
 [submodule "packages/frr"]
 	path = packages/frr
 	url = https://github.com/FRRouting/frr.git
+	branch = master
+[submodule "packages/conntrack-tools"]
+	path = packages/conntrack-tools
+	url = https://github.com/vyos/conntrack-tools.git
+	branch = current
+[submodule "packages/eventwatchd"]
+	path = packages/eventwatchd
+	url = https://github.com/vyos/eventwatchd.git
+	branch = current

Jenkinsfile

@@ -53,8 +53,11 @@ pipeline {
     }
 
     post {
-        always {
+        cleanup {
             echo 'One way or another, I have finished'
+            // the 'build' directory got elevated permissions during the build
+            // cdjust permissions so it can be cleaned up by the regular user
+            sh 'sudo chmod -R 777 build/'
             deleteDir() /* cleanup our workspace */
         }
     }

data/package-lists/vyos-dev.list.chroot

@@ -2,3 +2,4 @@ gdb
 strace
 aptitude
 apt-rdepends
+linux-perf

docker/Dockerfile

@@ -162,7 +162,16 @@ RUN apt-get update && apt-get install -y \
       python3-pytest \
       install-info \
       libc-ares-dev \
-      libc-ares2
+      libc-ares2 \
+      libzmq3 \
+      libzmq3-dev
+
+# Packages needed for conntrack-tools
+RUN apt-get update && apt-get install -y \
+      libnetfilter-conntrack-dev \
+      libnetfilter-cthelper0-dev \
+      libnetfilter-cttimeout-dev \
+      libnetfilter-queue-dev
 
 # Update live-build
 RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list &&\

packages/conntrack-tools

@@ -0,0 +1 @@
+Subproject commit 77cf2ae1cfc281ab11d3fa5ddc73c11bcb60ccd9

packages/eventwatchd

@@ -0,0 +1 @@
+Subproject commit c3d8ae7352f3e9c65b0f05dda245d144252574ca

packages/vyatta-vrrp

@@ -1 +0,0 @@
-Subproject commit c6411d8c4c1a11f0305ddee2824d7081cd2654a3

packages/vyos-pppoe-server

@@ -1 +0,0 @@
-Subproject commit 566709144fb119d32cc029615cff2e688a8a7557

scripts/build-submodules

@@ -141,8 +141,6 @@ if [ $INIT_PACKAGES ]; then
 fi
 
 build_frr() {
-  # FRR upstream version is specified here
-  FRR_VER="debian/frr-6.0.2-1"
   PKG=frr
   if ! package_in_buildlist "frr"; then
     return 0
@@ -153,10 +151,44 @@ build_frr() {
     status_skip "No source for: $PKG"
     return 1
   fi
+
   ( set -e; set -x
     cd $PKGDIR/$PKG
-    git checkout $FRR_VER
-    dpkg-buildpackage -uc -us -tc -b
+
+    # Run bootstrap.sh and make a dist tarball
+    # http://docs.frrouting.org/projects/dev-guide/en/latest/packaging-debian.html
+    ./bootstrap.sh
+    ./configure --with-pkg-extra-version=-vyos
+    make dist
+
+    # Create backports debian sources
+    mv debianpkg debian
+    make -f debian/rules backports
+
+    # Create a new directory to build the package and populate with package source.
+    mkdir frrpkg
+    cd frrpkg
+    tar xf ../frr_*.orig.tar.gz
+    cd frr*
+    source /etc/os-release
+    ls -al ../../frr_*${ID}${VERSION_ID}*
+    tar xf ../../frr_*${ID}${VERSION_ID}*.debian.tar.xz
+
+    # As libyang is not (yet) build and installed as native Debian package FRR
+    # build system reports the following error:
+    #
+    #   "dpkg-shlibdeps: error: no dependency information found for
+    #       /usr/lib/x86_64-linux-gnu/libyang.so.0.16"
+    #
+    # It is "overruled" by
+    sed '/dh_systemd_enable frr.service/ a \\noverride_dh_shlibdeps:\n\tdh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info\n' -i debian/rules
+
+
+    # Build Debian Package
+    debuild --no-lintian --set-envvar=WANT_SNMP=1 --set-envvar=WANT_RPKI=1 \
+        --set-envvar=WANT_CUMULUS_MODE=0 -b -uc -us
+
+    mv ../frr_*.deb $PKGDIR
   ) >>$PKGDIR/$PKG.buildlog 2>&1
   if [ $? -ne 0 ]; then
     status_fail
@@ -170,6 +202,8 @@ build_frr
 for PKG in mdns-repeater \
            pmacct \
            udp-broadcast-relay \
+           conntrack-tools \
+           eventwatchd \
            vyatta-bash \
            vyatta-cfg \
            vyatta-cfg-firewall \
@@ -197,7 +231,6 @@ for PKG in mdns-repeater \
            vyatta-op-vpn \
            vyatta-openvpn \
            vyatta-ravpn \
-           vyatta-vrrp \
            vyatta-wanloadbalance \
            vyatta-webgui \
            vyatta-webproxy \
@@ -206,7 +239,6 @@ for PKG in mdns-repeater \
            vyatta-zone \
            vyos-keepalived \
            vyos-nhrp \
-           vyos-pppoe-server \
            vyos-strongswan \
            vyos-world \
            ; do