qemu-devel
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v2 01/25] hw/usb/ccid: remove references to NSS

From: Wainer dos Santos Moschetta
Subject: Re: [PATCH v2 01/25] hw/usb/ccid: remove references to NSS
Date: Fri, 15 Jan 2021 10:42:41 -0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 

On 1/14/21 10:02 AM, Daniel P. Berrangé wrote:

The NSS package was previously pre-requisite for building CCID related
features, however, this became obsolete when the libcacard library was
spun off to a separate project:

     commit 7b02f5447c64d1854468f758398c9f6fe9e5721f
     Author: Marc-André Lureau <marcandre.lureau@redhat.com>
     Date:   Sun Aug 30 11:48:40 2015 +0200

         libcacard: use the standalone project

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
  .travis.yml                                | 14 +++++++-------
  docs/ccid.txt                              | 15 +++++++--------
  scripts/coverity-scan/coverity-scan.docker |  1 -
  tests/docker/dockerfiles/centos7.docker    |  1 +
  tests/docker/dockerfiles/centos8.docker    |  1 +
  tests/docker/dockerfiles/fedora.docker     |  2 +-
  tests/docker/dockerfiles/ubuntu.docker     |  1 -
  tests/docker/dockerfiles/ubuntu1804.docker |  1 -
  tests/docker/dockerfiles/ubuntu2004.docker |  1 -
  9 files changed, 17 insertions(+), 20 deletions(-)



Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>




diff --git a/.travis.yml b/.travis.yml
index f2a101936c..af6aeb68da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ addons:
        - libattr1-dev
        - libbrlapi-dev
        - libcap-ng-dev
+      - libcacard-dev
        - libgcc-7-dev
        - libgnutls28-dev
        - libgtk-3-dev
@@ -34,7 +35,6 @@ addons:
        - liblttng-ust-dev
        - libncurses5-dev
        - libnfs-dev
-      - libnss3-dev
        - libpixman-1-dev
        - libpng-dev
        - librados-dev
@@ -222,6 +222,7 @@ jobs:
              - libaio-dev
              - libattr1-dev
              - libbrlapi-dev
+            - libcacard-dev
              - libcap-ng-dev
              - libgnutls28-dev
              - libgtk-3-dev
@@ -229,7 +230,6 @@ jobs:
              - liblttng-ust-dev
              - libnfs-dev
              - libncurses5-dev
-            - libnss3-dev
              - libpixman-1-dev
              - libpng-dev
              - librados-dev
@@ -263,6 +263,7 @@ jobs:
            - libaio-dev
            - libattr1-dev
            - libbrlapi-dev
+          - libcacard-dev
            - libcap-ng-dev
            - libgcrypt20-dev
            - libgnutls28-dev
@@ -271,7 +272,6 @@ jobs:
            - liblttng-ust-dev
            - libncurses5-dev
            - libnfs-dev
-          - libnss3-dev
            - libpixman-1-dev
            - libpng-dev
            - librados-dev
@@ -297,6 +297,7 @@ jobs:
            - libaio-dev
            - libattr1-dev
            - libbrlapi-dev
+          - libcacard-dev
            - libcap-ng-dev
            - libgcrypt20-dev
            - libgnutls28-dev
@@ -305,7 +306,6 @@ jobs:
            - liblttng-ust-dev
            - libncurses5-dev
            - libnfs-dev
-          - libnss3-dev
            - libpixman-1-dev
            - libpng-dev
            - librados-dev
@@ -330,6 +330,7 @@ jobs:
            - libaio-dev
            - libattr1-dev
            - libbrlapi-dev
+          - libcacard-dev
            - libcap-ng-dev
            - libgcrypt20-dev
            - libgnutls28-dev
@@ -338,7 +339,6 @@ jobs:
            - liblttng-ust-dev
            - libncurses5-dev
            - libnfs-dev
-          - libnss3-dev
            - libpixman-1-dev
            - libpng-dev
            - librados-dev
@@ -372,6 +372,7 @@ jobs:
          apt_packages:
            - libaio-dev
            - libattr1-dev
+          - libcacard-dev
            - libcap-ng-dev
            - libgnutls28-dev
            - libiscsi-dev
@@ -379,7 +380,6 @@ jobs:
            - liblzo2-dev
            - libncurses-dev
            - libnfs-dev
-          - libnss3-dev
            - libpixman-1-dev
            - libsdl2-dev
            - libsdl2-image-dev
@@ -415,6 +415,7 @@ jobs:
            - libaio-dev
            - libattr1-dev
            - libbrlapi-dev
+          - libcacard-dev
            - libcap-ng-dev
            - libgcrypt20-dev
            - libgnutls28-dev
@@ -423,7 +424,6 @@ jobs:
            - liblttng-ust-dev
            - libncurses5-dev
            - libnfs-dev
