1 |
-----BEGIN PGP SIGNED MESSAGE----- |
2 |
Hash: SHA512 |
3 |
|
4 |
On 22/05/2011 11:07 πμ, PaweA Hajdan (phajdan.jr) wrote: |
5 |
> phajdan.jr 11/05/22 10:07:17 |
6 |
> |
7 |
> Modified: ChangeLog |
8 |
> Added: dnsmasq-2.57-r1.ebuild |
9 |
> Log: |
10 |
> Run as dedicated user instead of nobody, bug #360773. |
11 |
> |
12 |
> (Portage version: 2.1.9.42/cvs/Linux i686) |
13 |
> |
14 |
> Revision Changes Path |
15 |
> 1.207 net-dns/dnsmasq/ChangeLog |
16 |
> |
17 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.207&view=markup |
18 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.207&content-type=text/plain |
19 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?r1=1.206&r2=1.207 |
20 |
> |
21 |
> Index: ChangeLog |
22 |
> =================================================================== |
23 |
> RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v |
24 |
> retrieving revision 1.206 |
25 |
> retrieving revision 1.207 |
26 |
> diff -u -r1.206 -r1.207 |
27 |
> --- ChangeLog 16 Apr 2011 18:23:07 -0000 1.206 |
28 |
> +++ ChangeLog 22 May 2011 10:07:17 -0000 1.207 |
29 |
> @@ -1,6 +1,12 @@ |
30 |
> # ChangeLog for net-dns/dnsmasq |
31 |
> # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
32 |
> -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.206 2011/04/16 18:23:07 armin76 Exp $ |
33 |
> +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.207 2011/05/22 10:07:17 phajdan.jr Exp $ |
34 |
> + |
35 |
> +*dnsmasq-2.57-r1 (22 May 2011) |
36 |
> + |
37 |
> + 22 May 2011; Pawel Hajdan jr <phajdan.jr@g.o> +dnsmasq-2.57-r1.ebuild, |
38 |
> + +files/dnsmasq.confd-r1: |
39 |
> + Run as dedicated user instead of nobody, bug #360773. |
40 |
> |
41 |
> 16 Apr 2011; Raúl Porcel <armin76@g.o> dnsmasq-2.57.ebuild: |
42 |
> alpha/ia64/s390/sh/sparc stable wrt #361149 |
43 |
> |
44 |
> |
45 |
> |
46 |
> 1.1 net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild |
47 |
> |
48 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild?rev=1.1&view=markup |
49 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild?rev=1.1&content-type=text/plain |
50 |
> |
51 |
> Index: dnsmasq-2.57-r1.ebuild |
52 |
> =================================================================== |
53 |
> # Copyright 1999-2011 Gentoo Foundation |
54 |
> # Distributed under the terms of the GNU General Public License v2 |
55 |
> # $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 $ |
56 |
> |
57 |
> EAPI=2 |
58 |
> |
59 |
> inherit eutils toolchain-funcs flag-o-matic |
60 |
> |
61 |
> MY_P="${P/_/}" |
62 |
> MY_PV="${PV/_/}" |
63 |
> DESCRIPTION="Small forwarding DNS server" |
64 |
> HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/" |
65 |
> SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.lzma" |
66 |
> |
67 |
> LICENSE="GPL-2" |
68 |
> SLOT="0" |
69 |
> KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
70 |
> IUSE="dbus +dhcp idn ipv6 nls tftp" |
71 |
> |
72 |
> RDEPEND="dbus? ( sys-apps/dbus ) |
73 |
> idn? ( net-dns/libidn ) |
74 |
> nls? ( |
75 |
> sys-devel/gettext |
76 |
> net-dns/libidn |
77 |
> )" |
78 |
> |
79 |
> DEPEND="${RDEPEND} |
80 |
> dev-util/pkgconfig |
81 |
> || ( app-arch/xz-utils app-arch/lzma-utils )" |
82 |
> |
83 |
> S="${WORKDIR}/${PN}-${MY_PV}" |
84 |
> |
85 |
> pkg_setup() { |
86 |
> enewgroup dnsmasq |
87 |
> enewuser dnsmasq -1 -1 /dev/null dnsmasq |
88 |
> } |
89 |
> |
90 |
> src_prepare() { |
91 |
> # dnsmasq on FreeBSD wants the config file in a silly location, this fixes |
92 |
> epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch" |
93 |
> } |
94 |
> |
95 |
> src_configure() { |
96 |
> COPTS="" |
97 |
> use tftp || COPTS+=" -DNO_TFTP" |
98 |
> use dhcp || COPTS+=" -DNO_DHCP" |
99 |
> use ipv6 || COPTS+=" -DNO_IPV6" |
100 |
> use dbus && COPTS+=" -DHAVE_DBUS" |
101 |
> use idn && COPTS+=" -DHAVE_IDN" |
102 |
> } |
103 |
> |
104 |
> src_compile() { |
105 |
> emake \ |
106 |
> PREFIX=/usr \ |
107 |
> CC="$(tc-getCC)" \ |
108 |
> CFLAGS="${CFLAGS}" \ |
109 |
> COPTS="${COPTS}" \ |
110 |
> all$(use nls && echo "-i18n") || die |
111 |
> } |
112 |
> |
113 |
> src_install() { |
114 |
> emake \ |
115 |
> PREFIX=/usr \ |
116 |
> MANDIR=/usr/share/man \ |
117 |
> DESTDIR="${D}" \ |
118 |
> install$(use nls && echo "-i18n") || die |
119 |
> |
120 |
> dodoc CHANGELOG FAQ |
121 |
> dohtml *.html |
122 |
> |
123 |
> newinitd "${FILESDIR}"/dnsmasq-init dnsmasq |
124 |
> newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq |
125 |
> insinto /etc |
126 |
> newins dnsmasq.conf.example dnsmasq.conf |
127 |
> |
128 |
> if use dbus ; then |
129 |
> insinto /etc/dbus-1/system.d |
130 |
> doins dbus/dnsmasq.conf |
131 |
> fi |
132 |
> } |
133 |
> |
134 |
> |
135 |
> |
136 |
> |
137 |
Hi, |
138 |
|
139 |
Since you are not using EAPI=4 you need to add || die to every do* and |
140 |
new* function. |
141 |
|
142 |
Regards, |
143 |
- -- |
144 |
Markos Chandras / Gentoo Linux Developer / Key ID: B4AFF2C2 |
145 |
-----BEGIN PGP SIGNATURE----- |
146 |
Version: GnuPG v2.0.17 (GNU/Linux) |
147 |
|
148 |
iQIcBAEBCgAGBQJN2Ri1AAoJEPqDWhW0r/LCS2QP/RGYBtmtqiEXoYg4BsLCfkdM |
149 |
1JYmDmrSlCC072tts1wTzeP9U7sEq5l/b5eNYK9axcDqks87+O65pnddLIiu3Nbv |
150 |
Oi+84HYLPdF0muFp8htrQlOl2p39gxkth4MxJr0h9KxkyZapRSKPQzaFcU6UIKyO |
151 |
6pLBzLB6gvnT0EjED+IGMcSscCh3eXJlRu5XNVab23I12IShWSR6jZ8D+oyS6666 |
152 |
FFELCT1Eb4GmNsiGXTPFAy8wDDY6k480L1rOJ+3o+NqlobIFuUz40jKHParXicx6 |
153 |
Wr1O5zrhq3glbEwuRgZ2DdzXivoqOZ+XT0p5nyvEpihwAeVtzr2uA4BdDmZP/4TS |
154 |
jpxAX1SkLmlumJrmQEfEBq6/u97C+Uq/b1+Jto66ilsO1jBeV8Ey/6Ju4jvpbKuh |
155 |
s2H7u2/VAL7AITMShW+IXQHYxhQu2D+6x2lGE5cMcpwmzgVH1nQ3aoP3UcezN6Vz |
156 |
OEvc3DLomNWGuMCYMxnAbQpApGLeLJsonCoGLpbnScUGcQFeufn1xt/04dAuxh5n |
157 |
U/QMZ6NJeN7BizeZQ7bzdVIMWtRnN124qljfW6iFIq+1yxVVzTRPu5YTAlc+mQ60 |
158 |
QlochjoPIsEytj9hXDXsxh6yu7HSYjllM/mQJwRMTe4uB/fSfsdGYOLFNu4xVWB7 |
159 |
44HCz0vGsiTa0xierbJx |
160 |
=i9x9 |
161 |
-----END PGP SIGNATURE----- |