This commit is contained in:
Mario Fetka 2017-03-28 10:47:03 +02:00
parent 18f12ad1bc
commit 8e9bdf3481
1 changed files with 11 additions and 11 deletions

View File

@ -1,6 +1,6 @@
diff -uNr stunnel-4.57.orig/doc/stunnel.8 stunnel-4.57/doc/stunnel.8
--- stunnel-4.57.orig/doc/stunnel.8 2013-03-20 07:51:10.000000000 +0100
+++ stunnel-4.57/doc/stunnel.8 2017-03-28 10:36:24.616000000 +0200
+++ stunnel-4.57/doc/stunnel.8 2017-03-28 10:45:27.312000000 +0200
@@ -61,8 +61,8 @@
.\}
.\" ========================================================================
@ -14,7 +14,7 @@ diff -uNr stunnel-4.57.orig/doc/stunnel.8 stunnel-4.57/doc/stunnel.8
.if n .ad l
diff -uNr stunnel-4.57.orig/doc/stunnel.fr.8 stunnel-4.57/doc/stunnel.fr.8
--- stunnel-4.57.orig/doc/stunnel.fr.8 2013-03-19 13:35:53.000000000 +0100
+++ stunnel-4.57/doc/stunnel.fr.8 2017-03-28 10:37:04.348000000 +0200
+++ stunnel-4.57/doc/stunnel.fr.8 2017-03-28 10:45:27.316000000 +0200
@@ -61,8 +61,8 @@
.\}
.\" ========================================================================
@ -28,7 +28,7 @@ diff -uNr stunnel-4.57.orig/doc/stunnel.fr.8 stunnel-4.57/doc/stunnel.fr.8
.if n .ad l
diff -uNr stunnel-4.57.orig/doc/stunnel.pl.8 stunnel-4.57/doc/stunnel.pl.8
--- stunnel-4.57.orig/doc/stunnel.pl.8 2013-03-22 23:23:04.000000000 +0100
+++ stunnel-4.57/doc/stunnel.pl.8 2017-03-28 10:37:16.948000000 +0200
+++ stunnel-4.57/doc/stunnel.pl.8 2017-03-28 10:45:27.316000000 +0200
@@ -61,8 +61,8 @@
.\}
.\" ========================================================================
@ -42,7 +42,7 @@ diff -uNr stunnel-4.57.orig/doc/stunnel.pl.8 stunnel-4.57/doc/stunnel.pl.8
.if n .ad l
diff -uNr stunnel-4.57.orig/src/Makefile.am stunnel-4.57/src/Makefile.am
--- stunnel-4.57.orig/src/Makefile.am 2015-04-01 16:01:42.000000000 +0200
+++ stunnel-4.57/src/Makefile.am 2017-03-28 10:35:18.840000000 +0200
+++ stunnel-4.57/src/Makefile.am 2017-03-28 10:45:27.316000000 +0200
@@ -25,7 +25,7 @@
stunnel_CPPFLAGS += -I$(SSLDIR)/include
stunnel_CPPFLAGS += -DLIBDIR='"$(pkglibdir)"'
@ -54,7 +54,7 @@ diff -uNr stunnel-4.57.orig/src/Makefile.am stunnel-4.57/src/Makefile.am
stunnel_LDFLAGS = -L$(SSLDIR)/lib64 -L$(SSLDIR)/lib -lssl -lcrypto
diff -uNr stunnel-4.57.orig/src/Makefile.in stunnel-4.57/src/Makefile.in
--- stunnel-4.57.orig/src/Makefile.in 2015-04-01 16:01:42.000000000 +0200
+++ stunnel-4.57/src/Makefile.in 2017-03-28 10:35:18.840000000 +0200
+++ stunnel-4.57/src/Makefile.in 2017-03-28 10:45:27.316000000 +0200
@@ -277,7 +277,7 @@
# Additional preprocesor definitions
stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \
@ -66,7 +66,7 @@ diff -uNr stunnel-4.57.orig/src/Makefile.in stunnel-4.57/src/Makefile.in
EXTRA_DIST = make.bat makece.bat makew32.bat mingw.mak evc.mak vc.mak \
diff -uNr stunnel-4.57.orig/src/stunnel3.in stunnel-4.57/src/stunnel3.in
--- stunnel-4.57.orig/src/stunnel3.in 2012-01-01 22:46:06.000000000 +0100
+++ stunnel-4.57/src/stunnel3.in 2017-03-28 10:35:18.832000000 +0200
+++ stunnel-4.57/src/stunnel3.in 2017-03-28 10:45:27.320000000 +0200
@@ -22,7 +22,7 @@
use Getopt::Std;
@ -77,14 +77,14 @@ diff -uNr stunnel-4.57.orig/src/stunnel3.in stunnel-4.57/src/stunnel3.in
# stunnel3 script body begins here
($read_fd, $write_fd)=POSIX::pipe();
diff -uNr stunnel-4.57.orig/tools/stunnel.conf-sample.in stunnel-4.57/tools/stunnel.conf-sample.in
--- stunnel-4.57.orig/tools/stunnel.conf-sample.in 2013-03-13 14:39:20.000000000 +0100
+++ stunnel-4.57/tools/stunnel.conf-sample.in 2017-03-28 10:38:57.052000000 +0200
--- stunnel-4.57.orig/tools/stunnel.conf-sample.in 2017-03-28 10:45:15.200000000 +0200
+++ stunnel-4.57/tools/stunnel.conf-sample.in 2017-03-28 10:46:03.116000000 +0200
@@ -9,17 +9,17 @@
; A copy of some devices and system files is needed within the chroot jail
; Chroot conflicts with configuration file reload and many other features
-chroot = @prefix@/var/lib/stunnel/
+chroot = @prefix@/var/lib/stunnel4/
-chroot = @localstatedir@/lib/stunnel/
+chroot = @localstatedir@/lib/stunnel4/
; Chroot jail can be escaped if setuid option is not used
setuid = nobody
setgid = @DEFAULT_GROUP@
@ -102,7 +102,7 @@ diff -uNr stunnel-4.57.orig/tools/stunnel.conf-sample.in stunnel-4.57/tools/stun
; * Service defaults may also be specified in individual service sections *
diff -uNr stunnel-4.57.orig/tools/stunnel.init.in stunnel-4.57/tools/stunnel.init.in
--- stunnel-4.57.orig/tools/stunnel.init.in 2011-03-09 09:56:25.000000000 +0100
+++ stunnel-4.57/tools/stunnel.init.in 2017-03-28 10:35:18.848000000 +0200
+++ stunnel-4.57/tools/stunnel.init.in 2017-03-28 10:45:27.320000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh -e
### BEGIN INIT INFO