mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00
Code Issues Releases Activity

- Resolve dhcrelay6 issue with rc script that prevented it from working properly.

Browse Source 
- Bump PORTREVISION of isc-dhcp4?-relay ports

Reported by:	Glen Neff <glen.neff@emc.com>
Approved by:	Douglas Thrift <douglas@douglasthrift.net>, zi@
This commit is contained in:
Ryan Steinmetz 2012-04-18 17:55:19 +00:00
parent 310beeb63c
commit 0b6042298e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=295049
4 changed files with 73 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/isc-dhcp41-server/Makefile
View File

@ -24,7 +24,7 @@ LICENSE= ISCL
PATCHLEVEL= R4
PORTREVISION_SERVER= 3
PORTREVISION_CLIENT= 0
PORTREVISION_RELAY= 2
PORTREVISION_RELAY= 3
SUBSYS?= server
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}

41
net/isc-dhcp41-server/files/isc-dhcrelay.in
View File

@ -1,6 +1,6 @@
#! /bin/sh
#
# $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp41-server/files/isc-dhcrelay.in,v 1.4 2011-06-21 17:08:11 lev Exp $
# $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp41-server/files/isc-dhcrelay.in,v 1.5 2012-04-18 17:55:19 zi Exp $
#
# PROVIDE: dhcrelay
# REQUIRE: DAEMON
@ -15,8 +15,11 @@
dhcrelay_enable=${dhcrelay_enable:-"NO"}
dhcrelay6_enable=${dhcrelay6_enable:-"NO"}
# dhcrelay_flags="" # command option(s)
# dhcrelay_servers="" # dhcrelay server(s)
# dhcrelay_ifaces="" # ethernet interface(s)
# dhcrelay_servers="" # v4 dhcrelay server(s)
# dhcrelay_ifaces="" # v4 ethernet interface(s)
# dhcrelay6_lowers="" # v6 "lower" network interface(s)
# dhcrelay6_uppers="" # v6 "upper" network interface(s)
case $0 in
/etc/rc*)
@ -43,7 +46,7 @@ esac
dhcrelay_precmd ()
{
local ifaces _servers _ifaces
eval "_servers=\${${name}_servers}"
eval "_ifaces=\${${name}_ifaces}"
@ -59,11 +62,39 @@ dhcrelay_precmd ()
rc_flags="${rc_flags} ${ipversion} ${ifaces} ${_servers}"
}
dhcrelay6_precmd ()
{
local lowers _lowers uppers _uppers
eval "_lowers=\${${name}_lowers}"
eval "_uppers=\${${name}_uppers}"
if [ -z "${_lowers}" ]; then
err 1 "no ${name} lower(s) configured."
fi
if [ -z "${_uppers}" ]; then
err 1 "no ${name} upper(s) configured."
fi
lowers=
for lower in ${_lowers}; do
lowers="${lowers} -l ${lower}"
done
uppers=
for upper in ${_uppers}; do
uppers="${uppers} -u ${upper}"
done
rc_flags="${rc_flags} ${ipversion} ${lowers} ${uppers}"
}
. /etc/rc.subr
rcvar=${name}_enable
command=%%PREFIX%%/sbin/${name}
command=%%PREFIX%%/sbin/dhcrelay
pidfile=/var/run/${name}.pid
start_precmd=${name}_precmd

2
net/isc-dhcp42-server/Makefile
View File

@ -25,7 +25,7 @@ USE_GMAKE= yes
PATCHLEVEL= P2
PORTREVISION_SERVER= 2
PORTREVISION_CLIENT= 0
PORTREVISION_RELAY= 0
PORTREVISION_RELAY= 1
SUBSYS?= server
#WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}

39
net/isc-dhcp42-server/files/isc-dhcrelay.in
View File

@ -14,8 +14,11 @@
dhcrelay_enable=${dhcrelay_enable:-"NO"}
dhcrelay6_enable=${dhcrelay6_enable:-"NO"}
# dhcrelay_flags="" # command option(s)
# dhcrelay_servers="" # dhcrelay server(s)
# dhcrelay_ifaces="" # ethernet interface(s)
# dhcrelay_servers="" # v4 dhcrelay server(s)
# dhcrelay_ifaces="" # v4 ethernet interface(s)
# dhcrelay6_lowers="" # v6 "lower" network interface(s)
# dhcrelay6_uppers="" # v6 "upper" network interface(s)
case $0 in
/etc/rc*)
@ -42,7 +45,7 @@ esac
dhcrelay_precmd ()
{
local ifaces _servers _ifaces
eval "_servers=\${${name}_servers}"
eval "_ifaces=\${${name}_ifaces}"
@ -58,11 +61,39 @@ dhcrelay_precmd ()
rc_flags="${rc_flags} ${ipversion} ${ifaces} ${_servers}"
}
dhcrelay6_precmd ()
{
local lowers _lowers uppers _uppers
eval "_lowers=\${${name}_lowers}"
eval "_uppers=\${${name}_uppers}"
if [ -z "${_lowers}" ]; then
err 1 "no ${name} lower(s) configured."
fi
if [ -z "${_uppers}" ]; then
err 1 "no ${name} upper(s) configured."
fi
lowers=
for lower in ${_lowers}; do
lowers="${lowers} -l ${lower}"
done
uppers=
for upper in ${_uppers}; do
uppers="${uppers} -u ${upper}"
done
rc_flags="${rc_flags} ${ipversion} ${lowers} ${uppers}"
}
. /etc/rc.subr
rcvar=${name}_enable
command=%%PREFIX%%/sbin/${name}
command=%%PREFIX%%/sbin/dhcrelay
pidfile=/var/run/${name}.pid
start_precmd=${name}_precmd