From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 23 Dec 2020 22:55:11 +0000 (-0600)
Subject: github-ci: don't install libnss/libnspr packages
X-Git-Tag: suricata-7.0.0-beta1~1882
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e57b5e665a8ba3b193bdf726fd5d13f45257619;p=thirdparty%2Fsuricata.git

github-ci: don't install libnss/libnspr packages
---

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 784f2ca811..1ccd6fcc12 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -345,8 +345,6 @@ jobs:
                 libtool \
                 lz4-devel \
                 make \
-                nspr-devel \
-                nss-devel \
                 nss-softokn-devel \
                 pcre-devel \
                 pkgconfig \
@@ -420,8 +418,6 @@ jobs:
                 libtool \
                 lz4-devel \
                 make \
-                nspr-devel \
-                nss-devel \
                 nss-softokn-devel \
                 pcre-devel \
                 pkgconfig \
@@ -493,8 +489,6 @@ jobs:
                 libtool \
                 lz4-devel \
                 make \
-                nspr-devel \
-                nss-devel \
                 nss-softokn-devel \
                 pcre-devel \
                 pkgconfig \
@@ -579,7 +573,7 @@ jobs:
           chmod 755 $HOME/.cargo/bin/cbindgen
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
       - run: ./autogen.sh
-      - run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests --disable-nss --disable-nspr
+      - run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests
       - run: make -j2
       - run: make dist
       - name: Extracting suricata-verify
@@ -961,7 +955,6 @@ jobs:
                 libnetfilter-queue1 \
                 libnfnetlink-dev \
                 libnfnetlink0 \
-                libnss3-dev \
                 libpcre3 \
                 libpcre3-dev \
                 libpcap-dev \
@@ -1025,7 +1018,6 @@ jobs:
                 libcap-ng0 \
                 libmagic-dev \
                 libjansson-dev \
-                libnss3-dev \
                 libgeoip-dev \
                 liblua5.1-dev \
                 libhiredis-dev \
@@ -1089,7 +1081,6 @@ jobs:
                 libcap-ng0 \
                 libmagic-dev \
                 libjansson-dev \
-                libnss3-dev \
                 libgeoip-dev \
                 liblua5.1-dev \
                 libhiredis-dev \
@@ -1149,8 +1140,6 @@ jobs:
           libtool \
           libyaml \
           lua \
-          nss \
-          nspr \
           pcre \
           pkg-config \
           python \
@@ -1188,7 +1177,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: git mingw-w64-x86_64-toolchain automake1.16 automake-wrapper autoconf libtool libyaml-devel pcre-devel jansson-devel make mingw-w64-x86_64-libyaml mingw-w64-x86_64-pcre mingw-w64-x86_64-rust mingw-w64-x86_64-jansson mingw-w64-x86_64-nss mingw-w64-x86_64-nspr unzip p7zip python-setuptools mingw-w64-x86_64-python-yaml mingw-w64-x86_64-jq
+          install: git mingw-w64-x86_64-toolchain automake1.16 automake-wrapper autoconf libtool libyaml-devel pcre-devel jansson-devel make mingw-w64-x86_64-libyaml mingw-w64-x86_64-pcre mingw-w64-x86_64-rust mingw-w64-x86_64-jansson unzip p7zip python-setuptools mingw-w64-x86_64-python-yaml mingw-w64-x86_64-jq
       # hack: install our own cbindgen system wide as we can't get the
       # preinstalled one to be picked up by configure
       - name: cbindgen