From ec4ec28df9c4cdde481b063adacab4a809581834 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 28 Feb 2010 00:19:51 +0000 Subject: better patch name --- debian/patches/epfnosupport.patch | 23 ----------------------- debian/patches/hurd-epfnosupport.patch | 23 +++++++++++++++++++++++ debian/patches/series | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 debian/patches/epfnosupport.patch create mode 100644 debian/patches/hurd-epfnosupport.patch diff --git a/debian/patches/epfnosupport.patch b/debian/patches/epfnosupport.patch deleted file mode 100644 index ef3f6d993..000000000 --- a/debian/patches/epfnosupport.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Fix X forwarding on the Hurd - socket() may return EPFNOSUPPORT, which != EAFNOSUPPORT on the Hurd. -Author: Robert Bihlmeyer -Bug-Debian: http://bugs.debian.org/102991 -Last-Update: 2010-02-27 - -Index: b/channels.c -=================================================================== ---- a/channels.c -+++ b/channels.c -@@ -3098,7 +3098,11 @@ - sock = socket(ai->ai_family, ai->ai_socktype, - ai->ai_protocol); - if (sock < 0) { -- if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) { -+ if ((errno != EINVAL) && (errno != EAFNOSUPPORT) -+#ifdef EPFNOSUPPORT -+ && (errno != EPFNOSUPPORT) -+#endif -+ ) { - error("socket: %.100s", strerror(errno)); - freeaddrinfo(aitop); - return -1; diff --git a/debian/patches/hurd-epfnosupport.patch b/debian/patches/hurd-epfnosupport.patch new file mode 100644 index 000000000..ef3f6d993 --- /dev/null +++ b/debian/patches/hurd-epfnosupport.patch @@ -0,0 +1,23 @@ +Description: Fix X forwarding on the Hurd + socket() may return EPFNOSUPPORT, which != EAFNOSUPPORT on the Hurd. +Author: Robert Bihlmeyer +Bug-Debian: http://bugs.debian.org/102991 +Last-Update: 2010-02-27 + +Index: b/channels.c +=================================================================== +--- a/channels.c ++++ b/channels.c +@@ -3098,7 +3098,11 @@ + sock = socket(ai->ai_family, ai->ai_socktype, + ai->ai_protocol); + if (sock < 0) { +- if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) { ++ if ((errno != EINVAL) && (errno != EAFNOSUPPORT) ++#ifdef EPFNOSUPPORT ++ && (errno != EPFNOSUPPORT) ++#endif ++ ) { + error("socket: %.100s", strerror(errno)); + freeaddrinfo(aitop); + return -1; diff --git a/debian/patches/series b/debian/patches/series index 18758bf51..fd6f569d0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -33,7 +33,7 @@ keyfile-debug.patch # Miscellaneous bug fixes gnome-ssh-askpass2-link.patch user-group-modes.patch -epfnosupport.patch +hurd-epfnosupport.patch scp-quoting.patch shell-path.patch ssh-copy-id-status-check.patch -- cgit v1.2.3