SHA256
1
0
forked from pool/stunnel

- disable the previous two patches for the time being

- create debug packages

OBS-URL: https://build.opensuse.org/package/show/security:Stunnel/stunnel?expand=0&rev=44
This commit is contained in:
Daniel Rahn 2011-06-20 07:51:03 +00:00 committed by Git OBS Bridge
parent c1b41c7ae5
commit bd2d3975d9
3 changed files with 10 additions and 25 deletions

View File

@ -50,29 +50,6 @@
if(nonblock)
flags|=O_NONBLOCK;
else
@@ -526,21 +547,10 @@
} while(err<0 && get_last_socket_error()==EINTR);
if(err<0)
sockerror("fcntl SETFL"); /* non-critical */
-#ifdef FD_CLOEXEC
- do {
- err=fcntl(fd, F_SETFD, FD_CLOEXEC);
- } while(err<0 && get_last_socket_error()==EINTR);
- if(err<0)
- sockerror("fcntl SETFD"); /* non-critical */
-#endif /* FD_CLOEXEC */
#else /* use fcntl() */
- if(ioctlsocket(fd, FIONBIO, &l)<0)
+ if(ioctlsocket(fd, FIONBIO, &nonblock)<0)
sockerror("ioctlsocket"); /* non-critical */
#endif /* use fcntl() */
-#endif /* USE_NEW_LINUX_API */
- s_log(LOG_DEBUG, "%s: FD=%d allocated (%sblocking mode)",
- msg, fd, nonblock?"non-":"");
- return fd;
}
/**************************************** log messages to identify build */
--- src/prototypes.h 2011-06-18 12:14:22.883741503 +0200
+++ src/prototypes.h 2011-06-17 15:14:24.000000000 +0200
@@ -154,6 +154,7 @@

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 20 07:49:41 UTC 2011 - daniel.rahn@novell.com
- disable the previous two patches for the time being
- create debug packages
-------------------------------------------------------------------
Sat Jun 18 10:04:29 UTC 2011 - daniel.rahn@novell.com

View File

@ -37,6 +37,8 @@ Patch1: non-blocking-socket-handling.patch
Patch2: fix-ucontext-handling.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define VENDOR SUSE
%debug_package
%description
The stunnel program is designed to work as an SSL encryption wrapper
@ -51,9 +53,9 @@ without any changes to the program code.
%prep
%setup -q
%patch1 -p0
# %patch1 -p0
%patch0 -p0
%patch2 -p0
# %patch2 -p0
%build
#autoreconf -fi