diff --git a/.cvsignore b/.cvsignore index 64e402e..87b771b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ net-tools-1.60.tar.bz2 -netplug-1.2.3.tar.bz2 +netplug-1.2.6.tar.bz2 diff --git a/net-tools-1.60-execshield.patch b/net-tools-1.60-execshield.patch index 0674d42..f918d2d 100644 --- a/net-tools-1.60-execshield.patch +++ b/net-tools-1.60-execshield.patch @@ -1,6 +1,6 @@ -diff -urN net-tools-1.60/netplug-1.2.3/main.c net-tools-1.60.new/netplug-1.2.3/main.c ---- net-tools-1.60/netplug-1.2.3/main.c 2004-02-22 06:52:14.000000000 +0100 -+++ net-tools-1.60.new/netplug-1.2.3/main.c 2004-05-06 18:28:22.845977718 +0200 +diff -urN net-tools-1.60/netplug-1.2.6/main.c net-tools-1.60.new/netplug-1.2.6/main.c +--- net-tools-1.60/netplug-1.2.6/main.c 2004-02-22 06:52:14.000000000 +0100 ++++ net-tools-1.60.new/netplug-1.2.6/main.c 2004-05-06 18:28:22.845977718 +0200 @@ -149,10 +149,10 @@ /* Poll the existing interface state, so we can catch any state diff --git a/net-tools.spec b/net-tools.spec index 212f749..52e122c 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -1,9 +1,9 @@ -%define npversion 1.2.3 +%define npversion 1.2.6 Summary: Basic networking tools. Name: net-tools Version: 1.60 -Release: 26 +Release: 27 License: GPL Group: System Environment/Base Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2 @@ -27,6 +27,7 @@ Patch13: netplug-1.2.1-init.patch Patch14: net-tools-1.60-gcc34.patch Patch15: net-tools-1.60-overflow.patch Patch16: net-tools-1.60-execshield.patch +Patch17: netplug-1.2.6-compiler.patch BuildRoot: %{_tmppath}/%{name}-root Requires(post,preun): chkconfig @@ -52,6 +53,7 @@ ifconfig, netstat, route, and others. %patch14 -p1 -b .gcc34 %patch15 -p1 -b .overflow %patch16 -p1 -b .execshield +%patch17 -p1 -b .compiler cp %SOURCE2 ./config.h cp %SOURCE3 ./config.make @@ -124,6 +126,10 @@ exit 0 %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Fri May 14 2004 Phil Knirsch 1.60-27 +- Fixed compiler warning/error in netplug. +- Updated to netplug-1.2.6 for security update and fixes. + * Thu May 06 2004 Phil Knirsch 1.60-26 - Updated netplugd to latest upstream version. - Fixed execshield problem in main.c of netplugd. diff --git a/sources b/sources index cd90142..b4425cf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 888774accab40217dde927e21979c165 net-tools-1.60.tar.bz2 -1c8aac94c87c54ca48cd65a3b2e75d84 netplug-1.2.3.tar.bz2 +8456abf04166f911a8c86d3e67411774 netplug-1.2.6.tar.bz2