diff options
| author | Juergen Daubert <jue@jue.li> | 2015-04-03 12:06:03 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2015-04-03 12:06:03 +0200 |
| commit | 193e5b56a9084a7f59b64d9103e3cf47a620ccaa (patch) | |
| tree | 7b17a08bf5667ede69afaf1c7f342b3ce4a86dff /stunnel | |
| parent | 19b9a120b92b99e443f4a353a0546f0f145ed417 (diff) | |
| download | opt-193e5b56a9084a7f59b64d9103e3cf47a620ccaa.tar.gz opt-193e5b56a9084a7f59b64d9103e3cf47a620ccaa.tar.xz | |
[notify] stunnel: update to 5.14
includes a security fix, see https://www.stunnel.org/sdf_ChangeLog.html
Diffstat (limited to 'stunnel')
| -rw-r--r-- | stunnel/.md5sum | 6 | ||||
| -rw-r--r-- | stunnel/Pkgfile | 2 | ||||
| -rw-r--r-- | stunnel/stunnel | 2 | ||||
| -rw-r--r-- | stunnel/stunnel-config.patch | 18 |
4 files changed, 14 insertions, 14 deletions
diff --git a/stunnel/.md5sum b/stunnel/.md5sum index f2c71a271..bf4287d68 100644 --- a/stunnel/.md5sum +++ b/stunnel/.md5sum @@ -1,3 +1,3 @@ -41e68853b8005ad297354e5097856773 stunnel -1cd9997d6de9e8c82ac561039a33c329 stunnel-5.13.tar.gz -1f4f1cad1434b7d8641bd2ebe2be6e1c stunnel-config.patch +fd36d81539b5268afb99f51fdb090f95 stunnel +e716501960dc6856d80f92547298f724 stunnel-5.14.tar.gz +00bfe2db668d5558482238dbf796c2aa stunnel-config.patch diff --git a/stunnel/Pkgfile b/stunnel/Pkgfile index 84c295638..d468fa2ac 100644 --- a/stunnel/Pkgfile +++ b/stunnel/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl tcp_wrappers zlib name=stunnel -version=5.13 +version=5.14 release=1 source=(https://www.stunnel.org/downloads/$name-$version.tar.gz \ $name-config.patch $name) diff --git a/stunnel/stunnel b/stunnel/stunnel index 313552db3..30cf3027b 100644 --- a/stunnel/stunnel +++ b/stunnel/stunnel @@ -27,7 +27,7 @@ restart) status) $SSD --status --pidfile $PID case $? in - 0) echo "$PROG is running" ;; + 0) echo "$PROG is running with pid $(cat $PID)" ;; 1) echo "$PROG is not running but the pid file $PID exists" ;; 3) echo "$PROG is not running" ;; 4) echo "Unable to determine the program status" ;; diff --git a/stunnel/stunnel-config.patch b/stunnel/stunnel-config.patch index 0e24b93aa..b712e7ed1 100644 --- a/stunnel/stunnel-config.patch +++ b/stunnel/stunnel-config.patch @@ -1,18 +1,18 @@ -diff -Nru stunnel-5.07.orig/src/Makefile.in stunnel-5.07/src/Makefile.in ---- stunnel-5.07.orig/src/Makefile.in 2014-11-02 13:28:56.464569838 +0100 -+++ stunnel-5.07/src/Makefile.in 2014-11-02 13:29:17.703827231 +0100 -@@ -310,7 +310,7 @@ +diff -Nru stunnel-5.14.orig/src/Makefile.in stunnel-5.14/src/Makefile.in +--- stunnel-5.14.orig/src/Makefile.in 2015-03-26 11:18:09.430260236 +0100 ++++ stunnel-5.14/src/Makefile.in 2015-03-26 11:18:21.656486171 +0100 +@@ -387,7 +387,7 @@ # Additional preprocesor definitions stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \ - -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' + -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' - # Win32 executable - EXTRA_DIST = make.bat makece.bat makew32.bat mingw.mak evc.mak vc.mak \ -diff -Nru stunnel-5.07.orig/tools/stunnel.conf-sample.in stunnel-5.07/tools/stunnel.conf-sample.in ---- stunnel-5.07.orig/tools/stunnel.conf-sample.in 2014-11-02 13:28:56.464569838 +0100 -+++ stunnel-5.07/tools/stunnel.conf-sample.in 2014-11-02 13:34:24.086448235 +0100 + # SSL library + stunnel_LDFLAGS = -L$(SSLDIR)/lib64 -L$(SSLDIR)/lib -lssl -lcrypto +diff -Nru stunnel-5.14.orig/tools/stunnel.conf-sample.in stunnel-5.14/tools/stunnel.conf-sample.in +--- stunnel-5.14.orig/tools/stunnel.conf-sample.in 2015-03-26 11:18:09.430260236 +0100 ++++ stunnel-5.14/tools/stunnel.conf-sample.in 2015-03-26 11:18:21.656486171 +0100 @@ -10,25 +10,34 @@ ; A copy of some devices and system files is needed within the chroot jail ; Chroot conflicts with configuration file reload and many other features |