From 2183c9b5b464302cda0fac7ad632a94428d40b76 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aur=C3=A9lien=20Larcher?= <aurelien.larcher@gmail.com>
Date: Wed, 1 Feb 2017 23:47:14 +0100
Subject: [PATCH] Bump libXdmcp to 1.1.2

---
 components/x11/libXdmcp/Makefile                      | 10 +++++-----
 components/x11/libXdmcp/manifests/sample-manifest.p5m |  8 ++++++--
 components/x11/libXdmcp/patches/header.patch          | 11 +++++++++++
 3 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 components/x11/libXdmcp/patches/header.patch

diff --git a/components/x11/libXdmcp/Makefile b/components/x11/libXdmcp/Makefile
index acf4623d1..f1f6264b5 100644
--- a/components/x11/libXdmcp/Makefile
+++ b/components/x11/libXdmcp/Makefile
@@ -17,21 +17,21 @@ include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME= libXdmcp
 
-COMPONENT_VERSION= 1.0.3
+COMPONENT_VERSION= 1.1.2
 COMPONENT_SUMMARY= libXdmcp - X Display Manager Control Protocol (XDMCP) library
 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH= \
-  sha256:d8033a2fae20fed6de4f16b73ad69ca1c511e7da31c88e9bc6e75976187378cb
+  sha256:81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2
 COMPONENT_ARCHIVE_URL= \
   http://xorg.freedesktop.org/archive/individual/lib/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL = http://xorg.freedesktop.org
 
 LD_OPTIONS += -M $(COMPONENT_DIR)/mapfile-vers
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/configure.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 build: $(BUILD_32_and_64)
 
diff --git a/components/x11/libXdmcp/manifests/sample-manifest.p5m b/components/x11/libXdmcp/manifests/sample-manifest.p5m
index a14bed3ee..470ac7fd6 100644
--- a/components/x11/libXdmcp/manifests/sample-manifest.p5m
+++ b/components/x11/libXdmcp/manifests/sample-manifest.p5m
@@ -5,12 +5,12 @@
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
-# source.  A copy of the CDDL is also available via the Internet at
+# source. A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 #
 
 #
-# Copyright 2016 <contributor>
+# Copyright 2017 <contributor>
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -33,3 +33,7 @@ link path=usr/lib/libXdmcp.so target=libXdmcp.so.6.0.0
 link path=usr/lib/libXdmcp.so.6 target=libXdmcp.so.6.0.0
 file path=usr/lib/libXdmcp.so.6.0.0
 file path=usr/lib/pkgconfig/xdmcp.pc
+file path=usr/share/doc/libXdmcp/xdmcp.html
+file path=usr/share/doc/libXdmcp/xdmcp.html.db
+file path=usr/share/doc/libXdmcp/xdmcp.pdf.db
+file path=usr/share/doc/libXdmcp/xdmcp.xml
diff --git a/components/x11/libXdmcp/patches/header.patch b/components/x11/libXdmcp/patches/header.patch
new file mode 100644
index 000000000..637f89b64
--- /dev/null
+++ b/components/x11/libXdmcp/patches/header.patch
@@ -0,0 +1,11 @@
+--- a/Key.c	Mon Mar 23 09:21:31 2015
++++ b/Key.c	Mon Mar 23 11:20:24 2015
+@@ -36,6 +36,8 @@
+ #include <bsd/stdlib.h> /* for arc4random_buf() */
+ #endif
+ 
++extern void arc4random_buf();
++
+ #ifndef HAVE_ARC4RANDOM_BUF
+ static void
+ getbits (long data, unsigned char *dst)
-- 
2.11.4.GIT