- Avoid aliasing undefined by ISO C

This commit is contained in:
Miloslav Trmac 2009-04-30 12:05:50 +00:00
parent d32eab4793
commit 441e95b04a
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,21 @@
diff -urN stunnel/src/libwrap.c stunnel-4.27/src/libwrap.c
--- stunnel/src/libwrap.c 2009-04-16 10:48:49.000000000 +0200
+++ stunnel-4.27/src/libwrap.c 2009-04-29 11:34:05.000000000 +0200
@@ -246,7 +246,7 @@
s_log(LOG_ERR, "control type != SCM_RIGHTS");
return -1;
}
- *recvfd=*((int *)CMSG_DATA(cmptr));
+ memcpy(&recvfd, CMSG_DATA(cmptr), sizeof(int));
#else
if(msg.msg_accrightslen==sizeof(int))
*recvfd=newfd;
@@ -273,7 +273,7 @@
cmptr->cmsg_len=CMSG_LEN(sizeof(int));
cmptr->cmsg_level=SOL_SOCKET;
cmptr->cmsg_type=SCM_RIGHTS;
- *((int *)CMSG_DATA(cmptr))=sendfd;
+ memcpy(CMSG_DATA(cmptr), &sendfd, sizeof(int));
#else
msg.msg_accrights=(caddr_t)&sendfd;
msg.msg_accrightslen=sizeof(int);

View File

@ -1,7 +1,7 @@
Summary: An SSL-encrypting socket wrapper Summary: An SSL-encrypting socket wrapper
Name: stunnel Name: stunnel
Version: 4.27 Version: 4.27
Release: 1 Release: 2
License: GPLv2 License: GPLv2
Group: Applications/Internet Group: Applications/Internet
URL: http://stunnel.mirt.net/ URL: http://stunnel.mirt.net/
@ -14,6 +14,7 @@ Source5: pop3-redirect.xinetd
Source6: stunnel-pop3s-client.conf Source6: stunnel-pop3s-client.conf
Patch0: stunnel-4.27-authpriv.patch Patch0: stunnel-4.27-authpriv.patch
Patch1: stunnel-4.27-sample.patch Patch1: stunnel-4.27-sample.patch
Patch2: stunnel-4.27-aliasing.patch
Buildroot: %{_tmppath}/stunnel-root Buildroot: %{_tmppath}/stunnel-root
# util-linux is needed for rename # util-linux is needed for rename
BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@ -27,6 +28,7 @@ in conjunction with imapd to create an SSL secure IMAP server.
%setup -q %setup -q
%patch0 -p1 -b .authpriv %patch0 -p1 -b .authpriv
%patch1 -p1 -b .sample %patch1 -p1 -b .sample
%patch2 -p1 -b .aliasing
iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_ iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_
mv doc/stunnel.fr.8_ doc/stunnel.fr.8 mv doc/stunnel.fr.8_ doc/stunnel.fr.8
@ -79,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_sysconfdir}/stunnel/* %exclude %{_sysconfdir}/stunnel/*
%changelog %changelog
* Wed Apr 29 2009 Miloslav Trmač <mitr@redhat.com> - 4.27-2
- Avoid aliasing undefined by ISO C
* Thu Apr 16 2009 Miloslav Trmač <mitr@redhat.com> - 4.27-1 * Thu Apr 16 2009 Miloslav Trmač <mitr@redhat.com> - 4.27-1
- Update to stunnel-4.27. - Update to stunnel-4.27.