---- stunnel-3.22/configure.ac~ Mon Jan 7 14:08:57 2002
-+++ stunnel-3.22/configure.ac Mon Jan 7 14:08:57 2002
-@@ -15,6 +15,13 @@
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
-
-+dnl Checks for integer sizes
-+AC_CHECK_SIZEOF(unsigned char)
-+AC_CHECK_SIZEOF(unsigned short)
-+AC_CHECK_SIZEOF(unsigned int)
-+AC_CHECK_SIZEOF(unsigned long)
+diff -burN stunnel-4.06.orig/configure.ac stunnel-4.06/configure.ac
+--- stunnel-4.06.orig/configure.ac 2004-12-26 18:33:15.124066152 +0100
++++ stunnel-4.06/configure.ac 2004-12-26 18:34:28.262947352 +0100
+@@ -33,6 +33,7 @@
+ AC_CHECK_SIZEOF(unsigned short)
+ AC_CHECK_SIZEOF(unsigned int)
+ AC_CHECK_SIZEOF(unsigned long)
+AC_CHECK_SIZEOF(unsigned long long)
-+
- checkssldir() { :
- if test -f "$1/include/openssl/ssl.h"; then
- AC_DEFINE(HAVE_OPENSSL)
-@@ -194,12 +201,6 @@
- dnl Checks for library functions.
- AC_CHECK_FUNCS(snprintf vsnprintf openpty _getpty daemon waitpid wait4 sysconf getrlimit pthread_sigmask setgroups localtime_r chroot endhostent)
-
--dnl Checks for integer sizes
--AC_CHECK_SIZEOF(unsigned char)
--AC_CHECK_SIZEOF(unsigned short)
--AC_CHECK_SIZEOF(unsigned int)
--AC_CHECK_SIZEOF(unsigned long)
--
- LIBS="$LIBS $wrap_LIB"
- CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/run/stunnel.pid\\\""
+ AC_MSG_NOTICE([**************************************** PTY device files])
+ AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX))
---- stunnel-4.04/src/Makefile.am.orig Sun Jan 12 19:16:35 2003
-+++ stunnel-4.04/src/Makefile.am Sun Jan 12 19:17:30 2003
-@@ -21,26 +21,8 @@
- # Red Hat "by design" bug #82369
- INCLUDES = -I/usr/kerberos/include
+diff -burN stunnel-4.06.orig/tools/Makefile.am stunnel-4.06/tools/Makefile.am
+--- stunnel-4.06.orig/tools/Makefile.am 2004-12-26 18:33:15.119066912 +0100
++++ stunnel-4.06/tools/Makefile.am 2004-12-26 19:34:37.002335576 +0100
+@@ -13,8 +13,8 @@
+ stunnel.spec stunnel.init
--# Win32 executable
--
--EXTRA_DIST = stunnel.exe make.bat Makefile.w32
--EXTRA_PROGRAMS = stunnel.exe
--stunnel_exe_SOURCES = $(common_headers) $(common_sources) $(win32_sources)
--
--OPENSSLDIR=/usr/src/openssl-0.9.7c
--WINCFLAGS=-O2 -Wall -I$(OPENSSLDIR)/outinc \
-- -DUSE_WIN32=1 -DHAVE_OPENSSL=1 -DVERSION=\"@VERSION@\"
--WINLIBS=-L$(OPENSSLDIR)/out -leay32 -lssl32 -lwsock32 -lgdi32 -mwindows
--WINOBJ=client.obj log.obj options.obj protocol.obj sselect.obj \
-- ssl.obj sthreads.obj stunnel.obj gui.obj resources.obj
--WINGCC=i586-mingw32msvc-gcc
--WINDRES=i586-mingw32msvc-windres
--
- SUFFIXES = .c .rc .obj
-
--stunnel.exe: $(WINOBJ)
-- $(WINGCC) -s -o stunnel.exe $(WINOBJ) $(WINLIBS)
--
- .c.obj: $(common_headers)
- $(WINGCC) $(WINCFLAGS) -c $< -o $@
-
---- stunnel-4.04/tools/Makefile.am Sun Jan 12 05:22:12 2003
-+++ stunnel-4.04/tools/Makefile.am.new Sun Jan 12 19:22:57 2003
-@@ -16,7 +16,7 @@
+ install-data-local:
+- mkdir -p $(localstatedir)/stunnel
+- -chmod a=rwx,+t $(localstatedir)/stunnel
++ mkdir -p $(DESTDIR)$(localstatedir)/stunnel
++ -chmod a=rwx,+t $(DESTDIR)$(localstatedir)/stunnel
+ -uname | grep SunOS && \
+ mkdir -p $(localstatedir)/stunnel/dev && \
+ chmod u=rwx,go=rx $(localstatedir)/stunnel/dev && \
+@@ -27,7 +27,7 @@
then dd if="$(RANDOM_FILE)" of=stunnel.rnd bs=256 count=1; \
RND="-rand stunnel.rnd"; \
else RND=""; fi; \
---- stunnel-4.05/tools/stunnel.conf-sample.in.orig 2004-05-09 02:40:26.000000000 +0200
-+++ stunnel-4.05/tools/stunnel.conf-sample.in 2004-05-09 02:42:32.000000000 +0200
-@@ -2,12 +2,12 @@
- # Copyright by Michal Trojnara 2002
+diff -burN stunnel-4.06.orig/tools/stunnel.conf-sample.in stunnel-4.06/tools/stunnel.conf-sample.in
+--- stunnel-4.06.orig/tools/stunnel.conf-sample.in 2004-12-26 18:33:15.119066912 +0100
++++ stunnel-4.06/tools/stunnel.conf-sample.in 2004-12-26 19:14:48.552007488 +0100
+@@ -3,15 +3,15 @@
+ ; Please make sure you understand them (especially the effect of chroot jail)
- # Comment it out on Win32
+ ; Certificate/key is needed in server mode and optional in client mode
-cert = @prefix@/etc/stunnel/mail.pem
--chroot = @prefix@/var/run/stunnel/
-+#cert = /etc/stunnel/mail.pem
-+#chroot = @prefix@/var/run/stunnel/
- # PID is created inside chroot jail
--pid = /stunnel.pid
+-;key = @prefix@/etc/stunnel/mail.pem
++;cert = /etc/stunnel/mail.pem
++;key = /etc/stunnel/mail.pem
+
+ ; Some security enhancements for UNIX systems - comment them out on Win32
+-chroot = @prefix@/var/stunnel/
-setuid = nobody
-setgid = nogroup
-+pid = /var/run/stunnel/stunnel.pid
++;chroot = @prefix@/var/stunnel/
+setuid = stunnel
+setgid = stunnel
+ ; PID is created inside chroot jail
+-pid = /stunnel.pid
++pid = /var/run/stunnel/stunnel.pid
- # Workaround for Eudora bug
- #options = DONT_INSERT_EMPTY_FRAGMENTS
-@@ -33,26 +33,26 @@
+ ; Some performance tunings
+ socket = l:TCP_NODELAY=1
+@@ -41,17 +41,17 @@
- # Service-level configuration
+ ; Service-level configuration
-[pop3s]
-accept = 995
-[ssmtp]
-accept = 465
-connect = 25
--
--[s1]
--accept = 5000
--connect = mail.osw.pl:110
--# delay = yes
--
--[s2]
--accept = 5001
--connect = mail.osw.pl:25
-+#[pop3s]
-+#accept = 995
-+#connect = 110
-+
-+#[imaps]
-+#accept = 993
-+#connect = 143
-+
-+#[ssmtp]
-+#accept = 465
-+#connect = 25
++;[pop3s]
++;accept = 995
++;connect = 110
+
-+#[s1]
-+#accept = 5000
-+#connect = mail.osw.pl:110
-+#delay = yes
++;[imaps]
++;accept = 993
++;connect = 143
+
-+#[s2]
-+#accept = 5001
-+#connect = mail.osw.pl:25
++;[ssmtp]
++;accept = 465
++;connect = 25
- #[https]
- #accept = 443
+ ;[https]
+ ;accept = 443
---- stunnel-4.05/src/client.c.orig 2004-05-08 00:54:12.000000000 +0200
-+++ stunnel-4.05/src/client.c 2004-05-08 00:53:11.000000000 +0200
-@@ -651,8 +651,8 @@
- leave_critical_section(CRIT_NTOA);
+diff -burN stunnel-4.06.orig/src/client.c stunnel-4.06/src/client.c
+--- stunnel-4.06.orig/src/client.c 2004-12-26 18:33:15.114067672 +0100
++++ stunnel-4.06/src/client.c 2004-12-26 19:11:56.030234784 +0100
+@@ -705,8 +705,8 @@
+ leave_critical_section(CRIT_INET);
if (!result) {
-- log(LOG_WARNING, "Connection from %s:%d REFUSED by libwrap",
-- c->accepting_address, ntohs(c->addr.sin_port));
-+ log(LOG_WARNING, "Connection to service %s from %s:%d REFUSED by libwrap",
-+ c->opt->servname, c->accepting_address, ntohs(c->addr.sin_port));
- log(LOG_DEBUG, "See hosts_access(5) for details");
+- s_log(LOG_WARNING, "Connection from %s REFUSED by libwrap",
+- c->accepting_address);
++ s_log(LOG_WARNING, "Connection to service %s from %s REFUSED by libwrap",
++ c->opt->servname, c->accepting_address);
+ s_log(LOG_DEBUG, "See hosts_access(5) for details");
return -1; /* FAILED */
}
Summary: Universal SSL tunnel
Summary(pl): Uniwersalne narzêdzie do bezpiecznego tunelowania
Name: stunnel
-Version: 4.05
-Release: 4
+Version: 4.06
+Release: 0.1
License: GPL v2
Group: Networking/Daemons
Source0: ftp://stunnel.mirt.net/stunnel/%{name}-%{version}.tar.gz
-# Source0-md5: e28a03cf694a43a7f144ec3d5c064456
+# Source0-md5: bac37fe3ecb61a0481188694e0823220
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.inet
projects / packages / stunnel.git / commitdiff