Merge remote-tracking branch 'origin/released'

* origin/released:
  Update following packages:

Conflicts:
	X11/Xwinsock.h
	apps/xhost/xhost.c
	libXaw/src/Vendor.c
	libXfont/include/X11/fonts/bdfint.h
	libXfont/src/fontfile/catalogue.c

1 files changed, 5 insertions, 2 deletions

diff --git a/libXfont/src/fc/fsio.c b/libXfont/src/fc/fsio.c
index 1c6a8cb6c..3d2aa502d 100644
--- a/libXfont/src/fc/fsio.c
+++ b/libXfont/src/fc/fsio.c
@@ -186,8 +186,11 @@ _fs_fill (FSFpePtr conn)
 		    continue;
 		}
 	    }
-	    _fs_connection_died (conn);
-	    return FSIO_ERROR;
+	    if (!ECHECK(EINTR))
+	    {
+	        _fs_connection_died (conn);
+	        return FSIO_ERROR;
+	    }
 	}
     }
     return FSIO_READY;