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

  Thanks to Michael Cramer.

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

12 files changed, 42 insertions, 301 deletions

diff --git a/sys-apps/ifplugd/ChangeLog b/sys-apps/ifplugd/ChangeLog
index 64375e90c85a..8355854760fc 100644
--- a/sys-apps/ifplugd/ChangeLog
+++ b/sys-apps/ifplugd/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/ifplugd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.33 2006/04/06 12:23:08 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.34 2006/04/14 11:59:13 uberlord Exp $
+
+*ifplugd-0.28-r6 (14 Apr 2006)
+
+  14 Apr 2006; Roy Marples <uberlord@gentoo.org>
+  -files/ifplugd-0.28-gentoo.diff, -files/gentoo-ifplugd-conf-v3,
+  +files/ifplugd-0.28-interface.patch, -files/gentoo-ifplugd.action-v2,
+  -files/gentoo-ifplugd-init-v3, -ifplugd-0.28.ebuild,
+  -ifplugd-0.28-r4.ebuild, +ifplugd-0.28-r6.ebuild:
+  Fixed conflicting types for 'dev_t' compile error, #129916.
+  Thanks to Michael Cramer.
+  
+  Punted old versions.
 
 *ifplugd-0.28-r5 (06 Apr 2006)
 
diff --git a/sys-apps/ifplugd/Manifest b/sys-apps/ifplugd/Manifest
index d072205def2b..c480f84bc0aa 100644
--- a/sys-apps/ifplugd/Manifest
+++ b/sys-apps/ifplugd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b201936153611274b14dcfd1f7ba8d65 ChangeLog 6302
 RMD160 681d6e99953caf2eb13945562abd19b282bd588b ChangeLog 6302
 SHA256 d9c95b5fda34cba86bd4e6b20d53126e91ed4adeb032048a879965fef478479b ChangeLog 6302
@@ -13,6 +10,9 @@ SHA256 a6fa9a1f897727614b45915d01da3539bf77bef614661817e38332b4185e18d5 files/di
 MD5 83ebee09d9faecc03912ee8631d7f372 files/digest-ifplugd-0.28-r5 238
 RMD160 f0dc5bf3ea7253ad7658562a12c7d2ed991069f1 files/digest-ifplugd-0.28-r5 238
 SHA256 b94ae260a7fcdbd983c2809b8df46f528f65e42a61fa3402316fb67bb17939e5 files/digest-ifplugd-0.28-r5 238
+MD5 83ebee09d9faecc03912ee8631d7f372 files/digest-ifplugd-0.28-r6 238
+RMD160 f0dc5bf3ea7253ad7658562a12c7d2ed991069f1 files/digest-ifplugd-0.28-r6 238
+SHA256 b94ae260a7fcdbd983c2809b8df46f528f65e42a61fa3402316fb67bb17939e5 files/digest-ifplugd-0.28-r6 238
 MD5 046da68d6aa7665b0d3a9fd9e5a67b6a files/gentoo-ifplugd-conf-v3 2248
 RMD160 260115623472e1f55cccf1d0f7e9c2fd00fc5833 files/gentoo-ifplugd-conf-v3 2248
 SHA256 cd5cc217d9e9b77ac720fcbb7052514fd656e696f81bdaca07d773e3b8ee8571 files/gentoo-ifplugd-conf-v3 2248
@@ -25,6 +25,9 @@ SHA256 f1ef30a8084bbbb1e6371b2b8db97fd9122d4934109db059eab84f16f79aa607 files/ge
 MD5 e4322329d76406800bd7810f7d1869cd files/ifplugd-0.28-gentoo.diff 1119
 RMD160 1b5d171af4748956a93d5b2d9c06b30bb5258c26 files/ifplugd-0.28-gentoo.diff 1119
 SHA256 cf08094a51f29b638f2683766a7ccc465c7818318de665174a6aa2641d900760 files/ifplugd-0.28-gentoo.diff 1119
+MD5 54eb22844b5aeed161c0b80aa9008570 files/ifplugd-0.28-interface.patch 314
+RMD160 279d2241107413a3d818f7ec3658898a41300dae files/ifplugd-0.28-interface.patch 314
+SHA256 1bdbe17f26f467be2a5f300f20f2f8aa332ffa48cbe50bfc4bbff37de8f1bc67 files/ifplugd-0.28-interface.patch 314
 MD5 d16fbcdc0a1c6f5be1aa3bf0c3a932f6 files/ifplugd-0.28-nlapi.diff 639
 RMD160 2fbf6329fb16118de0f1122aa41bca6a2906d0f3 files/ifplugd-0.28-nlapi.diff 639
 SHA256 f648c027fb446d0b25cc5dbca9db57dc33f5b8bff8dfbf1009847504f2229dfb files/ifplugd-0.28-nlapi.diff 639
