commit: 7346a1c028fb1d242b50c3a1cff4fd49d88af224 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Feb 13 16:03:11 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Feb 13 16:03:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7346a1c0
sys-fs/udev: bump to 237 This update also drops the workaround for missing secure_getenv, which hasn't worked properly since the build system was switched to meson. Bug: https://bugs.gentoo.org/443030 Closes: https://bugs.gentoo.org/647260 Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99 sys-fs/udev/Manifest | 1 + sys-fs/udev/{udev-9999.ebuild => udev-237.ebuild} | 21 ++++----------------- sys-fs/udev/udev-9999.ebuild | 21 ++++----------------- 3 files changed, 9 insertions(+), 34 deletions(-) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 4d5255330b8..bced27a5264 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -4,4 +4,5 @@ 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 diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-237.ebuild similarity index 93% copy from sys-fs/udev/udev-9999.ebuild copy to sys-fs/udev/udev-237.ebuild index 5992ed3480b..3b794e7c3de 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-237.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 diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 5992ed3480b..3b794e7c3de 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
