Merging debian version 1.76.0+dfsg1-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 20 insertions, 17 deletions

diff --git a/debian/patches/u-hurd-socket2.patch b/debian/patches/vendor/u-hurd-socket2.patch
index 8257bfc61..0c1e027a6 100644
--- a/debian/patches/u-hurd-socket2.patch
+++ b/debian/patches/vendor/u-hurd-socket2.patch
@@ -1,13 +1,16 @@
-https://github.com/rust-lang/socket2/pull/474
+From: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Tue, 29 Aug 2023 20:03:20 +0000
+Subject: add hurd support
 
-commit c19d481701f01f77cf8346fc0f6e69886e44b097
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date:   Tue Aug 29 20:03:20 2023 +0000
-
-    Add GNU/Hurd support
+Forwarded: https://github.com/rust-lang/socket2/pull/474
+---
+ vendor/socket2/src/sockaddr.rs | 2 ++
+ vendor/socket2/src/socket.rs   | 4 ++++
+ vendor/socket2/src/sys/unix.rs | 3 +++
+ 3 files changed, 9 insertions(+)
 
 diff --git a/vendor/socket2/src/sockaddr.rs b/vendor/socket2/src/sockaddr.rs
-index 9ce638e..649a6dc 100644
+index e721018..682ec89 100644
 --- a/vendor/socket2/src/sockaddr.rs
 +++ b/vendor/socket2/src/sockaddr.rs
 @@ -231,6 +231,7 @@ impl From<SocketAddrV4> for SockAddr {
@@ -18,7 +21,7 @@ index 9ce638e..649a6dc 100644
                  target_os = "ios",
                  target_os = "macos",
                  target_os = "netbsd",
-@@ -270,6 +271,7 @@ impl From<SocketAddrV6> for SockAddr {
+@@ -275,6 +276,7 @@ impl From<SocketAddrV6> for SockAddr {
                  target_os = "dragonfly",
                  target_os = "freebsd",
                  target_os = "haiku",
@@ -27,10 +30,10 @@ index 9ce638e..649a6dc 100644
                  target_os = "macos",
                  target_os = "netbsd",
 diff --git a/vendor/socket2/src/socket.rs b/vendor/socket2/src/socket.rs
-index 69d0478..eedcff0 100644
+index 90649d9..45fe1e3 100644
 --- a/vendor/socket2/src/socket.rs
 +++ b/vendor/socket2/src/socket.rs
-@@ -1223,6 +1223,7 @@ impl Socket {
+@@ -1235,6 +1235,7 @@ impl Socket {
      #[cfg(not(any(
          target_os = "dragonfly",
          target_os = "haiku",
@@ -38,7 +41,7 @@ index 69d0478..eedcff0 100644
          target_os = "netbsd",
          target_os = "openbsd",
          target_os = "redox",
-@@ -1258,6 +1259,7 @@ impl Socket {
+@@ -1272,6 +1273,7 @@ impl Socket {
      #[cfg(not(any(
          target_os = "dragonfly",
          target_os = "haiku",
@@ -46,7 +49,7 @@ index 69d0478..eedcff0 100644
          target_os = "netbsd",
          target_os = "openbsd",
          target_os = "redox",
-@@ -1432,6 +1434,7 @@ impl Socket {
+@@ -1448,6 +1450,7 @@ impl Socket {
      #[cfg(not(any(
          target_os = "dragonfly",
          target_os = "fuchsia",
@@ -54,7 +57,7 @@ index 69d0478..eedcff0 100644
          target_os = "illumos",
          target_os = "netbsd",
          target_os = "openbsd",
-@@ -1461,6 +1464,7 @@ impl Socket {
+@@ -1479,6 +1482,7 @@ impl Socket {
      #[cfg(not(any(
          target_os = "dragonfly",
          target_os = "fuchsia",
@@ -63,10 +66,10 @@ index 69d0478..eedcff0 100644
          target_os = "netbsd",
          target_os = "openbsd",
 diff --git a/vendor/socket2/src/sys/unix.rs b/vendor/socket2/src/sys/unix.rs
-index 74da8cc..9d3d6cd 100644
+index ec7c3e2..1b89e37 100644
 --- a/vendor/socket2/src/sys/unix.rs
 +++ b/vendor/socket2/src/sys/unix.rs
-@@ -82,6 +82,7 @@ pub(crate) use libc::IP_HDRINCL;
+@@ -84,6 +84,7 @@ pub(crate) use libc::IP_HDRINCL;
  #[cfg(not(any(
      target_os = "dragonfly",
      target_os = "fuchsia",
@@ -74,7 +77,7 @@ index 74da8cc..9d3d6cd 100644
      target_os = "illumos",
      target_os = "netbsd",
      target_os = "openbsd",
-@@ -112,6 +113,7 @@ pub(crate) use libc::{
+@@ -116,6 +117,7 @@ pub(crate) use libc::{
  #[cfg(not(any(
      target_os = "dragonfly",
      target_os = "haiku",
@@ -82,7 +85,7 @@ index 74da8cc..9d3d6cd 100644
      target_os = "netbsd",
      target_os = "openbsd",
      target_os = "redox",
-@@ -226,6 +228,7 @@ type IovLen = usize;
+@@ -233,6 +235,7 @@ type IovLen = usize;
      target_os = "freebsd",
      target_os = "fuchsia",
      target_os = "haiku",