summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Walker <ka0ttic@gentoo.org>2004-12-20 13:57:11 +0000
committerAaron Walker <ka0ttic@gentoo.org>2004-12-20 13:57:11 +0000
commit7139dcd737c6a2b75dec9c330b3bb7cc0bb9bf0c (patch)
treeec591202c157ad954d132850c4f2f03326dd6f39 /sys-apps/ifplugd/files
parentadded ~ppc64 (Manifest recommit) (diff)
downloadgentoo-2-7139dcd737c6a2b75dec9c330b3bb7cc0bb9bf0c.tar.gz
gentoo-2-7139dcd737c6a2b75dec9c330b3bb7cc0bb9bf0c.tar.bz2
gentoo-2-7139dcd737c6a2b75dec9c330b3bb7cc0bb9bf0c.zip
Version bump; 0.25 stable on x86. Major cleanup and uncrustification; old ebuilds/filesdir cruft removed. doxygen dep removed as it was never required in the first place. Also updated metadata.xml.
Diffstat (limited to 'sys-apps/ifplugd/files')
-rw-r--r--sys-apps/ifplugd/files/digest-ifplugd-0.151
-rw-r--r--sys-apps/ifplugd/files/digest-ifplugd-0.201
-rw-r--r--sys-apps/ifplugd/files/digest-ifplugd-0.241
-rw-r--r--sys-apps/ifplugd/files/digest-ifplugd-0.261
-rw-r--r--sys-apps/ifplugd/files/gentoo-ifplugd-init-v261
-rw-r--r--sys-apps/ifplugd/files/ifplugd-0.26-gentoo.diff36
6 files changed, 37 insertions, 64 deletions
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.15 b/sys-apps/ifplugd/files/digest-ifplugd-0.15
deleted file mode 100644
index d77ec5c1646c..000000000000
--- a/sys-apps/ifplugd/files/digest-ifplugd-0.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1439df09fc8e8c7516f08bf889742615 ifplugd-0.15.tar.gz 112731
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.20 b/sys-apps/ifplugd/files/digest-ifplugd-0.20
deleted file mode 100644
index c45cfd6edb4a..000000000000
--- a/sys-apps/ifplugd/files/digest-ifplugd-0.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d259502c75f5ea9aebcd57c1a3d0739 ifplugd-0.20.tar.gz 128798
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.24 b/sys-apps/ifplugd/files/digest-ifplugd-0.24
deleted file mode 100644
index cf4d76ba7862..000000000000
--- a/sys-apps/ifplugd/files/digest-ifplugd-0.24
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e077079c3ff229e6ff74ddbc6b20a5ae ifplugd-0.24.tar.gz 137871
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.26 b/sys-apps/ifplugd/files/digest-ifplugd-0.26
new file mode 100644
index 000000000000..3e81a2bee88c
--- /dev/null
+++ b/sys-apps/ifplugd/files/digest-ifplugd-0.26
@@ -0,0 +1 @@
+MD5 f0ceac6690b02928015aa00c0d3e663b ifplugd-0.26.tar.gz 138914
diff --git a/sys-apps/ifplugd/files/gentoo-ifplugd-init-v2 b/sys-apps/ifplugd/files/gentoo-ifplugd-init-v2
deleted file mode 100644
index f57f4d23b38e..000000000000
--- a/sys-apps/ifplugd/files/gentoo-ifplugd-init-v2
+++ /dev/null
@@ -1,61 +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-v2,v 1.3 2004/07/15 00:43:53 agriffis 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=`cat /proc/net/dev | awk '{ print $1 }' | grep ^eth | cut -d: -f1`
-
-# Handle starting for all interfaces
-# $1 is extra args, $2 is action name
-do_all_if() {
- local status
- for IF in $INTERFACES ; do
- echo -n "$IF "
- $IFPLUGD $1 -i $IF $ARGS
- status=$?
- [ $status -ne 0 ] && break
- done
- echo
- eend $status "Couldn't $2 ifplugd for $IF"
-}
-
-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/ifplugd-0.26-gentoo.diff b/sys-apps/ifplugd/files/ifplugd-0.26-gentoo.diff
new file mode 100644
index 000000000000..800d94849d98
--- /dev/null
+++ b/sys-apps/ifplugd/files/ifplugd-0.26-gentoo.diff
@@ -0,0 +1,36 @@
+diff -urN ifplugd-0.26.orig/configure ifplugd-0.26/configure
+--- ifplugd-0.26.orig/configure 2004-12-20 08:39:14.684706181 -0500
++++ ifplugd-0.26/configure 2004-12-20 08:39:50.184734260 -0500
+@@ -3644,7 +3644,7 @@
+
+ # If using GCC specify some additional parameters
+ if test "x$GCC" = "xyes" ; then
+- CFLAGS="$CFLAGS -pipe -W -Wall -pedantic"
++ CFLAGS="$CFLAGS -W -Wall"
+
+ cat >conftest.$ac_ext <<_ACEOF
+ int main() {}
+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 = SYSCONFDIR"/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;
+ }