-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On 22/05/2011 11:07 πμ, PaweA Hajdan (phajdan.jr) wrote:
> phajdan.jr    11/05/22 10:07:17
> 
>   Modified:             ChangeLog
>   Added:                dnsmasq-2.57-r1.ebuild
>   Log:
>   Run as dedicated user instead of nobody, bug #360773.
>   
>   (Portage version: 2.1.9.42/cvs/Linux i686)
> 
> Revision  Changes    Path
> 1.207                net-dns/dnsmasq/ChangeLog
> 
> file : 
> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.207&view=markup
> plain: 
> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.207&content-type=text/plain
> diff : 
> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?r1=1.206&r2=1.207
> 
> Index: ChangeLog
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v
> retrieving revision 1.206
> retrieving revision 1.207
> diff -u -r1.206 -r1.207
> --- ChangeLog 16 Apr 2011 18:23:07 -0000      1.206
> +++ ChangeLog 22 May 2011 10:07:17 -0000      1.207
> @@ -1,6 +1,12 @@
>  # ChangeLog for net-dns/dnsmasq
>  # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
> -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.206 
> 2011/04/16 18:23:07 armin76 Exp $
> +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.207 
> 2011/05/22 10:07:17 phajdan.jr Exp $
> +
> +*dnsmasq-2.57-r1 (22 May 2011)
> +
> +  22 May 2011; Pawel Hajdan jr <phajdan...@gentoo.org> 
> +dnsmasq-2.57-r1.ebuild,
> +  +files/dnsmasq.confd-r1:
> +  Run as dedicated user instead of nobody, bug #360773.
>  
>    16 Apr 2011; Raúl Porcel <armi...@gentoo.org> dnsmasq-2.57.ebuild:
>    alpha/ia64/s390/sh/sparc stable wrt #361149
> 
> 
> 
> 1.1                  net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild
> 
> file : 
> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild?rev=1.1&view=markup
> plain: 
> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild?rev=1.1&content-type=text/plain
> 
> Index: dnsmasq-2.57-r1.ebuild
> ===================================================================
> # Copyright 1999-2011 Gentoo Foundation
> # Distributed under the terms of the GNU General Public License v2
> # $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild,v 
> 1.1 2011/05/22 10:07:17 phajdan.jr Exp $
> 
> EAPI=2
> 
> inherit eutils toolchain-funcs flag-o-matic
> 
> MY_P="${P/_/}"
> MY_PV="${PV/_/}"
> DESCRIPTION="Small forwarding DNS server"
> HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/";
> SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.lzma";
> 
> LICENSE="GPL-2"
> SLOT="0"
> KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
> ~x86 ~sparc-fbsd ~x86-fbsd"
> IUSE="dbus +dhcp idn ipv6 nls tftp"
> 
> RDEPEND="dbus? ( sys-apps/dbus )
>       idn? ( net-dns/libidn )
>       nls? (
>               sys-devel/gettext
>               net-dns/libidn
>       )"
> 
> DEPEND="${RDEPEND}
>       dev-util/pkgconfig
>       || ( app-arch/xz-utils app-arch/lzma-utils )"
> 
> S="${WORKDIR}/${PN}-${MY_PV}"
> 
> pkg_setup() {
>       enewgroup dnsmasq
>       enewuser dnsmasq -1 -1 /dev/null dnsmasq
> }
> 
> src_prepare() {
>       # dnsmasq on FreeBSD wants the config file in a silly location, this 
> fixes
>       epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch"
> }
> 
> src_configure() {
>       COPTS=""
>       use tftp || COPTS+=" -DNO_TFTP"
>       use dhcp || COPTS+=" -DNO_DHCP"
>       use ipv6 || COPTS+=" -DNO_IPV6"
>       use dbus && COPTS+=" -DHAVE_DBUS"
>       use idn  && COPTS+=" -DHAVE_IDN"
> }
> 
> src_compile() {
>       emake \
>               PREFIX=/usr \
>               CC="$(tc-getCC)" \
>               CFLAGS="${CFLAGS}" \
>               COPTS="${COPTS}" \
>               all$(use nls && echo "-i18n") || die
> }
> 
> src_install() {
>       emake \
>               PREFIX=/usr \
>               MANDIR=/usr/share/man \
>               DESTDIR="${D}" \
>               install$(use nls && echo "-i18n") || die
> 
>       dodoc CHANGELOG FAQ
>       dohtml *.html
> 
>       newinitd "${FILESDIR}"/dnsmasq-init dnsmasq
>       newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq
>       insinto /etc
>       newins dnsmasq.conf.example dnsmasq.conf
> 
>       if use dbus ; then
>               insinto /etc/dbus-1/system.d
>               doins dbus/dnsmasq.conf
>       fi
> }
> 
> 
> 
> 
Hi,

Since you are not using EAPI=4 you need to add || die to every do* and
new* function.

Regards,
- -- 
Markos Chandras / Gentoo Linux Developer / Key ID: B4AFF2C2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)

iQIcBAEBCgAGBQJN2Ri1AAoJEPqDWhW0r/LCS2QP/RGYBtmtqiEXoYg4BsLCfkdM
1JYmDmrSlCC072tts1wTzeP9U7sEq5l/b5eNYK9axcDqks87+O65pnddLIiu3Nbv
Oi+84HYLPdF0muFp8htrQlOl2p39gxkth4MxJr0h9KxkyZapRSKPQzaFcU6UIKyO
6pLBzLB6gvnT0EjED+IGMcSscCh3eXJlRu5XNVab23I12IShWSR6jZ8D+oyS6666
FFELCT1Eb4GmNsiGXTPFAy8wDDY6k480L1rOJ+3o+NqlobIFuUz40jKHParXicx6
Wr1O5zrhq3glbEwuRgZ2DdzXivoqOZ+XT0p5nyvEpihwAeVtzr2uA4BdDmZP/4TS
jpxAX1SkLmlumJrmQEfEBq6/u97C+Uq/b1+Jto66ilsO1jBeV8Ey/6Ju4jvpbKuh
s2H7u2/VAL7AITMShW+IXQHYxhQu2D+6x2lGE5cMcpwmzgVH1nQ3aoP3UcezN6Vz
OEvc3DLomNWGuMCYMxnAbQpApGLeLJsonCoGLpbnScUGcQFeufn1xt/04dAuxh5n
U/QMZ6NJeN7BizeZQ7bzdVIMWtRnN124qljfW6iFIq+1yxVVzTRPu5YTAlc+mQ60
QlochjoPIsEytj9hXDXsxh6yu7HSYjllM/mQJwRMTe4uB/fSfsdGYOLFNu4xVWB7
44HCz0vGsiTa0xierbJx
=i9x9
-----END PGP SIGNATURE-----

Reply via email to