From 86daabe3a442bff3f93545a5b0e716a1737eb2d6 Mon Sep 17 00:00:00 2001
From: Benjamin Barenblat <bbaren@mit.edu>
Date: Sun, 23 Oct 2016 14:32:06 -0400
Subject: Refresh patches

---
 debian/patches/export-fewer-symbols.diff | 24 ------------------------
 debian/patches/harden.diff               |  4 ++--
 debian/patches/series                    |  1 -
 3 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 debian/patches/export-fewer-symbols.diff

(limited to 'debian')

diff --git a/debian/patches/export-fewer-symbols.diff b/debian/patches/export-fewer-symbols.diff
deleted file mode 100644
index dcb20f80..00000000
--- a/debian/patches/export-fewer-symbols.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-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/harden.diff b/debian/patches/harden.diff
index 13c6068b..b0a368a5 100644
--- a/debian/patches/harden.diff
+++ b/debian/patches/harden.diff
@@ -16,6 +16,6 @@ OS X [1] and the latter to improve performance [2].
  AM_CPPFLAGS = -I$(srcdir)/../../include/urweb $(OPENSSL_INCLUDES)
 -AM_CFLAGS = -Wimplicit -Wall -Werror -Wno-format-security -Wno-deprecated-declarations -U_FORTIFY_SOURCE $(PTHREAD_CFLAGS)
 +AM_CFLAGS = -Wimplicit -Wall -Werror -Wno-deprecated-declarations $(PTHREAD_CFLAGS)
- liburweb_la_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
+ 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
diff --git a/debian/patches/series b/debian/patches/series
index 5c2af812..8bedd73d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 harden.diff
 doc-letterpaper.diff
 use-system-uthash.diff
-export-fewer-symbols.diff
-- 
cgit v1.2.3