Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/
Date: Mon, 20 Aug 2018 16:01:57
Message-Id: 1534780899.cab151fddb1e2cdbca5425ac81ab0e9f68d0dba5.whissi@gentoo
1 commit: cab151fddb1e2cdbca5425ac81ab0e9f68d0dba5
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 20 14:38:18 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 20 16:01:39 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cab151fd
7
8 app-admin/sudo: drop old
9
10 Package-Manager: Portage-2.3.47, Repoman-2.3.10
11
12 app-admin/sudo/Manifest | 1 -
13 app-admin/sudo/sudo-1.8.23.ebuild | 224 ---------------------------------
14 app-admin/sudo/sudo-1.8.24_rc1.ebuild | 231 ----------------------------------
15 3 files changed, 456 deletions(-)
16
17 diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
18 index 6960ffdff6d..1a15ddba2f3 100644
19 --- a/app-admin/sudo/Manifest
20 +++ b/app-admin/sudo/Manifest
21 @@ -1,4 +1,3 @@
22 DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
23 DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94ca77f7705b23ca6573424796d5c1f8e47e2874c4b54017141d01a632885ac60c92346d932537048373cad0ede SHA512 a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342
24 DIST sudo-1.8.24.tar.gz 3175719 BLAKE2B 61fc469e2d8146b8bb59709192dc33828f0065d4dcf9625e72ae1da9a2c1d6925a0201e5999e146e2e15f5a103ad5690a88fcabb75f57e76b779fe07de53b459 SHA512 ec6295a456a300e81ea2356080d51a57e3eb5d8070d8aab228cece0100ef54954f6c3dd458316b0c2da6839c0d8dab7cdc1a360aceb2594641e064465ecb1ee8
25 -DIST sudo-1.8.24rc1.tar.gz 3177086 BLAKE2B 3eb813d456bf115be2df7803f70870fe3cc2681d8d9a009026aa8c0f499784ae17e781c940a1c6ede61cd250a5703647db62b52cd1be385fd3d8ba96e1d8944a SHA512 a571ca5dfe2614ef66fc14a48d09977a59830dea641101f108a6565a1f813c36bdd6dc94b1c39160cc341215fe93628631ba43643b7b7ad63286e4db7b5fee6e
26
27 diff --git a/app-admin/sudo/sudo-1.8.23.ebuild b/app-admin/sudo/sudo-1.8.23.ebuild
28 deleted file mode 100644
29 index b67fefb0afb..00000000000
30 --- a/app-admin/sudo/sudo-1.8.23.ebuild
31 +++ /dev/null
32 @@ -1,224 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit eutils pam multilib libtool
39 -
40 -MY_P=${P/_/}
41 -MY_P=${MY_P/beta/b}
42 -
43 -uri_prefix=
44 -case ${P} in
45 - *_beta*|*_rc*) uri_prefix=beta/ ;;
46 -esac
47 -
48 -DESCRIPTION="Allows users or groups to run commands as other users"
49 -HOMEPAGE="https://www.sudo.ws/"
50 -SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
51 - ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
52 -
53 -# Basic license is ISC-style as-is, some files are released under
54 -# 3-clause BSD license
55 -LICENSE="ISC BSD"
56 -SLOT="0"
57 -if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
58 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
59 -fi
60 -IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
61 -
62 -CDEPEND="
63 - gcrypt? ( dev-libs/libgcrypt:= )
64 - openssl? ( dev-libs/openssl:0= )
65 - pam? ( virtual/pam )
66 - sasl? ( dev-libs/cyrus-sasl )
67 - skey? ( >=sys-auth/skey-1.1.5-r1 )
68 - ldap? (
69 - >=net-nds/openldap-2.1.30-r1
70 - dev-libs/cyrus-sasl
71 - )
72 - sys-libs/zlib
73 -"
74 -RDEPEND="
75 - ${CDEPEND}
76 - selinux? ( sec-policy/selinux-sudo )
77 - ldap? ( dev-lang/perl )
78 - pam? ( sys-auth/pambase )
79 - >=app-misc/editor-wrapper-3
80 - virtual/editor
81 - sendmail? ( virtual/mta )
82 -"
83 -DEPEND="
84 - ${CDEPEND}
85 - sys-devel/bison
86 -"
87 -
88 -S="${WORKDIR}/${MY_P}"
89 -
90 -REQUIRED_USE="
91 - pam? ( !skey )
92 - skey? ( !pam )
93 - ?? ( gcrypt openssl )
94 -"
95 -
96 -MAKEOPTS+=" SAMPLES="
97 -
98 -src_prepare() {
99 - default
100 - elibtoolize
101 -}
102 -
103 -set_rootpath() {
104 - # FIXME: secure_path is a compile time setting. using ROOTPATH
105 - # is not perfect, env-update may invalidate this, but until it
106 - # is available as a sudoers setting this will have to do.
107 - einfo "Setting secure_path ..."
108 -
109 - # first extract the default ROOTPATH from build env
110 - ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
111 - if [[ -z ${ROOTPATH} ]] ; then
112 - ewarn " Failed to find ROOTPATH, please report this"
113 - fi
114 -
115 - # then remove duplicate path entries
116 - cleanpath() {
117 - local newpath thisp IFS=:
118 - for thisp in $1 ; do
119 - if [[ :${newpath}: != *:${thisp}:* ]] ; then
120 - newpath+=:$thisp
121 - else
122 - einfo " Duplicate entry ${thisp} removed..."
123 - fi
124 - done
125 - ROOTPATH=${newpath#:}
126 - }
127 - cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
128 -
129 - # finally, strip gcc paths #136027
130 - rmpath() {
131 - local e newpath thisp IFS=:
132 - for thisp in ${ROOTPATH} ; do
133 - for e ; do [[ $thisp == $e ]] && continue 2 ; done
134 - newpath+=:$thisp
135 - done
136 - ROOTPATH=${newpath#:}
137 - }
138 - rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
139 -
140 - einfo "... done"
141 -}
142 -
143 -src_configure() {
144 - local ROOTPATH
145 - set_rootpath
146 -
147 - # audit: somebody got to explain me how I can test this before I
148 - # enable it.. - Diego
149 - # plugindir: autoconf code is crappy and does not delay evaluation
150 - # until `make` time, so we have to use a full path here rather than
151 - # basing off other values.
152 - myeconfargs=(
153 - --enable-zlib=system
154 - --with-editor="${EPREFIX}"/usr/libexec/editor
155 - --with-env-editor
156 - --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
157 - --with-rundir="${EPREFIX}"/var/run/sudo
158 - --with-secure-path="${ROOTPATH}"
159 - --with-vardir="${EPREFIX}"/var/db/sudo
160 - --without-linux-audit
161 - --without-opie
162 - $(use_enable gcrypt)
163 - $(use_enable nls)
164 - $(use_enable openssl)
165 - $(use_enable sasl)
166 - $(use_with offensive insults)
167 - $(use_with offensive all-insults)
168 - $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
169 - $(use_with ldap)
170 - $(use_with pam)
171 - $(use_with skey)
172 - $(use_with selinux)
173 - $(use_with sendmail)
174 - )
175 - econf "${myeconfargs[@]}"
176 -}
177 -
178 -src_install() {
179 - default
180 -
181 - if use ldap ; then
182 - dodoc README.LDAP
183 -
184 - cat <<-EOF > "${T}"/ldap.conf.sudo
185 - # See ldap.conf(5) and README.LDAP for details
186 - # This file should only be readable by root
187 -
188 - # supported directives: host, port, ssl, ldap_version
189 - # uri, binddn, bindpw, sudoers_base, sudoers_debug
190 - # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
191 - EOF
192 -
193 - insinto /etc
194 - doins "${T}"/ldap.conf.sudo
195 - fperms 0440 /etc/ldap.conf.sudo
196 -
197 - insinto /etc/openldap/schema
198 - newins doc/schema.OpenLDAP sudo.schema
199 - fi
200 -
201 - pamd_mimic system-auth sudo auth account session
202 -
203 - keepdir /var/db/sudo/lectured
204 - fperms 0700 /var/db/sudo/lectured
205 - fperms 0711 /var/db/sudo #652958
206 -
207 - # Don't install into /var/run as that is a tmpfs most of the time
208 - # (bug #504854)
209 - rm -rf "${ED}"/var/run
210 -}
211 -
212 -pkg_postinst() {
213 - #652958
214 - local sudo_db="${EROOT}/var/db/sudo"
215 - if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
216 - chmod 711 "${sudo_db}" || die
217 - fi
218 -
219 - if use ldap ; then
220 - ewarn
221 - ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
222 - ewarn
223 - if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
224 - ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
225 - ewarn "configured in /etc/nsswitch.conf."
226 - ewarn
227 - ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
228 - ewarn " sudoers: ldap files"
229 - ewarn
230 - fi
231 - fi
232 - if use prefix ; then
233 - ewarn
234 - ewarn "To use sudo, you need to change file ownership and permissions"
235 - ewarn "with root privileges, as follows:"
236 - ewarn
237 - ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
238 - ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
239 - ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
240 - ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
241 - ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
242 - ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
243 - ewarn
244 - fi
245 -
246 - elog "To use the -A (askpass) option, you need to install a compatible"
247 - elog "password program from the following list. Starred packages will"
248 - elog "automatically register for the use with sudo (but will not force"
249 - elog "the -A option):"
250 - elog ""
251 - elog " [*] net-misc/ssh-askpass-fullscreen"
252 - elog " net-misc/x11-ssh-askpass"
253 - elog ""
254 - elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
255 - elog "variable to the program you want to use."
256 -}
257
258 diff --git a/app-admin/sudo/sudo-1.8.24_rc1.ebuild b/app-admin/sudo/sudo-1.8.24_rc1.ebuild
259 deleted file mode 100644
260 index 8e7d28d69bd..00000000000
261 --- a/app-admin/sudo/sudo-1.8.24_rc1.ebuild
262 +++ /dev/null
263 @@ -1,231 +0,0 @@
264 -# Copyright 1999-2018 Gentoo Foundation
265 -# Distributed under the terms of the GNU General Public License v2
266 -
267 -EAPI=6
268 -
269 -inherit eutils pam multilib libtool
270 -
271 -MY_P=${P/_/}
272 -MY_P=${MY_P/beta/b}
273 -
274 -uri_prefix=
275 -case ${P} in
276 - *_beta*|*_rc*) uri_prefix=beta/ ;;
277 -esac
278 -
279 -DESCRIPTION="Allows users or groups to run commands as other users"
280 -HOMEPAGE="https://www.sudo.ws/"
281 -SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
282 - ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
283 -
284 -# Basic license is ISC-style as-is, some files are released under
285 -# 3-clause BSD license
286 -LICENSE="ISC BSD"
287 -SLOT="0"
288 -if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
289 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
290 -fi
291 -IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
292 -
293 -CDEPEND="
294 - gcrypt? ( dev-libs/libgcrypt:= )
295 - openssl? ( dev-libs/openssl:0= )
296 - pam? ( virtual/pam )
297 - sasl? ( dev-libs/cyrus-sasl )
298 - skey? ( >=sys-auth/skey-1.1.5-r1 )
299 - ldap? (
300 - >=net-nds/openldap-2.1.30-r1
301 - dev-libs/cyrus-sasl
302 - )
303 - sys-libs/zlib
304 -"
305 -RDEPEND="
306 - ${CDEPEND}
307 - selinux? ( sec-policy/selinux-sudo )
308 - ldap? ( dev-lang/perl )
309 - pam? ( sys-auth/pambase )
310 - >=app-misc/editor-wrapper-3
311 - virtual/editor
312 - sendmail? ( virtual/mta )
313 -"
314 -DEPEND="
315 - ${CDEPEND}
316 - sys-devel/bison
317 -"
318 -
319 -S="${WORKDIR}/${MY_P}"
320 -
321 -REQUIRED_USE="
322 - pam? ( !skey )
323 - skey? ( !pam )
324 - ?? ( gcrypt openssl )
325 -"
326 -
327 -MAKEOPTS+=" SAMPLES="
328 -
329 -src_prepare() {
330 - default
331 - elibtoolize
332 -}
333 -
334 -set_secure_path() {
335 - # FIXME: secure_path is a compile time setting. using PATH or
336 - # ROOTPATH is not perfect, env-update may invalidate this, but until it
337 - # is available as a sudoers setting this will have to do.
338 - einfo "Setting secure_path ..."
339 -
340 - # first extract the default ROOTPATH from build env
341 - SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
342 - echo "${ROOTPATH}")
343 - case "${SECURE_PATH}" in
344 - */usr/sbin*) ;;
345 - *) SECURE_PATH=$(unset PATH;
346 - . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
347 - ;;
348 - esac
349 - if [[ -z ${SECURE_PATH} ]] ; then
350 - ewarn " Failed to detect SECURE_PATH, please report this"
351 - fi
352 -
353 - # then remove duplicate path entries
354 - cleanpath() {
355 - local newpath thisp IFS=:
356 - for thisp in $1 ; do
357 - if [[ :${newpath}: != *:${thisp}:* ]] ; then
358 - newpath+=:$thisp
359 - else
360 - einfo " Duplicate entry ${thisp} removed..."
361 - fi
362 - done
363 - SECURE_PATH=${newpath#:}
364 - }
365 - cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
366 -
367 - # finally, strip gcc paths #136027
368 - rmpath() {
369 - local e newpath thisp IFS=:
370 - for thisp in ${SECURE_PATH} ; do
371 - for e ; do [[ $thisp == $e ]] && continue 2 ; done
372 - newpath+=:$thisp
373 - done
374 - SECURE_PATH=${newpath#:}
375 - }
376 - rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
377 -
378 - einfo "... done"
379 -}
380 -
381 -src_configure() {
382 - local SECURE_PATH
383 - set_secure_path
384 -
385 - # audit: somebody got to explain me how I can test this before I
386 - # enable it.. - Diego
387 - # plugindir: autoconf code is crappy and does not delay evaluation
388 - # until `make` time, so we have to use a full path here rather than
389 - # basing off other values.
390 - myeconfargs=(
391 - --enable-zlib=system
392 - --with-editor="${EPREFIX}"/usr/libexec/editor
393 - --with-env-editor
394 - --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
395 - --with-rundir="${EPREFIX}"/var/run/sudo
396 - --with-secure-path="${SECURE_PATH}"
397 - --with-vardir="${EPREFIX}"/var/db/sudo
398 - --without-linux-audit
399 - --without-opie
400 - $(use_enable gcrypt)
401 - $(use_enable nls)
402 - $(use_enable openssl)
403 - $(use_enable sasl)
404 - $(use_with offensive insults)
405 - $(use_with offensive all-insults)
406 - $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
407 - $(use_with ldap)
408 - $(use_with pam)
409 - $(use_with skey)
410 - $(use_with selinux)
411 - $(use_with sendmail)
412 - )
413 - econf "${myeconfargs[@]}"
414 -}
415 -
416 -src_install() {
417 - default
418 -
419 - if use ldap ; then
420 - dodoc README.LDAP
421 -
422 - cat <<-EOF > "${T}"/ldap.conf.sudo
423 - # See ldap.conf(5) and README.LDAP for details
424 - # This file should only be readable by root
425 -
426 - # supported directives: host, port, ssl, ldap_version
427 - # uri, binddn, bindpw, sudoers_base, sudoers_debug
428 - # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
429 - EOF
430 -
431 - insinto /etc
432 - doins "${T}"/ldap.conf.sudo
433 - fperms 0440 /etc/ldap.conf.sudo
434 -
435 - insinto /etc/openldap/schema
436 - newins doc/schema.OpenLDAP sudo.schema
437 - fi
438 -
439 - pamd_mimic system-auth sudo auth account session
440 -
441 - keepdir /var/db/sudo/lectured
442 - fperms 0700 /var/db/sudo/lectured
443 - fperms 0711 /var/db/sudo #652958
444 -
445 - # Don't install into /var/run as that is a tmpfs most of the time
446 - # (bug #504854)
447 - rm -rf "${ED}"/var/run
448 -}
449 -
450 -pkg_postinst() {
451 - #652958
452 - local sudo_db="${EROOT}/var/db/sudo"
453 - if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
454 - chmod 711 "${sudo_db}" || die
455 - fi
456 -
457 - if use ldap ; then
458 - ewarn
459 - ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
460 - ewarn
461 - if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
462 - ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
463 - ewarn "configured in /etc/nsswitch.conf."
464 - ewarn
465 - ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
466 - ewarn " sudoers: ldap files"
467 - ewarn
468 - fi
469 - fi
470 - if use prefix ; then
471 - ewarn
472 - ewarn "To use sudo, you need to change file ownership and permissions"
473 - ewarn "with root privileges, as follows:"
474 - ewarn
475 - ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
476 - ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
477 - ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
478 - ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
479 - ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
480 - ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
481 - ewarn
482 - fi
483 -
484 - elog "To use the -A (askpass) option, you need to install a compatible"
485 - elog "password program from the following list. Starred packages will"
486 - elog "automatically register for the use with sudo (but will not force"
487 - elog "the -A option):"
488 - elog ""
489 - elog " [*] net-misc/ssh-askpass-fullscreen"
490 - elog " net-misc/x11-ssh-askpass"
491 - elog ""
492 - elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
493 - elog "variable to the program you want to use."
494 -}