From 773275683759292fa1478a83180a9f70f80d5065 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Sun, 26 Jun 2016 10:12:51 -0700 Subject: [PATCH] bump(app-admin/sudo): sync with upstream --- .../portage-stable/app-admin/sudo/ChangeLog | 26 +++ .../portage-stable/app-admin/sudo/Manifest | 11 +- .../sudo-1.8.12-include-sys-types-h.patch | 146 ------------- .../app-admin/sudo/sudo-1.8.14_p3.ebuild | 196 ------------------ ...{sudo-1.8.12.ebuild => sudo-1.8.16.ebuild} | 15 +- .../app-admin/sudo/sudo-9999.ebuild | 5 +- .../metadata/md5-cache/app-admin/sudo-1.8.12 | 14 -- .../app-admin/{sudo-1.8.14_p3 => sudo-1.8.16} | 8 +- .../metadata/md5-cache/app-admin/sudo-9999 | 4 +- 9 files changed, 48 insertions(+), 377 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-admin/sudo/files/sudo-1.8.12-include-sys-types-h.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-1.8.14_p3.ebuild rename sdk_container/src/third_party/portage-stable/app-admin/sudo/{sudo-1.8.12.ebuild => sudo-1.8.16.ebuild} (94%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-1.8.12 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/{sudo-1.8.14_p3 => sudo-1.8.16} (76%) diff --git a/sdk_container/src/third_party/portage-stable/app-admin/sudo/ChangeLog b/sdk_container/src/third_party/portage-stable/app-admin/sudo/ChangeLog index 5bac5753c1..97bbe91cd1 100644 --- a/sdk_container/src/third_party/portage-stable/app-admin/sudo/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/app-admin/sudo/ChangeLog @@ -175,3 +175,29 @@ 24 Jan 2016; Michał Górny metadata.xml: Set appropriate maintainer types in metadata.xml (GLEP 67) + 08 Mar 2016; Doug Goldstein + -files/sudo-1.8.12-include-sys-types-h.patch, -sudo-1.8.12.ebuild, + -sudo-1.8.14_p3.ebuild: + remove vulnerable versions + + Clean up versions vulnerable to CVE-2015-5602 + + Gentoo-Bug: 564774 + + Package-Manager: portage-2.2.26 + Signed-off-by: Doug Goldstein + +*sudo-1.8.16 (17 Mar 2016) + + 17 Mar 2016; Lars Wendler +sudo-1.8.16.ebuild: + Bump to version 1.8.16 + + Package-Manager: portage-2.2.28 + Signed-off-by: Lars Wendler + + 17 Mar 2016; Lars Wendler sudo-9999.ebuild: + Bumped live ebuild to EAPI-6. + + Package-Manager: portage-2.2.28 + Signed-off-by: Lars Wendler + diff --git a/sdk_container/src/third_party/portage-stable/app-admin/sudo/Manifest b/sdk_container/src/third_party/portage-stable/app-admin/sudo/Manifest index db16ddcf59..5ea24d5d1d 100644 --- a/sdk_container/src/third_party/portage-stable/app-admin/sudo/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-admin/sudo/Manifest @@ -1,11 +1,8 @@ -AUX sudo-1.8.12-include-sys-types-h.patch 5838 SHA256 c86bd2e0cee16ccda405cf2888097e60f9cc489c43e71482057a4049b6b2dd4a SHA512 d230420b04bd7a8335f67450bcb638caccb5ebba1ee7c96b43343df0ada867095fa931a8743d5b8f78d7cc96a3eb855863de1cfa4723315e705cbed1dc9bd51c WHIRLPOOL adb64000d54d9c7f1c35474feebc0333354b8207740abea2e3f9c6bd6d3f21d80489dcafcd47f4358e6133b8be8062341be30b1d59abb34ba2ae96fe7a10fbe1 -DIST sudo-1.8.12.tar.gz 2493373 SHA256 163b51841de8ad19276581a6782d61f5948f1f72a0a843371a1c167d3dc4f3b0 SHA512 1815343eceb7cfa6e37c961ce1c68cf96fc290356b92078d6d24a2c85d8b7a7236df78d3ff7f5e30eba492dc8407346d884e01c0b989eef4414156cfec80b67b WHIRLPOOL 0d9e618937a08b9bf74aaebf12f5b9f96afd827728f90fa95b6a2a4f932cc84240d56674aa903062247068ec5aa3369b14bad64130caeb313330286510c2d3f6 -DIST sudo-1.8.14p3.tar.gz 2570892 SHA256 a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237 SHA512 022e75a4171c0d9b87569adc5b08afc1b8f2adb7dbc6c80dfb737029dbca560a08e317ce37f117b614f36b54666ed01559a72d0c92523a5a2ee3531f520d7a2b WHIRLPOOL 143ff1c464b539e79172cd0340a089739207d2b99fc01d183a27b24b5172c834d6ed0f7258116542ffa559a3a4c3540924261170655dd7bedb449f8d93496bbd DIST sudo-1.8.15.tar.gz 2660128 SHA256 4316381708324da8b6cb151f655c1a11855207c7c02244d8ffdea5104d7cc308 SHA512 f2bff92104ddc4cbea8c788da446043cbfe02c977cedf18d46b1c82e98d7227432cb5a61233e7a06af84e3637f906edd5e02bb88c03a2ce4a16df410469a5dab WHIRLPOOL 3da64eda51f22d7fc0ea76f0693e9960d511b7c762b5d6237318d17436fd64b58ae90caa9bf4e125ebee70b83eac7cba2c7451fb62fafd8ee3d133c4ae2037b9 -EBUILD sudo-1.8.12.ebuild 5574 SHA256 7caca4c84b4ee06443e180641472a401125d5768f66c7301b807cccd1a07f599 SHA512 d8256e0a41e630ca1e6ba331d04bccf29bcdb8e40fcc158a3d6a46423385c2509ef4029c40682167dc9c0bdf6ed95b847805c28465838443c09cdeb01fe6afe8 WHIRLPOOL dc646c2f9ce43f1c5e38a796c0cd1655eb08438f87e9127c6b0b97abd9ff665a1784b1b78f284d3a8876d920f9351fd89ca428a2d4a8b1a12b95e16d58c1893f -EBUILD sudo-1.8.14_p3.ebuild 5526 SHA256 6ad64c695694dc36b8f5ca162ff772f85507a26bdccd0e1143d4d82481b5f62d SHA512 d746d71892334f2861d4c714b9e0da0c9e02121db98a359c3003cfa1fc09e869797e84f30f226517b6b6f6b92186fb3101190b1a74086a83101bfe2cd4300396 WHIRLPOOL fa35079f66309141165710510602b83d83dd442d8accf919922e4e1604838603bb31d17303a96bcd39daaa882b989732e9047e4ade92894d4e9c6d395c057719 +DIST sudo-1.8.16.tar.gz 2707358 SHA256 2d83826fc5125bf073acc203dbda1cf2abeee017090ccc9dddb0431a53d5064d SHA512 7cf5399eb65c4b39071213c27c34d35ed2ea9c4578f19f6e8d3777179914fa30a2848c042e9f85e90e3b5d056322b9eb6c79e2d3b9b210a795e9921a1b00200b WHIRLPOOL 747bff26e93475441aab6bb6ff8e51114f8155277d570cbdb28909b7e63a49fcdcf5d65f186a2ec067f1100cac3c0a2e6f3a7611f78d83794f41d6884a8c6fc9 EBUILD sudo-1.8.15-r1.ebuild 5575 SHA256 df81d77b9940a948555dfcf9d9e775cbd705658908ebbfb57272b2958f4f8f73 SHA512 6c437d8a78ec793bb0ed24582468040a671e7b98076026387906dafdd609fa00b2eac23500ce3df7dbd8512f749d6af274aabbecbf80c66615948e7223f2035c WHIRLPOOL e8f49dba5df59ecc04305483516f4c8624f58163457015944e3b82bbcf266232c1b016c177fcdf894fc4a05f7da2ccf5e173b1583f0dee0a0e5a170a22ebeadd -EBUILD sudo-9999.ebuild 5668 SHA256 dafc0018285f2cd0ee86d7743e9e687e68cbc3632c7b78f0bf4995051cf0c133 SHA512 cc71836ac9da4dce33c129c103e811d48d21c440ef053c7ea914b6511c7afee08d99609a82a991e90da2f40c2aaac045fd7862a6d45d91d11a81e65e8a54ed63 WHIRLPOOL 0bea1cd0124d0d5f5ca10ad4cf6883c58473aa94c0c96647544d7e00ccc5687104cbfda045cd0de5b7db6c98c51a16b455c7b62a1cdb6bb237e4a7f647141881 -MISC ChangeLog 5987 SHA256 a971274ec33443737401b55a9dbc896294d6915e771c9329202b4fdc22e187ac SHA512 1e1ec368110a005ab339f22c6b00eed834452e921bce7547e871b621920fadcc9bf368a4f8df801c26b0dd108e555e9dd40cd15330a425a6ac87ec03d608206c WHIRLPOOL e76930f3d6d872c2945db69121e6539d9d0fdb795b8826634b14223e160f429d794c3e4a500c535f5fee82222595fd59c1c85130274509ec28aad84c2daeb5ef +EBUILD sudo-1.8.16.ebuild 5593 SHA256 669a366e12ae547091081b18fa65ce0e0d95c6e865dd6d4237334aff5c2ef847 SHA512 c5e76885475f7bccef8fb07d11ac532621fb35cd0358136f41dc85eafbbb31cd68adcf27ed9cb6c01e1de3fea5226b683af4f02a28b64c838e1b8775bf6fc8cb WHIRLPOOL 64f716ece334db0215693c3880cd05fb00c0287714e1cdcf772cf2784c86799496b59fcf84a3150322b13e137c8d89f7092b8e6f2effcfde934727daaa18b70a +EBUILD sudo-9999.ebuild 5677 SHA256 4523feaf92eee9d98f67541b45a9dd82dfff2def24d1c52e2ab1f0a6f6dd0439 SHA512 c2a1710819383eaed33c7b4291c80bbfd61dd142ca2c6352a3cd7c4534fbb4475c25a89990b43531c3f9894e50cd9ac4cf9b59c97087d7a87538a0b8147f5126 WHIRLPOOL 3ffde20ad98e2b5d3fb43b6b4a82c901d588992d0d3ebe35824928d36d90606f05127d0923b477f89bbf3a8afeae553303639fa99e31cef7029a1711347159eb +MISC ChangeLog 6736 SHA256 d8e9fd045344d0f94a7151b0f4d3b408e3a4c8b2ab95fa3ebdcd47f27326a5e6 SHA512 83405144fcf3857d93b6689f7c7b918a98f515f9a17830cd6ee2dcbd175a585be6ea54610e7406c579ccdaee54cdf461d85168bdf399094cce61c8f933737156 WHIRLPOOL b4db8401df0ce037f092c4039694d37d311f4a63b2fdab1883713d1e4317f8021aaca4af6546cd7bfe4e204cf2f83a3c86d5e98734814c4f93013de83686f562 MISC ChangeLog-2015 56371 SHA256 4ffe6c477fa8f0d089b6d135501283d409b880528f21162a52f8512555a1bc39 SHA512 af41912ac5e32ced0eea056593bdfd569c16a09760d42f79be1901ae8bed2ad98dc13b75d1c82861a0ccad613434076b63853bcb7c755fa775911e9688d7562e WHIRLPOOL 79db049d5b1286721e07d170b381b4fe8ff2433781e25c55fa7e4f999caa61f68d9282d47139b274e64d2f73a325cd18b26762ea6cd128cec7a70b4cd5c3ed37 MISC metadata.xml 823 SHA256 d6327d06d50a21b9a9ff16d804076279017085250e2e1e2b7c93a59734a12785 SHA512 d5cb8525376cb387d5c8909be9641e2c25b388295c7d8b0e23c628c9b586f758b8a11aae5d6ae30c4142937e9cf32255ed587f33a0409283d1af9f92c4e01fc1 WHIRLPOOL 29e48f17bee24e8dc3754cc321651b1b79c0fc37a357be1e655540fb22799c26cf0df047952a5cf466fe92cccf6eae60dd9917a89dc1a9bc6a7da39ac51ac4c3 diff --git a/sdk_container/src/third_party/portage-stable/app-admin/sudo/files/sudo-1.8.12-include-sys-types-h.patch b/sdk_container/src/third_party/portage-stable/app-admin/sudo/files/sudo-1.8.12-include-sys-types-h.patch deleted file mode 100644 index f33748669e..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-admin/sudo/files/sudo-1.8.12-include-sys-types-h.patch +++ /dev/null @@ -1,146 +0,0 @@ -This fixes builds on uClibc and musl. See -https://bugs.gentoo.org/show_bug.cgi?id=544756 - -This patch is a slight modification of uptream commits: -http://www.sudo.ws/repos/sudo/rev/86eb67f3c41a -http://www.sudo.ws/repos/sudo/rev/e0794f05e95c - -diff -Naur sudo-1.8.12.orig/lib/util/getopt_long.c sudo-1.8.12/lib/util/getopt_long.c ---- sudo-1.8.12.orig/lib/util/getopt_long.c 2015-02-09 18:40:10.000000000 +0000 -+++ sudo-1.8.12/lib/util/getopt_long.c 2015-04-10 19:21:20.337032782 +0000 -@@ -52,6 +52,7 @@ - - #include - -+#include - #include - #ifdef STDC_HEADERS - # include -diff -Naur sudo-1.8.12.orig/lib/util/mksiglist.c sudo-1.8.12/lib/util/mksiglist.c ---- sudo-1.8.12.orig/lib/util/mksiglist.c 2015-02-09 18:40:10.000000000 +0000 -+++ sudo-1.8.12/lib/util/mksiglist.c 2015-04-10 19:22:38.719856268 +0000 -@@ -43,6 +43,7 @@ - #include "mksiglist.h" - - printf("#include \n"); -+ printf("#include \n"); - printf("#include \n"); - printf("#include \"sudo_compat.h\"\n\n"); - printf("const char *const sudo_sys_siglist[NSIG] = {\n"); -diff -Naur sudo-1.8.12.orig/lib/util/mksigname.c sudo-1.8.12/lib/util/mksigname.c ---- sudo-1.8.12.orig/lib/util/mksigname.c 2015-02-09 18:40:10.000000000 +0000 -+++ sudo-1.8.12/lib/util/mksigname.c 2015-04-10 19:22:10.738491394 +0000 -@@ -43,6 +43,7 @@ - #include "mksigname.h" - - printf("#include \n"); -+ printf("#include \n"); - printf("#include \n"); - printf("#include \"sudo_compat.h\"\n\n"); - printf("const char *const sudo_sys_signame[NSIG] = {\n"); -diff -Naur sudo-1.8.12.orig/lib/util/regress/fnmatch/fnm_test.c sudo-1.8.12/lib/util/regress/fnmatch/fnm_test.c ---- sudo-1.8.12.orig/lib/util/regress/fnmatch/fnm_test.c 2015-02-09 18:40:10.000000000 +0000 -+++ sudo-1.8.12/lib/util/regress/fnmatch/fnm_test.c 2015-04-10 19:21:20.340032928 +0000 -@@ -6,6 +6,7 @@ - - #include - -+#include - #include - #include - #ifdef HAVE_STRING_H -diff -Naur sudo-1.8.12.orig/lib/util/regress/glob/globtest.c sudo-1.8.12/lib/util/regress/glob/globtest.c ---- sudo-1.8.12.orig/lib/util/regress/glob/globtest.c 2015-02-09 18:40:10.000000000 +0000 -+++ sudo-1.8.12/lib/util/regress/glob/globtest.c 2015-04-10 19:21:20.341032977 +0000 -@@ -6,6 +6,7 @@ - - #include - -+#include - #include - #include - #ifdef HAVE_STRING_H -diff -Naur sudo-1.8.12.orig/lib/util/sha2.c sudo-1.8.12/lib/util/sha2.c ---- sudo-1.8.12.orig/lib/util/sha2.c 2015-02-09 18:40:09.000000000 +0000 -+++ sudo-1.8.12/lib/util/sha2.c 2015-04-10 19:21:20.342033026 +0000 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2013 Todd C. Miller -+ * Copyright (c) 2013-2015 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above -@@ -25,6 +25,7 @@ - - #include - -+#include - #include - #ifdef STDC_HEADERS - # include -diff -Naur sudo-1.8.12.orig/plugins/sudoers/regress/parser/check_base64.c sudo-1.8.12/plugins/sudoers/regress/parser/check_base64.c ---- sudo-1.8.12.orig/plugins/sudoers/regress/parser/check_base64.c 2015-02-09 18:40:10.000000000 +0000 -+++ sudo-1.8.12/plugins/sudoers/regress/parser/check_base64.c 2015-04-10 19:21:20.342033026 +0000 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2013 Todd C. Miller -+ * Copyright (c) 2013-2015 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above -@@ -16,6 +16,7 @@ - - #include - -+#include - #include - #ifdef STDC_HEADERS - # include -diff -Naur sudo-1.8.12.orig/plugins/sudoers/regress/parser/check_digest.c sudo-1.8.12/plugins/sudoers/regress/parser/check_digest.c ---- sudo-1.8.12.orig/plugins/sudoers/regress/parser/check_digest.c 2015-02-09 18:40:10.000000000 +0000 -+++ sudo-1.8.12/plugins/sudoers/regress/parser/check_digest.c 2015-04-10 19:21:20.343033075 +0000 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2013 Todd C. Miller -+ * Copyright (c) 2013-2015 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above -@@ -16,6 +16,7 @@ - - #include - -+#include - #include - #ifdef STDC_HEADERS - # include -diff -Naur sudo-1.8.12.orig/plugins/sudoers/regress/parser/check_hexchar.c sudo-1.8.12/plugins/sudoers/regress/parser/check_hexchar.c ---- sudo-1.8.12.orig/plugins/sudoers/regress/parser/check_hexchar.c 2015-02-09 18:40:10.000000000 +0000 -+++ sudo-1.8.12/plugins/sudoers/regress/parser/check_hexchar.c 2015-04-10 19:21:20.344033124 +0000 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2014 Todd C. Miller -+ * Copyright (c) 2014-2015 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above -@@ -16,6 +16,7 @@ - - #include - -+#include - #include - #ifdef STDC_HEADERS - # include -diff -Naur sudo-1.8.12.orig/plugins/sudoers/solaris_audit.c sudo-1.8.12/plugins/sudoers/solaris_audit.c ---- sudo-1.8.12.orig/plugins/sudoers/solaris_audit.c 2015-02-09 18:53:54.000000000 +0000 -+++ sudo-1.8.12/plugins/sudoers/solaris_audit.c 2015-04-10 19:21:20.345033172 +0000 -@@ -15,6 +15,8 @@ - */ - - #include -+ -+#include - #include - #include - #include diff --git a/sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-1.8.14_p3.ebuild b/sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-1.8.14_p3.ebuild deleted file mode 100644 index c4e80afad0..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-1.8.14_p3.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils pam multilib libtool - -MY_P=${P/_/} -MY_P=${MY_P/beta/b} - -uri_prefix= -case ${P} in -*_beta*|*_rc*) uri_prefix=beta/ ;; -esac - -DESCRIPTION="Allows users or groups to run commands as other users" -HOMEPAGE="http://www.sudo.ws/" -SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz - ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz" - -# Basic license is ISC-style as-is, some files are released under -# 3-clause BSD license -LICENSE="ISC BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" -IUSE="ldap nls pam offensive selinux skey +sendmail" - -DEPEND="pam? ( virtual/pam ) - skey? ( >=sys-auth/skey-1.1.5-r1 ) - ldap? ( - >=net-nds/openldap-2.1.30-r1 - dev-libs/cyrus-sasl - ) - sys-libs/zlib" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-sudo ) - ldap? ( dev-lang/perl ) - pam? ( sys-auth/pambase ) - >=app-misc/editor-wrapper-3 - virtual/editor - sendmail? ( virtual/mta )" -DEPEND="${DEPEND} - sys-devel/bison" - -S=${WORKDIR}/${MY_P} - -REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" - -MAKEOPTS+=" SAMPLES=" - -src_prepare() { - elibtoolize -} - -set_rootpath() { - # FIXME: secure_path is a compile time setting. using ROOTPATH - # is not perfect, env-update may invalidate this, but until it - # is available as a sudoers setting this will have to do. - einfo "Setting secure_path ..." - - # first extract the default ROOTPATH from build env - ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}") - if [[ -z ${ROOTPATH} ]] ; then - ewarn " Failed to find ROOTPATH, please report this" - fi - - # then remove duplicate path entries - cleanpath() { - local newpath thisp IFS=: - for thisp in $1 ; do - if [[ :${newpath}: != *:${thisp}:* ]] ; then - newpath+=:$thisp - else - einfo " Duplicate entry ${thisp} removed..." - fi - done - ROOTPATH=${newpath#:} - } - cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}} - - # finally, strip gcc paths #136027 - rmpath() { - local e newpath thisp IFS=: - for thisp in ${ROOTPATH} ; do - for e ; do [[ $thisp == $e ]] && continue 2 ; done - newpath+=:$thisp - done - ROOTPATH=${newpath#:} - } - rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*' - - einfo "... done" -} - -src_configure() { - local ROOTPATH - set_rootpath - - # audit: somebody got to explain me how I can test this before I - # enable it.. - Diego - # plugindir: autoconf code is crappy and does not delay evaluation - # until `make` time, so we have to use a full path here rather than - # basing off other values. - econf \ - --enable-zlib=system \ - --with-secure-path="${ROOTPATH}" \ - --with-editor="${EPREFIX}"/usr/libexec/editor \ - --with-env-editor \ - $(use_with offensive insults) \ - $(use_with offensive all-insults) \ - $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \ - $(use_with ldap) \ - $(use_enable nls) \ - $(use_with pam) \ - $(use_with skey) \ - $(use_with selinux) \ - $(use_with sendmail) \ - --without-opie \ - --without-linux-audit \ - --with-rundir="${EPREFIX}"/var/run/sudo \ - --with-vardir="${EPREFIX}"/var/db/sudo \ - --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} -} - -src_install() { - default - - if use ldap ; then - dodoc README.LDAP doc/schema.OpenLDAP - dosbin plugins/sudoers/sudoers2ldif - - cat <<-EOF > "${T}"/ldap.conf.sudo - # See ldap.conf(5) and README.LDAP for details - # This file should only be readable by root - - # supported directives: host, port, ssl, ldap_version - # uri, binddn, bindpw, sudoers_base, sudoers_debug - # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key - EOF - - insinto /etc - doins "${T}"/ldap.conf.sudo - fperms 0440 /etc/ldap.conf.sudo - fi - - pamd_mimic system-auth sudo auth account session - - keepdir /var/db/sudo - fperms 0700 /var/db/sudo - - # Don't install into /var/run as that is a tmpfs most of the time - # (bug #504854) - rm -rf "${D}"/var/run -} - -pkg_postinst() { - if use ldap ; then - ewarn - ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration." - ewarn - if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then - ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly" - ewarn "configured in /etc/nsswitch.conf." - ewarn - ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:" - ewarn " sudoers: ldap files" - ewarn - fi - fi - if use prefix ; then - ewarn - ewarn "To use sudo, you need to change file ownership and permissions" - ewarn "with root privileges, as follows:" - ewarn - ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo" - ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so" - ewarn " # chown root:root ${EPREFIX}/etc/sudoers" - ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d" - ewarn " # chown root:root ${EPREFIX}/var/db/sudo" - ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo" - ewarn - fi - - elog "To use the -A (askpass) option, you need to install a compatible" - elog "password program from the following list. Starred packages will" - elog "automatically register for the use with sudo (but will not force" - elog "the -A option):" - elog "" - elog " [*] net-misc/ssh-askpass-fullscreen" - elog " net-misc/x11-ssh-askpass" - elog "" - elog "You can override the choice by setting the SUDO_ASKPASS environmnent" - elog "variable to the program you want to use." -} diff --git a/sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-1.8.12.ebuild b/sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-1.8.16.ebuild similarity index 94% rename from sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-1.8.12.ebuild rename to sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-1.8.16.ebuild index d1ed25ec38..66082e6e06 100644 --- a/sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-1.8.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-1.8.16.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils pam multilib libtool @@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz # 3-clause BSD license LICENSE="ISC BSD" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" IUSE="ldap nls pam offensive selinux skey +sendmail" DEPEND="pam? ( virtual/pam ) @@ -50,7 +50,7 @@ REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" MAKEOPTS+=" SAMPLES=" src_prepare() { - epatch "${FILESDIR}"/${P}-include-sys-types-h.patch + default elibtoolize } @@ -129,7 +129,7 @@ src_install() { default if use ldap ; then - dodoc README.LDAP doc/schema.OpenLDAP + dodoc README.LDAP dosbin plugins/sudoers/sudoers2ldif cat <<-EOF > "${T}"/ldap.conf.sudo @@ -138,12 +138,15 @@ src_install() { # supported directives: host, port, ssl, ldap_version # uri, binddn, bindpw, sudoers_base, sudoers_debug - # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key + # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key} EOF insinto /etc doins "${T}"/ldap.conf.sudo fperms 0440 /etc/ldap.conf.sudo + + insinto /etc/openldap/schema + newins doc/schema.OpenLDAP sudo.schema fi pamd_mimic system-auth sudo auth account session diff --git a/sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-9999.ebuild index c1143830b2..d544711d5f 100644 --- a/sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-admin/sudo/sudo-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils pam multilib libtool if [[ ${PV} == "9999" ]] ; then @@ -56,6 +56,7 @@ REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" MAKEOPTS+=" SAMPLES=" src_prepare() { + default elibtoolize } diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-1.8.12 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-1.8.12 deleted file mode 100644 index 56faf3e99d..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-1.8.12 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install postinst prepare -DEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison -DESCRIPTION=Allows users or groups to run commands as other users -EAPI=5 -HOMEPAGE=http://www.sudo.ws/ -IUSE=ldap nls pam offensive selinux skey +sendmail -KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris -LICENSE=ISC BSD -RDEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta ) -REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) -SLOT=0 -SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.12.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.12.tar.gz -_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 -_md5_=daea9be78238fb3bce3ba95d2a442d8e diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-1.8.14_p3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-1.8.16 similarity index 76% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-1.8.14_p3 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-1.8.16 index 42cb6ae9de..b8a0b6658e 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-1.8.14_p3 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-1.8.16 @@ -1,14 +1,14 @@ DEFINED_PHASES=configure install postinst prepare DEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison DESCRIPTION=Allows users or groups to run commands as other users -EAPI=5 +EAPI=6 HOMEPAGE=http://www.sudo.ws/ IUSE=ldap nls pam offensive selinux skey +sendmail -KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris LICENSE=ISC BSD RDEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta ) REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) SLOT=0 -SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.14p3.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.14p3.tar.gz +SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.16.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.16.tar.gz _eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 -_md5_=855993aa48e9a065488bbc22c873e1bb +_md5_=c5be292a04aacd86150d87c53a2e8ba8 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-9999 index fd580b7278..141ec79e5d 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-9999 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/sudo-9999 @@ -1,7 +1,7 @@ DEFINED_PHASES=configure install postinst prepare unpack DEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison dev-vcs/mercurial DESCRIPTION=Allows users or groups to run commands as other users -EAPI=5 +EAPI=6 HOMEPAGE=http://www.sudo.ws/ IUSE=ldap nls pam offensive selinux skey +sendmail LICENSE=ISC BSD @@ -9,4 +9,4 @@ RDEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nd REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) SLOT=0 _eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 mercurial 789038b352d112bcff9dff083aa40d8d multilib 3972ca401cf7dbb430df9995f5d8d580 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 -_md5_=989f60a94cf8aea51f6c20b35c3d99cd +_md5_=ed81970a6ac15fd38337c2d7ee9b1bee