From 3563b604c6df5ffcd00e946c2006c245479d7fb4 Mon Sep 17 00:00:00 2001
From: Benjamin Barenblat <bbaren@mit.edu>
Date: Fri, 5 Aug 2016 21:29:09 -0400
Subject: Update symbols files

Include upstream patch to avoid exporting unnecessarily.
---
 debian/liburweb-fastcgi0.symbols         |  1 -
 debian/liburweb0.symbols                 | 14 +++++++++++++-
 debian/patches/export-fewer-symbols.diff | 24 ++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/export-fewer-symbols.diff

diff --git a/debian/liburweb-fastcgi0.symbols b/debian/liburweb-fastcgi0.symbols
index 1d106269..9e2746ff 100644
--- a/debian/liburweb-fastcgi0.symbols
+++ b/debian/liburweb-fastcgi0.symbols
@@ -1,5 +1,4 @@
 liburweb_fastcgi.so.0 liburweb-fastcgi0 #MINVER#
- fastcgi_send_normal@Base 20150214
  main@Base 20150214
  uw_copy_client_data@Base 20150214
  uw_do_expunge@Base 20150214
diff --git a/debian/liburweb0.symbols b/debian/liburweb0.symbols
index dff6d4a0..b40cdca5 100644
--- a/debian/liburweb0.symbols
+++ b/debian/liburweb0.symbols
@@ -1,8 +1,13 @@
 liburweb.so.0 liburweb0 #MINVER#
  client_pruner@Base 20150214
- memmem@Base 20150214
  pthread_create_big@Base 20150214
+ strcmp_nullsafe@Base 20160805
+ uw_Basis_abs@Base 20160805
+ uw_Basis_acos@Base 20160805
  uw_Basis_addSeconds@Base 20150214
+ uw_Basis_asin@Base 20160805
+ uw_Basis_atan2@Base 20160805
+ uw_Basis_atan@Base 20160805
  uw_Basis_atom@Base 20150214
  uw_Basis_attrifyChannel@Base 20150214
  uw_Basis_attrifyChar@Base 20150214
@@ -36,6 +41,7 @@ liburweb.so.0 liburweb0 #MINVER#
  uw_Basis_chr@Base 20150214
  uw_Basis_clear_cookie@Base 20150214
  uw_Basis_clear_page@Base 20150214
+ uw_Basis_cos@Base 20160805
  uw_Basis_crypt@Base 20150214
  uw_Basis_css_url@Base 20150214
  uw_Basis_currentUrl@Base 20150214
@@ -54,6 +60,7 @@ liburweb.so.0 liburweb0 #MINVER#
  uw_Basis_ensqlBool@Base 20150214
  uw_Basis_ensqlTime@Base 20150214
  uw_Basis_eq_time@Base 20150214
+ uw_Basis_exp@Base 20160805
  uw_Basis_fieldName@Base 20150214
  uw_Basis_fieldValue@Base 20150214
  uw_Basis_fileData@Base 20150214
@@ -62,6 +69,7 @@ liburweb.so.0 liburweb0 #MINVER#
  uw_Basis_firstFormField@Base 20150214
  uw_Basis_floatFromInt@Base 20150214
  uw_Basis_floatToString@Base 20150214
+ uw_Basis_floor@Base 20160805
  uw_Basis_fresh@Base 20150214
  uw_Basis_fromDatetime@Base 20150214
  uw_Basis_fromMilliseconds@Base 20151122
@@ -103,6 +111,7 @@ liburweb.so.0 liburweb0 #MINVER#
  uw_Basis_jsifyString_ws@Base 20150214
  uw_Basis_jsifyTime@Base 20150214
  uw_Basis_le_time@Base 20150214
+ uw_Basis_log@Base 20160805
  uw_Basis_lt_time@Base 20150214
  uw_Basis_makeSigString@Base 20150214
  uw_Basis_maybe_onload@Base 20150214
