rpms/stunnel/devel stunnel-4.27-aliasing.patch, NONE, 1.1 stunnel.spec, 1.57, 1.58

[Miloslav Trmac]

Author: mitr

Update of /cvs/pkgs/rpms/stunnel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27501

Modified Files:
	stunnel.spec 
Added Files:
	stunnel-4.27-aliasing.patch 
Log Message:
* Wed Apr 29 2009 Miloslav Trmač <mitr at redhat.com> - 4.27-2
- Avoid aliasing undefined by ISO C


stunnel-4.27-aliasing.patch:

--- NEW FILE stunnel-4.27-aliasing.patch ---
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);


Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- stunnel.spec	16 Apr 2009 17:54:31 -0000	1.57
+++ stunnel.spec	30 Apr 2009 12:05:50 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
 Version: 4.27
-Release: 1
+Release: 2
 License: GPLv2
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -14,6 +14,7 @@ Source5: pop3-redirect.xinetd
 Source6: stunnel-pop3s-client.conf
 Patch0: stunnel-4.27-authpriv.patch
 Patch1: stunnel-4.27-sample.patch
+Patch2: stunnel-4.27-aliasing.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -27,6 +28,7 @@ in conjunction with imapd to create an S
 %setup -q
 %patch0 -p1 -b .authpriv
 %patch1 -p1 -b .sample
+%patch2 -p1 -b .aliasing
 
 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
@@ -79,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Wed Apr 29 2009 Miloslav Trmač <mitr at redhat.com> - 4.27-2
+- Avoid aliasing undefined by ISO C
+
 * Thu Apr 16 2009 Miloslav Trmač <mitr at redhat.com> - 4.27-1
 - Update to stunnel-4.27.