[arch-commits] Commit in ifplugd/repos (28 files)
Thomas Bächler
thomas at archlinux.org
Wed Aug 29 20:42:41 UTC 2012
Date: Wednesday, August 29, 2012 @ 16:42:40
Author: thomas
Revision: 165779
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ifplugd/repos/extra-i686/PKGBUILD
(from rev 165778, ifplugd/trunk/PKGBUILD)
ifplugd/repos/extra-i686/ifplugd
(from rev 165778, ifplugd/trunk/ifplugd)
ifplugd/repos/extra-i686/ifplugd-0.28-interface.patch
(from rev 165778, ifplugd/trunk/ifplugd-0.28-interface.patch)
ifplugd/repos/extra-i686/ifplugd-daemon
(from rev 165778, ifplugd/trunk/ifplugd-daemon)
ifplugd/repos/extra-i686/ifplugd-fix-return-value.patch
(from rev 165778, ifplugd/trunk/ifplugd-fix-return-value.patch)
ifplugd/repos/extra-i686/ifplugd.install
(from rev 165778, ifplugd/trunk/ifplugd.install)
ifplugd/repos/extra-i686/ifplugd.systemd
(from rev 165778, ifplugd/trunk/ifplugd.systemd)
ifplugd/repos/extra-x86_64/PKGBUILD
(from rev 165778, ifplugd/trunk/PKGBUILD)
ifplugd/repos/extra-x86_64/ifplugd
(from rev 165778, ifplugd/trunk/ifplugd)
ifplugd/repos/extra-x86_64/ifplugd-0.28-interface.patch
(from rev 165778, ifplugd/trunk/ifplugd-0.28-interface.patch)
ifplugd/repos/extra-x86_64/ifplugd-daemon
(from rev 165778, ifplugd/trunk/ifplugd-daemon)
ifplugd/repos/extra-x86_64/ifplugd-fix-return-value.patch
(from rev 165778, ifplugd/trunk/ifplugd-fix-return-value.patch)
ifplugd/repos/extra-x86_64/ifplugd.install
(from rev 165778, ifplugd/trunk/ifplugd.install)
ifplugd/repos/extra-x86_64/ifplugd.systemd
(from rev 165778, ifplugd/trunk/ifplugd.systemd)
Deleted:
ifplugd/repos/extra-i686/PKGBUILD
ifplugd/repos/extra-i686/ifdown.01-route.sh
ifplugd/repos/extra-i686/ifplugd
ifplugd/repos/extra-i686/ifplugd-0.28-interface.patch
ifplugd/repos/extra-i686/ifplugd.action
ifplugd/repos/extra-i686/ifup.01-route.sh
ifplugd/repos/extra-i686/ifup.02-ntpdate.sh
ifplugd/repos/extra-x86_64/PKGBUILD
ifplugd/repos/extra-x86_64/ifdown.01-route.sh
ifplugd/repos/extra-x86_64/ifplugd
ifplugd/repos/extra-x86_64/ifplugd-0.28-interface.patch
ifplugd/repos/extra-x86_64/ifplugd.action
ifplugd/repos/extra-x86_64/ifup.01-route.sh
ifplugd/repos/extra-x86_64/ifup.02-ntpdate.sh
---------------------------------------------+
extra-i686/PKGBUILD | 104 ++++++------
extra-i686/ifdown.01-route.sh | 3
extra-i686/ifplugd | 219 ++++++++++++--------------
extra-i686/ifplugd-0.28-interface.patch | 26 +--
extra-i686/ifplugd-daemon | 7
extra-i686/ifplugd-fix-return-value.patch | 12 +
extra-i686/ifplugd.action | 30 ---
extra-i686/ifplugd.install | 13 +
extra-i686/ifplugd.systemd | 11 +
extra-i686/ifup.01-route.sh | 5
extra-i686/ifup.02-ntpdate.sh | 2
extra-x86_64/PKGBUILD | 104 ++++++------
extra-x86_64/ifdown.01-route.sh | 3
extra-x86_64/ifplugd | 219 ++++++++++++--------------
extra-x86_64/ifplugd-0.28-interface.patch | 26 +--
extra-x86_64/ifplugd-daemon | 7
extra-x86_64/ifplugd-fix-return-value.patch | 12 +
extra-x86_64/ifplugd.action | 30 ---
extra-x86_64/ifplugd.install | 13 +
extra-x86_64/ifplugd.systemd | 11 +
extra-x86_64/ifup.01-route.sh | 5
extra-x86_64/ifup.02-ntpdate.sh | 2
22 files changed, 424 insertions(+), 440 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-i686/PKGBUILD 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,53 +0,0 @@
-# $Id$
-# Contributor: Manolis Tzanidakis
-# Contributor: kevin <kevin at archlinux.org>
-# Maintainer:
-
-pkgname=ifplugd
-pkgver=0.28
-pkgrel=11
-pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
-arch=('i686' 'x86_64')
-url="http://0pointer.de/lennart/projects/ifplugd"
-license=('GPL2')
-depends=('libdaemon' 'bash' 'net-tools')
-backup=('etc/ifplugd/ifplugd.conf' 'etc/ifplugd/ifplugd.action')
-options=('!makeflags')
-source=($url/${pkgname}-${pkgver}.tar.gz 'ifplugd' 'ifplugd.action' 'ifplugd-0.28-interface.patch' 'ifdown.01-route.sh' 'ifup.01-route.sh' 'ifup.02-ntpdate.sh')
-md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3'
- '2281cd3eda9e3403857863e1a1bc00be'
- '6f98767c4ea2cf0580f73ced81efd21a'
- '54eb22844b5aeed161c0b80aa9008570'
- 'd6ce6c7bd481a0b3944c944c5b277c0b'
- 'c35f0a637911b747f8dc3bd3c6156a1b'
- 'f8690ee18a5ca72555585ee96826c2cf')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p0 -i $srcdir/ifplugd-0.28-interface.patch
- ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
- --with-initdir=/etc/rc.d --disable-xmltoman --disable-subversion --disable-lynx
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # replace INTERFACES with NET_IFS since AL already uses it in /etc/rc.conf
- sed -i "s:INTERFACES:NET_IFS:g" \
- ${pkgdir}/etc/ifplugd/ifplugd.conf
-
- # replace the default init script & action files with ours.
- install -D -m755 ${srcdir}/ifplugd ${pkgdir}/etc/rc.d/ifplugd
- install -D -m755 ${srcdir}/ifplugd.action \
- ${pkgdir}/etc/ifplugd/ifplugd.action
-
- install -Dm755 ${srcdir}/ifdown.01-route.sh \
- ${pkgdir}/etc/ifplugd/ifdown.d/01-route.sh
- install -Dm755 ${srcdir}/ifup.01-route.sh \
- ${pkgdir}/etc/ifplugd/ifup.d/01-route.sh
- install -Dm755 ${srcdir}/ifup.02-ntpdate.sh \
- ${pkgdir}/etc/ifplugd/ifup.d/02-ntpdate.sh
-}
-
Copied: ifplugd/repos/extra-i686/PKGBUILD (from rev 165778, ifplugd/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-08-29 20:42:40 UTC (rev 165779)
@@ -0,0 +1,51 @@
+# $Id$
+# Contributor: Manolis Tzanidakis
+# Contributor: kevin <kevin at archlinux.org>
+# Maintainer:
+
+pkgname=ifplugd
+pkgver=0.28
+pkgrel=12
+pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
+arch=('i686' 'x86_64')
+url="http://0pointer.de/lennart/projects/ifplugd"
+install=ifplugd.install
+license=('GPL2')
+depends=('libdaemon' 'bash')
+backup=('etc/ifplugd/ifplugd.conf')
+options=('!makeflags')
+source=($url/${pkgname}-${pkgver}.tar.gz
+ ifplugd-0.28-interface.patch
+ ifplugd-fix-return-value.patch
+ ifplugd
+ ifplugd-daemon
+ ifplugd.systemd)
+md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3'
+ '54eb22844b5aeed161c0b80aa9008570'
+ 'f26dbd7597d9d637f0b2b104b11ab820'
+ '158bda9014eb35979af9b094feca5fe1'
+ 'f2e8a37af52b79ee0e3c5bcc2470ce10'
+ '3dc2ce45d0e12d155ecc7a5bc9e3ee04')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p0 -i ${srcdir}/ifplugd-0.28-interface.patch
+ patch -p1 -i ${srcdir}/ifplugd-fix-return-value.patch
+ sed 's|/var/run|/run|' -i src/ifplugd.c
+ ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --sysconfdir=/etc \
+ --with-initdir=/etc/rc.d --disable-xmltoman --disable-subversion --disable-lynx
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # replace the default init script & action files with ours.
+ install -D -m755 ${srcdir}/ifplugd ${pkgdir}/etc/rc.d/ifplugd
+ install -D -m755 ${srcdir}/ifplugd-daemon ${pkgdir}/usr/bin/ifplugd-daemon
+ # remove default action script
+ rm -f ${pkgdir}/etc/ifplugd/ifplugd.action
+ # install systemd unit
+ install -D -m644 ${srcdir}/ifplugd.systemd ${pkgdir}/usr/lib/systemd/system/ifplugd at .service
+}
Deleted: extra-i686/ifdown.01-route.sh
===================================================================
--- extra-i686/ifdown.01-route.sh 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-i686/ifdown.01-route.sh 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,3 +0,0 @@
-#!/bin/sh
-# same as up...
-/sbin/route del $1
\ No newline at end of file
Deleted: extra-i686/ifplugd
===================================================================
--- extra-i686/ifplugd 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-i686/ifplugd 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,114 +0,0 @@
-#!/bin/bash
-#
-# ifplugd daemon script for Arch Linux
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-shopt -s extglob
-
-# env vars
-daemonname=ifplugd
-cfg=/etc/ifplugd/ifplugd.conf
-PID=$(pidof -o %PPID ifplugd)
-
-# source configuration file
-[[ -r $cfg ]] && . "$cfg"
-
-# discover interfaces to monitor
-# (replacing INTERFACES with NET_IFS, since AL
-# already uses it in /etc/rc.conf)
-if [[ $NET_IFS ]]; then
- net_ifs=($NET_IFS)
-else
- net_ifs=(/sys/class/net/!(lo))
- net_ifs=("${net_ifs[@]##*/}")
-fi
-
-case $1 in
- start)
- stat_busy "Starting $daemonname: ${net_ifs[*]}"
-
- for nic in "${net_ifs[@]}"; do
- # only start if a PID doesn't already exist
- if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then
- args=ARGS_$nic
- [[ -z ${!args} ]] && args=$ARGS || args=${!args}
- ifplugd -i "$nic" $args
-
- # use presence of PID file to check for start success
- [[ -f /var/run/ifplugd.$nic.pid ]] || (( ++err ))
- fi
- done
- unset nic
-
- if (( err )); then
- stat_fail
- exit 1
- else
- add_daemon $daemonname
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping $daemonname: ${net_ifs[*]}"
-
- for nic in /var/run/ifplugd.*.pid; do
- [[ -f $nic ]] || { (( ++err )); break; }
- nic=${nic%.pid}
- nic=${nic##*.}
- ifplugd -k -i "$nic" || (( ++err ))
- done
-
- if (( err )); then
- stat_fail
- exit 1
- else
- rm_daemon $daemonname
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- for nic in "${net_ifs[@]}"; do
- ifplugd -c -i "$nic"
- done
- unset nic
- ;;
- suspend)
- stat_busy "Suspending $daemonname: ${net_ifs[*]}"
- for nic in "${net_ifs[@]}"; do
- ifplugd -S -i $nic || (( ++err ))
- done
- unset nic
-
- if (( err )); then
- stat_fail
- exit 1
- else
- stat_done
- fi
- ;;
- resume)
- stat_busy "Resuming $daemonname ${net_ifs[*]}"
-
- for nic in "${net_ifs[@]}"; do
- ifplugd -R -i $nic || (( ++err ))
- done
- unset nic
-
- if (( err )); then
- stat_fail
- exit 1
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|status|suspend|resume}"
-esac
-exit 0
Copied: ifplugd/repos/extra-i686/ifplugd (from rev 165778, ifplugd/trunk/ifplugd)
===================================================================
--- extra-i686/ifplugd (rev 0)
+++ extra-i686/ifplugd 2012-08-29 20:42:40 UTC (rev 165779)
@@ -0,0 +1,105 @@
+#!/bin/bash
+#
+# ifplugd daemon script for Arch Linux
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+shopt -s extglob
+
+# env vars
+daemonname=ifplugd
+cfg=/etc/ifplugd/ifplugd.conf
+PID=$(pidof -o %PPID ifplugd)
+
+# source configuration file
+[[ -r $cfg ]] && . "$cfg"
+
+# discover interfaces to monitor
+net_ifs=($INTERFACES)
+
+case $1 in
+ start)
+ stat_busy "Starting $daemonname: ${net_ifs[*]}"
+
+ for nic in "${net_ifs[@]}"; do
+ # only start if a PID doesn't already exist
+ if [[ ! -f /var/run/ifplugd.$nic.pid ]];
+ /usr/bin/ifplugd-daemon $nic
+
+ # use presence of PID file to check for start success
+ [[ -f /var/run/ifplugd.$nic.pid ]] || (( ++err ))
+ fi
+ done
+ unset nic
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ add_daemon $daemonname
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping $daemonname: ${net_ifs[*]}"
+
+ for nic in /var/run/ifplugd.*.pid; do
+ [[ -f $nic ]] || { (( ++err )); break; }
+ nic=${nic%.pid}
+ nic=${nic##*.}
+ ifplugd -k -i "$nic" || (( ++err ))
+ done
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ rm_daemon $daemonname
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ status)
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -c -i "$nic"
+ done
+ unset nic
+ ;;
+ suspend)
+ stat_busy "Suspending $daemonname: ${net_ifs[*]}"
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -S -i $nic || (( ++err ))
+ done
+ unset nic
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ stat_done
+ fi
+ ;;
+ resume)
+ stat_busy "Resuming $daemonname ${net_ifs[*]}"
+
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -R -i $nic || (( ++err ))
+ done
+ unset nic
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ stat_done
+ fi
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart|status|suspend|resume}"
+esac
+exit 0
Deleted: extra-i686/ifplugd-0.28-interface.patch
===================================================================
--- extra-i686/ifplugd-0.28-interface.patch 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-i686/ifplugd-0.28-interface.patch 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,13 +0,0 @@
---- 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>
Copied: ifplugd/repos/extra-i686/ifplugd-0.28-interface.patch (from rev 165778, ifplugd/trunk/ifplugd-0.28-interface.patch)
===================================================================
--- extra-i686/ifplugd-0.28-interface.patch (rev 0)
+++ extra-i686/ifplugd-0.28-interface.patch 2012-08-29 20:42:40 UTC (rev 165779)
@@ -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>
Copied: ifplugd/repos/extra-i686/ifplugd-daemon (from rev 165778, ifplugd/trunk/ifplugd-daemon)
===================================================================
--- extra-i686/ifplugd-daemon (rev 0)
+++ extra-i686/ifplugd-daemon 2012-08-29 20:42:40 UTC (rev 165779)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+. /etc/ifplugd/ifplugd.conf
+
+args=ARGS_$1
+[[ -z ${!args} ]] && args=$ARGS || args=${!args}
+/usr/bin/ifplugd -i "$1" $args
Copied: ifplugd/repos/extra-i686/ifplugd-fix-return-value.patch (from rev 165778, ifplugd/trunk/ifplugd-fix-return-value.patch)
===================================================================
--- extra-i686/ifplugd-fix-return-value.patch (rev 0)
+++ extra-i686/ifplugd-fix-return-value.patch 2012-08-29 20:42:40 UTC (rev 165779)
@@ -0,0 +1,12 @@
+diff -Nur ifplugd-0.28.orig/src/ifplugd.c ifplugd-0.28/src/ifplugd.c
+--- ifplugd-0.28.orig/src/ifplugd.c 2005-06-04 21:21:51.000000000 +0200
++++ ifplugd-0.28/src/ifplugd.c 2012-08-29 21:51:53.137644163 +0200
+@@ -447,7 +447,7 @@
+ goto finish;
+
+ if (send_retval && daemonize && wait_on_fork) {
+- char c = status == IFSTATUS_UP ? 2 : (status == IFSTATUS_DOWN ? 3 : 1);
++ char c = status == IFSTATUS_UP ? 1 : (status == IFSTATUS_DOWN ? 2 : 3);
+ daemon_retval_send(c);
+ send_retval = 0;
+ }
Deleted: extra-i686/ifplugd.action
===================================================================
--- extra-i686/ifplugd.action 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-i686/ifplugd.action 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# ifplugd.action script for Arch Linux
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-plugscript() { # arguments are ifup|ifdown, interface_name
- for script in /etc/ifplugd/$1.d/*.sh; do
- [[ -x $script ]] && "$script" $2
- done
- return 0
-}
-
-case $2 in
- up)
- /etc/rc.d/network ifup "$1"
- plugscript ifup "$1"
- ;;
- down)
- plugscript ifdown "$1"
- /etc/rc.d/network ifdown $1
- ;;
- *)
- echo "Wrong arguments" >&2
- ;;
-esac
-
-exit 1
Copied: ifplugd/repos/extra-i686/ifplugd.install (from rev 165778, ifplugd/trunk/ifplugd.install)
===================================================================
--- extra-i686/ifplugd.install (rev 0)
+++ extra-i686/ifplugd.install 2012-08-29 20:42:40 UTC (rev 165779)
@@ -0,0 +1,13 @@
+post_upgrade() {
+ if [ $(vercmp $2 0.28-12) -lt 0 ]; then
+ cat << "EOF"
+* When used with initscripts, /etc/ifplugd/ifplugd.conf now uses
+ INTERFACES= again instead of NET_IFS=.
+* This package no longer provides a default ifplugd.action script.
+* To use ifplugd with systemd, run
+ systemctl enable ifplugd at eth0.service
+EOF
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
Copied: ifplugd/repos/extra-i686/ifplugd.systemd (from rev 165778, ifplugd/trunk/ifplugd.systemd)
===================================================================
--- extra-i686/ifplugd.systemd (rev 0)
+++ extra-i686/ifplugd.systemd 2012-08-29 20:42:40 UTC (rev 165779)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Daemon which acts upon network cable insertion/removal
+
+[Service]
+Type=forking
+PIDFile=/run/ifplugd.%i.pid
+ExecStart=/usr/bin/ifplugd-daemon %i
+SuccessExitStatus=0 1 2
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-i686/ifup.01-route.sh
===================================================================
--- extra-i686/ifup.01-route.sh 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-i686/ifup.01-route.sh 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,5 +0,0 @@
-#!/bin/sh
-# ugly way to load up gateway, since
-# al's net configuration doesn't associate
-# gateways with specific interfaces.
-/sbin/route add $gateway
Deleted: extra-i686/ifup.02-ntpdate.sh
===================================================================
--- extra-i686/ifup.02-ntpdate.sh 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-i686/ifup.02-ntpdate.sh 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,2 +0,0 @@
-#!/bin/sh
-ntpdate ru.pool.ntp.org | logger
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-x86_64/PKGBUILD 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,53 +0,0 @@
-# $Id$
-# Contributor: Manolis Tzanidakis
-# Contributor: kevin <kevin at archlinux.org>
-# Maintainer:
-
-pkgname=ifplugd
-pkgver=0.28
-pkgrel=11
-pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
-arch=('i686' 'x86_64')
-url="http://0pointer.de/lennart/projects/ifplugd"
-license=('GPL2')
-depends=('libdaemon' 'bash' 'net-tools')
-backup=('etc/ifplugd/ifplugd.conf' 'etc/ifplugd/ifplugd.action')
-options=('!makeflags')
-source=($url/${pkgname}-${pkgver}.tar.gz 'ifplugd' 'ifplugd.action' 'ifplugd-0.28-interface.patch' 'ifdown.01-route.sh' 'ifup.01-route.sh' 'ifup.02-ntpdate.sh')
-md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3'
- '2281cd3eda9e3403857863e1a1bc00be'
- '6f98767c4ea2cf0580f73ced81efd21a'
- '54eb22844b5aeed161c0b80aa9008570'
- 'd6ce6c7bd481a0b3944c944c5b277c0b'
- 'c35f0a637911b747f8dc3bd3c6156a1b'
- 'f8690ee18a5ca72555585ee96826c2cf')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p0 -i $srcdir/ifplugd-0.28-interface.patch
- ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
- --with-initdir=/etc/rc.d --disable-xmltoman --disable-subversion --disable-lynx
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # replace INTERFACES with NET_IFS since AL already uses it in /etc/rc.conf
- sed -i "s:INTERFACES:NET_IFS:g" \
- ${pkgdir}/etc/ifplugd/ifplugd.conf
-
- # replace the default init script & action files with ours.
- install -D -m755 ${srcdir}/ifplugd ${pkgdir}/etc/rc.d/ifplugd
- install -D -m755 ${srcdir}/ifplugd.action \
- ${pkgdir}/etc/ifplugd/ifplugd.action
-
- install -Dm755 ${srcdir}/ifdown.01-route.sh \
- ${pkgdir}/etc/ifplugd/ifdown.d/01-route.sh
- install -Dm755 ${srcdir}/ifup.01-route.sh \
- ${pkgdir}/etc/ifplugd/ifup.d/01-route.sh
- install -Dm755 ${srcdir}/ifup.02-ntpdate.sh \
- ${pkgdir}/etc/ifplugd/ifup.d/02-ntpdate.sh
-}
-
Copied: ifplugd/repos/extra-x86_64/PKGBUILD (from rev 165778, ifplugd/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-08-29 20:42:40 UTC (rev 165779)
@@ -0,0 +1,51 @@
+# $Id$
+# Contributor: Manolis Tzanidakis
+# Contributor: kevin <kevin at archlinux.org>
+# Maintainer:
+
+pkgname=ifplugd
+pkgver=0.28
+pkgrel=12
+pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
+arch=('i686' 'x86_64')
+url="http://0pointer.de/lennart/projects/ifplugd"
+install=ifplugd.install
+license=('GPL2')
+depends=('libdaemon' 'bash')
+backup=('etc/ifplugd/ifplugd.conf')
+options=('!makeflags')
+source=($url/${pkgname}-${pkgver}.tar.gz
+ ifplugd-0.28-interface.patch
+ ifplugd-fix-return-value.patch
+ ifplugd
+ ifplugd-daemon
+ ifplugd.systemd)
+md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3'
+ '54eb22844b5aeed161c0b80aa9008570'
+ 'f26dbd7597d9d637f0b2b104b11ab820'
+ '158bda9014eb35979af9b094feca5fe1'
+ 'f2e8a37af52b79ee0e3c5bcc2470ce10'
+ '3dc2ce45d0e12d155ecc7a5bc9e3ee04')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p0 -i ${srcdir}/ifplugd-0.28-interface.patch
+ patch -p1 -i ${srcdir}/ifplugd-fix-return-value.patch
+ sed 's|/var/run|/run|' -i src/ifplugd.c
+ ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --sysconfdir=/etc \
+ --with-initdir=/etc/rc.d --disable-xmltoman --disable-subversion --disable-lynx
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # replace the default init script & action files with ours.
+ install -D -m755 ${srcdir}/ifplugd ${pkgdir}/etc/rc.d/ifplugd
+ install -D -m755 ${srcdir}/ifplugd-daemon ${pkgdir}/usr/bin/ifplugd-daemon
+ # remove default action script
+ rm -f ${pkgdir}/etc/ifplugd/ifplugd.action
+ # install systemd unit
+ install -D -m644 ${srcdir}/ifplugd.systemd ${pkgdir}/usr/lib/systemd/system/ifplugd at .service
+}
Deleted: extra-x86_64/ifdown.01-route.sh
===================================================================
--- extra-x86_64/ifdown.01-route.sh 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-x86_64/ifdown.01-route.sh 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,3 +0,0 @@
-#!/bin/sh
-# same as up...
-/sbin/route del $1
\ No newline at end of file
Deleted: extra-x86_64/ifplugd
===================================================================
--- extra-x86_64/ifplugd 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-x86_64/ifplugd 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,114 +0,0 @@
-#!/bin/bash
-#
-# ifplugd daemon script for Arch Linux
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-shopt -s extglob
-
-# env vars
-daemonname=ifplugd
-cfg=/etc/ifplugd/ifplugd.conf
-PID=$(pidof -o %PPID ifplugd)
-
-# source configuration file
-[[ -r $cfg ]] && . "$cfg"
-
-# discover interfaces to monitor
-# (replacing INTERFACES with NET_IFS, since AL
-# already uses it in /etc/rc.conf)
-if [[ $NET_IFS ]]; then
- net_ifs=($NET_IFS)
-else
- net_ifs=(/sys/class/net/!(lo))
- net_ifs=("${net_ifs[@]##*/}")
-fi
-
-case $1 in
- start)
- stat_busy "Starting $daemonname: ${net_ifs[*]}"
-
- for nic in "${net_ifs[@]}"; do
- # only start if a PID doesn't already exist
- if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then
- args=ARGS_$nic
- [[ -z ${!args} ]] && args=$ARGS || args=${!args}
- ifplugd -i "$nic" $args
-
- # use presence of PID file to check for start success
- [[ -f /var/run/ifplugd.$nic.pid ]] || (( ++err ))
- fi
- done
- unset nic
-
- if (( err )); then
- stat_fail
- exit 1
- else
- add_daemon $daemonname
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping $daemonname: ${net_ifs[*]}"
-
- for nic in /var/run/ifplugd.*.pid; do
- [[ -f $nic ]] || { (( ++err )); break; }
- nic=${nic%.pid}
- nic=${nic##*.}
- ifplugd -k -i "$nic" || (( ++err ))
- done
-
- if (( err )); then
- stat_fail
- exit 1
- else
- rm_daemon $daemonname
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- for nic in "${net_ifs[@]}"; do
- ifplugd -c -i "$nic"
- done
- unset nic
- ;;
- suspend)
- stat_busy "Suspending $daemonname: ${net_ifs[*]}"
- for nic in "${net_ifs[@]}"; do
- ifplugd -S -i $nic || (( ++err ))
- done
- unset nic
-
- if (( err )); then
- stat_fail
- exit 1
- else
- stat_done
- fi
- ;;
- resume)
- stat_busy "Resuming $daemonname ${net_ifs[*]}"
-
- for nic in "${net_ifs[@]}"; do
- ifplugd -R -i $nic || (( ++err ))
- done
- unset nic
-
- if (( err )); then
- stat_fail
- exit 1
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|status|suspend|resume}"
-esac
-exit 0
Copied: ifplugd/repos/extra-x86_64/ifplugd (from rev 165778, ifplugd/trunk/ifplugd)
===================================================================
--- extra-x86_64/ifplugd (rev 0)
+++ extra-x86_64/ifplugd 2012-08-29 20:42:40 UTC (rev 165779)
@@ -0,0 +1,105 @@
+#!/bin/bash
+#
+# ifplugd daemon script for Arch Linux
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+shopt -s extglob
+
+# env vars
+daemonname=ifplugd
+cfg=/etc/ifplugd/ifplugd.conf
+PID=$(pidof -o %PPID ifplugd)
+
+# source configuration file
+[[ -r $cfg ]] && . "$cfg"
+
+# discover interfaces to monitor
+net_ifs=($INTERFACES)
+
+case $1 in
+ start)
+ stat_busy "Starting $daemonname: ${net_ifs[*]}"
+
+ for nic in "${net_ifs[@]}"; do
+ # only start if a PID doesn't already exist
+ if [[ ! -f /var/run/ifplugd.$nic.pid ]];
+ /usr/bin/ifplugd-daemon $nic
+
+ # use presence of PID file to check for start success
+ [[ -f /var/run/ifplugd.$nic.pid ]] || (( ++err ))
+ fi
+ done
+ unset nic
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ add_daemon $daemonname
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping $daemonname: ${net_ifs[*]}"
+
+ for nic in /var/run/ifplugd.*.pid; do
+ [[ -f $nic ]] || { (( ++err )); break; }
+ nic=${nic%.pid}
+ nic=${nic##*.}
+ ifplugd -k -i "$nic" || (( ++err ))
+ done
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ rm_daemon $daemonname
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ status)
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -c -i "$nic"
+ done
+ unset nic
+ ;;
+ suspend)
+ stat_busy "Suspending $daemonname: ${net_ifs[*]}"
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -S -i $nic || (( ++err ))
+ done
+ unset nic
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ stat_done
+ fi
+ ;;
+ resume)
+ stat_busy "Resuming $daemonname ${net_ifs[*]}"
+
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -R -i $nic || (( ++err ))
+ done
+ unset nic
+
+ if (( err )); then
+ stat_fail
+ exit 1
+ else
+ stat_done
+ fi
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart|status|suspend|resume}"
+esac
+exit 0
Deleted: extra-x86_64/ifplugd-0.28-interface.patch
===================================================================
--- extra-x86_64/ifplugd-0.28-interface.patch 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-x86_64/ifplugd-0.28-interface.patch 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,13 +0,0 @@
---- 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>
Copied: ifplugd/repos/extra-x86_64/ifplugd-0.28-interface.patch (from rev 165778, ifplugd/trunk/ifplugd-0.28-interface.patch)
===================================================================
--- extra-x86_64/ifplugd-0.28-interface.patch (rev 0)
+++ extra-x86_64/ifplugd-0.28-interface.patch 2012-08-29 20:42:40 UTC (rev 165779)
@@ -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>
Copied: ifplugd/repos/extra-x86_64/ifplugd-daemon (from rev 165778, ifplugd/trunk/ifplugd-daemon)
===================================================================
--- extra-x86_64/ifplugd-daemon (rev 0)
+++ extra-x86_64/ifplugd-daemon 2012-08-29 20:42:40 UTC (rev 165779)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+. /etc/ifplugd/ifplugd.conf
+
+args=ARGS_$1
+[[ -z ${!args} ]] && args=$ARGS || args=${!args}
+/usr/bin/ifplugd -i "$1" $args
Copied: ifplugd/repos/extra-x86_64/ifplugd-fix-return-value.patch (from rev 165778, ifplugd/trunk/ifplugd-fix-return-value.patch)
===================================================================
--- extra-x86_64/ifplugd-fix-return-value.patch (rev 0)
+++ extra-x86_64/ifplugd-fix-return-value.patch 2012-08-29 20:42:40 UTC (rev 165779)
@@ -0,0 +1,12 @@
+diff -Nur ifplugd-0.28.orig/src/ifplugd.c ifplugd-0.28/src/ifplugd.c
+--- ifplugd-0.28.orig/src/ifplugd.c 2005-06-04 21:21:51.000000000 +0200
++++ ifplugd-0.28/src/ifplugd.c 2012-08-29 21:51:53.137644163 +0200
+@@ -447,7 +447,7 @@
+ goto finish;
+
+ if (send_retval && daemonize && wait_on_fork) {
+- char c = status == IFSTATUS_UP ? 2 : (status == IFSTATUS_DOWN ? 3 : 1);
++ char c = status == IFSTATUS_UP ? 1 : (status == IFSTATUS_DOWN ? 2 : 3);
+ daemon_retval_send(c);
+ send_retval = 0;
+ }
Deleted: extra-x86_64/ifplugd.action
===================================================================
--- extra-x86_64/ifplugd.action 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-x86_64/ifplugd.action 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# ifplugd.action script for Arch Linux
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-plugscript() { # arguments are ifup|ifdown, interface_name
- for script in /etc/ifplugd/$1.d/*.sh; do
- [[ -x $script ]] && "$script" $2
- done
- return 0
-}
-
-case $2 in
- up)
- /etc/rc.d/network ifup "$1"
- plugscript ifup "$1"
- ;;
- down)
- plugscript ifdown "$1"
- /etc/rc.d/network ifdown $1
- ;;
- *)
- echo "Wrong arguments" >&2
- ;;
-esac
-
-exit 1
Copied: ifplugd/repos/extra-x86_64/ifplugd.install (from rev 165778, ifplugd/trunk/ifplugd.install)
===================================================================
--- extra-x86_64/ifplugd.install (rev 0)
+++ extra-x86_64/ifplugd.install 2012-08-29 20:42:40 UTC (rev 165779)
@@ -0,0 +1,13 @@
+post_upgrade() {
+ if [ $(vercmp $2 0.28-12) -lt 0 ]; then
+ cat << "EOF"
+* When used with initscripts, /etc/ifplugd/ifplugd.conf now uses
+ INTERFACES= again instead of NET_IFS=.
+* This package no longer provides a default ifplugd.action script.
+* To use ifplugd with systemd, run
+ systemctl enable ifplugd at eth0.service
+EOF
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
Copied: ifplugd/repos/extra-x86_64/ifplugd.systemd (from rev 165778, ifplugd/trunk/ifplugd.systemd)
===================================================================
--- extra-x86_64/ifplugd.systemd (rev 0)
+++ extra-x86_64/ifplugd.systemd 2012-08-29 20:42:40 UTC (rev 165779)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Daemon which acts upon network cable insertion/removal
+
+[Service]
+Type=forking
+PIDFile=/run/ifplugd.%i.pid
+ExecStart=/usr/bin/ifplugd-daemon %i
+SuccessExitStatus=0 1 2
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/ifup.01-route.sh
===================================================================
--- extra-x86_64/ifup.01-route.sh 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-x86_64/ifup.01-route.sh 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,5 +0,0 @@
-#!/bin/sh
-# ugly way to load up gateway, since
-# al's net configuration doesn't associate
-# gateways with specific interfaces.
-/sbin/route add $gateway
Deleted: extra-x86_64/ifup.02-ntpdate.sh
===================================================================
--- extra-x86_64/ifup.02-ntpdate.sh 2012-08-29 20:00:37 UTC (rev 165778)
+++ extra-x86_64/ifup.02-ntpdate.sh 2012-08-29 20:42:40 UTC (rev 165779)
@@ -1,2 +0,0 @@
-#!/bin/sh
-ntpdate ru.pool.ntp.org | logger
More information about the arch-commits
mailing list