From 70b9ea9fb0d89983bbc0dc2d1a854282fdfe573b Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 09:13:05 +0000
Subject: auto-import changelog data from net-tools-1.60-26.src.rpm

Thu May 06 2004 Phil Knirsch <pknirsch@redhat.com> 1.60-26
- Updated netplugd to latest upstream version.
- Fixed execshield problem in main.c of netplugd.

---

diff --git a/.cvsignore b/.cvsignore
index bc03d98..64e402e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 net-tools-1.60.tar.bz2
-netplug-1.2.1.tar.bz2
+netplug-1.2.3.tar.bz2
diff --git a/net-tools-1.60-execshield.patch b/net-tools-1.60-execshield.patch
new file mode 100644
index 0000000..0674d42
--- /dev/null
+++ b/net-tools-1.60-execshield.patch
@@ -0,0 +1,51 @@
+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
+@@ -149,10 +149,10 @@
+ 
+ /* Poll the existing interface state, so we can catch any state
+    changes for which we may not have neen a netlink message. */
++static int sockfd = -1;
+ static void
+ poll_interfaces(void)
+ {
+-    static int sockfd = -1;
+ 
+     if (sockfd == -1) {
+         sockfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
+@@ -182,6 +182,12 @@
+     for_each_iface(pollflags);
+ }
+ 
++int poll_flags(struct if_info *i) {
++    if (if_match(i->name))
++        ifsm_flagpoll(i);
++    return 0;
++}
++
+ int debug = 0;
+ 
+ int
+@@ -287,17 +293,11 @@
+         { child_handler_pipe[0], POLLIN, 0 },
+     };
+ 
+-    {
+-        /* Run over each of the interfaces we know and care about, and
+-           make sure the state machine has done the appropriate thing
+-           for their current state. */
+-        int poll_flags(struct if_info *i) {
+-            if (if_match(i->name))
+-                ifsm_flagpoll(i);
+-            return 0;
+-        }
+-        for_each_iface(poll_flags);
+-    }
++    /* Run over each of the interfaces we know and care about, and
++       make sure the state machine has done the appropriate thing
++       for their current state. */
++    for_each_iface(poll_flags);
++
+ 
+     for(;;) {
+         int ret;
diff --git a/net-tools.spec b/net-tools.spec
index da930ba..212f749 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -1,9 +1,9 @@
-%define npversion	1.2.1
+%define npversion	1.2.3
 
 Summary: Basic networking tools.
 Name: net-tools
 Version: 1.60
-Release: 25
+Release: 26
 License: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@@ -26,6 +26,7 @@ Patch12: net-tools-1.60-interface.patch
 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
 BuildRoot: %{_tmppath}/%{name}-root
 Requires(post,preun): chkconfig
 
@@ -50,6 +51,7 @@ ifconfig, netstat, route, and others.
 %patch13 -p1 -b .init
 %patch14 -p1 -b .gcc34
 %patch15 -p1 -b .overflow
+%patch16 -p1 -b .execshield
 
 cp %SOURCE2 ./config.h
 cp %SOURCE3 ./config.make
@@ -122,6 +124,10 @@ exit 0
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Thu May 06 2004 Phil Knirsch <pknirsch@redhat.com> 1.60-26
+- Updated netplugd to latest upstream version.
+- Fixed execshield problem in main.c of netplugd.
+
 * Thu Apr 15 2004 Phil Knirsch <pknirsch@redhat.com> 1.60-25
 - Fixed several possible buffer overflows (#120343)
 
diff --git a/sources b/sources
index 2302efc..cd90142 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 888774accab40217dde927e21979c165  net-tools-1.60.tar.bz2
-7ac304d77a77045951b8643605adc2a3  netplug-1.2.1.tar.bz2
+1c8aac94c87c54ca48cd65a3b2e75d84  netplug-1.2.3.tar.bz2