[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcp dhcp.conf.d dhcp4 dhcp6 dhcpd)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Fri May 31 13:50:17 UTC 2013
Date: Friday, May 31, 2013 @ 15:50:17
Author: foutrelis
Revision: 186878
upgpkg: dhcp 4.2.5.p1-2
Drop rc.d scripts.
Modified:
dhcp/trunk/PKGBUILD
Deleted:
dhcp/trunk/dhcp
dhcp/trunk/dhcp.conf.d
dhcp/trunk/dhcp4
dhcp/trunk/dhcp6
dhcp/trunk/dhcpd
-------------+
PKGBUILD | 19 +++++++------------
dhcp | 10 ----------
dhcp.conf.d | 6 ------
dhcp4 | 57 ---------------------------------------------------------
dhcp6 | 57 ---------------------------------------------------------
dhcpd | 40 ----------------------------------------
6 files changed, 7 insertions(+), 182 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-31 13:31:02 UTC (rev 186877)
+++ PKGBUILD 2013-05-31 13:50:17 UTC (rev 186878)
@@ -7,20 +7,18 @@
# separate patch levels with a period to maintain proper versioning.
pkgver=4.2.5.p1
_pkgver=4.2.5-P1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('custom:isc-dhcp')
url="https://www.isc.org/software/dhcp"
makedepends=('bash' 'iproute2')
source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
- dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
+ dhcpd4.service
+ dhcpd6.service
dhcp-4.2.5-client_script-1.patch
dhcp-4.2.5-missing_ipv6-1.patch)
md5sums=('f68e3c1f00a9af5742bc5e71d567cf93'
'SKIP'
- 'c49b1497837ba56c54e401a66e1bab9b'
- '12c2f3ae47ed23eb698eb7f1bfd80f20'
- '8f357e46e1efcbb746f38737a3f977a2'
'439ee2f145a1e86dd644cb94a854f8e7'
'588aa85b6fe228c45623185a58d11992'
'9e4dcf90beec15bfcb6631809cdcc780'
@@ -52,15 +50,12 @@
package_dhcp(){
pkgdesc="A DHCP server, client, and relay agent"
- backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
+ backup=('etc/dhcpd.conf')
install=dhcp.install
-
+
cd "${srcdir}/${pkgbase}-${_pkgver}"
make DESTDIR="${pkgdir}" install
- install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4"
- install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6"
- install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}"
install -d "${pkgdir}/var/lib/dhcp"
install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service"
@@ -71,7 +66,7 @@
# Remove dhclient
make -C client DESTDIR="${pkgdir}" uninstall
-
+
# install license
install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhcp/LICENSE"
}
@@ -86,7 +81,7 @@
install -m755 -d "${pkgdir}/usr/share/dhclient"
mv "${pkgdir}/etc/dhclient.conf.example" "${pkgdir}/usr/share/dhclient/"
-
+
install -d "${pkgdir}/var/lib/dhclient"
# install dhclient linux script
Deleted: dhcp
===================================================================
--- dhcp 2013-05-31 13:31:02 UTC (rev 186877)
+++ dhcp 2013-05-31 13:50:17 UTC (rev 186878)
@@ -1,10 +0,0 @@
-#
-# Arguments to be passed to the DHCP server daemon
-#
-
-# ipv4 runtime parameters
-DHCP4_ARGS="-q"
-
-# ipv6 runtime parameters
-DHCP6_ARGS="-q"
-
Deleted: dhcp.conf.d
===================================================================
--- dhcp.conf.d 2013-05-31 13:31:02 UTC (rev 186877)
+++ dhcp.conf.d 2013-05-31 13:50:17 UTC (rev 186878)
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the DHCP server daemon
-#
-
-DHCP_ARGS="-q"
-
Deleted: dhcp4
===================================================================
--- dhcp4 2013-05-31 13:31:02 UTC (rev 186877)
+++ dhcp4 2013-05-31 13:50:17 UTC (rev 186878)
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE="/var/run/dhcpd.pid"
-
-if [[ -f $PIDFILE ]]; then
- read -r PID < "$PIDFILE"
-
- # prevent stale pidfiles from hanging around
- if [[ ! -d /proc/$PID ]]; then
- echo 'pid not found. deleteing stale pidfile'
- unset PID
- rm -f "$PIDFILE"
- fi
-fi
-
-case "$1" in
- start)
- stat_busy "Starting DHCPv4 Server"
- if [[ $PID ]]; then
- stat_fail
- exit 1
- fi
- if /usr/sbin/dhcpd -4 -pf "$PIDFILE" $DHCP4_ARGS; then
- add_daemon dhcp4
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- stop)
- stat_busy "Stopping DHCPv4 Server"
- if [[ ! $PID ]]; then
- stat_fail
- exit 1
- fi
- if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then
- rm_daemon dhcp4
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-
Deleted: dhcp6
===================================================================
--- dhcp6 2013-05-31 13:31:02 UTC (rev 186877)
+++ dhcp6 2013-05-31 13:50:17 UTC (rev 186878)
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE="/var/run/dhcp6.pid"
-
-if [[ -f $PIDFILE ]]; then
- read -r PID < "$PIDFILE"
-
- # prevent stale pidfiles from hanging around
- if [[ ! -d /proc/$PID ]]; then
- echo 'pid not found. deleteing stale pidfile'
- unset PID
- rm -f "$PIDFILE"
- fi
-fi
-
-case "$1" in
- start)
- stat_busy "Starting DHCPv6 Server"
- if [[ $PID ]]; then
- stat_fail
- exit 1
- fi
- if /usr/sbin/dhcpd -6 -pf "$PIDFILE" $DHCP6_ARGS; then
- add_daemon dhcp6
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- stop)
- stat_busy "Stopping DHCPv6 Server"
- if [[ ! $PID ]]; then
- stat_fail
- exit 1
- fi
- if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then
- rm_daemon dhcp6
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-
Deleted: dhcpd
===================================================================
--- dhcpd 2013-05-31 13:31:02 UTC (rev 186877)
+++ dhcpd 2013-05-31 13:50:17 UTC (rev 186878)
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE="/var/run/dhcpd.pid"
-PID=`cat $PIDFILE 2>/dev/null`
-case "$1" in
- start)
- stat_busy "Starting DHCP Server"
- if [ "$PID" = "" ]; then
- /usr/sbin/dhcpd $DHCP_ARGS
- fi
- if [ "$PID" != "" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon dhcpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping DHCP Server"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- rm -f $PIDFILE
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon dhcpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
More information about the arch-commits
mailing list