dhcp: Followed upstream version bump
This commit is contained in:
parent
8e704d9ebe
commit
de30dce5d1
|
|
@ -17,6 +17,7 @@ AUX dhcp-3.1.3-dhclient-no-down.patch 2762 SHA256 94c9dbe45063c6c600976ffab4c1fc
|
|||
AUX dhcp-4.0-dhclient-ntp.patch 7966 SHA256 e93bda7f2baae9163f96ab0408bfbe885caa96a8698f9e566b8a9dc04de9359b SHA512 548c865988e12d8dbff357d7b5400f7afbb221297765c4de265bc55c016d144d9d7acd0bc6536160d8ca849f7f5b830c2413f407e376216fc05c8bd4b152b927 WHIRLPOOL 2850679345d2da92e3868c47ccbc07b142e51f1c6257c4d8cc4c8736bfc03b23aca3e127e73a43ea0125fd6054796edddcf9d2768d5a52276e5921c6545a07b8
|
||||
AUX dhcp-4.0.1-dhclient-stdin-conf.patch 2965 SHA256 0b25bc74ae258656dd1f0e6f4ffd6b4ef8b4ad56956624c0b6070941a180e57c SHA512 a65ad75be87f71d7e4021b0d875b9c1d123e9bb691ca9b555a0455ac12addfb4fd0c1e42ab9d5ec78ed0c3ffac40754b997b8729ca3e9a7907d989357ad83763 WHIRLPOOL 100e3dfff5ea75eaad636fb7c4519c08ca004ad6580b5dcf6cc73f041e0c96c0905b4157c1a72aae8d4e4f7031b853a8d348ed8334034a186971f57bdde8fd09
|
||||
AUX dhcp-4.2.0-errwarn-message.patch 1508 SHA256 e2baa7b6097a6ca20b66afcd7b0e399840a8b0f251b3750a49a03f0d5b714231 SHA512 6471e4b73fd817740118a5db9ac801914f418360c3322e98c4c2417cb9f563729bb88885e12735ad35a9ec404ac345367300b47be0ca6c2a42673f3c6528ce8d WHIRLPOOL 3262c1433aaec67ce0fbd7cb83eaf47a4d2b264b67c082e0db704c47b918bfc8b6284de54ae205220e6ffa3d34cab360e7a94fcdf0aa6160ac9b0b4e5d8e1cf3
|
||||
AUX dhcp-4.2.1-dhclient-parse_option_param-Bad-format-a.patch 1440 SHA256 d54d013d5947f8e501b9cce43a04c611e420eec5cbf29ff67f151db6cee6e9c8 SHA512 e897de809d78e2e924ae15dfcfebf94c5ea8e72445f575259305c149f6e6255b820f39d495c7e3457d129cf955ea016282c4fa6b0a6cab57656a8590a889d6d8 WHIRLPOOL b61598aa7cb2885cade07622d63f800bdb69fd6747bd06b607b15c844e4d53db5e4ff7544347e26de59e0feb7f95287433282744f76a70a817455f06239790e7
|
||||
AUX dhcp-4.2.1-dhclient-resolvconf.patch 13742 SHA256 ddc284623b421098702d3e0cc1849b37c015e78dc510aa7efdd2e5fc9b6a849c SHA512 edd0b70196650216a669de5cb5661a2b5225e2bbecdf15f8862173cfa821f27448eb30d4ba6b4244e26e1aa898e624a8e3ad3c95c8a192ba12eb9a436fe2e61f WHIRLPOOL dfd18488ff027bfb688877d7634217ddd43ffdbfa8a9230efd82c545aceb514a88def6d7a3a0dbc308c4b21934ab292bb75680e8c243afbb63bf2ad70ab8b5de
|
||||
AUX dhcp-4.2.1-nogateway.patch 1648 SHA256 694caca5fbcf900cef2223307a43fb21a66fd672728cebfd873313730029acc4 SHA512 4b2fce7cb99d490f16382c80fb5615a402a3a655c960151ef49b1d7757caedb471445f3333c50707053b6438cc83297def87142824a4e17d4a43ce85b66c2141 WHIRLPOOL 9282d13538ad2f0cbec74bdc073e61c1707515bd6c6a98299ad7d929ac86a2c6755e482fde48a75368bb01cec036e0abc9fd62378c83a636810d0caa0604cc24
|
||||
AUX dhcp-4.2.2-bind-build-flags.patch 476 SHA256 a16d9da5fc29c95c46cf7e2401744292b898f692d49dea4753991505e03c1ca8 SHA512 f552f2b8b1e13e22636f8e4548557801273b0ab38f076a141adb72584ad55b4da156401d94abd12e9364b8632a6e75ecbf3cd90af3b6dbad88627ad3f9658059 WHIRLPOOL 3202f614747eaa9b533e36495bfa862eb96b3e884cb4939a8406fdbded56061aabea20e9249d647e6aa8ed5ed5547d5c8f14c46af193c248239a2734dc79411a
|
||||
|
|
@ -26,6 +27,8 @@ AUX dhcp-4.2.2-dhclient-resolvconf.patch 14535 SHA256 a87f33e33fc3f3a103264909cc
|
|||
AUX dhcp-4.2.2-dhclient-stdin-conf.patch 3017 SHA256 701da4d022490bf9e1cfd946c752a00a2d2ab9a1fd5030281c1608f367cc68fe SHA512 1adfa938e5531040008981dd4dcba37219bce0794524d3c3530eff527528ef7b22aa6fd540f9ac175339372e98347c0a91b86b4bb5f2aa93f04217b9902c3388 WHIRLPOOL c42b3880b5cf710613021c192fc5bc1290bd04db9d79b991bac9e361f58fd84514044a19a5eff82695845e017c996cd46b29b697bfe718e51fba413caf925096
|
||||
AUX dhcp-4.2.2-nogateway.patch 1671 SHA256 3fed5823812c134e1819c8ac10c5fc718df86f4013ffc7505efbbe692319480e SHA512 fefbb402020dfdc3eff75da50bfaed0f30c5b90facd4b4ca25ac38d62f14bb85b18028261b32ac3f4654afc8e6915fcdd6f5e580444f2efe882f6f75ea10be0c WHIRLPOOL 91d38301aaecc4a2199ffd0be19d5c2b36531446524aeb65e743adb82220d20b18f53f3e740b5286bdf578f8fd35b2511f52747406b914d1c4d2841d1677e1bd
|
||||
AUX dhcp-4.2.2-xen-checksum.patch 8204 SHA256 047d0d688ba164884772b1517e9a834405e24656fd075fb2f0fb3fb1ae39fd57 SHA512 00cec5717d02784363e23f7bb20139982103e2de06e9e45babf01224c80b6c2991e3151c4a420d02b3133ac7dab614cc6dc69f05a5557e4f32599cde0aecf8c1 WHIRLPOOL 9af148e5c0ab84572950a01838dbccf203e366e8aa551ab7f22e196fbc1b030ef2fb64ee1c309bb7d1ff9a5583aa053325513d7e2569c17d086fa69422d908e1
|
||||
AUX dhcp-4.2.4-always-accept-4.patch 907 SHA256 2a876b92ff385e97955279eab8d7658b9a323cdf16c4a162ba649166cae10194 SHA512 682583d3a68b9609b16ba5029fb14a068c5e4ba1134b91e3c5c91f8cfa0d97d68e7b0fec2aa3d4e224bef9e97765971ca423e54f853a74ff6a2e24715ce17a2c WHIRLPOOL 27516c02bcece28eac935f2a6fbfbf64e3b31b75206151ec618daa906b21a40b62497cefe2e793c1ae74b0b4ee5decde363c9908a632bb38513e14cbb64347e5
|
||||
AUX dhcp-4.2.4-quieter-ping.patch 2771 SHA256 8acf6266190a76f13c942da5c0a52c38421259f3fd63426134ad245e65081db0 SHA512 1a17a7ca52aa2a56e483e5f70e9878d7472f8eb3982b4f04c6cb3c32f839fa3972f79f632f99f47196a7e7b9fd8826392b94daaa074691d26636b793fcd40e73 WHIRLPOOL aa0b2bc3f3c539eaa6de27f9ce98525c5342af9a257cf36b8889b40455b3264f7b824a615146539ab012bcf4e5a55a7f1992cfc6222ce77976709c1a88dc907b
|
||||
AUX dhcpd.conf 1092 SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5 SHA512 21467475571e914b60084a20eacba794806631c84c33e5977db0c5f3b572752c2518c807daac107ec9cbfe4d4ef0cdf54e9797d7ab064e7386b586b00619e035 WHIRLPOOL 0c9a81b3b19f6b91687db7a7ede9107afc0e50fe1ee9d86e848fa444d0da9c55798b545cb8215ec1149d48163a944d6f86969430570b26012f0a19413cff278a
|
||||
AUX dhcpd.conf2 1068 SHA256 e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9f3c63199a8e7 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d WHIRLPOOL eef0331ee019b561de2f3e46860d2c470f6de05be9104f46316d61b09bad9687d916af94eb4b399612bfd05340cda5f68f87886200801de485bd3665cc0886b9
|
||||
AUX dhcpd.init2 2421 SHA256 fef93e5a7264780044a977ade27e9cc70de824063791bcd07d3db81c11c16df5 SHA512 ab7f9c310ad7d6342aa996ae4a94f71e7df71ecaea569cec721637f75ba1a26681769181ef6f2eef1b11cb6bbf5827ab7503ba6012a689d82ac1b96eb918c444 WHIRLPOOL bfc0a4e31521c8b527c5c47ee449d2f2c9e84c4316fa869ba019fb31c9cc9db884d65d016a537c53874556fdc95165039705943dae32b30a8853900685cbfc2e
|
||||
|
|
@ -55,6 +58,8 @@ EBUILD dhcp-4.2.2.ebuild 7474 SHA256 9f15f5b2d35d9ff4372250886f3751b94abb0fbebc9
|
|||
EBUILD dhcp-4.2.3_p1.ebuild 7211 SHA256 663b373b3661a23ae1364ba18a52ade63022aad8229bc1b275cc82d110b07253 SHA512 469187bbf12ab52530e85a9227ae9d52aa617aa9a16732f21cb22e3987e681dd44b69f7c4dd3c5eb9ec207d8ab9ad34d1a61504d8a24c23eb3a494845ae6564d WHIRLPOOL 23a042697190429f090e31daedc663059c00e6228e8b9193e78f30e3799fa24bb7a3e25a3b58bed3e2e70d2ff5d625916a06b91d33580527005d96357082ee18
|
||||
EBUILD dhcp-4.2.3_p2.ebuild 7242 SHA256 cb357fc0589a09af61868fedcfc31dad70df8278a5ef78a1cd23ae96170ded9e SHA512 69eefa262861c301d5de344eaf45dfc88d211a1b0434d6898fc8bc802ec8804b7e588d5dec524183c193c2a8d41e95eaa0f2272ba3fb64a37641ce45df3fc86a WHIRLPOOL 5b0263ae207a72874c4d3576845d8f973cb768c22b2b19993b0eaa78f83f20984da74fbb35ec45725fa7f2b56666c26b7c26e39112414da194e640a901f248a1
|
||||
EBUILD dhcp-4.2.4_p1.ebuild 7236 SHA256 3d49361c1f952bbc3e14a46b872f33ae6cac102842ea6c6ac2f5ad326dd90da0 SHA512 d00831932a3cfdb7ff0cf451ccb29a22812a79c82800b4faad9d82289002728744bfa58046f60dcaaa08da21657ea10818a8eaf75f7ee24bb8d8d6fac3c136f5 WHIRLPOOL 47259067563ecb691837308974f57c98a4c79339ee19f6f2afc8b18e6d3e20425d70fda4a5ce731680ebc901357607315dfc7e82b6e1e54dfc6c4be0324d02f7
|
||||
EBUILD dhcp-4.2.4_p2.ebuild 7342 SHA256 ca6b4fa01f93c355bbf9c883712278b189a57c0f2fdab11ceccc29f8784dfcc7 SHA512 0dff9998e7adcb90c19a3bc9a7320c9ff7e77abf9f888e79ece8fa4cfaff92ecf70c430bc7cab89976717bdc1df7b32da857917a843c5c3b2db5a47a783ea3a6 WHIRLPOOL 1b9f8dfce6e128639f5c981f34f457f8b063f53ea7d705ec31abd457a98ed100b0d9eaffe3a34d833b4b8003043463de3d1690bae502868a44b323823f2f91f9
|
||||
EBUILD dhcp-4.2.4_p2-r1.ebuild 7459 SHA256 c6eafd4e540351031d403e182d5cf2b47d90034132e6e23ceb9d2bc0033d0680 SHA512 607af624d23431845376663f8881752927bca67060a51d2b6d8099a98c04169455c8e53211215fa1ac3051bd9f021df2f8c23b2987ae0138534e9892e76627aa WHIRLPOOL f74353d7c611744296ebe07465037407a594ba4717a055d54bd84984562ea833a9e6acfaddf6637ddf6d53482963845158a88289a559c9bc2e62716ee50b71b3
|
||||
EBUILD dhcp-4.2.4_p2-r2.ebuild 7557 SHA256 339f1c0c7b2f5dbe649c67490aa21d969ae2abc0e8686ef54b07f73b2c82b24f SHA512 ca6253e7dabb14498b645a6197e9b8fbeda78df21bad4b1d3198a9f5c87beeac9ff568b560597b6e5bbbd1f6fec7bf385762c09b30567038e0f81867054b857b WHIRLPOOL d5f726d402e23e4ad4128c37d9995f7fcfd79a90a29e800ead2c8d0f1c5f4b769e4b1fa704a15370c7534ebce97851c1fc26295f70de44d509f0abcf126694fd
|
||||
EBUILD dhcp-4.2.4_p2.ebuild 7331 SHA256 13044c2c3be4889c5dcc82447722cd8cb049b47d3f3076d0b16ee7fdac313c35 SHA512 a15dde74681b7774706e7b10d5e93f0b87a8884f403dbde6139bb3103c478bd16399ffacec0b08bc47dcfd984b9baa48ed2ff534a1da92661566d66f23504723 WHIRLPOOL 6ec6f841639a6c3575f104819bb2ee15931db7c06ab4c448bbcbf2d7dcc64e2a0739fd708e23eedec431a1733347f8b724f1cabe0812ce052b20111265f95c1e
|
||||
MISC ChangeLog 36584 SHA256 80fe996ef5b3704ab2201605dd2361543357691b90fd1ae27d1d2cb1dc124f4b SHA512 4946fe04a335f94d5ef5e7a1f2d1d965591831df1baea0161939e217c5bb37ef3bd29637f6e693114273a3556aba7b36cf04f3d50cd9468ed6e3414b2e4904e2 WHIRLPOOL 479ed1361c99217b5e9b5e723f6006419ac6afcf20a6441764abde2c3246f5e787ffa5bbecffffb044c0e25ebff9b125544c209e846d7d172c3e1ed44b68e4b5
|
||||
MISC metadata.xml 500 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c SHA512 52b56888b04bd8533e00930fddeccac3f1e6a4e6172b57489f52300dcf60191784fec25e94916dbc9ff007c1493fd8144ec30458b4de3589d31d6f2ddafa78b2 WHIRLPOOL 9631e8fe91b7874d03b4f91ab8ac3064a9c259433a7f27214580ea6643c3784f1988559e9c0336fd3508def32ea0ec7be74be20e8ff7d62f0d47b45b478e8714
|
||||
|
|
|
|||
|
|
@ -0,0 +1,240 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild,v 1.1 2012/10/10 04:16:40 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
MY_PV="${PV//_alpha/a}"
|
||||
MY_PV="${MY_PV//_beta/b}"
|
||||
MY_PV="${MY_PV//_rc/rc}"
|
||||
MY_PV="${MY_PV//_p/-P}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
|
||||
HOMEPAGE="http://www.isc.org/products/DHCP"
|
||||
SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
|
||||
ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="as-is BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
|
||||
|
||||
DEPEND="selinux? ( sec-policy/selinux-dhcp )
|
||||
client? ( kernel_linux? ( sys-apps/net-tools ) )
|
||||
ldap? (
|
||||
net-nds/openldap
|
||||
ssl? ( dev-libs/openssl )
|
||||
)"
|
||||
RDEPEND="${DEPEND}
|
||||
vim-syntax? ( app-vim/dhcpd-syntax )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
# handle local bind hell
|
||||
cd "${S}"/bind
|
||||
unpack ./bind.tar.gz
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Gentoo patches - these will probably never be accepted upstream
|
||||
# Fix some permission issues
|
||||
epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
|
||||
# Enable dhclient to equery NTP servers
|
||||
epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
|
||||
# resolvconf support in dhclient-script
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-resolvconf.patch
|
||||
# Stop downing the interface on Linux as that breaks link daemons
|
||||
# such as wpa_supplicant and netplug
|
||||
epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
|
||||
# Enable dhclient to get extra configuration from stdin
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
|
||||
epatch "${FILESDIR}"/${PN}-4.2.1-dhclient-parse_option_param-Bad-format-a.patch #432998
|
||||
epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
|
||||
epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
|
||||
|
||||
# NetworkManager support patches
|
||||
# If they fail to apply to future versions they will be dropped
|
||||
# Add dbus support to dhclient
|
||||
epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-dbus.patch
|
||||
|
||||
# Brand the version with Gentoo
|
||||
sed -i \
|
||||
-e "/VERSION=/s:'$: Gentoo-${PR}':" \
|
||||
configure || die
|
||||
|
||||
# Change the hook script locations of the scripts
|
||||
sed -i \
|
||||
-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
|
||||
-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
|
||||
client/scripts/* || die
|
||||
|
||||
# No need for the linux script to force bash #158540
|
||||
sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
|
||||
|
||||
# Quiet the freebsd logger a little
|
||||
sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
|
||||
|
||||
# Remove these options from the sample config
|
||||
sed -i \
|
||||
-e "/\(script\|host-name\|domain-name\) / d" \
|
||||
client/dhclient.conf || die
|
||||
|
||||
if use client && ! use server ; then
|
||||
sed -i -r \
|
||||
-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
|
||||
Makefile.in || die
|
||||
elif ! use client && use server ; then
|
||||
sed -i -r \
|
||||
-e '/^SUBDIRS/s:\<client\>::' \
|
||||
Makefile.in || die
|
||||
fi
|
||||
|
||||
# Only install different man pages if we don't have en
|
||||
if [[ " ${LINGUAS} " != *" en "* ]]; then
|
||||
# Install Japanese man pages
|
||||
if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
|
||||
einfo "Installing Japanese documention"
|
||||
cp doc/ja_JP.eucJP/dhclient* client
|
||||
cp doc/ja_JP.eucJP/dhcp* common
|
||||
fi
|
||||
fi
|
||||
# Now remove the non-english docs so there are no errors later
|
||||
rm -rf doc/ja_JP.eucJP
|
||||
|
||||
# make the bind build work
|
||||
binddir=${S}/bind
|
||||
cd "${binddir}" || die
|
||||
cat <<-EOF > bindvar.tmp
|
||||
binddir=${binddir}
|
||||
GMAKE=${MAKE:-gmake}
|
||||
EOF
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
|
||||
cd bind-*/
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# bind defaults to stupid `/usr/bin/ar`
|
||||
tc-export AR BUILD_CC
|
||||
export ac_cv_path_AR=${AR}
|
||||
|
||||
# this is tested for by the bind build system, and can cause trouble
|
||||
# when cross-building; since dhcp itself doesn't make use of libcap,
|
||||
# simply disable it.
|
||||
export ac_cv_lib_cap_cap_set_proc=no
|
||||
|
||||
# Use FHS sane paths ... some of these have configure options,
|
||||
# but not all, so just do it all here.
|
||||
local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
|
||||
cat <<-EOF >> includes/site.h
|
||||
#define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
|
||||
#define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
|
||||
#define _PATH_DHCPD_DB "${l}/dhcpd.leases"
|
||||
#define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
|
||||
#define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
|
||||
#define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
|
||||
#define _PATH_DHCPD_PID "${r}/dhcpd.pid"
|
||||
#define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
|
||||
#define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
|
||||
#define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
|
||||
#define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
|
||||
#define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
|
||||
EOF
|
||||
|
||||
econf \
|
||||
--enable-paranoia \
|
||||
--enable-early-chroot \
|
||||
--sysconfdir=${e} \
|
||||
$(use_enable ipv6 dhcpv6) \
|
||||
$(use_with ldap) \
|
||||
$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
|
||||
|
||||
# configure local bind cruft. symtable option requires
|
||||
# perl and we don't want to require that #383837.
|
||||
cd bind/bind-*/ || die
|
||||
eval econf \
|
||||
$(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
|
||||
--disable-symtable \
|
||||
--without-make-clean
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# build local bind cruft first
|
||||
emake -C bind/bind-*/lib/export install
|
||||
# then build standard dhcp code
|
||||
emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}"
|
||||
|
||||
dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
|
||||
dohtml doc/References.html
|
||||
|
||||
if [[ -e client/dhclient ]] ; then
|
||||
# move the client to /
|
||||
dodir /sbin
|
||||
mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
|
||||
|
||||
exeinto /sbin
|
||||
if use kernel_linux ; then
|
||||
newexe "${S}"/client/scripts/linux dhclient-script
|
||||
else
|
||||
newexe "${S}"/client/scripts/freebsd dhclient-script
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -e server/dhcpd ]] ; then
|
||||
if use ldap ; then
|
||||
insinto /etc/openldap/schema
|
||||
doins contrib/ldap/dhcp.*
|
||||
dosbin contrib/ldap/dhcpd-conf-to-ldap
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
|
||||
newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
|
||||
newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
|
||||
newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
|
||||
newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
|
||||
newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
|
||||
fi
|
||||
|
||||
# the default config files aren't terribly useful #384087
|
||||
sed -i '/^[^#]/s:^:#:' "${D}"/etc/dhcp/*.conf || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
enewgroup dhcp
|
||||
enewuser dhcp -1 -1 /var/lib/dhcp dhcp
|
||||
|
||||
# Keep the user files over the sample ones. The
|
||||
# hashing is to ignore the crappy defaults #384087.
|
||||
local f h
|
||||
for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
|
||||
h=${f#*:}
|
||||
f="/etc/dhcp/${f%:*}.conf"
|
||||
if [ -e "${ROOT}"${f} ] ; then
|
||||
case $(md5sum "${ROOT}"${f}) in
|
||||
${h}*) ;;
|
||||
*) cp -p "${ROOT}"${f} "${D}"${f};;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
|
||||
ewarn
|
||||
ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
|
||||
ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
|
||||
ewarn "and dhcp should be removed from the default runlevel"
|
||||
ewarn
|
||||
fi
|
||||
}
|
||||
|
|
@ -0,0 +1,243 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild,v 1.1 2012/10/10 04:16:40 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
MY_PV="${PV//_alpha/a}"
|
||||
MY_PV="${MY_PV//_beta/b}"
|
||||
MY_PV="${MY_PV//_rc/rc}"
|
||||
MY_PV="${MY_PV//_p/-P}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
|
||||
HOMEPAGE="http://www.isc.org/products/DHCP"
|
||||
SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
|
||||
ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="as-is BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
|
||||
|
||||
DEPEND="selinux? ( sec-policy/selinux-dhcp )
|
||||
client? ( kernel_linux? ( sys-apps/net-tools ) )
|
||||
ldap? (
|
||||
net-nds/openldap
|
||||
ssl? ( dev-libs/openssl )
|
||||
)"
|
||||
RDEPEND="${DEPEND}
|
||||
vim-syntax? ( app-vim/dhcpd-syntax )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
# handle local bind hell
|
||||
cd "${S}"/bind
|
||||
unpack ./bind.tar.gz
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Gentoo patches - these will probably never be accepted upstream
|
||||
# Fix some permission issues
|
||||
epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
|
||||
# Enable dhclient to equery NTP servers
|
||||
epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
|
||||
# resolvconf support in dhclient-script
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-resolvconf.patch
|
||||
# Stop downing the interface on Linux as that breaks link daemons
|
||||
# such as wpa_supplicant and netplug
|
||||
epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
|
||||
# Enable dhclient to get extra configuration from stdin
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
|
||||
epatch "${FILESDIR}"/${PN}-4.2.1-dhclient-parse_option_param-Bad-format-a.patch #432998
|
||||
epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
|
||||
epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
|
||||
|
||||
# NetworkManager support patches
|
||||
# If they fail to apply to future versions they will be dropped
|
||||
# Add dbus support to dhclient
|
||||
epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-dbus.patch
|
||||
|
||||
# Fix UDP checksums for VMs using virtio
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-xen-checksum.patch
|
||||
|
||||
# Brand the version with Gentoo
|
||||
sed -i \
|
||||
-e "/VERSION=/s:'$: Gentoo-${PR}':" \
|
||||
configure || die
|
||||
|
||||
# Change the hook script locations of the scripts
|
||||
sed -i \
|
||||
-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
|
||||
-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
|
||||
client/scripts/* || die
|
||||
|
||||
# No need for the linux script to force bash #158540
|
||||
sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
|
||||
|
||||
# Quiet the freebsd logger a little
|
||||
sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
|
||||
|
||||
# Remove these options from the sample config
|
||||
sed -i \
|
||||
-e "/\(script\|host-name\|domain-name\) / d" \
|
||||
client/dhclient.conf || die
|
||||
|
||||
if use client && ! use server ; then
|
||||
sed -i -r \
|
||||
-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
|
||||
Makefile.in || die
|
||||
elif ! use client && use server ; then
|
||||
sed -i -r \
|
||||
-e '/^SUBDIRS/s:\<client\>::' \
|
||||
Makefile.in || die
|
||||
fi
|
||||
|
||||
# Only install different man pages if we don't have en
|
||||
if [[ " ${LINGUAS} " != *" en "* ]]; then
|
||||
# Install Japanese man pages
|
||||
if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
|
||||
einfo "Installing Japanese documention"
|
||||
cp doc/ja_JP.eucJP/dhclient* client
|
||||
cp doc/ja_JP.eucJP/dhcp* common
|
||||
fi
|
||||
fi
|
||||
# Now remove the non-english docs so there are no errors later
|
||||
rm -rf doc/ja_JP.eucJP
|
||||
|
||||
# make the bind build work
|
||||
binddir=${S}/bind
|
||||
cd "${binddir}" || die
|
||||
cat <<-EOF > bindvar.tmp
|
||||
binddir=${binddir}
|
||||
GMAKE=${MAKE:-gmake}
|
||||
EOF
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
|
||||
cd bind-*/
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# bind defaults to stupid `/usr/bin/ar`
|
||||
tc-export AR BUILD_CC
|
||||
export ac_cv_path_AR=${AR}
|
||||
|
||||
# this is tested for by the bind build system, and can cause trouble
|
||||
# when cross-building; since dhcp itself doesn't make use of libcap,
|
||||
# simply disable it.
|
||||
export ac_cv_lib_cap_cap_set_proc=no
|
||||
|
||||
# Use FHS sane paths ... some of these have configure options,
|
||||
# but not all, so just do it all here.
|
||||
local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
|
||||
cat <<-EOF >> includes/site.h
|
||||
#define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
|
||||
#define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
|
||||
#define _PATH_DHCPD_DB "${l}/dhcpd.leases"
|
||||
#define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
|
||||
#define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
|
||||
#define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
|
||||
#define _PATH_DHCPD_PID "${r}/dhcpd.pid"
|
||||
#define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
|
||||
#define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
|
||||
#define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
|
||||
#define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
|
||||
#define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
|
||||
EOF
|
||||
|
||||
econf \
|
||||
--enable-paranoia \
|
||||
--enable-early-chroot \
|
||||
--sysconfdir=${e} \
|
||||
$(use_enable ipv6 dhcpv6) \
|
||||
$(use_with ldap) \
|
||||
$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
|
||||
|
||||
# configure local bind cruft. symtable option requires
|
||||
# perl and we don't want to require that #383837.
|
||||
cd bind/bind-*/ || die
|
||||
eval econf \
|
||||
$(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
|
||||
--disable-symtable \
|
||||
--without-make-clean
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# build local bind cruft first
|
||||
emake -C bind/bind-*/lib/export install
|
||||
# then build standard dhcp code
|
||||
emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}"
|
||||
|
||||
dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
|
||||
dohtml doc/References.html
|
||||
|
||||
if [[ -e client/dhclient ]] ; then
|
||||
# move the client to /
|
||||
dodir /sbin
|
||||
mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
|
||||
|
||||
exeinto /sbin
|
||||
if use kernel_linux ; then
|
||||
newexe "${S}"/client/scripts/linux dhclient-script
|
||||
else
|
||||
newexe "${S}"/client/scripts/freebsd dhclient-script
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -e server/dhcpd ]] ; then
|
||||
if use ldap ; then
|
||||
insinto /etc/openldap/schema
|
||||
doins contrib/ldap/dhcp.*
|
||||
dosbin contrib/ldap/dhcpd-conf-to-ldap
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
|
||||
newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
|
||||
newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
|
||||
newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
|
||||
newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
|
||||
newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
|
||||
fi
|
||||
|
||||
# the default config files aren't terribly useful #384087
|
||||
sed -i '/^[^#]/s:^:#:' "${D}"/etc/dhcp/*.conf || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
enewgroup dhcp
|
||||
enewuser dhcp -1 -1 /var/lib/dhcp dhcp
|
||||
|
||||
# Keep the user files over the sample ones. The
|
||||
# hashing is to ignore the crappy defaults #384087.
|
||||
local f h
|
||||
for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
|
||||
h=${f#*:}
|
||||
f="/etc/dhcp/${f%:*}.conf"
|
||||
if [ -e "${ROOT}"${f} ] ; then
|
||||
case $(md5sum "${ROOT}"${f}) in
|
||||
${h}*) ;;
|
||||
*) cp -p "${ROOT}"${f} "${D}"${f};;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
|
||||
ewarn
|
||||
ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
|
||||
ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
|
||||
ewarn "and dhcp should be removed from the default runlevel"
|
||||
ewarn
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p1.ebuild,v 1.8 2012/09/20 13:29:07 xarthisius Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2.ebuild,v 1.1 2012/10/07 06:25:42 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
|
|
@ -54,15 +54,13 @@ src_prepare() {
|
|||
# Enable dhclient to get extra configuration from stdin
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
|
||||
epatch "${FILESDIR}"/${PN}-4.2.1-dhclient-parse_option_param-Bad-format-a.patch #432998
|
||||
|
||||
# NetworkManager support patches
|
||||
# If they fail to apply to future versions they will be dropped
|
||||
# Add dbus support to dhclient
|
||||
epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-dbus.patch
|
||||
|
||||
# Fix UDP checksums for VMs using virtio
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-xen-checksum.patch
|
||||
|
||||
# Brand the version with Gentoo
|
||||
sed -i \
|
||||
-e "/VERSION=/s:'$: Gentoo-${PR}':" \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
https://bugs.gentoo.org/432998
|
||||
|
||||
snipped from OpenSUSE
|
||||
|
||||
From 19248f4207e55ecb1f5cdd9eb084f1a69470afaf Mon Sep 17 00:00:00 2001
|
||||
From: Marius Tomaschewski <mt@suse.de>
|
||||
Date: Thu, 5 Jan 2012 16:20:42 +0100
|
||||
Subject: [PATCH] dhclient: parse_option_param: Bad format a
|
||||
|
||||
When the server provides options using the "a" array type, such as:
|
||||
option rfc3442-classless-routes code 121 = array of unsigned integer 8;
|
||||
the option is stored into the lease file, but when the client reads the
|
||||
lease file next time, it complains about, because "a" array type aren't
|
||||
recognized in the parsing loop and the option (lease?) discarded.
|
||||
|
||||
Signed-off-by: Marius Tomaschewski <mt@suse.de>
|
||||
---
|
||||
common/parse.c | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/common/parse.c b/common/parse.c
|
||||
index 865522e..b4a821b 100644
|
||||
--- a/common/parse.c
|
||||
+++ b/common/parse.c
|
||||
@@ -5409,7 +5409,7 @@ int parse_option_decl (oc, cfile)
|
||||
/* Parse the option data... */
|
||||
do {
|
||||
for (fmt = option -> format; *fmt; fmt++) {
|
||||
- if (*fmt == 'A')
|
||||
+ if (*fmt == 'A' || *fmt == 'a')
|
||||
break;
|
||||
if (*fmt == 'o' && fmt != option -> format)
|
||||
continue;
|
||||
@@ -5623,7 +5623,7 @@ int parse_option_decl (oc, cfile)
|
||||
}
|
||||
}
|
||||
token = next_token (&val, (unsigned *)0, cfile);
|
||||
- } while (*fmt == 'A' && token == COMMA);
|
||||
+ } while ((*fmt == 'A' || *fmt == 'a') && token == COMMA);
|
||||
|
||||
if (token != SEMI) {
|
||||
parse_warn (cfile, "semicolon expected.");
|
||||
--
|
||||
1.7.7
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
https://bugs.gentoo.org/437108
|
||||
|
||||
always accept the -4 option even if we don't have IPv6 support enabled.
|
||||
the relay code does this already.
|
||||
|
||||
--- a/client/dhclient.c
|
||||
+++ b/client/dhclient.c
|
||||
@@ -170,8 +170,8 @@ main(int argc, char **argv) {
|
||||
if (!strcmp(argv[i], "-r")) {
|
||||
release_mode = 1;
|
||||
no_daemon = 1;
|
||||
-#ifdef DHCPv6
|
||||
} else if (!strcmp(argv[i], "-4")) {
|
||||
+#ifdef DHCPv6
|
||||
if (local_family_set && local_family != AF_INET)
|
||||
log_fatal("Client can only do v4 or v6, not "
|
||||
"both.");
|
||||
--- a/server/dhcpd.c
|
||||
+++ b/server/dhcpd.c
|
||||
@@ -373,8 +373,8 @@ main(int argc, char **argv) {
|
||||
} else if (!strcmp (argv [i], "-q")) {
|
||||
quiet = 1;
|
||||
quiet_interface_discovery = 1;
|
||||
-#ifdef DHCPv6
|
||||
} else if (!strcmp(argv[i], "-4")) {
|
||||
+#ifdef DHCPv6
|
||||
if (local_family_set && (local_family != AF_INET)) {
|
||||
log_fatal("Server cannot run in both IPv4 and "
|
||||
"IPv6 mode at the same time.");
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
https://bugs.gentoo.org/296921
|
||||
|
||||
`ping -q` will still print out summary information. send that to /dev/null.
|
||||
|
||||
patch by Martin Mokrejš
|
||||
|
||||
--- a/client/scripts/bsdos
|
||||
+++ b/client/scripts/bsdos
|
||||
@@ -251,7 +251,7 @@ if [ x$reason = xTIMEOUT ]; then
|
||||
sleep 1
|
||||
if [ "$new_routers" != "" ]; then
|
||||
set $new_routers
|
||||
- if ping -q -c 1 -w 1 $1; then
|
||||
+ if ping -q -c 1 -w 1 $1 >/dev/null; then
|
||||
if [ x$new_ip_address != x$alias_ip_address ] && \
|
||||
[ x$alias_ip_address != x ]; then
|
||||
ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
|
||||
--- a/client/scripts/freebsd
|
||||
+++ b/client/scripts/freebsd
|
||||
@@ -284,7 +284,7 @@ if [ x$reason = xTIMEOUT ]; then
|
||||
if [ -n "$new_routers" ]; then
|
||||
$LOGGER "New Routers: $new_routers"
|
||||
set -- $new_routers
|
||||
- if ping -q -c 1 $1; then
|
||||
+ if ping -q -c 1 $1 >/dev/null; then
|
||||
if [ x$new_ip_address != x$alias_ip_address ] && \
|
||||
[ x$alias_ip_address != x ]; then
|
||||
ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
|
||||
--- a/client/scripts/linux
|
||||
+++ b/client/scripts/linux
|
||||
@@ -253,7 +253,7 @@ if [ x$reason = xTIMEOUT ]; then
|
||||
ifconfig $interface inet $new_ip_address $new_subnet_arg \
|
||||
$new_broadcast_arg $mtu_arg
|
||||
set $new_routers
|
||||
- if ping -q -c 1 $1; then
|
||||
+ if ping -q -c 1 $1 >/dev/null; then
|
||||
if [ x$new_ip_address != x$alias_ip_address ] && \
|
||||
[ x$alias_ip_address != x ]; then
|
||||
ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
|
||||
--- a/client/scripts/netbsd
|
||||
+++ b/client/scripts/netbsd
|
||||
@@ -251,7 +251,7 @@ if [ x$reason = xTIMEOUT ]; then
|
||||
sleep 1
|
||||
if [ "$new_routers" != "" ]; then
|
||||
set $new_routers
|
||||
- if ping -q -c 1 -w 1 $1; then
|
||||
+ if ping -q -c 1 -w 1 $1 >/dev/null; then
|
||||
if [ x$new_ip_address != x$alias_ip_address ] && \
|
||||
[ x$alias_ip_address != x ]; then
|
||||
ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
|
||||
--- a/client/scripts/openbsd
|
||||
+++ b/client/scripts/openbsd
|
||||
@@ -245,7 +245,7 @@ if [ x$reason = xTIMEOUT ]; then
|
||||
sleep 1
|
||||
if [ "$new_routers" != "" ]; then
|
||||
set $new_routers
|
||||
- if ping -q -c 1 -w 1 $1; then
|
||||
+ if ping -q -c 1 -w 1 $1 >/dev/null; then
|
||||
if [ x$new_ip_address != x$alias_ip_address ] && \
|
||||
[ x$alias_ip_address != x ]; then
|
||||
ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
|
||||
--- a/client/scripts/openwrt
|
||||
+++ b/client/scripts/openwrt
|
||||
@@ -186,7 +186,7 @@ if [ x$reason = xTIMEOUT ]; then
|
||||
ifconfig $interface $new_ip_address $new_subnet_arg \
|
||||
$new_broadcast_arg $mtu_arg $metric_arg
|
||||
set $new_routers
|
||||
- if ping -q -c 1 $1; then
|
||||
+ if ping -q -c 1 $1 >/dev/null; then
|
||||
if [ x$new_ip_address != x$alias_ip_address ] && \
|
||||
[ x$alias_ip_address != x ]; then
|
||||
ifconfig $interface:0 $alias_ip_address $alias_subnet_arg
|
||||
Loading…
Reference in New Issue