Author: arekm Date: Mon Jun 28 11:53:55 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; fix strcpy over overlaping areas
---- Files affected: packages/iptraf: iptraf.spec (1.63 -> 1.64) , iptraf-strcpy-overlap-memory.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/iptraf/iptraf.spec diff -u packages/iptraf/iptraf.spec:1.63 packages/iptraf/iptraf.spec:1.64 --- packages/iptraf/iptraf.spec:1.63 Sat Jul 25 23:39:20 2009 +++ packages/iptraf/iptraf.spec Mon Jun 28 13:53:50 2010 @@ -7,7 +7,7 @@ Summary(uk.UTF-8): IPTraf - консольна програма моніторингу трафіку в мережі Name: iptraf Version: 3.0.1 -Release: 1 +Release: 2 License: GPL Group: Networking/Utilities Source0: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz @@ -15,6 +15,7 @@ Patch0: %{name}.patch Patch1: %{name}-iface.patch Patch2: %{name}-show_all_interfaces.patch +Patch3: %{name}-strcpy-overlap-memory.patch URL: http://iptraf.seul.org/ BuildRequires: ncurses-ext-devel >= 5.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -67,13 +68,14 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build cd src %{__make} clean %{__make} TARGET=%{_sbindir} \ CC="%{__cc}" \ - CFLAGS="%{rpmcflags} -DALLOWUSERS" \ + CFLAGS="%{rpmcppflags} %{rpmcflags} -DALLOWUSERS" \ WORKDIR=/var/lib/iptraf %install @@ -103,6 +105,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.64 2010/06/28 11:53:50 arekm +- rel 2; fix strcpy over overlaping areas + Revision 1.63 2009/07/25 21:39:20 arekm - up to 3.0.1 ================================================================ Index: packages/iptraf/iptraf-strcpy-overlap-memory.patch diff -u /dev/null packages/iptraf/iptraf-strcpy-overlap-memory.patch:1.1 --- /dev/null Mon Jun 28 13:53:55 2010 +++ packages/iptraf/iptraf-strcpy-overlap-memory.patch Mon Jun 28 13:53:50 2010 @@ -0,0 +1,26 @@ +From 74581ec4f4ebd7abf68c5ab042164dc0b77133ba Mon Sep 17 00:00:00 2001 +From: Nikola Pajkovsky <[email protected]> +Date: Wed, 17 Mar 2010 17:24:48 +0100 +Subject: [PATCH] fix strcpy overlap memory + +Signed-off-by: Nikola Pajkovsky <[email protected]> +--- + src/ifaces.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/ifaces.c b/src/ifaces.c +index 8447f51..ecb8a2d 100644 +--- a/src/ifaces.c ++++ b/src/ifaces.c +@@ -51,7 +51,7 @@ char *ltrim(char *buf) + while ((*tmp == ' ') || (*tmp == '\t')) + tmp++; + +- strcpy(buf, tmp); ++ memmove(buf, tmp, strlen(buf)); + return buf; + } + +-- +1.6.6.1 + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptraf/iptraf.spec?r1=1.63&r2=1.64&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
