From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C7B0C138010 for ; Sun, 7 Oct 2012 06:25:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 862EEE0175; Sun, 7 Oct 2012 06:25:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E6F1DE0175 for ; Sun, 7 Oct 2012 06:25:44 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3277533C1F0 for ; Sun, 7 Oct 2012 06:25:44 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 5445721600; Sun, 7 Oct 2012 06:25:42 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-misc/dhcp: dhcp-4.2.4_p2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: dhcp-4.2.4_p2.ebuild ChangeLog X-VCS-Directories: net-misc/dhcp X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121007062542.5445721600@flycatcher.gentoo.org> Date: Sun, 7 Oct 2012 06:25:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7e088263-1088-4e6f-ba47-45a23d8ce674 X-Archives-Hash: 28bc271b751e9cd4390b575b1ecb74fe vapier 12/10/07 06:25:42 Modified: ChangeLog Added: dhcp-4.2.4_p2.ebuild Log: Version bump. Add fix from OpenSUSE for parsing "a" options #432998 by Andreas Steinmetz. (Portage version: 2.2.0_alpha131/cvs/Linux x86_64) Revision Changes Path 1.218 net-misc/dhcp/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?rev=1.218&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?rev=1.218&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/ChangeLog?r1=1.217&r2=1.218 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- ChangeLog 20 Sep 2012 13:29:07 -0000 1.217 +++ ChangeLog 7 Oct 2012 06:25:42 -0000 1.218 @@ -1,6 +1,13 @@ # ChangeLog for net-misc/dhcp # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.217 2012/09/20 13:29:07 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.218 2012/10/07 06:25:42 vapier Exp $ + +*dhcp-4.2.4_p2 (07 Oct 2012) + + 07 Oct 2012; Mike Frysinger +dhcp-4.2.4_p2.ebuild, + +files/dhcp-4.2.1-dhclient-parse_option_param-Bad-format-a.patch: + Version bump. Add fix from OpenSUSE for parsing "a" options #432998 by Andreas + Steinmetz. 20 Sep 2012; Kacper Kowalik dhcp-4.2.4_p1.ebuild: ppc64 stable wrt #428120 1.1 net-misc/dhcp/dhcp-4.2.4_p2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2.ebuild?rev=1.1&content-type=text/plain Index: dhcp-4.2.4_p2.ebuild =================================================================== # 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.ebuild,v 1.1 2012/10/07 06:25:42 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 # 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:\::' \ 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 }