diff options
| author | Peter Pentchev <roam@ringlet.net> | 2015-11-11 01:25:45 +0200 |
|---|---|---|
| committer | Peter Pentchev <roam@ringlet.net> | 2015-11-12 19:00:02 +0200 |
| commit | 5750dc55253bdb2cdb5ad039f47553b24d52cc3b (patch) | |
| tree | 0eda294dcfeadedae3aa637351f15dd34eb4207f /debian/patches | |
| parent | 377d7600f747cc8c58106f1ff7ec3e6ae1e6827f (diff) | |
Update the Debian patches for stunnel-5.21.
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/02-rename-binary.patch | 6 | ||||
| -rw-r--r-- | debian/patches/10-no-zlib-compression.patch | 4 | ||||
| -rw-r--r-- | debian/patches/21-author-tests.patch | 22 |
3 files changed, 8 insertions, 24 deletions
diff --git a/debian/patches/02-rename-binary.patch b/debian/patches/02-rename-binary.patch index 3598b18..ab78ba5 100644 --- a/debian/patches/02-rename-binary.patch +++ b/debian/patches/02-rename-binary.patch @@ -2,7 +2,7 @@ Description: Change references to the binary from stunnel to stunnel4 Forwarded: not-needed Author: Julien Lemoine <speedblue@debian.org> Author: Luis Rodrigo Gallardo Cruz <rodrigo@debian.org> -Last-Update: 2015-07-13 +Last-Update: 2015-11-11 --- a/src/stunnel3.in +++ b/src/stunnel3.in @@ -95,9 +95,9 @@ Last-Update: 2015-07-13 .\" ======================================================================== .\" -.IX Title "stunnel 8" --.TH stunnel 8 "2015.06.28" "5.20" "stunnel TLS Proxy" +-.TH stunnel 8 "2015.07.10" "5.21" "stunnel TLS Proxy" +.IX Title "stunnel4 8" -+.TH stunnel 8 "2015.06.28" "5.20" "stunnel4 TLS Proxy" ++.TH stunnel 8 "2015.07.10" "5.21" "stunnel4 TLS Proxy" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/debian/patches/10-no-zlib-compression.patch b/debian/patches/10-no-zlib-compression.patch index 83966d8..e466a28 100644 --- a/debian/patches/10-no-zlib-compression.patch +++ b/debian/patches/10-no-zlib-compression.patch @@ -3,11 +3,11 @@ Description: Do not look for zlib at all. compression since version 1.0.1e-5. Forwarded: not-yet Author: Peter Pentchev <roam@ringlet.net> -Last-Update: 2015-07-13 +Last-Update: 2015-11-11 --- a/configure.ac +++ b/configure.ac -@@ -180,10 +180,9 @@ +@@ -181,10 +181,9 @@ AC_SEARCH_LIBS([yp_get_default_domain], [nsl]) AC_SEARCH_LIBS([socket], [socket]) AC_SEARCH_LIBS([openpty], [util]) diff --git a/debian/patches/21-author-tests.patch b/debian/patches/21-author-tests.patch index 65ddf73..d1c6102 100644 --- a/debian/patches/21-author-tests.patch +++ b/debian/patches/21-author-tests.patch @@ -1,32 +1,16 @@ Description: Only build the Win32 executables if requested. Author: Peter Pentchev <roam@ringlet.net> Forwarded: not yet -Last-Update: 2015-07-13 +Last-Update: 2015-11-11 --- a/configure.ac +++ b/configure.ac -@@ -9,6 +9,7 @@ +@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE AC_DEFINE([_GNU_SOURCE], [1], [Use GNU source]) +-AM_CONDITIONAL([AUTHOR_TESTS], [test -d ".git"]) +AM_CONDITIONAL([AUTHOR_TESTS], [test -n "$AUTHOR_TESTS"]) AC_CANONICAL_HOST AC_SUBST([host]) AC_DEFINE_UNQUOTED([HOST], ["$host"], [Host description]) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -44,12 +44,14 @@ - # SSL library - stunnel_LDFLAGS = -L$(SSLDIR)/lib64 -L$(SSLDIR)/lib -lssl -lcrypto - -+if AUTHOR_TESTS - # Win32 executables - - # Just check if the programs can be built, don't perform any actual tests - check_PROGRAMS = stunnel.exe tstunnel.exe - stunnel_exe_SOURCES = $(common_headers) $(common_sources) $(win32_gui_sources) - tstunnel_exe_SOURCES = $(common_headers) $(common_sources) $(win32_cli_sources) -+endif - - # Remaining files to be included - # EXTRA_PROGRAMS = stunnel.exe tstunnel.exe |