diff options
author | 2015-08-03 18:22:50 +0000 | |
---|---|---|
committer | 2015-08-03 18:22:50 +0000 | |
commit | 86b5aded0ecb9d9060a55f77c17ea545a2aeb49e (patch) | |
tree | 19e5cc3c04bb84db52f14c2b8713f48276b83a17 /sys-apps | |
parent | Pull in fixes for psutil-3 usage, useful on non-Linux only (diff) | |
download | historical-86b5aded0ecb9d9060a55f77c17ea545a2aeb49e.tar.gz historical-86b5aded0ecb9d9060a55f77c17ea545a2aeb49e.tar.bz2 historical-86b5aded0ecb9d9060a55f77c17ea545a2aeb49e.zip |
Backport fix for networkd crash.
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/systemd/ChangeLog | 8 | ||||
-rw-r--r-- | sys-apps/systemd/Manifest | 10 | ||||
-rw-r--r-- | sys-apps/systemd/files/224-0001-networkd-fix-neworkd-crash.patch | 28 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-224-r1.ebuild | 479 |
4 files changed, 520 insertions, 5 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 991b8a119521..dd7c743a5225 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.395 2015/08/02 09:36:14 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.396 2015/08/03 18:22:47 floppym Exp $ + +*systemd-224-r1 (03 Aug 2015) + + 03 Aug 2015; Mike Gilbert <floppym@gentoo.org> + +files/224-0001-networkd-fix-neworkd-crash.patch, +systemd-224-r1.ebuild: + Backport fix for networkd crash. 02 Aug 2015; Pacho Ramos <pacho@gentoo.org> systemd-218-r3.ebuild: sparc stable wrt bug #536902 diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 089568ab4799..46a009d69e02 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -8,6 +8,7 @@ AUX 216-lz4-build.patch 592 SHA256 c914d38894f6743361e511378b43aaa632bd2abc9b1f8 AUX 216-tmpfiles-setup-dev.patch 837 SHA256 3d6e24f17eb5669c565375c158ba2a0b550d6c847d116fb278e4d430280734a6 SHA512 b0bc01b3947c9d72e1cf61e603726905ede86a861b861e905a124e0d8f3eba857946b0e1044b0e21e37d64a1c724df13931b65ceb2cf5300e963282dddf4eced WHIRLPOOL c1649530581f6cfa3ada6e10dd3efbbcc223e4ea8b90a61dead5b3d2bddbc0c46c96e026c67bb12c64f2c85c35777908aa16e7aa98ab2f3467a0c0c5c562d9f7 AUX 217-systemd-consoled.service.in 444 SHA256 c576b19723087b9068593053e101c4fb047d451ee200586149fdf8b21917e797 SHA512 19b182bbdde7645626d661b3e753356483b4c40e19e5790cabf7b94a0c5322eddb151336f7f61347fd52d664b1ecfedbd9e0d55f4f08143e87777503f08bf686 WHIRLPOOL 2d2e4b63fb4cadb60ca855984c61d16b85483653bf241e4f6179ea5fc38276faf68de01140109f7280a45683e8a54034e7b653dbd14d76a04929f093a03833d7 AUX 218-Dont-enable-audit-by-default.patch 1027 SHA256 760365637ea7528623fa1685d454ecdbd2dbae29990062e0bb234a5e662b2123 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0 WHIRLPOOL 14c689ba78c7b4221657931fb909d9d37ab14078ade593986f1abaf643e82b5b0677dddd69134bdbf6e087b4f694d252d7cd6558c671d061a80f7dc3c99e5175 +AUX 224-0001-networkd-fix-neworkd-crash.patch 872 SHA256 ed501d89044c01d27c00011f6109fc58e0830952acc971c61f362348cc0285e0 SHA512 fc5d4a88b63be8c414f3a9dc6b8e67997995c26ac8885dbd07bf69bcfa76c151a65bbe49b243905f555b1a41e783ee582a51572355e3a25ecfe0ec2860d9cf76 WHIRLPOOL 40e63baceff826a848348cd522f0d487432377f11b2795bba602481b60a263459dc56ce4bdd765aa182e57e39bf924fe52ecc0fcae791fb39d783bffe06af670 AUX compile-unifont.py 3336 SHA256 dbab8fbd08ac6eb3f8d293ab2c65e3979299827dc4970b0c0b79b62cc6b57861 SHA512 df2c0cc6d4bce119803f7c08d53bd8ad9ba6f34d1cab05d839fd0b3c4b0a7e609d02064438e9182c34142c05b7555ed5392333417be0f10e92498649b361db1c WHIRLPOOL c402bbb0d4be5433961d0e788be93f2642843fd75586d1e9c20d84be176b6083f77d05adc4f1004ce08d8bbe15048c84227e9a8bd262806fbb509b5c097de378 DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494 DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b09075010a97c7aa08eee3fd59b SHA512 c183cce8532ccb4716b84587c96a626eea390202a5469b9d89c8cee7f703e40d7c584e05f29501d375b8cd2a1409d011de564df16f54e27f66b3c3007a6e5bd4 WHIRLPOOL 4d0bcf3ddfecd3354d9f4ab13851f8da6baf31e89e64d3b1ac671159f16f23597d88cc2525aece2f867c140fc97e80bce086a5af91f84b8095e2503c13995e6d @@ -27,14 +28,15 @@ EBUILD systemd-220-r2.ebuild 15427 SHA256 efe7bd19caaca0f851cade9ed42932b76ef3a5 EBUILD systemd-221.ebuild 14778 SHA256 3d07e2eac970058c8a79426bf4fdb7eab4090c44b01c7d872cfa90de64adad1e SHA512 2bdbad8eff3ffbc88696463c1096be203ff9b938514c9a185f042e128f6bd915d4b97e4eb3ee1d976b3e86901f8f029e65211dc5899e969ee4f32574f1eec8b4 WHIRLPOOL c9ea036f2db1941e637f0c3bbb3bc7160514c1886fbd4cac10b75e8c459d4debf019b1a103b3ae03bada83e05cfa6ed028d98567acc95bc683cfc28c5076f499 EBUILD systemd-222-r1.ebuild 14568 SHA256 4473d526d84668644c6611b02cb05dface9c1cc634abfb83e0a4d2db61e055fa SHA512 357059161a39f885a24c4767ac617c91aa479e7220c58d6bccaab35ad6738c35d9458c88105a667da4b41bebf24b19ffb531ea8b0b1b08cd7d7ed823dea99ee2 WHIRLPOOL e69cf68ba524c2fe354e93755c3765f4e4ecf491c39c3f42a3d280beaaaae851ddb44c2ae9ea9eb3b67c834f3ae427f3c6ad8d3e71bfb7e29cf25fcf741dde0e EBUILD systemd-222.ebuild 14545 SHA256 658fefb43b24b8d6a0754a5bcbc2793967ec559bffbb7a68199964a2c2e13321 SHA512 1df4e951899fc3d6cc0c20ba71b9c5465b32921846054b0a0b58372e0a2d2260548831fb793525627e9053e823a124855a0f443f3f2442f90d0803dfe88a9c6b WHIRLPOOL 0b6ab8d6970392475bdbbf79fde90169696e14deaf6bfcc2596c7955f90f1395486f854cd50c7013df2c449f3e6952f8505e3e4f9ee02ddf361d0659a245153f +EBUILD systemd-224-r1.ebuild 14425 SHA256 10b4532a91a8aa13539147a67702bc64944de9f1d4fbd9a898960d8235ec8680 SHA512 d019da62d181121586e168314d83a52220630f0059565a7f22aa494194da4466da6c35d5446a75d41a5e77f0d6da1479e62ac24fd92d2b9d53145355a16aaa53 WHIRLPOOL f9dbd52ec930451eb0229d008318b5420897b85f4607485121977acc97d8dd7fcec2312ed2b7cf74bd6c01536033ac33bdd61a256baed724e172184ccb3a62ba EBUILD systemd-224.ebuild 14364 SHA256 babe22f1ed71923b62f2e95f2b1b1aa471ca7fde119389bad37e1d022e063703 SHA512 2793a394e077ff355f43fc8a5681b68794e4987c96e0a0365be3fb70805f4511282830ec9f4e7f80fe320cb46deea222fc58a1b1a5e3518017df9dcff01490e6 WHIRLPOOL 665ee92b937f24c85dff5ba07f28bf1a98351bb6584ead08631c2becab9966c7522da5b078ed930d2c5f5dd859375f5ca732315a8c0e02c150187a0dd934a5f3 EBUILD systemd-9999.ebuild 14367 SHA256 63b47cb7ed4b69874cfb11fa59370b65b97653328d3a97efab44d0e1b968bca9 SHA512 53b223caf4c9fcd715d0784ea6a53be81ccb34ef1517684f2e8aea58be8472ffbd04ea52fcf5faa1f9de0d3cc34008c3c41a2edd55a5e6cfabf7174efdc5cba6 WHIRLPOOL a126b5b4c3079c6ee549b31733566b5bf99d3a980ef4990734376e54579af5fd1ae8eee8824f5ac1cd753d8cea66dbcf6e90442ac54beac9ca63b3b075bc0468 -MISC ChangeLog 69118 SHA256 f6d6b29f0f98a68e5a7726ba068d8ff70db683270dc2f5f9123d77ceb0485e9e SHA512 9483d55d5c27c2d18c094fd6c5c7fcb17864a248f2c934b325bc563fe525464c683abfd13ba2c95dc0fa6d954a4f586364cb92847b05c2827709bd19cf16ffa6 WHIRLPOOL f34dd7b7448489377774f7f4f737b0d16aa9eb40dfc7b51262248c218c6c8c019c5a7336d507e6a6771e70b1dec2b9373733a7f60a78bcf0ab02c8ae2b88aa2c +MISC ChangeLog 69312 SHA256 ff599e58cdade4c017d68e897e00ff4348af8136aae54861878b5bf879e11be9 SHA512 4b6c98ecb2b4742f98c9599ed01cee193bc72d21d6f125ccf4c4e807c4dc4dab09c7854fef45e49d88ebe4397a262c4b8e5b6cd2654ad2174989f9edb8f87f55 WHIRLPOOL ca4839f3f8d8152fcf16a78cd16053b049c590043910c4d59e5681a38d8b568a67f3c8b3286b59e3919fb483914c13ad13f56168cbe9fa2eaad791918932d734 MISC metadata.xml 2221 SHA256 6030d7df02c7334e9a31e6966d2ec9f37248ee9141ef2710c122e711d0b042d3 SHA512 f73e04911d01073b776e835d4d8c220535acd58a210c712efa319329b73d949a86e6ad13237215708953485627050a6117026dfe8183c438108e44e36472def6 WHIRLPOOL 02f2256bf6cc8a6d745b373617f340093a5c641e1b2fc153c54521c2ef45a043f5f9730fa349d55c471d2b5be99b16cdf4146c250cacf78e5bb11521a7be1bc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlW95I8ACgkQCaWpQKGI+9ThgQCfcYn+zEH8QZ8Rdt3B/rFOE7gU -FswAn2832nThBeSwtmjhNumEGbNN+o3K -=KPX+ +iF4EAREIAAYFAlW/sXkACgkQRxvnM+8pGj9uCQEAsm6BZEKtbHxv7EWqj/BJ6NVo +ueTHx+JbBoxwzxMlwZAA/RRG6kYLNf0/812l7uH6flgtB2RaKSbJoDcB7IOoMmRX +=Ugcz -----END PGP SIGNATURE----- diff --git a/sys-apps/systemd/files/224-0001-networkd-fix-neworkd-crash.patch b/sys-apps/systemd/files/224-0001-networkd-fix-neworkd-crash.patch new file mode 100644 index 000000000000..0e73ddec0196 --- /dev/null +++ b/sys-apps/systemd/files/224-0001-networkd-fix-neworkd-crash.patch @@ -0,0 +1,28 @@ +From 49f6e11e89b46bacf7b26f6da3921abc1c2faa80 Mon Sep 17 00:00:00 2001 +From: Susant Sahani <ssahani@gmail.com> +Date: Sun, 2 Aug 2015 00:16:02 +0530 +Subject: [PATCH] networkd: fix neworkd crash + +fix issue #827 + +hostname should be init to NULL. +--- + src/network/networkd-dhcp4.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c +index 4aa301b..5454bdd 100644 +--- a/src/network/networkd-dhcp4.c ++++ b/src/network/networkd-dhcp4.c +@@ -468,7 +468,7 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { + } + + if (link->network->dhcp_hostname) { +- const char *hostname; ++ const char *hostname = NULL; + + if (!link->network->hostname) + r = sd_dhcp_lease_get_hostname(lease, &hostname); +-- +2.5.0 + diff --git a/sys-apps/systemd/systemd-224-r1.ebuild b/sys-apps/systemd/systemd-224-r1.ebuild new file mode 100644 index 000000000000..89f406ecc2fc --- /dev/null +++ b/sys-apps/systemd/systemd-224-r1.ebuild @@ -0,0 +1,479 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-224-r1.ebuild,v 1.1 2015/08/03 18:22:47 floppym Exp $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=yes +AUTOTOOLS_PRUNE_LIBTOOL_FILES=all + +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 -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~ia64 ~x86" +fi + +inherit autotools-utils bash-completion-r1 linux-info multilib \ + multilib-minimal pam systemd toolchain-funcs udev user + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/2" +IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http + idn importd +kdbus +kmod +lz4 lzma nat pam policykit + qrcode +seccomp selinux ssl sysv-utils test vanilla xkb" + +REQUIRED_USE="importd? ( curl gcrypt lzma )" + +MINKV="3.8" + +COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + !<sys-libs/glibc-2.16 + acl? ( sys-apps/acl:0= ) + apparmor? ( sys-libs/libapparmor:0= ) + audit? ( >=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) + curl? ( net-misc/curl:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + http? ( + >=net-libs/libmicrohttpd-0.9.33:0= + ssl? ( >=net-libs/gnutls-3.1.4:0= ) + ) + idn? ( net-dns/libidn:0= ) + importd? ( + app-arch/bzip2:0= + sys-libs/zlib:0= + ) + kmod? ( >=sys-apps/kmod-15:0= ) + lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) + nat? ( net-firewall/iptables:0= ) + pam? ( virtual/pam:= ) + qrcode? ( media-gfx/qrencode:0= ) + seccomp? ( sys-libs/libseccomp:0= ) + selinux? ( sys-libs/libselinux:0= ) + sysv-utils? ( + !sys-apps/systemd-sysv-utils + !sys-apps/sysvinit ) + xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + >=sys-apps/baselayout-2.2 + !sys-auth/nss-myhostname + !sys-fs/eudev + !sys-fs/udev" + +# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) +PDEPEND=">=sys-apps/dbus-1.6.8-r1:0[systemd] + >=sys-apps/hwids-20150417[udev] + >=sys-fs/udev-init-scripts-25 + policykit? ( sys-auth/polkit ) + !vanilla? ( sys-apps/gentoo-systemd-integration )" + +# Newer linux-headers needed by ia64, bug #480218 +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils:0 + dev-util/gperf + >=dev-util/intltool-0.50 + >=sys-apps/coreutils-8.16 + >=sys-devel/binutils-2.23.1 + >=sys-devel/gcc-4.6 + >=sys-kernel/linux-headers-${MINKV} + ia64? ( >=sys-kernel/linux-headers-3.9 ) + virtual/pkgconfig + gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) + test? ( >=sys-apps/dbus-1.6.8-r1:0 )" + +if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then + DEPEND+=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt:0 + >=dev-libs/libgcrypt-1.4.5:0" +fi + +PATCHES=( + "${FILESDIR}/218-Dont-enable-audit-by-default.patch" + "${FILESDIR}/224-0001-networkd-fix-neworkd-crash.patch" +) + +pkg_pretend() { + local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS + ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE + ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS + ~TIMERFD ~TMPFS_XATTR + ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED + ~!SYSFS_DEPRECATED_V2" + + use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" + kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" + + if linux_config_exists; then + local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) + if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then + ewarn "It's recommended to set an empty value to the following kernel config option:" + ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" + fi + fi + + if [[ ${MERGE_TYPE} != binary ]]; then + if [[ $(gcc-major-version) -lt 4 + || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]] + then + eerror "systemd requires at least gcc 4.6 to build. Please switch the active" + eerror "gcc version using gcc-config." + die "systemd requires at least gcc 4.6" + fi + fi + + if [[ ${MERGE_TYPE} != buildonly ]]; then + if kernel_is -lt ${MINKV//./ }; then + ewarn "Kernel version at least ${MINKV} required" + fi + + check_extra_config + fi +} + +pkg_setup() { + : +} + +src_unpack() { + default + [[ ${PV} != 9999 ]] || git-r3_src_unpack +} + +src_prepare() { + # Bug 463376 + sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die + + autotools-utils_src_prepare +} + +src_configure() { + # Keep using the one where the rules were installed. + MY_UDEVDIR=$(get_udevdir) + # Fix systems broken by bug #509454. + [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + # disable -flto since it is an optimization flag + # and makes distcc less effective + cc_cv_CFLAGS__flto=no + + # Workaround for gcc-4.7, bug 554454. + cc_cv_CFLAGS__Werror_shadow=no + + # Workaround for bug 516346 + --enable-dependency-tracking + + --disable-maintainer-mode + --localstatedir=/var + --with-pamlibdir=$(getpam_mod_dir) + # avoid bash-completion dep + --with-bashcompletiondir="$(get_bashcompdir)" + # make sure we get /bin:/sbin in $PATH + --enable-split-usr + # For testing. + --with-rootprefix="${ROOTPREFIX-/usr}" + --with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)" + # disable sysv compatibility + --with-sysvinit-path= + --with-sysvrcnd-path= + # no deps + --enable-efi + --enable-ima + --without-python + + # Optional components/dependencies + $(multilib_native_use_enable acl) + $(multilib_native_use_enable apparmor) + $(multilib_native_use_enable audit) + $(multilib_native_use_enable cryptsetup libcryptsetup) + $(multilib_native_use_enable curl libcurl) + $(multilib_native_use_enable elfutils) + $(use_enable gcrypt) + $(multilib_native_use_enable gnuefi) + $(multilib_native_use_enable http microhttpd) + $(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls) + $(multilib_native_use_enable idn libidn) + $(multilib_native_use_enable importd) + $(multilib_native_use_enable importd bzip2) + $(multilib_native_use_enable importd zlib) + $(use_enable kdbus) + $(multilib_native_use_enable kmod) + $(use_enable lz4) + $(use_enable lzma xz) + $(multilib_native_use_enable nat libiptc) + $(multilib_native_use_enable pam) + $(multilib_native_use_enable policykit polkit) + $(multilib_native_use_enable qrcode qrencode) + $(multilib_native_use_enable seccomp) + $(multilib_native_use_enable selinux) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable test dbus) + $(multilib_native_use_enable xkb xkbcommon) + + # hardcode a few paths to spare some deps + QUOTAON=/usr/sbin/quotaon + QUOTACHECK=/usr/sbin/quotacheck + + # TODO: we may need to restrict this to gcc + EFI_CC="$(tc-getCC)" + + # dbus paths + --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" + --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" + --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" + + --with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" + ) + + # Work around bug 463846. + tc-export CC + + autotools-utils_src_configure +} + +multilib_src_compile() { + local mymakeopts=( + udevlibexecdir="${MY_UDEVDIR}" + ) + + if multilib_is_native_abi; then + emake "${mymakeopts[@]}" + else + echo 'gentoo: $(BUILT_SOURCES)' | \ + emake "${mymakeopts[@]}" -f Makefile -f - gentoo + echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \ + emake "${mymakeopts[@]}" -f Makefile -f - gentoo + fi +} + +multilib_src_test() { + multilib_is_native_abi || continue + + default +} + +multilib_src_install() { + local mymakeopts=( + # automake fails with parallel libtool relinking + # https://bugs.gentoo.org/show_bug.cgi?id=491398 + -j1 + + udevlibexecdir="${MY_UDEVDIR}" + dist_udevhwdb_DATA= + DESTDIR="${D}" + ) + + if multilib_is_native_abi; then + emake "${mymakeopts[@]}" install + else + mymakeopts+=( + install-libLTLIBRARIES + install-pkgconfiglibDATA + install-includeHEADERS + # safe to call unconditionally, 'installs' empty list + install-pkgincludeHEADERS + ) + + emake "${mymakeopts[@]}" + fi + + # install compat pkg-config files + # Change dbus to >=sys-apps/dbus-1.8.8 if/when this is dropped. + local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc ) + emake "${mymakeopts[@]}" install-pkgconfiglibDATA \ + pkgconfiglib_DATA="${pcfiles[*]}" +} + +multilib_src_install_all() { + prune_libtool_files --modules + einstalldocs + + if use sysv-utils; then + for app in halt poweroff reboot runlevel shutdown telinit; do + dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app} + done + dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init + else + # we just keep sysvinit tools, so no need for the mans + rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ + || die + rm "${D}"/usr/share/man/man1/init.1 || die + fi + + # Disable storing coredumps in journald, bug #433457 + mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die + + # Preserve empty dirs in /etc & /var, bug #437008 + keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ + /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \ + /var/log/journal/remote + + # Symlink /etc/sysctl.conf for easy migration. + dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf + + # If we install these symlinks, there is no way for the sysadmin to remove them + # permanently. + rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die + rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die + rm -r "${D}"/etc/systemd/system/network-online.target.wants || die + rm -r "${D}"/etc/systemd/system/sockets.target.wants || die + rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die +} + +migrate_locale() { + local envd_locale_def="${EROOT%/}/etc/env.d/02locale" + local envd_locale=( "${EROOT%/}"/etc/env.d/??locale ) + local locale_conf="${EROOT%/}/etc/locale.conf" + + if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then + # If locale.conf does not exist... + if [[ -e ${envd_locale} ]]; then + # ...either copy env.d/??locale if there's one + ebegin "Moving ${envd_locale} to ${locale_conf}" + mv "${envd_locale}" "${locale_conf}" + eend ${?} || FAIL=1 + else + # ...or create a dummy default + ebegin "Creating ${locale_conf}" + cat > "${locale_conf}" <<-EOF + # This file has been created by the sys-apps/systemd ebuild. + # See locale.conf(5) and localectl(1). + + # LANG=${LANG} + EOF + eend ${?} || FAIL=1 + fi + fi + + if [[ ! -L ${envd_locale} ]]; then + # now, if env.d/??locale is not a symlink (to locale.conf)... + if [[ -e ${envd_locale} ]]; then + # ...warn the user that he has duplicate locale settings + ewarn + ewarn "To ensure consistent behavior, you should replace ${envd_locale}" + ewarn "with a symlink to ${locale_conf}. Please migrate your settings" + ewarn "and create the symlink with the following command:" + ewarn "ln -s -n -f ../locale.conf ${envd_locale}" + ewarn + else + # ...or just create the symlink if there's nothing here + ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" + ln -n -s ../locale.conf "${envd_locale_def}" + eend ${?} || FAIL=1 + fi + fi +} + +migrate_net_name_slot() { + # 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="${EROOT%/}"/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 + net_move=no + elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then + net_move=yes + elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then + net_move=yes + net_name_slot_sym=yes + 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 $? || FAIL=1 + fi +} + +reenable_unit() { + if systemctl is-enabled --root="${ROOT}" "$1" &> /dev/null; then + ebegin "Re-enabling $1" + systemctl reenable --root="${ROOT}" "$1" + eend $? || FAIL=1 + fi +} + +pkg_postinst() { + newusergroup() { + enewgroup "$1" + enewuser "$1" -1 -1 -1 "$1" + } + + enewgroup input + enewgroup systemd-journal + newusergroup systemd-bus-proxy + newusergroup systemd-journal-gateway + newusergroup systemd-journal-remote + newusergroup systemd-journal-upload + newusergroup systemd-network + newusergroup systemd-resolve + newusergroup systemd-timesync + use http && newusergroup systemd-journal-gateway + + systemd_update_catalog + + # Keep this here in case the database format changes so it gets updated + # when required. Despite that this file is owned by sys-apps/hwids. + if has_version "sys-apps/hwids[udev]"; then + udevadm hwdb --update --root="${ROOT%/}" + fi + + udev_reload || FAIL=1 + + # Bug 465468, make sure locales are respect, and ensure consistency + # between OpenRC & systemd + migrate_locale + + # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules + migrate_net_name_slot + + # Re-enable systemd-networkd for socket activation + reenable_unit systemd-networkd.service + + if [[ ${FAIL} ]]; then + eerror "One of the postinst commands failed. Please check the postinst output" + eerror "for errors. You may need to clean up your system and/or try installing" + eerror "systemd again." + eerror + fi + + if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then + ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable" + ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf" + ewarn "to /run/systemd/resolve/resolv.conf" + ewarn + fi +} + +pkg_prerm() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} |