Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/
Date: Wed, 25 Sep 2019 22:38:45
Message-Id: 1569451113.3f03dc51e801a05262eb8f24417344c01729074b.polynomial-c@gentoo
1 commit: 3f03dc51e801a05262eb8f24417344c01729074b
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 25 22:21:23 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 25 22:38:33 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f03dc51
7
8 app-admin/sudo: Removed old
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.17
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 app-admin/sudo/Manifest | 1 -
14 app-admin/sudo/metadata.xml | 1 -
15 app-admin/sudo/sudo-1.8.25_p1-r1.ebuild | 242 --------------------------------
16 3 files changed, 244 deletions(-)
17
18 diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
19 index 03a9af4b1bf..a1360dc973d 100644
20 --- a/app-admin/sudo/Manifest
21 +++ b/app-admin/sudo/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0a86bab3b34d91096c08e8b8ece056ba312f9fecd4cdd704fc17d49a36681b41cd40269df7c67cd66d80c0d8efb SHA512 b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72
24 DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca333491ffa6dcdb3c44b53cb8149d3bf2f3aea2aa49529ea811d4727a11ac1909305e342b858a4c14f923f12956 SHA512 0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac
25 DIST sudo-1.8.28rc1.tar.gz 3312316 BLAKE2B 051111a9a39333aef2c9a5afcb893b08656400bed42687370ba1d6ef1a60b8bbb3d3c8457a8150eaeed6a838de5f3d657f12ecdcad9881a5b9a5228fbeb2adee SHA512 03ab9fe009808f5b46bdee1f30b9c1a2bc94b7f342e573afa06089935c3a8f844f1ee3579b0b243a7195caf65502ac576b2b1629d9484ec1c54b9567478f6f42
26
27 diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
28 index 8e31d55ef94..72faa0680c3 100644
29 --- a/app-admin/sudo/metadata.xml
30 +++ b/app-admin/sudo/metadata.xml
31 @@ -15,7 +15,6 @@
32 <flag name="gcrypt">Use message digest functions from <pkg>dev-libs/libgcrypt</pkg> instead of sudo's</flag>
33 <flag name="libressl">Use message digest functions from <pkg>dev-libs/libressl</pkg> instead of sudo's</flag>
34 <flag name="offensive">Let sudo print insults when the user types the wrong password</flag>
35 - <flag name="openssl">Use message digest functions from <pkg>dev-libs/openssl</pkg> instead of sudo's</flag>
36 <flag name="sendmail">Allow sudo to send emails with sendmail</flag>
37 <flag name="sssd">Add System Security Services Daemon support</flag>
38 <flag name="secure-path">Replace PATH variable with compile time secure paths</flag>
39
40 diff --git a/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild b/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
41 deleted file mode 100644
42 index 284b319e05f..00000000000
43 --- a/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
44 +++ /dev/null
45 @@ -1,242 +0,0 @@
46 -# Copyright 1999-2018 Gentoo Authors
47 -# Distributed under the terms of the GNU General Public License v2
48 -
49 -EAPI=6
50 -
51 -inherit eutils pam multilib libtool tmpfiles
52 -if [[ ${PV} == "9999" ]] ; then
53 - EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
54 - inherit mercurial
55 -fi
56 -
57 -MY_P=${P/_/}
58 -MY_P=${MY_P/beta/b}
59 -
60 -uri_prefix=
61 -case ${P} in
62 - *_beta*|*_rc*) uri_prefix=beta/ ;;
63 -esac
64 -
65 -DESCRIPTION="Allows users or groups to run commands as other users"
66 -HOMEPAGE="https://www.sudo.ws/"
67 -if [[ ${PV} != "9999" ]] ; then
68 - SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
69 - ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
70 - if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
71 - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
72 - fi
73 -fi
74 -
75 -# Basic license is ISC-style as-is, some files are released under
76 -# 3-clause BSD license
77 -LICENSE="ISC BSD"
78 -SLOT="0"
79 -IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey sssd"
80 -
81 -CDEPEND="
82 - sys-libs/zlib:=
83 - gcrypt? ( dev-libs/libgcrypt:= )
84 - ldap? (
85 - >=net-nds/openldap-2.1.30-r1
86 - dev-libs/cyrus-sasl
87 - )
88 - openssl? ( dev-libs/openssl:0= )
89 - pam? ( virtual/pam )
90 - sasl? ( dev-libs/cyrus-sasl )
91 - skey? ( >=sys-auth/skey-1.1.5-r1 )
92 - sssd? ( sys-auth/sssd[sudo] )
93 -"
94 -RDEPEND="
95 - ${CDEPEND}
96 - >=app-misc/editor-wrapper-3
97 - virtual/editor
98 - ldap? ( dev-lang/perl )
99 - pam? ( sys-auth/pambase )
100 - selinux? ( sec-policy/selinux-sudo )
101 - sendmail? ( virtual/mta )
102 -"
103 -DEPEND="
104 - ${CDEPEND}
105 - sys-devel/bison
106 -"
107 -
108 -S="${WORKDIR}/${MY_P}"
109 -
110 -REQUIRED_USE="
111 - pam? ( !skey )
112 - skey? ( !pam )
113 - ?? ( gcrypt openssl )
114 -"
115 -
116 -MAKEOPTS+=" SAMPLES="
117 -
118 -src_prepare() {
119 - default
120 - elibtoolize
121 -}
122 -
123 -set_secure_path() {
124 - # FIXME: secure_path is a compile time setting. using PATH or
125 - # ROOTPATH is not perfect, env-update may invalidate this, but until it
126 - # is available as a sudoers setting this will have to do.
127 - einfo "Setting secure_path ..."
128 -
129 - # first extract the default ROOTPATH from build env
130 - SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
131 - echo "${ROOTPATH}")
132 - case "${SECURE_PATH}" in
133 - */usr/sbin*) ;;
134 - *) SECURE_PATH=$(unset PATH;
135 - . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
136 - ;;
137 - esac
138 - if [[ -z ${SECURE_PATH} ]] ; then
139 - ewarn " Failed to detect SECURE_PATH, please report this"
140 - fi
141 -
142 - # then remove duplicate path entries
143 - cleanpath() {
144 - local newpath thisp IFS=:
145 - for thisp in $1 ; do
146 - if [[ :${newpath}: != *:${thisp}:* ]] ; then
147 - newpath+=:$thisp
148 - else
149 - einfo " Duplicate entry ${thisp} removed..."
150 - fi
151 - done
152 - SECURE_PATH=${newpath#:}
153 - }
154 - cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
155 -
156 - # finally, strip gcc paths #136027
157 - rmpath() {
158 - local e newpath thisp IFS=:
159 - for thisp in ${SECURE_PATH} ; do
160 - for e ; do [[ $thisp == $e ]] && continue 2 ; done
161 - newpath+=:$thisp
162 - done
163 - SECURE_PATH=${newpath#:}
164 - }
165 - rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
166 -
167 - einfo "... done"
168 -}
169 -
170 -src_configure() {
171 - local SECURE_PATH
172 - set_secure_path
173 -
174 - # audit: somebody got to explain me how I can test this before I
175 - # enable it.. - Diego
176 - # plugindir: autoconf code is crappy and does not delay evaluation
177 - # until `make` time, so we have to use a full path here rather than
178 - # basing off other values.
179 - myeconfargs=(
180 - --enable-zlib=system
181 - --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
182 - --with-editor="${EPREFIX}"/usr/libexec/editor
183 - --with-env-editor
184 - --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
185 - --with-rundir="${EPREFIX}"/run/sudo
186 - --with-secure-path="${SECURE_PATH}"
187 - --with-vardir="${EPREFIX}"/var/db/sudo
188 - --without-linux-audit
189 - --without-opie
190 - $(use_enable gcrypt)
191 - $(use_enable nls)
192 - $(use_enable openssl)
193 - $(use_enable sasl)
194 - $(use_with offensive insults)
195 - $(use_with offensive all-insults)
196 - $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
197 - $(use_with ldap)
198 - $(use_with pam)
199 - $(use_with skey)
200 - $(use_with sssd)
201 - $(use_with selinux)
202 - $(use_with sendmail)
203 - )
204 - econf "${myeconfargs[@]}"
205 -}
206 -
207 -src_install() {
208 - default
209 -
210 - if use ldap ; then
211 - dodoc README.LDAP
212 -
213 - cat <<-EOF > "${T}"/ldap.conf.sudo
214 - # See ldap.conf(5) and README.LDAP for details
215 - # This file should only be readable by root
216 -
217 - # supported directives: host, port, ssl, ldap_version
218 - # uri, binddn, bindpw, sudoers_base, sudoers_debug
219 - # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
220 - EOF
221 -
222 - insinto /etc
223 - doins "${T}"/ldap.conf.sudo
224 - fperms 0440 /etc/ldap.conf.sudo
225 -
226 - insinto /etc/openldap/schema
227 - newins doc/schema.OpenLDAP sudo.schema
228 - fi
229 -
230 - pamd_mimic system-auth sudo auth account session
231 -
232 - keepdir /var/db/sudo/lectured
233 - fperms 0700 /var/db/sudo/lectured
234 - fperms 0711 /var/db/sudo #652958
235 -
236 - # Don't install into /run as that is a tmpfs most of the time
237 - # (bug #504854)
238 - rm -rf "${ED%/}"/run
239 -}
240 -
241 -pkg_postinst() {
242 - tmpfiles_process sudo.conf
243 -
244 - #652958
245 - local sudo_db="${EROOT}/var/db/sudo"
246 - if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
247 - chmod 711 "${sudo_db}" || die
248 - fi
249 -
250 - if use ldap ; then
251 - ewarn
252 - ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
253 - ewarn
254 - if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
255 - ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
256 - ewarn "configured in /etc/nsswitch.conf."
257 - ewarn
258 - ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
259 - ewarn " sudoers: ldap files"
260 - ewarn
261 - fi
262 - fi
263 - if use prefix ; then
264 - ewarn
265 - ewarn "To use sudo, you need to change file ownership and permissions"
266 - ewarn "with root privileges, as follows:"
267 - ewarn
268 - ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
269 - ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
270 - ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
271 - ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
272 - ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
273 - ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
274 - ewarn
275 - fi
276 -
277 - elog "To use the -A (askpass) option, you need to install a compatible"
278 - elog "password program from the following list. Starred packages will"
279 - elog "automatically register for the use with sudo (but will not force"
280 - elog "the -A option):"
281 - elog ""
282 - elog " [*] net-misc/ssh-askpass-fullscreen"
283 - elog " net-misc/x11-ssh-askpass"
284 - elog ""
285 - elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
286 - elog "variable to the program you want to use."
287 -}