summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorPeter Pentchev <roam@ringlet.net>2015-06-13 18:41:58 +0300
committerPeter Pentchev <roam@ringlet.net>2015-06-13 18:41:58 +0300
commit6e06ba2207148d129839379fb1405ed1990fa7b5 (patch)
tree6457df15c67a605daeefc0f68785d9c80561d373 /debian/patches
parent18b3f17f7c95206ed139bf2a5d8ed85b4dde0c88 (diff)
Refresh the line numbers in four more patches.
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/10-no-zlib-compression.patch2
-rw-r--r--debian/patches/12-restore-pidfile-default.patch4
-rw-r--r--debian/patches/19-typos.patch46
-rw-r--r--debian/patches/20-comparison.patch2
4 files changed, 27 insertions, 27 deletions
diff --git a/debian/patches/10-no-zlib-compression.patch b/debian/patches/10-no-zlib-compression.patch
index e9e511a..544a9ba 100644
--- a/debian/patches/10-no-zlib-compression.patch
+++ b/debian/patches/10-no-zlib-compression.patch
@@ -52,7 +52,7 @@ Last-Update: 2015-06-13
return 0; /* success */
--- a/src/options.c
+++ b/src/options.c
-@@ -439,9 +439,9 @@
+@@ -442,9 +442,9 @@
if(strcasecmp(opt, "compression"))
break;
if(SSLeay()>=0x00908051L && !strcasecmp(arg, "deflate"))
diff --git a/debian/patches/12-restore-pidfile-default.patch b/debian/patches/12-restore-pidfile-default.patch
index 0b30bbc..df0d153 100644
--- a/debian/patches/12-restore-pidfile-default.patch
+++ b/debian/patches/12-restore-pidfile-default.patch
@@ -22,7 +22,7 @@ Last-Update: 2015-06-04
stunnel_LDFLAGS = -L$(SSLDIR)/lib64 -L$(SSLDIR)/lib -lssl -lcrypto
--- a/src/options.c
+++ b/src/options.c
-@@ -777,7 +777,7 @@
+@@ -778,7 +778,7 @@
#ifndef USE_WIN32
switch(cmd) {
case CMD_BEGIN:
@@ -31,7 +31,7 @@ Last-Update: 2015-06-04
break;
case CMD_EXEC:
if(strcasecmp(opt, "pid"))
-@@ -792,9 +792,10 @@
+@@ -793,9 +793,10 @@
case CMD_FREE:
break;
case CMD_DEFAULT:
diff --git a/debian/patches/19-typos.patch b/debian/patches/19-typos.patch
index c104715..c1b921c 100644
--- a/debian/patches/19-typos.patch
+++ b/debian/patches/19-typos.patch
@@ -265,7 +265,7 @@ Last-Update: 2015-06-04
openssl ecparam -list_curves
-@@ -480,7 +480,7 @@
+@@ -521,7 +521,7 @@
=item B<delay> = yes | no
@@ -274,7 +274,7 @@ Last-Update: 2015-06-04
This option is useful for dynamic DNS, or when DNS is not available during
B<stunnel> startup (road warrior VPN, dial-up configurations).
-@@ -504,19 +504,19 @@
+@@ -545,19 +545,19 @@
=item B<exec> = EXECUTABLE_PATH
@@ -299,7 +299,7 @@ Last-Update: 2015-06-04
=item B<failover> = rr | prio
-@@ -533,15 +533,15 @@
+@@ -574,15 +574,15 @@
=item B<key> = KEY_FILE
@@ -319,7 +319,7 @@ Last-Update: 2015-06-04
=item B<libwrap> = yes | no
-@@ -551,8 +551,8 @@
+@@ -592,8 +592,8 @@
=item B<local> = HOST
@@ -330,7 +330,7 @@ Last-Update: 2015-06-04
=item B<sni> = SERVICE:SERVER_PATTERN (server mode)
-@@ -560,29 +560,29 @@
+@@ -601,29 +601,29 @@
Name Indication TLS extension (RFC 3546).
I<service_name> specifies the master service that accepts client connections
@@ -369,7 +369,7 @@ Last-Update: 2015-06-04
=item B<OCSP> = URL
-@@ -634,7 +634,7 @@
+@@ -675,7 +675,7 @@
This option enables initial, protocol-specific negotiation of the SSL/TLS
encryption.
@@ -378,7 +378,7 @@ Last-Update: 2015-06-04
Currently supported protocols:
-@@ -701,7 +701,7 @@
+@@ -742,7 +742,7 @@
authentication type for protocol negotiations
@@ -387,7 +387,7 @@ Last-Update: 2015-06-04
default: basic
-@@ -709,11 +709,11 @@
+@@ -750,11 +750,11 @@
destination address for protocol negotiations
@@ -401,7 +401,7 @@ Last-Update: 2015-06-04
=item B<protocolPassword> = PASSWORD
-@@ -745,7 +745,7 @@
+@@ -786,7 +786,7 @@
=item B<pty> = yes | no (Unix only)
@@ -410,7 +410,7 @@ Last-Update: 2015-06-04
=item B<redirect> = [HOST:]PORT
-@@ -772,7 +772,7 @@
+@@ -813,7 +813,7 @@
=item B<reset> = yes | no
@@ -419,7 +419,7 @@ Last-Update: 2015-06-04
This option is not supported on some platforms.
-@@ -792,7 +792,7 @@
+@@ -833,7 +833,7 @@
entries.
The value of 0 can be used for unlimited size. It is not recommended
@@ -428,7 +428,7 @@ Last-Update: 2015-06-04
=item B<sessionCacheTimeout> = TIMEOUT
-@@ -824,7 +824,7 @@
+@@ -865,7 +865,7 @@
=item B<TIMEOUTconnect> = SECONDS
@@ -437,7 +437,7 @@ Last-Update: 2015-06-04
=item B<TIMEOUTidle> = SECONDS
-@@ -844,7 +844,7 @@
+@@ -885,7 +885,7 @@
=item I<source>
@@ -446,7 +446,7 @@ Last-Update: 2015-06-04
from the SSL client machine instead of the machine running B<stunnel>.
This option is currently available in:
-@@ -854,7 +854,7 @@
+@@ -895,7 +895,7 @@
=item Remote mode (I<connect> option) on I<Linux E<gt>=2.6.28>
This configuration requires B<stunnel> to be executed as root and without
@@ -455,7 +455,7 @@ Last-Update: 2015-06-04
This configuration requires the following setup for iptables and routing
(possibly in /etc/rc.local or equivalent file):
-@@ -867,25 +867,25 @@
+@@ -908,25 +908,25 @@
ip route add local 0.0.0.0/0 dev lo table 100
echo 0 >/proc/sys/net/ipv4/conf/lo/rp_filter
@@ -486,7 +486,7 @@ Last-Update: 2015-06-04
_RLD_LIST environment variable is used on Tru64, and LD_PRELOAD variable on
other platforms.
-@@ -893,7 +893,7 @@
+@@ -934,7 +934,7 @@
=item I<destination>
@@ -495,7 +495,7 @@ Last-Update: 2015-06-04
A service section for transparent destination may look like this:
-@@ -917,7 +917,7 @@
+@@ -958,7 +958,7 @@
/sbin/iptables -t nat -I PREROUTING -p tcp --dport <redirected_port> \
-i eth0 -j DNAT --to-destination <local_ip>:<stunnel_port>
@@ -504,7 +504,7 @@ Last-Update: 2015-06-04
=item I<both>
-@@ -931,40 +931,40 @@
+@@ -972,40 +972,40 @@
=item I<yes>
@@ -553,7 +553,7 @@ Last-Update: 2015-06-04
=item default
-@@ -972,7 +972,7 @@
+@@ -1013,7 +1013,7 @@
=back
@@ -562,7 +562,7 @@ Last-Update: 2015-06-04
control and not for authorization. Specifically for level 2 every non-revoked
certificate is accepted regardless of its Common Name. For this reason a
dedicated CA should be used with level 2, and not a generic CA commonly used
-@@ -1022,16 +1022,16 @@
+@@ -1063,16 +1063,16 @@
=back
@@ -583,7 +583,7 @@ Last-Update: 2015-06-04
This function can be used for log rotation.
=item SIGTERM, SIGQUIT, SIGINT
-@@ -1146,8 +1146,8 @@
+@@ -1187,8 +1187,8 @@
The order of contents of the I<.pem> file is important. It should contain the
unencrypted private key first, then a signed certificate (not certificate
@@ -594,7 +594,7 @@ Last-Update: 2015-06-04
should be discarded. So the file should look like this:
-----BEGIN RSA PRIVATE KEY-----
-@@ -1161,7 +1161,7 @@
+@@ -1202,7 +1202,7 @@
=head2 RANDOMNESS
@@ -603,7 +603,7 @@ Last-Update: 2015-06-04
order for SSL to use good randomness. The following sources are loaded
in order until sufficient random data has been gathered:
-@@ -1247,7 +1247,7 @@
+@@ -1288,7 +1288,7 @@
=head1 BUGS
diff --git a/debian/patches/20-comparison.patch b/debian/patches/20-comparison.patch
index 6187537..060474f 100644
--- a/debian/patches/20-comparison.patch
+++ b/debian/patches/20-comparison.patch
@@ -5,7 +5,7 @@ Last-Update: 2015-04-27
--- a/src/log.c
+++ b/src/log.c
-@@ -215,7 +215,7 @@
+@@ -218,7 +218,7 @@
file_putline(outfile, line); /* send log to file */
}
} else if(mode==LOG_MODE_ERROR) {