ubuntu-security-tools

Merge ~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:coverity-snap-update into ubuntu-security-tools:master

  1. Git
  2. lp:~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools
  3. coverity-snap-update
  4. Merge into master
Proposed by Spyros Seimenis
Status: Needs review
Proposed branch: ~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:coverity-snap-update
Merge into: ubuntu-security-tools:master
Diff against target: 71 lines (+10/-10)
3 files modified
snaps/coverity-ubuntu-security/README.md (+3/-2)
snaps/coverity-ubuntu-security/files/bin/install (+3/-1)
snaps/coverity-ubuntu-security/snapcraft.yaml (+4/-7)
Reviewer Review Type Date Requested Status
Alex Murray Approve
Review via email: mp+422375@code.launchpad.net
To post a comment you must log in.
~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:coverity-snap-update updated
c6583f1... by Spyros Seimenis

snaps/coverity: Rename README to README.md and minor text change

c9d37bf... by Spyros Seimenis

snaps/coverity: Fix install command

install command shouldn't be guarded by the check in common.sh for
existence of the bin folder because this is the command responsible
for the initial setup of that folder.

d119c6a... by Spyros Seimenis

snaps/coverity: make snap description more generic

1275de4... by Spyros Seimenis

snaps/coverity: fix build command

Remove redundant cov-build command and wrap it with "wrap"
so that the standard path checks and warnings are shown when
running the command.

507b1d3... by Spyros Seimenis

snaps/coverity: update to the latest coverity version

Revision history for this message
Spyros Seimenis (sespiros) wrote :

Updated that old branch that fixes the coverity snap installation as well as updated it to the latest coverity version.

The snap's version is following the coverity version but since this is mostly a wrapper for the installer, maybe it doesn't have to be updated every time coverity has a new release and could have its own versioning.

For now it still makes sense though as this also includes apparmor profiles for coverity tools running in a schroot and those could be affected by new coverity versions.

Reply
Revision history for this message
Alex Murray (alexmurray) wrote :

LGTM!

review: Approve
Reply

Unmerged commits

507b1d3... by Spyros Seimenis

snaps/coverity: update to the latest coverity version

1275de4... by Spyros Seimenis

snaps/coverity: fix build command

Remove redundant cov-build command and wrap it with "wrap"
so that the standard path checks and warnings are shown when
running the command.

d119c6a... by Spyros Seimenis

snaps/coverity: make snap description more generic

c9d37bf... by Spyros Seimenis

snaps/coverity: Fix install command

install command shouldn't be guarded by the check in common.sh for
existence of the bin folder because this is the command responsible
for the initial setup of that folder.

c6583f1... by Spyros Seimenis

snaps/coverity: Rename README to README.md and minor text change

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/snaps/coverity-ubuntu-security/README b/snaps/coverity-ubuntu-security/README.md
0similarity index 92%0similarity index 92%
1rename from snaps/coverity-ubuntu-security/README1rename from snaps/coverity-ubuntu-security/README
2rename to snaps/coverity-ubuntu-security/README.md2rename to snaps/coverity-ubuntu-security/README.md
index e11ca30..2808351 100644
--- a/snaps/coverity-ubuntu-security/README
+++ b/snaps/coverity-ubuntu-security/README.md
@@ -13,8 +13,9 @@ $ sudo snap install ./coverity-ubuntu-security*.snap --dangerous
13To use:13To use:
14$ coverity-ubuntu-security.install <coverity tarball> <coverity license>14$ coverity-ubuntu-security.install <coverity tarball> <coverity license>
1515
16The above command installs coverity into ~/snap/coverity-ubuntu-security/common16The above command unpacks coverity into ~/snap/coverity-ubuntu-security/common
17with the symlink ~/snap/coverity-ubuntu-security/common/cov-analysis-current.17and adds a symlink from ~/snap/coverity-ubuntu-security/common/cov-analysis-current
18to it.
1819
19If you follow the installation script instructions, uaudit will prefer the snap20If you follow the installation script instructions, uaudit will prefer the snap
20aliases and there is nothing else you need to do (eg, no need to adjust PATH).21aliases and there is nothing else you need to do (eg, no need to adjust PATH).
diff --git a/snaps/coverity-ubuntu-security/files/bin/install b/snaps/coverity-ubuntu-security/files/bin/install
index 1f030be..e36c875 100755
--- a/snaps/coverity-ubuntu-security/files/bin/install
+++ b/snaps/coverity-ubuntu-security/files/bin/install
@@ -1,7 +1,9 @@
1#!/bin/sh1#!/bin/sh
2set -e2set -e
33
4. "$SNAP/bin/common.sh"4install_symlink="cov-analysis-current"
5topdir="$SNAP_USER_COMMON/$install_symlink"
6bindir="$topdir/bin"
57
6if [ -z "$SNAP_USER_COMMON" ]; then8if [ -z "$SNAP_USER_COMMON" ]; then
7 echo "SNAP_USER_COMMON not set! Aborting"9 echo "SNAP_USER_COMMON not set! Aborting"
diff --git a/snaps/coverity-ubuntu-security/snapcraft.yaml b/snaps/coverity-ubuntu-security/snapcraft.yaml
index 7df5bfa..c2d5cda 100644
--- a/snaps/coverity-ubuntu-security/snapcraft.yaml
+++ b/snaps/coverity-ubuntu-security/snapcraft.yaml
@@ -1,11 +1,10 @@
1name: coverity-ubuntu-security1name: coverity-ubuntu-security
2version: "2019.03-64"2version: "2023.03-64"
3summary: Coverity packaging for running as a snap3summary: Coverity packaging for running as a snap
4description: |4description: |
5 Unpack cov-analysis-linux64-YYYY.MM.tar.gz to $SNAP_USER_COMMON with a symlink5 Unpack cov-analysis-linux64-YYYY.MM.tar.gz to $SNAP_USER_COMMON with a symlink
6 from $SNAP_USER_COMMON/cov-analysis to6 from $SNAP_USER_COMMON/cov-analysis-current to $SNAP_USER_COMMON/cov-analysis-linux64-YYYY.MM.X
7 $SNAP_USER_COMMON/cov-analysis-linux64-2019.03. Copy license file to7 Copy license file to $SNAP_USER_COMMON/cov-analysis-linux64-YYYY.MM.X/bin
8 $SNAP_USER_COMMON/cov-analysis-linux64-2019.03/bin
9#architectures:8#architectures:
10#- all9#- all
11grade: devel10grade: devel
@@ -16,8 +15,6 @@ environment:
16 LD_LIBRARY_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET15 LD_LIBRARY_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET
1716
18apps:17apps:
19 cov-build:
20 command: bin/cov-build
21 install:18 install:
22 command: bin/install19 command: bin/install
23 plugs:20 plugs:
@@ -27,7 +24,7 @@ apps:
27 plugs:24 plugs:
28 - network-bind25 - network-bind
29 cov-build:26 cov-build:
30 command: bin/cov-build27 command: bin/wrap cov-build
31 cov-analyze:28 cov-analyze:
32 command: bin/wrap cov-analyze29 command: bin/wrap cov-analyze
33 plugs:30 plugs:

Subscribers

People subscribed via source and target branches