diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2019-12-12 10:29:35 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2019-12-12 10:29:35 +0000 |
commit | dfb173f845153485908f44a2778a40c7f198edee (patch) | |
tree | 7f90ee1da1d44f208c4ba2c6df27b391ffb6b4cd | |
parent | 2019-12-12 09:49:26 UTC (diff) | |
parent | acct-user/shellinaboxd: change UID to 306. (diff) | |
download | gentoo-dfb173f845153485908f44a2778a40c7f198edee.tar.gz gentoo-dfb173f845153485908f44a2778a40c7f198edee.tar.bz2 gentoo-dfb173f845153485908f44a2778a40c7f198edee.zip |
Merge updates from master
-rw-r--r-- | acct-group/shellinaboxd/shellinaboxd-0.ebuild | 2 | ||||
-rw-r--r-- | acct-user/shellinaboxd/shellinaboxd-0.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/util-linux/Manifest | 1 | ||||
-rw-r--r-- | sys-apps/util-linux/metadata.xml | 1 | ||||
-rw-r--r-- | sys-apps/util-linux/util-linux-2.35_rc1.ebuild (renamed from sys-apps/util-linux/util-linux-2.34-r2.ebuild) | 14 | ||||
-rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 4 |
6 files changed, 18 insertions, 6 deletions
diff --git a/acct-group/shellinaboxd/shellinaboxd-0.ebuild b/acct-group/shellinaboxd/shellinaboxd-0.ebuild index 862bbf2a9cd0..d5fee0d5f3dd 100644 --- a/acct-group/shellinaboxd/shellinaboxd-0.ebuild +++ b/acct-group/shellinaboxd/shellinaboxd-0.ebuild @@ -6,4 +6,4 @@ EAPI=7 inherit acct-group DESCRIPTION="shellinabox group" -ACCT_GROUP_ID=14000 +ACCT_GROUP_ID=306 diff --git a/acct-user/shellinaboxd/shellinaboxd-0.ebuild b/acct-user/shellinaboxd/shellinaboxd-0.ebuild index 413ed5720890..02ff9473f3f5 100644 --- a/acct-user/shellinaboxd/shellinaboxd-0.ebuild +++ b/acct-user/shellinaboxd/shellinaboxd-0.ebuild @@ -6,4 +6,4 @@ EAPI=7 inherit acct-user DESCRIPTION="shellinabox user" -ACCT_USER_ID=14000 +ACCT_USER_ID=306 diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index d93241555ce7..da7b8d8ee6c0 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,2 +1,3 @@ DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749 DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7 +DIST util-linux-2.35-rc1.tar.xz 5125036 BLAKE2B 099c5ba1f8111b9ba006f77f2e650b7ff8e0607c0b8e9e59efe4d3b6f47a380b9c87ff28c71e312749ab6073cfa4ef1ac97953510a62fc9ea16ab0d42458ad6a SHA512 1ecf0b6868409dad4a2cc6e7fda708b8bea939f0c2a02b97068d114dac316a3d27c27542e2b220fc4ebef307d6c78b4f318685c1b7877429689f794cb2d4dc7a diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml index dd6f8b1b1ccf..d707189c1c8d 100644 --- a/sys-apps/util-linux/metadata.xml +++ b/sys-apps/util-linux/metadata.xml @@ -8,6 +8,7 @@ <use> <flag name="caps">build setpriv helper (run programs with diff capabilities)</flag> <flag name="cramfs">build mkfs/fsck helpers for cramfs filesystems</flag> + <flag name="cryptsetup">Use <pkg>sys-fs/cryptsetup</pkg> to have built-in dm-verity in libmount</flag> <flag name="fdformat">build fdformat (floppy disk format)</flag> <flag name="hardlink">build hardlink program</flag> <flag name="kill">build the kill program</flag> diff --git a/sys-apps/util-linux/util-linux-2.34-r2.ebuild b/sys-apps/util-linux/util-linux-2.35_rc1.ebuild index 19757977d3d9..212d66fe2dbd 100644 --- a/sys-apps/util-linux/util-linux-2.34-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.35_rc1.ebuild @@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/ LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" SLOT="0" -IUSE="build caps +cramfs fdformat hardlink kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU" +IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. @@ -33,6 +33,7 @@ DEPEND=" virtual/os-headers caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) + cryptsetup? ( sys-fs/cryptsetup ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) @@ -49,10 +50,15 @@ BDEPEND=" " RDEPEND="${DEPEND} hardlink? ( !app-arch/hardlink ) + logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) + su? ( + !<sys-apps/shadow-4.7-r2 + !>=sys-apps/shadow-4.7-r2[su] + ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch @@ -169,7 +175,6 @@ multilib_src_configure() { --disable-login --disable-nologin --disable-pylibmount - --disable-su --enable-agetty --enable-bash-completion --enable-line @@ -183,10 +188,13 @@ multilib_src_configure() { $(use_enable cramfs) $(use_enable fdformat) $(use_enable hardlink) + $(use_enable kill) + $(use_enable logger) + $(use_enable su) $(use_enable tty-helpers mesg) $(use_enable tty-helpers wall) $(use_enable tty-helpers write) - $(use_enable kill) + $(use_with cryptsetup) ) else myeconfargs+=( diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 666d96fe4d15..212d66fe2dbd 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/ LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" SLOT="0" -IUSE="build caps +cramfs fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" +IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. @@ -33,6 +33,7 @@ DEPEND=" virtual/os-headers caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) + cryptsetup? ( sys-fs/cryptsetup ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) @@ -193,6 +194,7 @@ multilib_src_configure() { $(use_enable tty-helpers mesg) $(use_enable tty-helpers wall) $(use_enable tty-helpers write) + $(use_with cryptsetup) ) else myeconfargs+=( |