CVS commit: pkgsrc/security/sequoia-sq

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Mar 31 22:37:55 UTC 2024

Modified Files:
        pkgsrc/security/sequoia-sq: distinfo
        pkgsrc/security/sequoia-sq/patches:
            patch-.._vendor_openpgp-cert-d-0.3.1_src_unixdir.rs

Log Message:
sequoia-sq: use upstream version of patch


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/sequoia-sq/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/security/sequoia-sq/patches/patch-.._vendor_openpgp-cert-d-0.3.1_src_unixdir.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/sequoia-sq/distinfo
diff -u pkgsrc/security/sequoia-sq/distinfo:1.4 pkgsrc/security/sequoia-sq/distinfo:1.5
--- pkgsrc/security/sequoia-sq/distinfo:1.4     Sat Mar  2 12:16:19 2024
+++ pkgsrc/security/sequoia-sq/distinfo Sun Mar 31 22:37:55 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2024/03/02 12:16:19 wiz Exp $
+$NetBSD: distinfo,v 1.5 2024/03/31 22:37:55 wiz Exp $
 
 BLAKE2s (addr2line-0.21.0.crate) = aa7d8fa248d0454d92b962f5d741ba41c55564299d33e6814e70dfe0b71bbcc7
 SHA512 (addr2line-0.21.0.crate) = afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b
@@ -1437,4 +1437,4 @@ Size (zeroize-1.7.0.crate) = 19039 bytes
 BLAKE2s (zeroize_derive-1.4.2.crate) = c5aded3e16d18c2128d74254a509eabb77f2c7d657922e38cf5edca492d4a523
 SHA512 (zeroize_derive-1.4.2.crate) = d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226
 Size (zeroize_derive-1.4.2.crate) = 11141 bytes
-SHA1 (patch-.._vendor_openpgp-cert-d-0.3.1_src_unixdir.rs) = 799105202e9ca6f512287ef6bc18cb81d3153200
+SHA1 (patch-.._vendor_openpgp-cert-d-0.3.1_src_unixdir.rs) = 2748dc447e3d9d44d8840c44dccba04a20d8d5c4

Index: pkgsrc/security/sequoia-sq/patches/patch-.._vendor_openpgp-cert-d-0.3.1_src_unixdir.rs
diff -u pkgsrc/security/sequoia-sq/patches/patch-.._vendor_openpgp-cert-d-0.3.1_src_unixdir.rs:1.2 pkgsrc/security/sequoia-sq/patches/patch-.._vendor_openpgp-cert-d-0.3.1_src_unixdir.rs:1.3
--- pkgsrc/security/sequoia-sq/patches/patch-.._vendor_openpgp-cert-d-0.3.1_src_unixdir.rs:1.2  Wed Feb 28 16:39:07 2024
+++ pkgsrc/security/sequoia-sq/patches/patch-.._vendor_openpgp-cert-d-0.3.1_src_unixdir.rs      Sun Mar 31 22:37:55 2024
@@ -1,16 +1,27 @@
-$NetBSD: patch-.._vendor_openpgp-cert-d-0.3.1_src_unixdir.rs,v 1.2 2024/02/28 16:39:07 wiz Exp $
+$NetBSD: patch-.._vendor_openpgp-cert-d-0.3.1_src_unixdir.rs,v 1.3 2024/03/31 22:37:55 wiz Exp $
 
-NetBSD has st_mtimensec
-https://gitlab.com/sequoia-pgp/pgp-cert-d/-/issues/45
+Fix build on NetBSD.
+https://gitlab.com/sequoia-pgp/pgp-cert-d/-/merge_requests/99/diffs
 
---- ../vendor/openpgp-cert-d-0.3.1/src/unixdir.rs.orig 2024-02-28 14:58:05.502259036 +0000
+--- ../vendor/openpgp-cert-d-0.3.1/src/unixdir.rs.orig 2006-07-24 01:21:28.000000000 +0000
 +++ ../vendor/openpgp-cert-d-0.3.1/src/unixdir.rs
-@@ -69,7 +69,7 @@ impl Metadata {
+@@ -67,9 +67,17 @@ impl Metadata {
+ 
+     /// The modification time as the time since the Unix epoch.
      pub fn modified(&self) -> std::time::Duration {
-         std::time::Duration::new(
+-        std::time::Duration::new(
++        // Netbsd-like systems.  See:
++        // https://github.com/rust-lang/libc/blob/a0f5b4b21391252fe38b2df9310dc65e37b07d9f/src/unix/bsd/mod.rs#L931
++        #[cfg(any(target_os = "openbsd", target_os = "netbsd"))]
++        return std::time::Duration::new(
              self.0.st_mtime as u64,
 -            self.0.st_mtime_nsec as u32)
-+            self.0.st_mtimensec as u32)
++            self.0.st_mtimensec as u32);
++
++        #[cfg(not(any(target_os = "openbsd", target_os = "netbsd")))]
++        return std::time::Duration::new(
++            self.0.st_mtime as u64,
++            self.0.st_mtime_nsec as u32);
      }
  
      /// Whether a file is a directory.