* [gentoo-commits] gentoo-x86 commit in net-misc/dhcp: ChangeLog dhcp-4.2.2-r1.ebuild
@ 2011-08-27 15:41 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2011-08-27 15:41 UTC (permalink / raw
To: gentoo-commits
vapier 11/08/27 15:41:50
Modified: ChangeLog
Added: dhcp-4.2.2-r1.ebuild
Log:
Fix up some bad paths to conf/run files #380829 by Agostino Sarubbo.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Revision Changes Path
1.184 net-misc/dhcp/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?rev=1.184&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?rev=1.184&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?r1=1.183&r2=1.184
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- ChangeLog 27 Aug 2011 04:58:56 -0000 1.183
+++ ChangeLog 27 Aug 2011 15:41:50 -0000 1.184
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/dhcp
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.183 2011/08/27 04:58:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.184 2011/08/27 15:41:50 vapier Exp $
+
+*dhcp-4.2.2-r1 (27 Aug 2011)
+
+ 27 Aug 2011; Mike Frysinger <vapier@gentoo.org> +dhcp-4.2.2-r1.ebuild:
+ Fix up some bad paths to conf/run files #380829 by Agostino Sarubbo.
27 Aug 2011; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.2.ebuild,
+files/dhcp-4.2.2-bind-build-flags.patch,
1.1 net-misc/dhcp/dhcp-4.2.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: dhcp-4.2.2-r1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.1 2011/08/27 15:41:50 vapier Exp $
EAPI="2"
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"
LICENSE="as-is BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
DEPEND="selinux? ( sec-policy/selinux-dhcp )
kernel_linux? ( sys-apps/net-tools )
vim-syntax? ( app-vim/dhcpd-syntax )
ldap? (
net-nds/openldap
ssl? ( dev-libs/openssl )
)"
RDEPEND="${DEPEND}"
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
# 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}
# 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}/dhcprelay.pid"
#define _PATH_DHCRELAY6_PID "${r}/dhcprelay6.pid"
EOF
econf \
--enable-paranoia \
--sysconfdir=${e} \
$(use_enable ipv6 dhcpv6) \
$(use_with ldap) \
$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
# configure local bind cruft
cd bind/bind-*/ || die
eval econf \
$(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
--without-make-clean
}
src_compile() {
# build local bind cruft first
emake -C bind/bind-*/lib/export install || die
# then build standard dhcp code
emake || die
}
src_install() {
emake install DESTDIR="${D}" || die
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 || die
else
newexe "${S}"/client/scripts/freebsd dhclient-script || die
fi
fi
if [[ -e server/dhcpd ]] ; then
if use ldap ; then
insinto /etc/openldap/schema
doins contrib/ldap/dhcp.* || die
dosbin contrib/ldap/dhcpd-conf-to-ldap || die
fi
newinitd "${FILESDIR}"/dhcpd.init3 dhcpd || die
newconfd "${FILESDIR}"/dhcpd.conf dhcpd || die
newinitd "${FILESDIR}"/dhcrelay.init2 dhcrelay || die
newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay || die
keepdir /var/{lib,run}/dhcp
fi
}
pkg_preinst() {
enewgroup dhcp
enewuser dhcp -1 -1 /var/lib/dhcp dhcp
# Keep the user files over the sample ones
local f
for f in dhclient dhcpd ; do
f="/etc/dhcp/${f}.conf"
if [ -e "${ROOT}"${f} ] ; then
cp -p "${ROOT}"${f} "${D}"${f}
fi
done
}
pkg_postinst() {
chown -R 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() {
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"
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/dhcp: ChangeLog dhcp-4.2.2-r1.ebuild
@ 2011-08-29 21:08 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2011-08-29 21:08 UTC (permalink / raw
To: gentoo-commits
flameeyes 11/08/29 21:08:27
Modified: ChangeLog dhcp-4.2.2-r1.ebuild
Log:
Make sure the bind sub-build doesn't find libcap or it can rely on it for the build process (disrupting cross-compilation). Also make the vim syntax package a runtime dependency only, not a build-time one.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Revision Changes Path
1.185 net-misc/dhcp/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?rev=1.185&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?rev=1.185&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?r1=1.184&r2=1.185
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- ChangeLog 27 Aug 2011 15:41:50 -0000 1.184
+++ ChangeLog 29 Aug 2011 21:08:27 -0000 1.185
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/dhcp
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.184 2011/08/27 15:41:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.185 2011/08/29 21:08:27 flameeyes Exp $
+
+ 29 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> dhcp-4.2.2-r1.ebuild:
+ Make sure the bind sub-build doesn't find libcap or it can rely on it for the
+ build process (disrupting cross-compilation). Also make the vim syntax
+ package a runtime dependency only, not a build-time one.
*dhcp-4.2.2-r1 (27 Aug 2011)
1.2 net-misc/dhcp/dhcp-4.2.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild?r1=1.1&r2=1.2
Index: dhcp-4.2.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-4.2.2-r1.ebuild 27 Aug 2011 15:41:50 -0000 1.1
+++ dhcp-4.2.2-r1.ebuild 29 Aug 2011 21:08:27 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.1 2011/08/27 15:41:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.2 2011/08/29 21:08:27 flameeyes Exp $
EAPI="2"
@@ -22,12 +22,12 @@
DEPEND="selinux? ( sec-policy/selinux-dhcp )
kernel_linux? ( sys-apps/net-tools )
- vim-syntax? ( app-vim/dhcpd-syntax )
ldap? (
net-nds/openldap
ssl? ( dev-libs/openssl )
)"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ vim-syntax? ( app-vim/dhcpd-syntax )"
S="${WORKDIR}/${MY_P}"
@@ -121,6 +121,11 @@
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"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/dhcp: ChangeLog dhcp-4.2.2-r1.ebuild
@ 2011-09-19 17:14 Markos Chandras (hwoarang)
0 siblings, 0 replies; 3+ messages in thread
From: Markos Chandras (hwoarang) @ 2011-09-19 17:14 UTC (permalink / raw
To: gentoo-commits
hwoarang 11/09/19 17:14:51
Modified: ChangeLog dhcp-4.2.2-r1.ebuild
Log:
Stable on amd64 wrt bug #378799
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Revision Changes Path
1.189 net-misc/dhcp/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?rev=1.189&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?rev=1.189&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?r1=1.188&r2=1.189
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- ChangeLog 18 Sep 2011 19:18:11 -0000 1.188
+++ ChangeLog 19 Sep 2011 17:14:51 -0000 1.189
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/dhcp
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.188 2011/09/18 19:18:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.189 2011/09/19 17:14:51 hwoarang Exp $
+
+ 19 Sep 2011; Markos Chandras <hwoarang@gentoo.org> dhcp-4.2.2-r1.ebuild:
+ Stable on amd64 wrt bug #378799
18 Sep 2011; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.2-r2.ebuild,
files/dhcpd.conf2:
1.3 net-misc/dhcp/dhcp-4.2.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild?r1=1.2&r2=1.3
Index: dhcp-4.2.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dhcp-4.2.2-r1.ebuild 29 Aug 2011 21:08:27 -0000 1.2
+++ dhcp-4.2.2-r1.ebuild 19 Sep 2011 17:14:51 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.2 2011/08/29 21:08:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.3 2011/09/19 17:14:51 hwoarang Exp $
EAPI="2"
@@ -17,7 +17,7 @@
LICENSE="as-is BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
DEPEND="selinux? ( sec-policy/selinux-dhcp )
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-19 17:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-19 17:14 [gentoo-commits] gentoo-x86 commit in net-misc/dhcp: ChangeLog dhcp-4.2.2-r1.ebuild Markos Chandras (hwoarang)
-- strict thread matches above, loose matches on Subject: below --
2011-08-29 21:08 Diego Petteno (flameeyes)
2011-08-27 15:41 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox