diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2020-05-31 18:36:12 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2020-05-31 18:36:12 -0400 |
| commit | 60851048acd6ba9c75103bcda809f26d9fdf0ce8 (patch) | |
| tree | ba32778103f4e0a7e190caab8294a3c1db85bf1f | |
| parent | 8e16f1081ef1543bc2260f56fea5dd3207905acb (diff) | |
Refresh patches
| -rw-r--r-- | debian/patches/harden.diff | 10 | ||||
| -rw-r--r-- | debian/patches/use-system-uthash.diff | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/harden.diff b/debian/patches/harden.diff index b0a368a5..a3bac565 100644 --- a/debian/patches/harden.diff +++ b/debian/patches/harden.diff @@ -13,9 +13,9 @@ OS X [1] and the latter to improve performance [2]. @@ -7,7 +7,7 @@ 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-format-security -Wno-deprecated-declarations -U_FORTIFY_SOURCE $(PTHREAD_CFLAGS) -+AM_CFLAGS = -Wimplicit -Wall -Werror -Wno-deprecated-declarations $(PTHREAD_CFLAGS) + AM_CPPFLAGS = -I$(srcdir)/../../include/urweb $(OPENSSL_INCLUDES) $(ICU_INCLUDES) +-AM_CFLAGS = -Wall -Wunused-parameter -Werror -Wno-format-security -Wno-deprecated-declarations -U_FORTIFY_SOURCE $(PTHREAD_CFLAGS) ++AM_CFLAGS = -Wall -Wunused-parameter -Werror -Wno-deprecated-declarations $(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) + -export-symbols-regex '^(client_pruner|pthread_create_big|strcmp_nullsafe|uw_.*)' \ + -version-info 1:0:0 diff --git a/debian/patches/use-system-uthash.diff b/debian/patches/use-system-uthash.diff index 270bf553..d8de0292 100644 --- a/debian/patches/use-system-uthash.diff +++ b/debian/patches/use-system-uthash.diff @@ -5,7 +5,7 @@ Forwarded: no Remove upstream’s vendored copy of uthash. --- a/include/urweb/types_cpp.h +++ b/include/urweb/types_cpp.h -@@ -123,7 +123,7 @@ typedef struct { +@@ -125,7 +125,7 @@ // Caching #include <pthread.h> @@ -16,7 +16,7 @@ Remove upstream’s vendored copy of uthash. char *result; --- a/src/c/urweb.c +++ b/src/c/urweb.c -@@ -22,7 +22,7 @@ +@@ -26,7 +26,7 @@ #include "types.h" |