@@ -43,16 +46,12 @@ SHA256 44fc1758f70c08c497a224f828604c8af87f61bcb2792e3e9e720581cfb0dcfb ifplugd-
 MD5 db8e3e67f45bdd5d06bcdba1387708aa ifplugd-0.28-r5.ebuild 1326
 RMD160 0a7c2d51b6629611717c1d285b1b61ef7d7598af ifplugd-0.28-r5.ebuild 1326
 SHA256 dd959b2b28da61ee19f613c60ee4ee2a14d18ddaeb2d8c417b84cc4365f6efd9 ifplugd-0.28-r5.ebuild 1326
+MD5 9d061a2ea5e1b3a004d7673f6e6f4b29 ifplugd-0.28-r6.ebuild 1372
+RMD160 b7e799f38d6143e01dab4882cbfdc358c6b7a393 ifplugd-0.28-r6.ebuild 1372
+SHA256 ffc0296939bf05cf70e0854c0e854a77fd5e0405ee7b7c285ef136aa13de12e3 ifplugd-0.28-r6.ebuild 1372
 MD5 e6ac7d869a0eb46fcd8069766bcf9370 ifplugd-0.28.ebuild 1445
 RMD160 ea4c5c05dcc45751d3731bfaab294e34027baa81 ifplugd-0.28.ebuild 1445
 SHA256 72cf833ee7a6c829e800ce570340ebbfa5427032e827b47cb883d1fdfbde1b17 ifplugd-0.28.ebuild 1445
 MD5 d13433a9981e2386ff10934a71b003a6 metadata.xml 359
 RMD160 a6e7020e754414ebf691db22495b6adf36c080dc metadata.xml 359
 SHA256 c2255a7d82e88d539b6acdb44db885d353f8943602c36acbe256910d776ec955 metadata.xml 359
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFENQg6EbVyYKaZ/NERAkhsAJ4/95XdqvDcZleXQ99J0VlEjgIOyACePlua
-SDWjwaac2ZlZx7+hb8n1NfE=
-=Mdv4
------END PGP SIGNATURE-----
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>
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r4.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r6.ebuild
index 25dbc682ef5e..b97ab044383d 100644
--- a/sys-apps/ifplugd/ifplugd-0.28-r4.ebuild
+++ b/sys-apps/ifplugd/ifplugd-0.28-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.28-r4.ebuild,v 1.4 2005/12/24 16:32:25 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.28-r6.ebuild,v 1.1 2006/04/14 11:59:13 uberlord Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
 
 DEPEND="dev-util/pkgconfig
@@ -21,6 +21,7 @@ src_unpack() {
 	unpack "${A}"
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-nlapi.diff"
+	epatch "${FILESDIR}/${P}-interface.patch"
 }
 
 src_compile() {
diff --git a/sys-apps/ifplugd/ifplugd-0.28.ebuild b/sys-apps/ifplugd/ifplugd-0.28.ebuild
deleted file mode 100644
index f33f13795ff3..000000000000
--- a/sys-apps/ifplugd/ifplugd-0.28.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.28.ebuild,v 1.3 2005/09/01 15:33:28 uberlord Exp $
-
-inherit eutils
-
-DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
-HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
-SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-DEPEND="dev-util/pkgconfig
-	doc? ( www-client/lynx )"
-RDEPEND=">=dev-libs/libdaemon-0.5"
-
-# Gentoo-provided scripts. Version is for the scripts, not ifplugd.
-INITSCRIPT=${FILESDIR}/gentoo-ifplugd-init-v3
-ACTIONSCRIPT=${FILESDIR}/gentoo-ifplugd.action-v2
-CONFFILE=${FILESDIR}/gentoo-ifplugd-conf-v3
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	econf $(use_enable doc lynx) \
-		--with-initdir=/etc/init.d \
-		--disable-xmltoman \
-		--disable-subversion \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	newsbin ${ACTIONSCRIPT} ifplugd.action
-
-	# Fix init.d configuration
-	rm -fr ${D}/etc/ifplugd ${D}/etc/init.d/ifplugd
-
-	insinto /etc/conf.d ; newins ${CONFFILE} ${PN} || die
-	exeinto /etc/init.d ; newexe ${INITSCRIPT} ${PN} || die
-
-	cd ${S}/doc
-	dodoc README SUPPORTED_DRIVERS
-	use doc && dohtml *.{html,css}
-}