summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorGravatar Benjamin Barenblat <bbaren@mit.edu>2016-08-05 21:29:09 -0400
committerGravatar Benjamin Barenblat <bbaren@mit.edu>2016-08-05 21:48:34 -0400
commit3563b604c6df5ffcd00e946c2006c245479d7fb4 (patch)
tree09bc516c8ec3706c2f367296f7fdf23d2caf4f71 /debian/patches
parent62d3e17a6ebfecf74386a781682c36259231eea5 (diff)
Update symbols files
Include upstream patch to avoid exporting unnecessarily.
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/export-fewer-symbols.diff24
-rw-r--r--debian/patches/series1
2 files changed, 25 insertions, 0 deletions
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