Bump
This commit is contained in:
Mario Fetka
parent
83fe2cf45c
commit
18f12ad1bc
|
|
@ -1,8 +1,72 @@
|
|||
# Change references to the binary from stunnel to stunnel4
|
||||
Index: stunnel4/src/stunnel3.in
|
||||
===================================================================
|
||||
--- stunnel4.orig/src/stunnel3.in
|
||||
+++ stunnel4/src/stunnel3.in
|
||||
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
|
||||
@@ -61,8 +61,8 @@
|
||||
.\}
|
||||
.\" ========================================================================
|
||||
.\"
|
||||
-.IX Title "STUNNEL 8"
|
||||
-.TH STUNNEL 8 "2013.03.20" "4.56" "stunnel"
|
||||
+.IX Title "STUNNEL4 8"
|
||||
+.TH STUNNEL 8 "2013.03.20" "4.56" "stunnel4"
|
||||
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
||||
.\" way too many mistakes in technical documents.
|
||||
.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
|
||||
@@ -61,8 +61,8 @@
|
||||
.\}
|
||||
.\" ========================================================================
|
||||
.\"
|
||||
-.IX Title "STUNNEL.FR 8"
|
||||
-.TH STUNNEL.FR 8 "2013.03.19" "4.56" "stunnel"
|
||||
+.IX Title "STUNNEL4.FR 8"
|
||||
+.TH STUNNEL.FR 8 "2013.03.19" "4.56" "stunnel4"
|
||||
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
||||
.\" way too many mistakes in technical documents.
|
||||
.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
|
||||
@@ -61,8 +61,8 @@
|
||||
.\}
|
||||
.\" ========================================================================
|
||||
.\"
|
||||
-.IX Title "STUNNEL.PL 8"
|
||||
-.TH STUNNEL.PL 8 "2013.03.22" "4.56" "stunnel"
|
||||
+.IX Title "STUNNEL4.PL 8"
|
||||
+.TH STUNNEL.PL 8 "2013.03.22" "4.56" "stunnel4"
|
||||
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
||||
.\" way too many mistakes in technical documents.
|
||||
.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
|
||||
@@ -25,7 +25,7 @@
|
||||
stunnel_CPPFLAGS += -I$(SSLDIR)/include
|
||||
stunnel_CPPFLAGS += -DLIBDIR='"$(pkglibdir)"'
|
||||
stunnel_CPPFLAGS += -DCONFDIR='"$(sysconfdir)/stunnel"'
|
||||
-stunnel_CPPFLAGS += -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
|
||||
+stunnel_CPPFLAGS += -DPIDFILE='"$(localstatedir)/run/stunnel4.pid"'
|
||||
|
||||
# SSL library
|
||||
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
|
||||
@@ -277,7 +277,7 @@
|
||||
# Additional preprocesor definitions
|
||||
stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \
|
||||
-DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' \
|
||||
- -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
|
||||
+ -DPIDFILE='"$(localstatedir)/run/stunnel4.pid"'
|
||||
|
||||
# Win32 executable
|
||||
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
|
||||
@@ -22,7 +22,7 @@
|
||||
use Getopt::Std;
|
||||
|
||||
|
|
@ -12,31 +76,15 @@ Index: stunnel4/src/stunnel3.in
|
|||
|
||||
# stunnel3 script body begins here
|
||||
($read_fd, $write_fd)=POSIX::pipe();
|
||||
Index: stunnel4/doc/stunnel.8
|
||||
===================================================================
|
||||
--- stunnel4.orig/doc/stunnel.8
|
||||
+++ stunnel4/doc/stunnel.8
|
||||
@@ -61,8 +61,8 @@
|
||||
.\}
|
||||
.\" ========================================================================
|
||||
.\"
|
||||
-.IX Title "STUNNEL 8"
|
||||
-.TH STUNNEL 8 "2012.01.14" "4.53" "stunnel"
|
||||
+.IX Title "STUNNEL4 8"
|
||||
+.TH STUNNEL 8 "2012.01.14" "4.53" "stunnel4"
|
||||
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
||||
.\" way too many mistakes in technical documents.
|
||||
.if n .ad l
|
||||
Index: stunnel4/tools/stunnel.conf-sample.in
|
||||
===================================================================
|
||||
--- stunnel4.orig/tools/stunnel.conf-sample.in
|
||||
+++ stunnel4/tools/stunnel.conf-sample.in
|
||||
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
|
||||
@@ -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 = @localstatedir@/lib/stunnel/
|
||||
+chroot = @localstatedir@/lib/stunnel4/
|
||||
-chroot = @prefix@/var/lib/stunnel/
|
||||
+chroot = @prefix@/var/lib/stunnel4/
|
||||
; Chroot jail can be escaped if setuid option is not used
|
||||
setuid = nobody
|
||||
setgid = @DEFAULT_GROUP@
|
||||
|
|
@ -52,66 +100,9 @@ Index: stunnel4/tools/stunnel.conf-sample.in
|
|||
|
||||
; **************************************************************************
|
||||
; * Service defaults may also be specified in individual service sections *
|
||||
Index: stunnel4/src/Makefile.am
|
||||
===================================================================
|
||||
--- stunnel4.orig/src/Makefile.am
|
||||
+++ stunnel4/src/Makefile.am
|
||||
@@ -25,7 +25,7 @@
|
||||
stunnel_CPPFLAGS += -I$(SSLDIR)/include
|
||||
stunnel_CPPFLAGS += -DLIBDIR='"$(pkglibdir)"'
|
||||
stunnel_CPPFLAGS += -DCONFDIR='"$(sysconfdir)/stunnel"'
|
||||
-stunnel_CPPFLAGS += -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
|
||||
+stunnel_CPPFLAGS += -DPIDFILE='"$(localstatedir)/run/stunnel4.pid"'
|
||||
|
||||
# SSL library
|
||||
stunnel_LDFLAGS = -L$(SSLDIR)/lib64 -L$(SSLDIR)/lib -lssl -lcrypto
|
||||
Index: stunnel4/src/Makefile.in
|
||||
===================================================================
|
||||
--- stunnel4.orig/src/Makefile.in
|
||||
+++ stunnel4/src/Makefile.in
|
||||
@@ -273,7 +273,7 @@
|
||||
# Additional preprocesor definitions
|
||||
stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \
|
||||
-DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' \
|
||||
- -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
|
||||
+ -DPIDFILE='"$(localstatedir)/run/stunnel4.pid"'
|
||||
|
||||
# Win32 executable
|
||||
EXTRA_DIST = nogui.c make.bat makece.bat makew32.bat mingw.mak evc.mak \
|
||||
Index: stunnel4/doc/stunnel.pl.8
|
||||
===================================================================
|
||||
--- stunnel4.orig/doc/stunnel.pl.8
|
||||
+++ stunnel4/doc/stunnel.pl.8
|
||||
@@ -61,8 +61,8 @@
|
||||
.\}
|
||||
.\" ========================================================================
|
||||
.\"
|
||||
-.IX Title "STUNNEL.PL 8"
|
||||
-.TH STUNNEL.PL 8 "2012.01.14" "4.53" "stunnel"
|
||||
+.IX Title "STUNNEL4.PL 8"
|
||||
+.TH STUNNEL.PL 8 "2012.01.14" "4.53" "stunnel4"
|
||||
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
||||
.\" way too many mistakes in technical documents.
|
||||
.if n .ad l
|
||||
Index: stunnel4/doc/stunnel.fr.8
|
||||
===================================================================
|
||||
--- stunnel4.orig/doc/stunnel.fr.8
|
||||
+++ stunnel4/doc/stunnel.fr.8
|
||||
@@ -61,8 +61,8 @@
|
||||
.\}
|
||||
.\" ========================================================================
|
||||
.\"
|
||||
-.IX Title "STUNNEL.FR 8"
|
||||
-.TH STUNNEL.FR 8 "2012.01.12" "4.53" "stunnel"
|
||||
+.IX Title "STUNNEL4.FR 8"
|
||||
+.TH STUNNEL.FR 8 "2012.01.12" "4.53" "stunnel4"
|
||||
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
||||
.\" way too many mistakes in technical documents.
|
||||
.if n .ad l
|
||||
Index: stunnel4/tools/stunnel.init.in
|
||||
===================================================================
|
||||
--- stunnel4.orig/tools/stunnel.init.in
|
||||
+++ stunnel4/tools/stunnel.init.in
|
||||
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
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh -e
|
||||
### BEGIN INIT INFO
|
||||
|
|
|
|||
Loading…
Reference in New Issue