@@ -116,6 +125,7 @@ liburweb.so.0 liburweb0 #MINVER#
  uw_Basis_ord@Base 20150214
  uw_Basis_postData@Base 20150214
  uw_Basis_postType@Base 20150214
+ uw_Basis_pow@Base 20160805
  uw_Basis_property@Base 20150214
  uw_Basis_rand@Base 20150214
  uw_Basis_readUtc@Base 20150214
@@ -128,6 +138,7 @@ liburweb.so.0 liburweb0 #MINVER#
  uw_Basis_set_client_source@Base 20150214
  uw_Basis_set_cookie@Base 20150214
  uw_Basis_sigString@Base 20150214
+ uw_Basis_sin@Base 20160805
  uw_Basis_sqlifyBlob@Base 20150214
  uw_Basis_sqlifyBool@Base 20150214
  uw_Basis_sqlifyBoolN@Base 20150214
@@ -142,6 +153,7 @@ liburweb.so.0 liburweb0 #MINVER#
  uw_Basis_sqlifyStringN@Base 20150214
  uw_Basis_sqlifyTime@Base 20150214
  uw_Basis_sqlifyTimeN@Base 20150214
+ uw_Basis_sqrt@Base 20160805
  uw_Basis_str1@Base 20150214
  uw_Basis_strcat@Base 20150214
  uw_Basis_strchr@Base 20150214
diff --git a/debian/patches/export-fewer-symbols.diff b/debian/patches/export-fewer-symbols.diff
new file mode 100644
index 00000000..dcb20f80
--- /dev/null
+++ b/debian/patches/export-fewer-symbols.diff
@@ -0,0 +1,24 @@
+From: Benjamin Barenblat <bbaren@mit.edu
+Description: Export fewer symbols
+Origin: upstream, https://github.com/urweb/urweb/commit/06cb0a88e1df0d4c84427786a9d04f7a75856854
+Bug: https://github.com/urweb/urweb/issues/43
+--- a/src/c/Makefile.am
++++ b/src/c/Makefile.am
+@@ -7,10 +7,15 @@ liburweb_fastcgi_la_SOURCES = fastcgi.c
+ liburweb_static_la_SOURCES = static.c
+ 
+ AM_CPPFLAGS = -I$(srcdir)/../../include/urweb $(OPENSSL_INCLUDES)
+-AM_CFLAGS = -Wimplicit -Wall -Werror -Wno-deprecated-declarations $(PTHREAD_CFLAGS)
+-liburweb_la_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
++AM_CFLAGS = -Wimplicit -Wall -Werror -Wno-format-security -Wno-deprecated-declarations -U_FORTIFY_SOURCE $(PTHREAD_CFLAGS)
++liburweb_la_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS) \
++	-export-symbols-regex '^(client_pruner|pthread_create_big|strcmp_nullsafe|uw_.*)'
+ liburweb_la_LIBADD = $(PTHREAD_LIBS) -lm $(OPENSSL_LIBS)
+ liburweb_http_la_LIBADD = liburweb.la
++liburweb_http_la_LDFLAGS = -export-symbols-regex '^(main|uw_.*)'
+ liburweb_cgi_la_LIBADD = liburweb.la
++liburweb_cgi_la_LDFLAGS = -export-symbols-regex '^(main|uw_.*)'
+ liburweb_fastcgi_la_LIBADD = liburweb.la
++liburweb_fastcgi_la_LDFLAGS = -export-symbols-regex '^(main|uw_.*)'
+ liburweb_static_la_LIBADD = liburweb.la
++liburweb_static_la_LDFLAGS = -export-symbols-regex '^(main|uw_.*)'
diff --git a/debian/patches/series b/debian/patches/series
index 8bedd73d..5c2af812 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 harden.diff
 doc-letterpaper.diff
 use-system-uthash.diff
+export-fewer-symbols.diff
-- 
cgit v1.2.3