From 434d713861b70f6c6563d6ee50a8e64f14c970d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 15 Feb 2018 16:58:00 +0000 Subject: gentoo resync : 15.02.2018 --- sys-fs/udev/Manifest | 4 +- sys-fs/udev/udev-237.ebuild | 327 +++++++++++++++++++++++++++++++++++++++++++ sys-fs/udev/udev-9999.ebuild | 21 +-- 3 files changed, 334 insertions(+), 18 deletions(-) create mode 100644 sys-fs/udev/udev-237.ebuild (limited to 'sys-fs/udev') diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index fdfccc516366..bb8241f888e8 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -8,6 +8,7 @@ DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2 DIST systemd-234.tar.gz 4800186 BLAKE2B 398ed8869da98909d1374ef5e549ca3e26b02ece577d94dec53e98431de0c6441e50762a3bc2c93fa1c14c236a8f0dca8e3f4102fd276ec977dfb3e77a789165 SHA512 762336a7d96c6583cf71cad62efce95a0ed93cd0a0d7251f128d10dba8200c0c8df0e5a7d168179ababa5b221295a231e73b7e7ea2697cb3fb5c1b33538efa68 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d +DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b DIST udev-216-patches-2.tar.xz 1264 BLAKE2B b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4 EBUILD udev-216.ebuild 15211 BLAKE2B 81f928e1ba8897fbe5dc97efbd6e33b6d4c77065741732969f4ca50f32c7458a914e6786175d560bbd3eba183ad023cfe41217d967029cdf18fdd185d6764eed SHA512 bf4e3c887eaca0ab747b5ffbcceeba94ed6662a27838cc9f5c09bb248483ececbe37cc9db17a3fd246f789874cc62b2ed831e7f452f9c5163e735da33c924b68 EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb3ddf979655ecad6eafd4f77442928e1ecc7587afc2ad976b8068878dd11714633b159d84591d743c5b6d5640 SHA512 ea3955b5cee2d1a1adfe21cc00eda4e6378a344f5862e1825fdb4bf313077b6e2b5fbb8ee80e786ab4809644d1b3c39dcdcbe14bd01e17e94ca2726d1f3de33d @@ -15,5 +16,6 @@ EBUILD udev-233.ebuild 13034 BLAKE2B ab219baa2baa309e5b0598bbc1fc9a11d8dfb110e10 EBUILD udev-234-r1.ebuild 9990 BLAKE2B 8759bf272f1f7d2e03692049c11d9cbf106e0169c36b5125f8bf342af00133c70c5ecf88bf10bd1edfecddbc3c5075c7149903d5211c956277d7920191275688 SHA512 347f2941145237bc9732ad94074e5a6be432b15466ef2af4f82110a9314dbd9c6d69d391d8181ca66e9b13998466d9a609d03886e5afb5e250ad0323aaa65ec9 EBUILD udev-235.ebuild 9988 BLAKE2B 275ed1ba897951832d3bcd566aed8c3762002736444fcd808b71c11cdadb194ab59da7df31af42092f474eeba2ae47f87cf8d68ed1c09117990c0bdfeda7fbaf SHA512 8a6fc0f42ccba3f0cbf808d1bf4c2d725347781f156fb36fe39057573f35e8d2a5c01fc091e2a5fc2a9a49ba78b4c86f6fec164ffd4d9d153092c3dfdc46c76f EBUILD udev-236-r1.ebuild 10187 BLAKE2B 67015754fdbaf239bf4fc04c71bd9c6186eab00d9dbd6549646fa8947f9b82dc8a26b2b7e4c27b54bfa025997f6dbeb0d76aa33e5cfcc82c5153aa434ee80bd1 SHA512 2ca66a3d3afdefe55b0948cd046f0cc337fe33b6eaa99be244c60e462f9af3130ddddfce9e250ec63106a6ba10858df3d05b36674212c4d8c04a94909f039c25 -EBUILD udev-9999.ebuild 10191 BLAKE2B 245b79d5ea1af56980bdd62ff7a103a0107d8236bb9b295ef02f837ec469404bf2a4df500614e52a5ca6e6820f53266f08c59ff5b4aeda76c29e5221f4971ded SHA512 ed2f79f3d1a517114f19f1b3068280329c18dd591df9748a415df446f615de63e58677f73ed6a42b8ee597c6cdfa68291d013e2887b09fa82a8ee2dc0982deaf +EBUILD udev-237.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4 +EBUILD udev-9999.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4 MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e diff --git a/sys-fs/udev/udev-237.ebuild b/sys-fs/udev/udev-237.ebuild new file mode 100644 index 000000000000..3b794e7c3ded --- /dev/null +++ b/sys-fs/udev/udev-237.ebuild @@ -0,0 +1,327 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user versionator + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl +kmod selinux" + +RESTRICT="test" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl ) + kmod? ( >=sys-apps/kmod-16 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) + ! "${T}"/40-gentoo.rules + # Gentoo specific floppy and usb groups + ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" + ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" + EOF + + local PATCHES=( + "${FILESDIR}/236-uucp-group.patch" + ) + + default +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi +} + +multilib_src_configure() { + local emesonargs=( + -Dacl=$(meson_multilib_native_use acl) + -Defi=false + -Dkmod=$(meson_multilib_native_use kmod) + -Dselinux=$(meson_multilib_native_use selinux) + -Dlink-udev-shared=false + -Dsplit-usr=true + + # Prevent automagic deps + -Dgcrypt=false + -Dlibcryptsetup=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dseccomp=false + -Dlz4=false + -Dxz=false + ) + meson_src_configure +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + multilib-minimal_src_configure +} + +multilib_src_compile() { + # meson creates this link + local libudev=$(readlink src/udev/libudev.so.1) + + local targets=( + src/udev/${libudev} + ) + if multilib_is_native_abi; then + targets+=( + systemd-udevd + udevadm + src/udev/ata_id + src/udev/cdrom_id + src/udev/collect + src/udev/mtd_probe + src/udev/scsi_id + src/udev/v4l_id + man/udev.conf.5 + man/systemd.link.5 + man/hwdb.7 + man/udev.7 + man/systemd-udevd.service.8 + man/udevadm.8 + ) + fi + eninja "${targets[@]}" +} + +multilib_src_install() { + local libudev=$(readlink src/udev/libudev.so.1) + + into / + dolib.so src/udev/{${libudev},libudev.so.1,libudev.so} + + insinto "/usr/$(get_libdir)/pkgconfig" + doins src/libudev/libudev.pc + + if multilib_is_native_abi; then + into / + dobin udevadm + + exeinto /lib/systemd + doexe systemd-udevd + + exeinto /lib/udev + doexe src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id} + + rm rules/99-systemd.rules || die + insinto /lib/udev/rules.d + doins rules/*.rules + + insinto /usr/share/pkgconfig + doins src/udev/udev.pc + + mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die + rm man/systemd-udevd-{control,kernel}.socket.8 || die + doman man/*.[0-9] + fi +} + +multilib_src_install_all() { + doheader src/libudev/libudev.h + + insinto /etc/udev + doins src/udev/udev.conf + keepdir /etc/udev/{hwdb.d,rules.d} + + insinto /lib/systemd/network + doins network/99-default.link + + # see src_prepare() for content of 40-gentoo.rules + insinto /lib/udev/rules.d + doins "${T}"/40-gentoo.rules + doins "${S}"/rules/*.rules + + dobashcomp shell-completion/bash/udevadm + + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_udevadm + + einstalldocs +} + +pkg_postinst() { + mkdir -p "${ROOT%/}"/run + + # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 + # So try to remove it here (will only work if empty). + rmdir "${ROOT%/}"/dev/loop 2>/dev/null + if [[ -d ${ROOT%/}/dev/loop ]]; then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + local fstab="${ROOT%/}"/etc/fstab dev path fstype rest + while read -r dev path fstype rest; do + if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then + ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" + ewarn "filesystem. Otherwise udev won't be able to boot." + ewarn "See, https://bugs.gentoo.org/453186" + fi + done < "${fstab}" + + if [[ -d ${ROOT%/}/usr/lib/udev ]]; then + ewarn + ewarn "Please re-emerge all packages on your system which install" + ewarn "rules and helpers in /usr/lib/udev. They should now be in" + ewarn "/lib/udev." + ewarn + ewarn "One way to do this is to run the following command:" + ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)" + ewarn "Note that qfile can be found in app-portage/portage-utils" + fi + + local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules + local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules + for old_rules in "${old_cd_rules}" "${old_net_rules}"; do + if [[ -f ${old_rules} ]]; then + ewarn + ewarn "File ${old_rules} is from old udev installation but if you still use it," + ewarn "rename it to something else starting with 70- to silence this deprecation" + ewarn "warning." + fi + done + + elog + elog "Starting from version >= 197 the new predictable network interface names are" + elog "used by default, see:" + elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c" + elog + elog "Example command to get the information for the new interface name before booting" + elog "(replace with, for example, eth0):" + elog "# udevadm test-builtin net_id /sys/class/net/ 2> /dev/null" + elog + elog "You can use either kernel parameter \"net.ifnames=0\", create empty" + elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null" + elog "to disable the feature." + + if has_version 'sys-apps/biosdevname'; then + ewarn + ewarn "You can replace the functionality of sys-apps/biosdevname which has been" + ewarn "detected to be installed with the new predictable network interface names." + fi + + ewarn + ewarn "You need to restart udev as soon as possible to make the upgrade go" + ewarn "into effect." + ewarn "The method you use to do this depends on your init system." + if has_version 'sys-apps/openrc'; then + ewarn "For sys-apps/openrc users it is:" + ewarn "# /etc/init.d/udev --nodeps restart" + fi + + elog + elog "For more information on udev on Gentoo, upgrading, writing udev rules, and" + elog "fixing known issues visit:" + elog "https://wiki.gentoo.org/wiki/Udev" + elog "https://wiki.gentoo.org/wiki/Udev/upgrade" + + # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, + # do the same for 80-net-setup-link.rules to keep the old behavior + local net_move=no + local net_name_slot_sym=no + local net_rules_path="${ROOT%/}"/etc/udev/rules.d + local net_name_slot="${net_rules_path}"/80-net-name-slot.rules + local net_setup_link="${net_rules_path}"/80-net-setup-link.rules + if [[ ! -e ${net_setup_link} ]]; then + [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes + if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then + net_move=yes + net_name_slot_sym=yes + fi + fi + if [[ ${net_move} == yes ]]; then + ebegin "Copying ${net_name_slot} to ${net_setup_link}" + + if [[ ${net_name_slot_sym} == yes ]]; then + ln -nfs /dev/null "${net_setup_link}" + else + cp "${net_name_slot}" "${net_setup_link}" + fi + eend $? + fi + + # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 + # https://bugs.gentoo.org/246847 + # https://bugs.gentoo.org/514174 + enewgroup input + + # Update hwdb database in case the format is changed by udev version. + if has_version 'sys-apps/hwids[udev]'; then + udevadm hwdb --update --root="${ROOT%/}" + # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd + # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + [[ -z ${REPLACING_VERSIONS} ]] && udev_reload + fi +} diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 5992ed3480b6..3b794e7c3ded 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -78,14 +78,6 @@ pkg_setup() { } src_prepare() { - if ! [[ ${PV} = 9999* ]]; then - # secure_getenv() disable for non-glibc systems wrt bug #443030 - if ! [[ $(grep -r secure_getenv * | wc -l) -eq 27 ]]; then - eerror "The line count for secure_getenv() failed, see bug #443030" - die - fi - fi - cat <<-EOF > "${T}"/40-gentoo.rules # Gentoo specific floppy and usb groups ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" @@ -97,11 +89,6 @@ src_prepare() { ) default - - if ! use elibc_glibc; then #443030 - echo '#define secure_getenv(x) NULL' >> config.h.in - sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die - fi } meson_multilib_native_use() { @@ -142,10 +129,10 @@ src_configure() { multilib_src_compile() { # meson creates this link - local libudev=$(readlink src/libudev/libudev.so.1) + local libudev=$(readlink src/udev/libudev.so.1) local targets=( - src/libudev/${libudev} + src/udev/${libudev} ) if multilib_is_native_abi; then targets+=( @@ -169,10 +156,10 @@ multilib_src_compile() { } multilib_src_install() { - local libudev=$(readlink src/libudev/libudev.so.1) + local libudev=$(readlink src/udev/libudev.so.1) into / - dolib.so src/libudev/{${libudev},libudev.so.1,libudev.so} + dolib.so src/udev/{${libudev},libudev.so.1,libudev.so} insinto "/usr/$(get_libdir)/pkgconfig" doins src/libudev/libudev.pc -- cgit v1.2.3