From 9b207cc050da0cabfa9d3b157f0598bc0bffe7c2 Mon Sep 17 00:00:00 2001
From: Rafid Bin Mostofa <rafid.mostofa@canonical.com>
Date: Thu, 24 Oct 2024 14:50:40 +0600
Subject: [PATCH 1/2] fix(22.04/libnss3): libs should contain all libraries

This commit restructures the libnss3 slices. It renames the former
"libs" slice to "nss", to only include nss3-specific libraries. It also
adds a new slice "smime" to include S/MIME libraries.

Finally, the "libs" slice is added back, which includes all of the
slices that provide libraries. The rationale is that "libs" slices
should contain all libraries coming from the package.

Note that the ca-certificates-java slice has also been updated to
reflect this change.

Resolves #381
---
 slices/ca-certificates-java.yaml |  2 +-
 slices/libnss3.yaml              | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/slices/ca-certificates-java.yaml b/slices/ca-certificates-java.yaml
index 2c490695..6448d08d 100644
--- a/slices/ca-certificates-java.yaml
+++ b/slices/ca-certificates-java.yaml
@@ -7,7 +7,7 @@ slices:
   data:
     essential:
       - ca-certificates_data
-      - libnss3_libs
+      - libnss3_nss
     contents:
       /etc/default/cacerts:
       /etc/ssl/certs/java/:
diff --git a/slices/libnss3.yaml b/slices/libnss3.yaml
index d7e4bb81..c09fe3ab 100644
--- a/slices/libnss3.yaml
+++ b/slices/libnss3.yaml
@@ -1,18 +1,39 @@
+# Network Security Service libraries.
+#
+# This is a set of libraries designed to support cross-platform development of
+# security-enabled client and server applications. It can support SSLv2 and v4,
+# TLS, PKCS #5, #7, #11, #12, S/MIME, X.509 v3 certificates and other security
+# standards.
 package: libnss3
 
 essential:
   - libnss3_copyright
 
 slices:
+  # The libs slice contains all the libraries coming from this package.
   libs:
+    essential:
+      # This package still has many other libraries which are not part of any
+      # slices yet. Upon creation of new slices containing those libraries,
+      # make sure to add those slices in this list.
+      - libnss3_nss
+      - libnss3_smime
+
+  nss:
     essential:
       - libc6_libs
       - libnspr4_libs
-      - libsqlite3-0_libs
     contents:
       /usr/lib/*-linux-*/libnss3.so:
       /usr/lib/*-linux-*/libnssutil3.so:
 
+  smime:
+    essential:
+      - libc6_libs
+      - libnspr4_libs
+    contents:
+      /usr/lib/*-linux-*/libsmime3.so:
+
   copyright:
     contents:
       /usr/share/doc/libnss3/copyright:

From 3ebada4787acb40c173944ded9c9eeb4c282f36d Mon Sep 17 00:00:00 2001
From: Rafid Bin Mostofa <rafid.mostofa@canonical.com>
Date: Thu, 31 Oct 2024 16:19:13 +0600
Subject: [PATCH 2/2] fix: libsoftokn.so does require sqlite3 libs

---
 slices/libnss3.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/slices/libnss3.yaml b/slices/libnss3.yaml
index c09fe3ab..db5c002e 100644
--- a/slices/libnss3.yaml
+++ b/slices/libnss3.yaml
@@ -23,6 +23,7 @@ slices:
     essential:
       - libc6_libs
       - libnspr4_libs
+      - libsqlite3-0_libs
     contents:
       /usr/lib/*-linux-*/libnss3.so:
       /usr/lib/*-linux-*/libnssutil3.so: