gnu: nss: Ungraft update to 3.99.

* gnu/packages/nss.scm (nss): Ungraft and update to 3.99.
(nss/fixed): Remove variable.

Change-Id: I57d4426deb3b96e88d83ba1a7a529a94c9e7815f

1 files changed, 11 insertions, 55 deletions

diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 1ee13450e0..49276817ae 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -112,8 +112,7 @@ in the Mozilla clients.")
     ;; IMPORTANT: Also update and test the nss-certs package, which duplicates
     ;; version and source to avoid a top-level variable reference & module
     ;; cycle.
-    (version "3.88.1")
-    (replacement nss/fixed)
+    (version "3.99")
     (source (origin
               (method url-fetch)
               (uri (let ((version-with-underscores
@@ -124,7 +123,7 @@ in the Mozilla clients.")
                       "nss-" version ".tar.gz")))
               (sha256
                (base32
-                "15il9fsmixa1r4446zq1wl627sg0hz9h67w6kjxz273xz3nl7li7"))
+                "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw"))
               ;; Create nss.pc and nss-config.
               (patches (search-patches "nss-3.56-pkgconfig.patch"
                                        "nss-getcwd-nonnull.patch"
@@ -204,11 +203,19 @@ in the Mozilla clients.")
                     (setenv "USE_IP" "TRUE")
                     (setenv "IP_ADDRESS" "127.0.0.1")
 
+                    ;; This specific test is looking at performance "now
+                    ;; verify that we can quickly dump a database", and
+                    ;; we're not testing performance here (especially
+                    ;; since we're using faketime), so raise the
+                    ;; threshold
+                    (substitute* "nss/tests/dbtests/dbtests.sh"
+                      ((" -lt 5") " -lt 50"))
+
                     ;; The "PayPalEE.cert" certificate expires every six months,
                     ;; leading to test failures:
                     ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>.  To
                     ;; work around that, set the time to roughly the release date.
-                    (invoke "faketime" "2022-11-01" "./nss/tests/all.sh"))
+                    (invoke "faketime" "2024-01-23" "./nss/tests/all.sh"))
                   (format #t "test suite not run~%"))))
           (replace 'install
             (lambda* (#:key outputs #:allow-other-keys)
@@ -249,57 +256,6 @@ PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other
 security standards.")
     (license license:mpl2.0)))
 
-(define-public nss/fixed
-  (let ((actual-version "3.99"))
-    (hidden-package
-     (package
-       (inherit nss)
-       (version (string-append actual-version ".0")) ;for grafts requirements
-       (source (origin
-                 (inherit (package-source nss))
-                 (uri (let ((version-with-underscores
-                             (string-join (string-split actual-version #\.) "_")))
-                        (string-append
-                         "https://ftp.mozilla.org/pub/mozilla.org/security/nss/"
-                         "releases/NSS_" version-with-underscores "_RTM/src/"
-                         "nss-" actual-version ".tar.gz")))
-                 (sha256
-                  (base32
-                   "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw"))))
-       (arguments
-        (substitute-keyword-arguments (package-arguments nss)
-          ((#:phases phases)
-           #~(modify-phases #$phases
-               (replace 'check
-                 (lambda* (#:key tests? #:allow-other-keys)
-                   (if tests?
-                       (begin
-                         ;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for
-                         ;; testing.  The latter requires a working DNS or /etc/hosts.
-                         (setenv "DOMSUF" "localdomain")
-                         (setenv "USE_IP" "TRUE")
-                         (setenv "IP_ADDRESS" "127.0.0.1")
-
-                         ;; This specific test is looking at performance "now
-                         ;; verify that we can quickly dump a database", and
-                         ;; we're not testing performance here (especially
-                         ;; since we're using faketime), so raise the
-                         ;; threshold
-                         (substitute* "nss/tests/dbtests/dbtests.sh"
-                           ((" -lt 5") " -lt 50"))
-
-                         ;; Since the test suite is very lengthy, run the test
-                         ;; suite once, not thrice as done by default, by
-                         ;; selecting only the 'standard' cycle.
-                         (setenv "NSS_CYCLES" "standard")
-
-                         ;; The "PayPalEE.cert" certificate expires every six months,
-                         ;; leading to test failures:
-                         ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>.  To
-                         ;; work around that, set the time to roughly the release date.
-                         (invoke "faketime" "2024-01-23" "./nss/tests/all.sh"))
-                       (format #t "test suite not run~%"))))))))))))
-
 (define-public nsncd
   (package
     (name "nsncd")