rpms/tcpick/devel tcpick-0.2.1-timezone.patch, NONE, 1.1 tcpick.spec, 1.9, 1.10

[Lubomir Rintel]

Author: lkundrak

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

Modified Files:
	tcpick.spec 
Added Files:
	tcpick-0.2.1-timezone.patch 
Log Message:
* Sun Mar 29 2009 Lubomir Rintel <lkundrak at v3.sk> 0.2.1-16
- Fix -t abort on 64bit (#492109)


tcpick-0.2.1-timezone.patch:

--- NEW FILE tcpick-0.2.1-timezone.patch ---
Fix a typo. Timezone is a bit longer on 64bit and it triggers
a FORTIFY_SOURCE abort.

Lubomir Rintel <lkundrak at v3.sk>

diff -up tcpick-0.2.1/src/time.c.timezone tcpick-0.2.1/src/time.c
--- tcpick-0.2.1/src/time.c.timezone	2009-03-29 17:21:06.512148187 +0200
+++ tcpick-0.2.1/src/time.c	2009-03-29 17:21:34.145151786 +0200
@@ -42,7 +42,7 @@ char * time_ascii(char * ret)
   tzp = (struct timezone * ) S_malloc( sizeof(struct timezone) );
 
   memset(tp,  0, sizeof(struct timeval));
-  memset(tzp, 0, sizeof(struct timeval));
+  memset(tzp, 0, sizeof(struct timezone));
   
   if(gettimeofday(tp, tzp)) {
 


Index: tcpick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpick/devel/tcpick.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tcpick.spec	23 Feb 2009 20:00:45 -0000	1.9
+++ tcpick.spec	29 Mar 2009 15:27:27 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	A tcp stream sniffer, tracker and capturer
 Name: 		tcpick
 Version: 	0.2.1
-Release: 	15%{?dist}
+Release: 	16%{?dist}
 License: 	GPLv2+
 Group: 		Applications/Internet
 URL: 		http://tcpick.sourceforge.net/
@@ -10,6 +10,7 @@
 Patch1:		tcpick-0.2.1-ppc.patch
 Patch2:		tcpick-0.2.1-pointers.patch
 Patch3:		tcpick-0.2.1-cpu-loop.patch
+Patch4:		tcpick-0.2.1-timezone.patch
 BuildRequires:	%{_includedir}/pcap.h
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,6 +30,7 @@
 %patch1 -p1 -b .ppc
 %patch2 -p1 -b .pointers
 %patch3 -p1 -b .cpu-loop
+%patch4 -p1 -b .timezone
 
 %build
 %configure --bindir=%{_sbindir}
@@ -57,6 +59,9 @@
 %{_mandir}/it/man8/%{name}.8*
 
 %changelog
+* Sun Mar 29 2009 Lubomir Rintel <lkundrak at v3.sk> 0.2.1-16
+- Fix -t abort on 64bit (#492109)
+
 * Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 0.2.1-15
 - Rebuilt against gcc 4.4 and rpm 4.6