NetBSD: Correct ipc_perm, split from OpenBSD as ipc.rs

The field ordering is incorrect on NetBSD. Move it to the `new` module
for NetBSD and OpenBSD and fix the mismatch on NetBSD.

Link: https://github.com/NetBSD/src/blob/6ace5fed3bd010695a1b88ca6c1f8a5af7793ffb/sys/sys/ipc.h#L54-L68
Link: https://github.com/openbsd/src/blob/9abc5df53d8ad6b65dbd35b89ed94f73e2fc58da/sys/sys/ipc.h#L53-L61

(backport <#4782>)
(cherry picked from commit 066e702)

Author: tgross35

src/new/mod.rs

@@ -183,7 +183,10 @@ cfg_if! {
     } else if #[cfg(target_vendor = "apple")] {
         pub use signal::*;
     } else if #[cfg(target_os = "netbsd")] {
+        pub use sys::ipc::*;
         pub use sys::statvfs::*;
+    } else if #[cfg(target_os = "openbsd")] {
+        pub use sys::ipc::*;
     }
 }
 

src/new/netbsd/sys/ipc.rs

@@ -0,0 +1,17 @@
+//! Header: `sys/ipc.h`
+//!
+//! <https://github.com/NetBSD/src/blob/trunk/sys/sys/ipc.h>
+
+use crate::prelude::*;
+
+s! {
+    pub struct ipc_perm {
+        pub uid: crate::uid_t,
+        pub gid: crate::gid_t,
+        pub cuid: crate::uid_t,
+        pub cgid: crate::gid_t,
+        pub mode: crate::mode_t,
+        pub _seq: c_ushort,
+        pub _key: crate::key_t,
+    }
+}

src/new/netbsd/sys/mod.rs

@@ -2,4 +2,5 @@
 //!
 //! https://github.com/NetBSD/src/tree/trunk/sys/sys
 
+pub(crate) mod ipc;
 pub(crate) mod statvfs;

src/new/openbsd/mod.rs

@@ -3,4 +3,5 @@
 //! * Headers: <https://github.com/openbsd/src>
 //! * Manual pages: <https://man.openbsd.org/>
 
+pub(crate) mod sys;
 pub(crate) mod unistd;

src/new/openbsd/sys/ipc.rs

@@ -0,0 +1,17 @@
+//! Header: `sys/ipc.h`
+//!
+//! <https://github.com/openbsd/src/blob/master/sys/sys/ipc.h>
+
+use crate::prelude::*;
+
+s! {
+    pub struct ipc_perm {
+        pub cuid: crate::uid_t,
+        pub cgid: crate::gid_t,
+        pub uid: crate::uid_t,
+        pub gid: crate::gid_t,
+        pub mode: crate::mode_t,
+        pub seq: c_ushort,
+        pub key: crate::key_t,
+    }
+}

src/new/openbsd/sys/mod.rs

@@ -0,0 +1,5 @@
+//! Directory: `sys/`
+//!
+//! https://github.com/openbsd/src/tree/trunk/sys/sys
+
+pub(crate) mod ipc;

src/unix/bsd/netbsdlike/mod.rs

@@ -61,22 +61,6 @@ s! {
         pub l_whence: c_short,
     }
 
-    pub struct ipc_perm {
-        pub cuid: crate::uid_t,
-        pub cgid: crate::gid_t,
-        pub uid: crate::uid_t,
-        pub gid: crate::gid_t,
-        pub mode: mode_t,
-        #[cfg(target_os = "openbsd")]
-        pub seq: c_ushort,
-        #[cfg(target_os = "netbsd")]
-        pub _seq: c_ushort,
-        #[cfg(target_os = "openbsd")]
-        pub key: crate::key_t,
-        #[cfg(target_os = "netbsd")]
-        pub _key: crate::key_t,
-    }
-
     pub struct ptrace_io_desc {
         pub piod_op: c_int,
         pub piod_offs: *mut c_void,