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, 1 insertions, 1 deletions

diff --git a/libXpm/src/WrFFrBuf.c b/libXpm/src/WrFFrBuf.c
index bd1c45b91..b80aa62ec 100644
--- a/libXpm/src/WrFFrBuf.c
+++ b/libXpm/src/WrFFrBuf.c
@@ -41,7 +41,7 @@
 
 int
 XpmWriteFileFromBuffer(
-    char	*filename,
+    const char	*filename,
     char	*buffer)
 {
     int fcheck, len;