rpms/tcpick/EL-5 tcpick-0.2.1-timezone.patch, NONE, 1.1 tcpick.spec, 1.7, 1.8
Robert Scheck
robert at fedoraproject.org
Sun Mar 29 15:40:29 UTC 2009
Author: robert
Update of /cvs/extras/rpms/tcpick/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14542/EL-5
Modified Files:
tcpick.spec
Added Files:
tcpick-0.2.1-timezone.patch
Log Message:
Fix -t abort on 64bit (#492109), thanks to Lubomir Rintel (lkundrak)
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/extras/rpms/tcpick/EL-5/tcpick.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tcpick.spec 28 Aug 2007 21:41:29 -0000 1.7
+++ tcpick.spec 29 Mar 2009 15:39:58 -0000 1.8
@@ -1,15 +1,16 @@
+Summary: A tcp stream sniffer, tracker and capturer
Name: tcpick
Version: 0.2.1
-Release: 13%{?dist}
-Summary: A tcp stream sniffer, tracker and capturer
+Release: 16%{?dist}
License: GPLv2+
Group: Applications/Internet
URL: http://tcpick.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
Patch0: tcpick-0.2.1-CVE-2006-0048.patch
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}
@@ -36,12 +38,16 @@
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
# Move the Italian man page to its correct place
mkdir -p $RPM_BUILD_ROOT%{_mandir}/it/man8
mv -f $RPM_BUILD_ROOT%{_mandir}/man8/tcpick_italian.8 $RPM_BUILD_ROOT%{_mandir}/it/man8/tcpick.8
+# Convert non-utf8 authors file into utf8
+iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
+touch -c -r AUTHORS AUTHORS.utf8; mv -f AUTHORS.utf8 AUTHORS
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -53,6 +59,15 @@
%{_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
+
+* Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 0.2.1-14
+- Rebuilt against gcc 4.3
+
* Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 0.2.1-13
- Updated the license tag according to the guidelines
- Buildrequire %%{_includedir}/pcap.h instead of conditionals
More information about the fedora-extras-commits
mailing list