From 28fb0953a7ae8006c8f05cccbe14b649014226e9 Mon Sep 17 00:00:00 2001
From: bluhm <bluhm@openbsd.org>
Date: Thu, 6 Jul 2017 11:17:58 +0000
Subject: [PATCH] Compile libexpat with -fvisibility=hidden.  This restricts
 the exported symbols to the indended API.  We do not need a Symbols.map
 anymore.  Major library bump is necessary as some internal functions vanish
 from the ABI. Discussed upstream with Sebastian Pipping; ports bulk build
 ajacoutot@; OK deraadt@

---
 lib/libexpat/Makefile      | 6 ++----
 lib/libexpat/Symbols.map   | 4 ----
 lib/libexpat/shlib_version | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 lib/libexpat/Symbols.map

diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile
index 9376e090f46..e63076d1348 100644
--- a/lib/libexpat/Makefile
+++ b/lib/libexpat/Makefile
@@ -1,16 +1,14 @@
-#	$OpenBSD: Makefile,v 1.12 2017/06/30 11:25:29 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.13 2017/07/06 11:17:58 bluhm Exp $
 
 .PATH: ${.CURDIR}/lib
 
 LIB=	expat
 SRCS=	xmlparse.c xmltok.c xmlrole.c
-CFLAGS+=-I${.CURDIR} -DHAVE_EXPAT_CONFIG_H
+CFLAGS+=-I${.CURDIR} -DHAVE_EXPAT_CONFIG_H -fvisibility=hidden
 
 PC_FILES=expat.pc
 CLEANFILES+=${PC_FILES}
 
-VERSION_SCRIPT= ${.CURDIR}/Symbols.map
-
 includes:
 	cmp -s ${DESTDIR}/usr/include/expat.h ${.CURDIR}/lib/expat.h || \
 	  ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) \
diff --git a/lib/libexpat/Symbols.map b/lib/libexpat/Symbols.map
deleted file mode 100644
index a8a602dc51e..00000000000
--- a/lib/libexpat/Symbols.map
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	local:
-		align_limit_to_full_utf8_characters;
-};
diff --git a/lib/libexpat/shlib_version b/lib/libexpat/shlib_version
index f461c533903..56246d02b24 100644
--- a/lib/libexpat/shlib_version
+++ b/lib/libexpat/shlib_version
@@ -1,2 +1,2 @@
-major=11
+major=12
 minor=0
-- 
2.20.1