Fixed conflicting types for 'dev_t' compile error, #129916.

  Thanks to Michael Cramer.

  Punted old versions.
(Portage version: 2.1_pre7-r5)

8 files changed, 16 insertions, 234 deletions

diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.28 b/sys-apps/ifplugd/files/digest-ifplugd-0.28
deleted file mode 100644
index a53e0fb022c3..000000000000
--- a/sys-apps/ifplugd/files/digest-ifplugd-0.28
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df6f4bab52f46ffd6eb1f5912d4ccee3 ifplugd-0.28.tar.gz 142677
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.28-r4 b/sys-apps/ifplugd/files/digest-ifplugd-0.28-r4
deleted file mode 100644
index a53e0fb022c3..000000000000
--- a/sys-apps/ifplugd/files/digest-ifplugd-0.28-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df6f4bab52f46ffd6eb1f5912d4ccee3 ifplugd-0.28.tar.gz 142677
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.28-r6 b/sys-apps/ifplugd/files/digest-ifplugd-0.28-r6
new file mode 100644
index 000000000000..d58875572dca
--- /dev/null
+++ b/sys-apps/ifplugd/files/digest-ifplugd-0.28-r6
@@ -0,0 +1,3 @@
+MD5 df6f4bab52f46ffd6eb1f5912d4ccee3 ifplugd-0.28.tar.gz 142677
+RMD160 09914a1914a4432822bb660d6aef194debe688f1 ifplugd-0.28.tar.gz 142677
+SHA256 474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0 ifplugd-0.28.tar.gz 142677
diff --git a/sys-apps/ifplugd/files/gentoo-ifplugd-conf-v3 b/sys-apps/ifplugd/files/gentoo-ifplugd-conf-v3
deleted file mode 100644
index 06698a7f07b5..000000000000
--- a/sys-apps/ifplugd/files/gentoo-ifplugd-conf-v3
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*-sh-*-
-# $Id: gentoo-ifplugd-conf-v3,v 1.2 2005/03/22 13:05:53 ka0ttic Exp $
-
-# This file is part of ifplugd.
-#
-# ifplugd is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your
-# option) any later version.
-#
-# ifplugd is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ifplugd; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-# ifplugd configuration file
-
-# Please note that this is a bourne shell fragment sourced by the
-# init script of ifplugd.
-
-# Specify the interfaces to control here, separated by spaces.
-# Ifplugd processes will be started for each of these interfaces when
-# the ifplugd init script is called with the "start" argument. You may
-# use the magic string "auto" to make the init script start or stop
-# ifplugd processes for ALL eth and wlan interfaces that are available
-# according to /proc/net/dev. Note that the list of interfaces
-# appearing in /proc/net/dev may depend on which kernel modules you
-# have loaded.
-INTERFACES="eth0"
-
-# Additional parameters for ifplugd.
-# See manual page ifplugd.8 for details.
-# If you set AUTO to yes, you have to read http://bugs.gentoo.org/show_bug.cgi?id=28362
-# I recommend a delay of 0, both ways, since then, you can swap ethernet
-# cables on different networks and get a new ip address.
-# None of the programs I tested had a problem with the interface being
-# gone in the mean time.
-AUTO="no"
-BEEP="yes"
-IGNORE_FAIL="yes"
-IGNORE_FAIL_POSITIVE="no"
-IGNORE_RETVAL="yes"
-POLL_TIME="1"
-DELAY_UP="0"
-DELAY_DOWN="0"
-API_MODE="auto"
-SHUTDOWN="no"
-WAIT_ON_FORK="no"
-MONITOR="no"
-ARGS=""
-
-# Additional parameters for ifplugd for the specified interface. Note that
-# the global variable is ignored, when a variable like this is set for an
-# interface
-# MONITOR_wlan0="yes"
-# DELAY_UP_wlan0="5"
-# DELAY_DOWN_wlan0="5"
-
diff --git a/sys-apps/ifplugd/files/gentoo-ifplugd-init-v3 b/sys-apps/ifplugd/files/gentoo-ifplugd-init-v3
deleted file mode 100644
index 1484f98d4004..000000000000
--- a/sys-apps/ifplugd/files/gentoo-ifplugd-init-v3
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/files/gentoo-ifplugd-init-v3,v 1.4 2005/04/09 16:20:56 ka0ttic Exp $
-
-#NB: Config is in /etc/conf.d/ifplugd
-
-opts="stop start status suspend resume"
-
-IFPLUGD=/usr/sbin/ifplugd
-
-[ -z "$INTERFACES" ] && INTERFACES="eth0"
-[ "$INTERFACES" = "auto" ] && INTERFACES=$(sed -ne 's/.*\<\(eth[0-9]*\):.*/\1/p' /proc/net/dev)
-
-# Check if an option is set for a given interface.
-# $1 is interface, $2 is option name, $3 is preset
-is_set() {
-	[ "$(get_opt "$@")" = "yes" ]
-}
-
-# Expand an option value for a given interface.
-# $1 is interface, $2 is option name, $3 is preset
-get_opt() {
-	local iface=$1 option=$2 preset=$3
-	eval preset=\${${option}:=${preset}}
-	eval echo \${${option}_${iface}:=${preset}}
-}
-
-check_success() {
-	local iface=$1 action=$2 status=$3
-
-	if [ "${action}" = "start" ] && is_set ${iface} WAIT_ON_FORK yes; then
-		[ ${status} -le 2 ]
-	else
-		[ ${status} ]
-	fi
-}
-
-# Handle starting for all interfaces
-# $1 is deamon args, $2 is action name
-do_all_if() {
-	local dargs=$1 action=$2 IF args status
-
-	for IF in ${INTERFACES}; do
-		iargs=
-		
-		is_set ${IF} AUTO yes || iargs="${iargs}a"
-		is_set ${IF} BEEP yes || iargs="${iargs}b"
-		is_set ${IF} IGNORE_FAIL yes && iargs="${iargs}f"
-		is_set ${IF} IGNORE_FAIL_POSITIVE no && iargs="${iargs}F"
-		is_set ${IF} IGNORE_RETVAL yes && iargs="${iargs}I"
-		is_set ${IF} SHUTDOWN yes || iargs="${iargs}q"
-		is_set ${IF} WAIT_ON_FORK yes && iargs="${iargs}w"
-		is_set ${IF} MONITOR no && iargs="${iargs}M"
-
-		[ -n "${iargs}" ] && iargs="-${iargs}"
-
-		iargs="${iargs} -t$(get_opt ${IF} POLL_TIME 1)"
-		iargs="${iargs} -u$(get_opt ${IF} DELAY_UP 0)"
-		iargs="${iargs} -d$(get_opt ${IF} DELAY_DOWN 5)"
-		iargs="${iargs} -m$(get_opt ${IF} API_MODE auto)"
-		iargs="${iargs} $(get_opt ${IF} ARGS '')"
-
-		echo -n "${IF} "
-		${IFPLUGD} ${dargs} --iface=${IF} ${iargs}
-		check_success ${IF} ${action} $?
-		status=$?
-
-		[ $status ] || break
-	done
-
-	echo
-	eend $status "Couldn't ${action} ifplugd for ${IF}"
-}
-
-depend()
-{
-	use pcmcia
-}
-
-start() {
-	einfon "Starting ifplugd: "
-	do_all_if "" start
-}
-
-stop() {
-	einfon "Stopping ifplugd: "
-	do_all_if -k stop
-	# Now we have to wait until it's actually down
-	local i=10
-	while [ $i -gt 0 ] && status | grep -q "running as"; do
-		i=$(( $i - 1 ))
-		sleep 1
-	done
-	if [ $i -eq 0 ]; then
-		eend 1 "Timeout exceeded, ifplugd won't die!"
-	fi
-}
-
-status() {
-	do_all_if -c "get status from"
-}
-
-suspend() {
-	einfon "Suspending ifplugd: "
-	do_all_if -S suspend
-}
-
-resume() {
-	einfon "Resuming ifplugd: "
-	do_all_if -R resume
-}
-# vim:ts=4
diff --git a/sys-apps/ifplugd/files/gentoo-ifplugd.action-v2 b/sys-apps/ifplugd/files/gentoo-ifplugd.action-v2
deleted file mode 100644
index 3dda5c871b0d..000000000000
--- a/sys-apps/ifplugd/files/gentoo-ifplugd.action-v2
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/files/gentoo-ifplugd.action-v2,v 1.3 2004/07/15 00:43:53 agriffis Exp $
-#
-# Gentoo-specific ifplugd.action
-#
-# This file gets called by ifplugd when it wants to bring an interface
-# up or down.
-#
-
-case "$2" in
-	up)
-		state=start
-		;;
-	down)
-		state=stop
-		;;
-	*)
-		echo "$0: wrong arguments"
-		echo "Call with <interface> <up|down>"
-		exit 1
-		;;
-esac
-
-if [ -x /etc/init.d/net.$1 ]
-then
-	/etc/init.d/net.$1 --quiet $state
-	exit 0
-else
-	logger -t ifplugd.action "Error: Couldn't configure $1, no /etc/init.d/net.$1 script!"
-	exit 1
-fi
diff --git a/sys-apps/ifplugd/files/ifplugd-0.28-gentoo.diff b/sys-apps/ifplugd/files/ifplugd-0.28-gentoo.diff
deleted file mode 100644
index cb407822e445..000000000000
--- a/sys-apps/ifplugd/files/ifplugd-0.28-gentoo.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN ifplugd-0.26.orig/src/ifplugd.c ifplugd-0.26/src/ifplugd.c
---- ifplugd-0.26.orig/src/ifplugd.c	2004-12-20 08:39:14.682706517 -0500
-+++ ifplugd-0.26/src/ifplugd.c	2004-12-20 08:40:56.903506651 -0500
-@@ -64,7 +64,7 @@
- 	interface_do_message = 1;
- 
- char *interface = NULL;
--char *run = SYSCONFDIR"/ifplugd/ifplugd.action";
-+char *run = "/usr/sbin/ifplugd.action";
- char *extra_arg = NULL;
- 
- int polltime = 1,
-diff -urN ifplugd-0.26.orig/src/nlapi.c ifplugd-0.26/src/nlapi.c
---- ifplugd-0.26.orig/src/nlapi.c	2004-12-20 08:39:14.682706517 -0500
-+++ ifplugd-0.26/src/nlapi.c	2004-12-20 08:39:50.185734092 -0500
-@@ -86,7 +86,7 @@
-         for (; bytes > 0; p = NLMSG_NEXT(p, bytes)) {
-             struct callback_info *c;
-             
--            if (!NLMSG_OK(p, bytes) || (size_t) bytes < sizeof(struct nlmsghdr) || (size_t) bytes < p->nlmsg_len) {
-+            if (!NLMSG_OK(p, (size_t) bytes) || (size_t) bytes < sizeof(struct nlmsghdr) || (size_t) bytes < (size_t) p->nlmsg_len) {
-                 daemon_log(LOG_ERR, "NLAPI: Packet too small or truncated!\n");
-                 return -1;
-             }
diff --git a/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch b/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch
new file mode 100644
index 000000000000..9c2de464bbde
--- /dev/null
+++ b/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch
@@ -0,0 +1,13 @@
+--- src/interface.c	2004/12/19 00:08:01	114
++++ src/interface.c	2006/03/07 13:15:11	133
+@@ -22,9 +22,9 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/types.h>
+ #include <linux/sockios.h>
+ #include <linux/if_ether.h>
+-#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <linux/if.h>