net-misc/dhcp: Bump
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@424 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
parent
d4ea9c2df3
commit
fe52ad2028
|
|
@ -2,6 +2,10 @@
|
|||
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
30 Jul 2008; Mario Fetka <mario.fetka@gmail.com> +files/dhcp-ebuild.patch,
|
||||
+dhcp-3.1.1-r1.ebuild:
|
||||
Bump
|
||||
|
||||
08 Jun 2008; Mario Fetka <mario-fetka@gmx.at> +metadata.xml:
|
||||
Initial ldap patched dhcp
|
||||
|
||||
|
|
|
|||
|
|
@ -18,11 +18,14 @@ AUX dhcp-3.0.4-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e2
|
|||
AUX dhcp-3.0.5-bpf-nofallback.patch 1473 RMD160 1a5ece77cb481416935b0d2eea53e85dc4c4ee93 SHA1 d4cad638075a98606e07c633551c8a1d2f78f2e7 SHA256 b215c5ff4a282b475f28168250c05bbbc85e7c37e7af92616571d499b8c14da6
|
||||
AUX dhcp-3.1.0-ldap.patch 186418 RMD160 a84a45107f5b050c859a6a78e6a05be48e553364 SHA1 30f60d83e01decf0de6556f4abab85b168071062 SHA256 2c061f5cd90858d9cacc7176c60c1d9f26a6f034daf161c4f4df1e381eed91cb
|
||||
AUX dhcp-3.1.0a1-dhclient-resolvconf.patch 10316 RMD160 183bedd1660bf5a5f9dc7d002199e76aec12341c SHA1 1e0332ea31cfdbe92f3053405587f08117de8f8b SHA256 112b2ed44aab92592eb3810c61ada7f30d9d01fe43b647667326972a37b412a1
|
||||
AUX dhcp-ebuild.patch 1058 RMD160 cac2599e02559a1121fdb59d81ef6eb75a4b5176 SHA1 678d14435dec874a33661f471796d88a025ccc74 SHA256 940cf75efd99f26135fbcb3032229f5c1c7ca032ea0236ea20dbd74b01c8aedb
|
||||
AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5
|
||||
AUX dhcpd.init 1989 RMD160 7f6b6858020100e47efa5d6a0809b2959e551249 SHA1 2c611adc6425fd095740aa56d09d8aafb4fea58a SHA256 916bfeb81dcb3423fd4239270ac2dce2e6dc105b28a06e03b352f6bf6b30ed1e
|
||||
AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecdb000382893fb49d0052ced063955b0ad9cf SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730
|
||||
AUX dhcrelay.init 736 RMD160 04566b87bd6dbb8bb754b26409ca30b878ef3ca3 SHA1 72742b308314b2e1476b27e94212fbf4d179adc4 SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c
|
||||
DIST dhcp-3.1.0.tar.gz 797100 RMD160 59ef8b695b66d3cb61437e25a179d9f17639017d SHA1 f33d017f055648e6571aa26cf314d37857491a2e SHA256 26d02217f53e40ab7c7140cf58d99b55a64979c8501481b28da9c432f0f92243
|
||||
DIST dhcp-3.1.1.tar.gz 798228 RMD160 08ed15d26ca64928e1d3b07c631cbbfa9a3dc8cb SHA1 3f7e013cb62aed0f3af45bdd97424d8b63e9c280 SHA256 129024c7545e3e8d37e75cd5d534b50c53955592c4935189a57916e216355f6d
|
||||
EBUILD dhcp-3.1.0-r1.ebuild 7622 RMD160 831ed83951cf678c02ea5b2a7b6c0c873009270f SHA1 a1be08f55e97189d6cde851491b410294db6c6c0 SHA256 a7ca880b7af8422ed152f09eb9c5917b6c3186d51f2a87ab043eae560b94d127
|
||||
MISC ChangeLog 206 RMD160 57be9c636f3341f3ad13f258aee621c021410c54 SHA1 cba9a15db0a2078e5109d57c9fc3135c585dfac6 SHA256 e8ca20553a04e1befc400de72fcae6bfb654358aa7e70c6b30aaa46ed5eb428b
|
||||
EBUILD dhcp-3.1.1-r1.ebuild 7627 RMD160 be9c724df2ed0914b35aaf5fd3e84668abc8876e SHA1 d25967f3fc46afbd60b8eb38573e175efdfe2a69 SHA256 bb9c72fa54c65b5bccb0fb4b155fd84a71ae198deb3ea6abe2c617364d18601a
|
||||
MISC ChangeLog 316 RMD160 c5213df754217bebc1b7c4db5611f20202c13183 SHA1 e78201917d91fa1ecc845e3e060994197658af11 SHA256 91d4b2bfa24081d06dd0738e537af35e2963c66f10879619dbefd4af451b8d90
|
||||
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
|
||||
|
|
|
|||
|
|
@ -0,0 +1,244 @@
|
|||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.1.ebuild,v 1.8 2008/06/29 11:13:40 klausman Exp $
|
||||
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs
|
||||
|
||||
MY_PV="${PV//_alpha/a}"
|
||||
MY_PV="${MY_PV//_beta/b}"
|
||||
MY_PV="${MY_PV//_rc/rc}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
DESCRIPTION="ISC Dynamic Host Configuration Protocol"
|
||||
HOMEPAGE="http://www.isc.org/products/DHCP"
|
||||
SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="isc-dhcp"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
|
||||
IUSE="doc minimal static selinux kernel_linux ldap"
|
||||
|
||||
DEPEND="selinux? ( sec-policy/selinux-dhcp )
|
||||
kernel_linux? ( sys-apps/net-tools )
|
||||
ldap? ( net-nds/openldap )"
|
||||
|
||||
PROVIDE="virtual/dhcpc"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
|
||||
# Gentoo patches - these will probably never be accepted upstream
|
||||
# Enable chroot support
|
||||
epatch "${FILESDIR}/${PN}"-3.0-paranoia.patch
|
||||
# Fix some permission issues
|
||||
epatch "${FILESDIR}/${PN}"-3.0-fix-perms.patch
|
||||
# Enable dhclient to equery NTP servers
|
||||
epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-ntp.patch
|
||||
# resolvconf support in dhclient-script
|
||||
epatch "${FILESDIR}/${PN}"-3.1.0a1-dhclient-resolvconf.patch
|
||||
# Fix setting hostnames on Linux
|
||||
epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-hostname.patch
|
||||
# Allow mtu settings
|
||||
epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-mtu.patch
|
||||
# Allow dhclient to use IF_METRIC to set route metrics
|
||||
epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-metric.patch
|
||||
# Stop downing the interface on Linux as that breaks link dameons
|
||||
# such as wpa_supplicant and netplug
|
||||
epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-no-down.patch
|
||||
# Quiet the isc blurb
|
||||
epatch "${FILESDIR}/${PN}"-3.0.3-no_isc_blurb.patch
|
||||
# Enable dhclient to get extra configuration from stdin
|
||||
epatch "${FILESDIR}/${PN}"-3.0.4-dhclient-stdin-conf.patch
|
||||
# Disable fallback interfaces when using BPF
|
||||
# This allows more than one dhclient instance on the BSD's
|
||||
epatch "${FILESDIR}/${PN}"-3.0.5-bpf-nofallback.patch
|
||||
|
||||
# General fixes which will probably be accepted upstream eventually
|
||||
# Install libdst, #75544
|
||||
epatch "${FILESDIR}/${PN}"-3.0.3-libdst.patch
|
||||
# Fix building on Gentoo/FreeBSD
|
||||
epatch "${FILESDIR}/${PN}"-3.0.2-gmake.patch
|
||||
|
||||
# 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
|
||||
|
||||
# Ldap support patch
|
||||
# Add ldap support to dhcpd
|
||||
use ldap && epatch "${FILESDIR}/${PN}"-3.1.0-ldap.patch
|
||||
|
||||
# Brand the version with Gentoo
|
||||
# include revision if >0
|
||||
local newver="${MY_PV}-Gentoo"
|
||||
use ldap && local newver="${MY_PV}-Gentoo-LDAP"
|
||||
[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
|
||||
sed -i '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
|
||||
includes/version.h || 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
|
||||
|
||||
# Build sed man pages as we don't ever support BSD 4.4 and older, #130251.
|
||||
local x=
|
||||
for x in Makefile.dist $(ls */Makefile.dist) ; do
|
||||
sed -i -e 's/$(CATMANPAGES)/$(SEDMANPAGES)/g' "${x}" || die
|
||||
done
|
||||
|
||||
# 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
|
||||
[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use static && append-ldflags -static
|
||||
|
||||
cat <<-END >> includes/site.h
|
||||
#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
|
||||
#define _PATH_DHCPD_PID "/var/run/dhcp/dhcpd.pid"
|
||||
#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
|
||||
#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
|
||||
#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
|
||||
#define _PATH_DHCLIENT_PID "/var/run/dhcp/dhclient.pid"
|
||||
#define DHCPD_LOG_FACILITY LOG_LOCAL1
|
||||
END
|
||||
|
||||
cat <<-END > site.conf
|
||||
CC = $(tc-getCC)
|
||||
LFLAGS = ${LDFLAGS}
|
||||
LIBDIR = /usr/$(get_libdir)
|
||||
INCDIR = /usr/include
|
||||
ETC = /etc/dhcp
|
||||
VARDB = /var/lib/dhcp
|
||||
VARRUN = /var/run/dhcp
|
||||
ADMMANDIR = /usr/share/man/man8
|
||||
ADMMANEXT = .8
|
||||
FFMANDIR = /usr/share/man/man5
|
||||
FFMANEXT = .5
|
||||
LIBMANDIR = /usr/share/man/man3
|
||||
LIBMANEXT = .3
|
||||
USRMANDIR = /usr/share/man/man1
|
||||
USRMANEXT = .1
|
||||
MANCAT = man
|
||||
END
|
||||
|
||||
./configure --copts "-DPARANOIA -DEARLY_CHROOT ${CFLAGS}" \
|
||||
|| die "configure failed"
|
||||
|
||||
# Remove server support from the Makefile
|
||||
# We still install some extra crud though
|
||||
if use minimal ; then
|
||||
sed -i -e 's/\(server\|relay\|dhcpctl\)/ /g' work.*/Makefile || die
|
||||
fi
|
||||
emake || die "compile problem"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
make install DESTDIR="${D}" || die
|
||||
use doc && dodoc README RELNOTES doc/*
|
||||
|
||||
insinto /etc/dhcp
|
||||
newins client/dhclient.conf dhclient.conf.sample
|
||||
keepdir /var/{lib,run}/dhcp
|
||||
|
||||
# Install our server files
|
||||
if ! use minimal ; then
|
||||
insinto /etc/dhcp
|
||||
newins server/dhcpd.conf dhcpd.conf.sample
|
||||
newinitd "${FILESDIR}"/dhcpd.init dhcpd
|
||||
newinitd "${FILESDIR}"/dhcrelay.init dhcrelay
|
||||
newconfd "${FILESDIR}"/dhcpd.conf dhcpd
|
||||
newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
|
||||
|
||||
# We never want portage to own this file
|
||||
rm -f "${D}"/var/lib/dhcp/dhcpd.leases
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if ! use minimal ; then
|
||||
enewgroup dhcp
|
||||
enewuser dhcp -1 -1 /var/lib/dhcp dhcp
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use minimal && return
|
||||
|
||||
chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
|
||||
|
||||
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
|
||||
|
||||
einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
|
||||
einfo
|
||||
einfo "If you would like to run dhcpd in a chroot, simply configure the"
|
||||
einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
|
||||
einfo " emerge --config =${PF}"
|
||||
}
|
||||
|
||||
pkg_config() {
|
||||
if use minimal ; then
|
||||
eerror "${PN} has not been compiled for server support"
|
||||
eerror "emerge ${PN} without the minimal USE flag to use dhcp sever"
|
||||
return 1
|
||||
fi
|
||||
|
||||
local CHROOT="$(
|
||||
sed -n -e 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \
|
||||
"${ROOT}"/etc/conf.d/dhcpd
|
||||
)"
|
||||
|
||||
if [[ -z ${CHROOT} ]]; then
|
||||
eerror "CHROOT not defined in /etc/conf.d/dhcpd"
|
||||
return 1
|
||||
fi
|
||||
|
||||
CHROOT="${ROOT}/${CHROOT}"
|
||||
|
||||
if [[ -d ${CHROOT} ]] ; then
|
||||
ewarn "${CHROOT} already exists - aborting"
|
||||
return 0
|
||||
fi
|
||||
|
||||
ebegin "Setting up the chroot directory"
|
||||
mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
|
||||
cp /etc/{localtime,resolv.conf} "${CHROOT}"/etc
|
||||
cp -R /etc/dhcp "${CHROOT}"/etc
|
||||
cp -R /var/lib/dhcp "${CHROOT}"/var/lib
|
||||
ln -s ../../var/lib/dhcp "${CHROOT}"/etc/dhcp/lib
|
||||
chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp
|
||||
eend 0
|
||||
|
||||
local logger="$(best_version virtual/logger)"
|
||||
einfo "To enable logging from the dhcpd server, configure your"
|
||||
einfo "logger (${logger}) to listen on ${CHROOT}/dev/log"
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
--- dhcp-3.1.0.ebuild 2008-01-10 10:36:28.000000000 +0100
|
||||
+++ dhcp-3.1.0-r1.ebuild 2008-07-30 14:55:17.000000000 +0200
|
||||
@@ -15,10 +15,11 @@
|
||||
LICENSE="isc-dhcp"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
|
||||
-IUSE="doc minimal static selinux kernel_linux"
|
||||
+IUSE="doc minimal static selinux kernel_linux ldap"
|
||||
|
||||
DEPEND="selinux? ( sec-policy/selinux-dhcp )
|
||||
- kernel_linux? ( sys-apps/net-tools )"
|
||||
+ kernel_linux? ( sys-apps/net-tools )
|
||||
+ ldap? ( net-nds/openldap )"
|
||||
|
||||
PROVIDE="virtual/dhcpc"
|
||||
|
||||
@@ -65,9 +66,14 @@
|
||||
# Add dbus support to dhclient
|
||||
epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
|
||||
|
||||
+ # Ldap support patch
|
||||
+ # Add ldap support to dhcpd
|
||||
+ use ldap && epatch "${FILESDIR}/${PN}"-3.1.0-ldap.patch
|
||||
+
|
||||
# Brand the version with Gentoo
|
||||
# include revision if >0
|
||||
local newver="${MY_PV}-Gentoo"
|
||||
+ use ldap && local newver="${MY_PV}-Gentoo-LDAP"
|
||||
[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
|
||||
sed -i '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
|
||||
includes/version.h || die
|
||||
Loading…
Reference in New Issue