diff --git a/ethtool-5-buffer-overflow.patch b/ethtool-5-buffer-overflow.patch deleted file mode 100644 index 5ce7f2f..0000000 --- a/ethtool-5-buffer-overflow.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ethtool.c -+++ ethtool.c -@@ -628,7 +628,13 @@ - } - - if (devname == NULL) -+ { - show_usage(1); -+ } else if (strlen(devname) > IFNAMSIZ - 1) { -+ fprintf(stderr, "Device name \"%s\" exceeds maximum length.\n", -+ devname); -+ exit(1); -+ } - if (strlen(devname) >= IFNAMSIZ) - show_usage(1); - } diff --git a/ethtool.changes b/ethtool.changes index 4f27990..29bee54 100644 --- a/ethtool.changes +++ b/ethtool.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 12 09:38:24 CEST 2007 - lnussel@suse.de + +- remove superfluous buffer overflow check patch + ------------------------------------------------------------------- Wed Sep 6 16:29:24 CEST 2006 - mskibbe@suse.de diff --git a/ethtool.spec b/ethtool.spec index 21d0e08..c32a463 100644 --- a/ethtool.spec +++ b/ethtool.spec @@ -1,7 +1,7 @@ # # spec file for package ethtool (Version 5) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,16 +11,15 @@ # norootforbuild Name: ethtool -License: GPL +License: GNU General Public License (GPL) Group: Productivity/Networking/Diagnostic Autoreqprov: on Summary: Examine and Tune Ethernet-Based Network Interfaces Version: 5 -Release: 3 +Release: 30 URL: http://sourceforge.net/projects/gkernel Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch: %{name}-%{version}-buffer-overflow.patch %description Ethtool is a small utility for examining and tuning ethernet-based @@ -37,7 +36,6 @@ Authors: %prep %setup -q -%patch %build %{suse_update_config -f} @@ -63,7 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/ethtool.8* %doc AUTHORS COPYING INSTALL NEWS README ChangeLog -%changelog -n ethtool +%changelog +* Thu Apr 12 2007 - lnussel@suse.de +- remove superfluous buffer overflow check patch * Wed Sep 06 2006 - mskibbe@suse.de - fix bug #202756 - No Buffer Overflow check in Ethtool * Mon Sep 04 2006 - mskibbe@suse.de