-          - libnss3-dev
            - libpixman-1-dev
            - libpng-dev
            - librados-dev
diff --git a/docs/ccid.txt b/docs/ccid.txt
index c7fda6d07d..4866ee4abd 100644
--- a/docs/ccid.txt
+++ b/docs/ccid.txt
@@ -34,15 +34,14 @@ reader and smart card (i.e. not backed by a physical 
device) using this device.
2. Building -The cryptographic functions and access to the physical card is done via NSS. 
-
-Installing NSS:
+The cryptographic functions and access to the physical card is done via the
+libcacard library, whose development package must be installed prior to
+building QEMU:
In redhat/fedora: 
-    yum install nss-devel
-In ubuntu/debian:
-    apt-get install libnss3-dev
-    (not tested on ubuntu)
+    yum install libcacard-devel
+In ubuntu:
+    apt-get install libcacard-dev
Configuring and building: 
      ./configure --enable-smartcard && make
@@ -51,7 +50,7 @@ Configuring and building:
  3. Using ccid-card-emulated with hardware
Assuming you have a working smartcard on the host with the current 
-user, using NSS, qemu acts as another NSS client using ccid-card-emulated:
+user, using libcacard, QEMU acts as another client using ccid-card-emulated:
qemu -usb -device usb-ccid -device ccid-card-emulated diff --git a/scripts/coverity-scan/coverity-scan.docker b/scripts/coverity-scan/coverity-scan.docker 
index 501ac67233..ecff6ac5b4 100644
--- a/scripts/coverity-scan/coverity-scan.docker
+++ b/scripts/coverity-scan/coverity-scan.docker
@@ -93,7 +93,6 @@ ENV PACKAGES \
      mingw64-SDL2 \
      ncurses-devel \
      nettle-devel \
-    nss-devel \
      numactl-devel \
      perl \
      perl-Test-Harness \
diff --git a/tests/docker/dockerfiles/centos7.docker 
b/tests/docker/dockerfiles/centos7.docker
index 6f11af1989..d47c96135c 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -17,6 +17,7 @@ ENV PACKAGES \
      glib2-devel \
      gnutls-devel \
      libaio-devel \
+    libcacard-devel \
      libepoxy-devel \
      libfdt-devel \
      libgcrypt-devel \
diff --git a/tests/docker/dockerfiles/centos8.docker 
b/tests/docker/dockerfiles/centos8.docker
index 64cb7a6eda..0c90c3d4d5 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -14,6 +14,7 @@ ENV PACKAGES \
      git \
      glib2-devel \
      libaio-devel \
+    libcacard-devel \
      libepoxy-devel \
      libgcrypt-devel \
      lzo-devel \
diff --git a/tests/docker/dockerfiles/fedora.docker 
b/tests/docker/dockerfiles/fedora.docker
index 0b5053f2d0..19e7a3d28a 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -27,6 +27,7 @@ ENV PACKAGES \
      libasan \
      libattr-devel \
      libblockdev-mpath-devel \
+    libcacard-devel \
      libcap-ng-devel \
      libcurl-devel \
      libepoxy-devel \
@@ -77,7 +78,6 @@ ENV PACKAGES \
      ncurses-devel \
      nettle-devel \
      ninja-build \
-    nss-devel \
      numactl-devel \
      perl \
      perl-Test-Harness \
diff --git a/tests/docker/dockerfiles/ubuntu.docker 
b/tests/docker/dockerfiles/ubuntu.docker
index b5ef7a8198..9dec1c4bc6 100644
--- a/tests/docker/dockerfiles/ubuntu.docker
+++ b/tests/docker/dockerfiles/ubuntu.docker
@@ -39,7 +39,6 @@ ENV PACKAGES \
      libncurses5-dev \
      libncursesw5-dev \
      libnfs-dev \
-    libnss3-dev \
      libnuma-dev \
      libpixman-1-dev \
      libpng-dev \
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker 
b/tests/docker/dockerfiles/ubuntu1804.docker
index 9b0a19ba5e..aacea8627a 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -26,7 +26,6 @@ ENV PACKAGES \
      libncurses5-dev \
      libncursesw5-dev \
      libnfs-dev \
-    libnss3-dev \
      libnuma-dev \
      libpixman-1-dev \
      librados-dev \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker 
b/tests/docker/dockerfiles/ubuntu2004.docker
index ae889d8482..52810d4e27 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -28,7 +28,6 @@ ENV PACKAGES flex bison \
      libncurses5-dev \
      libncursesw5-dev \
      libnfs-dev \
-    libnss3-dev \
      libnuma-dev \
      libpixman-1-dev \
      librados-dev \
reply via email to
[Prev in Thread] Current Thread [Next in Thread]