lib: fix coverity warnings

[mirror_frr.git] / snapcraft / snapcraft.yaml.in

diff --git a/snapcraft/snapcraft.yaml.in b/snapcraft/snapcraft.yaml.in
index 54865b9c80194de80d6b930bcd303990865de1c2..1836f34979d3581863a3cc5420e622f7a620a224 100644 (file)
--- a/snapcraft/snapcraft.yaml.in
+++ b/snapcraft/snapcraft.yaml.in
@@ -134,6 +134,13 @@ apps:
             - network
             - network-bind
             - network-control
+    vrrpd:
+        command: bin/vrrpd-service
+        daemon: simple
+        plugs:
+            - network
+            - network-bind
+            - network-control
     set:
         command: bin/set-options
     zebra-debug:
@@ -232,7 +239,12 @@ apps:
             - network
             - network-bind
             - network-control
-
+    vrrpd-debug:
+        command: sbin/vrrpd -f $SNAP_DATA/vrrpd.conf --pid_file $SNAP_DATA/vrrpd.pid --socket $SNAP_DATA/zsock --vty_socket $SNAP_DATA
+        plugs:
+            - network
+            - network-bind
+            - network-control
 parts:
     rtrlib:
         build-packages:
@@ -247,7 +259,7 @@ parts:
            - usr/lib/x86_64-linux-gnu/libssh.so*
         source: https://github.com/rtrlib/rtrlib.git
         source-type: git
-        source-tag: v0.6.3
+        source-tag: v0.7.0
         plugin: cmake
         configflags:
            - -DCMAKE_BUILD_TYPE=Release
@@ -261,11 +273,12 @@ parts:
            - libpcre3
         source: https://github.com/CESNET/libyang.git
         source-type: git
-        source-tag: v0.16-r3
+        source-tag: v1.0.184
         plugin: cmake
         configflags:
            - -DCMAKE_INSTALL_PREFIX:PATH=/usr
            - -DENABLE_LYD_PRIV=ON
+           - -DENABLE_CACHE=ON
            - -DCMAKE_BUILD_TYPE:String="Release"
     frr: 
         after: [rtrlib,libyang]
@@ -307,6 +320,7 @@ parts:
            - libc-ares2
            - libatm1
            - libprotobuf-c1
+           - libdb5.3
         plugin: autotools
         source: ../frr-@PACKAGE_VERSION@.tar.gz
         configflags:
@@ -325,6 +339,7 @@ parts:
             - --enable-fpm
             - --enable-protobuf
             - --enable-rpki
+            - --enable-vrrpd
             - --enable-configfile-mask=0640
             - --enable-logfile-mask=0640 
             - --localstatedir=/var/run
@@ -351,6 +366,7 @@ parts:
             pbrd.conf.default: etc/frr/pbrd.conf.default
             bfdd.conf.default: etc/frr/bfdd.conf.default
             fabricd.conf.default: etc/frr/fabricd.conf.default
+            vrrpd.conf.default: etc/frr/vrrpd.conf.default
             vtysh.conf.default: etc/frr/vtysh.conf.default
             staticd.conf.default: etc/frr/staticd.conf.default
     frr-scripts:
@@ -376,6 +392,6 @@ parts:
 
 passthrough:
     layout:
-         /usr/lib/x86_64-linux-gnu/libyang:
-             bind: $SNAP/usr/lib/x86_64-linux-gnu/libyang
+         /usr/lib/x86_64-linux-gnu/libyang1:
+             bind: $SNAP/usr/lib/x86_64-linux-gnu/libyang1