From 0474732b4e7cd15cc065ce47cb0cc9ac15a9ad9b Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 26 Apr 2015 17:14:42 +0000 Subject: [PATCH] Add a snapshot from the v219-stable branch upstream. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- sys-apps/systemd/ChangeLog | 7 +- sys-apps/systemd/Manifest | 10 +- sys-apps/systemd/systemd-219_p112.ebuild | 492 +++++++++++++++++++++++ 3 files changed, 504 insertions(+), 5 deletions(-) create mode 100644 sys-apps/systemd/systemd-219_p112.ebuild diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index d7485c92e952..062c3978b84a 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,11 @@ # 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.363 2015/04/26 09:49:46 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.364 2015/04/26 17:14:33 floppym Exp $ + +*systemd-219_p112 (26 Apr 2015) + + 26 Apr 2015; Mike Gilbert +systemd-219_p112.ebuild: + Add a snapshot from the v219-stable branch upstream. 26 Apr 2015; Pacho Ramos systemd-218-r3.ebuild: amd64/ppc/ppc64/x86 stable, bug #536902 diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 7c955447ab3d..ea692958c352 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -12,19 +12,21 @@ DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f1 DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494 DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b09075010a97c7aa08eee3fd59b SHA512 c183cce8532ccb4716b84587c96a626eea390202a5469b9d89c8cee7f703e40d7c584e05f29501d375b8cd2a1409d011de564df16f54e27f66b3c3007a6e5bd4 WHIRLPOOL 4d0bcf3ddfecd3354d9f4ab13851f8da6baf31e89e64d3b1ac671159f16f23597d88cc2525aece2f867c140fc97e80bce086a5af91f84b8095e2503c13995e6d DIST systemd-219.tar.xz 3938228 SHA256 5c57113454e37c040d0cb481bd960ae7cf3a3fe0a231ff4945259bc74503f2d9 SHA512 19a92891996723bbd83fe745f365d25b2879a059466670aebb9e9fbb6a79a3ed6e1a93e8b76042605038766cabad3ddb89aff40b4a11ab830ffa7dc64f87234f WHIRLPOOL 440868c47bed26571084009fa86d267c921cd5cbbc63b596c1161ef7f33a1b9427ad315450014cd729c761b27bf42542c3b0b7ca68e09b23fc8f606147e7e9fb +DIST systemd-219_p112.tar.xz 3937616 SHA256 68e806c5b6455d99fd665f1992504caa07a81ebd95f939ffca254e0b6bbf01be SHA512 4d55d14ceb7c9165f950105551aa3f1084c08812398b149d5449b6fb2de1fa0053149f689b3708d73b367eb9e08134d951ebd04cc2e377e972e58f200ebd2f10 WHIRLPOOL a8fc4c62029a5aca876c84d6ebd41faac3172609c98f99070b5d39a98753f07636e24d92bd5a011b26760ae8a142d56b4723cf05a170036211f888874f054d9a DIST systemd.conf.m4-v219 1493 SHA256 90ee489b6e34945e5cda27a269e1247644382084f5a145a2df691282007c6768 SHA512 a117c40229af3ba2a0cec4c3db01728c3cab49bb6403fc84cb34f8a09979d98f7a200cd28bf2bbc7a71cbad856edf31190fba30a9d5810c55911746457bbf31a WHIRLPOOL a1604a4fdf5e2d4a4505252859c64d0a3c131b4bb371cff8c75331438f291f138d2732d939947988ab95b040e377412db84fbf6c45866fee028a2aac70e8eb9f EBUILD systemd-215-r3.ebuild 16083 SHA256 8495ef81907c4ab43de633e0e7947c632e5c55eefaa7f2a4b201d491ac798597 SHA512 ffdbcb167db4bb4d6c722964ebb7e29d6636fd3e11f62889988ea0aed9df2754e7f18927ec9e62844f240cf4c9d878b3618ce295657674730e1aab6e5a0a60bd WHIRLPOOL 901e59257abd0d06f0c50dd9b0f95f504af302197570213da5576049bcd09dab46b3a07eee58da5cc2193aaceb50f3caaf2b80a759b9b182541ab2dc1f80f191 EBUILD systemd-216-r3.ebuild 16090 SHA256 c4b2c2a3ec1d401a2cbd0f2b241698d2cc1fa19efe11a2060758523f62b4c1e1 SHA512 2b4eeb142b9426bf8c84294b4234a4fd611d7722d189719dbec42a7bb1e2d78d6dc938e93b5e82d20aeca8481f7580020065efaf34789dcb4b4907f2298d0137 WHIRLPOOL 5ffc5a936d9b8836f0c09e7ec25a8e32a91ee7ed6683c806867943ec8e87ee88d6e8ca9faecb45339101486f904e3e889bd46cc3cb321aa87b3382465ed79b68 EBUILD systemd-216-r4.ebuild 16023 SHA256 dc741cb224c519e07351929fc2bdbf57acf4c899aa17c1e6076f3e9c44a8a855 SHA512 a86914677d340147da7a7cb17b47d0f92d86fc4b6e9cec8839c75ec5d09220edd6a1a46321d5f5ff84ba832b95e1551a4946d00195d3101a73fe9a0c945d0819 WHIRLPOOL d5bca84b20b9bc5dfe226f9dce5e78d2331466d900e13381b2b8aafd1475e27ea3f415a5868a7949dc5180109c59cd34558b03fb12e94712c93910b73b3e9ab5 EBUILD systemd-218-r3.ebuild 15060 SHA256 bcfe74f74390134a3ca1f97bfe25fd62a355d8b735931cea76472e51a669755b SHA512 fc8e81feb5f6606db135e2eb9864a342f0b198a5b102c24d87a6f114824043d37d3b2926dcce066c75ab0e6e74e9e2b89b670a505d603cf23941e615644b8b22 WHIRLPOOL 1f2a13332cfb619e11ad3b47b869ff3b9dfbd71d20251d10f307f1702738298553e38a89a9cd84684ec311b01d4a9c10754fba63435047e6b83f3497c2e1c806 EBUILD systemd-219-r2.ebuild 15469 SHA256 eace7a3a729f73a79331ebaf82e7aa7239c63bfe0fa4731055b1d3d3a8a758e5 SHA512 c15cadeeaef561cabf2ee8e1a8b8fa10659514b74b34b7588a13d8a6c51db03c75f44fb26f5ea80d312568b2cf2e7858c0747b935aff4f7cbc79dd36429625aa WHIRLPOOL 68aa2ca25d6d3e006c248237a91c3853da72977a849ca118dfa0d3ab62c7ec0ca60b8d81cc08cce3410ee3a07c56ec6670744c5d87894635ebe2628b15e12367 +EBUILD systemd-219_p112.ebuild 15496 SHA256 3a287c7fabf0aaca80e0bbdf8aeae0188773869067f2d2b58fc64acfa55c55ec SHA512 8b0f56a99c1b60e6787efac96c05487f143e6247b99b3c7a3ea310bcdc442b3095a1cf2014f1ca2581653e7e1b3026491e956e8a83d781a91bec4e5539ffc69b WHIRLPOOL 2ff894faddb53cabb4e529980ead9319a471ae7325ce190e16be1d4f94d4c60604a4b35f9699f06bf7d9fa1dad7dab56afa9a1be4dfbb4e0fcee6470fae2e964 EBUILD systemd-9999.ebuild 15841 SHA256 4f6dbac397fe989ff7f005ebc42dbb660848d93af55067e0b2caf647a24b0a66 SHA512 02096ffb702a2758781fe492eb74ec939623184cc9afc90d3650838a0aedc11314d6327bcafce98b5c39721128e840cf4fe8dfc5bfab6f8069fc2deacb7e9062 WHIRLPOOL de255f5f39ea26806c5c946082eb62b1df957a88483b31aae7d1b92dad5e108b90fc08bd18587d4a7652dcecc86b1cd6ca723700698d20f01b8f9b923c3ec9d5 -MISC ChangeLog 64265 SHA256 1c6432190a1248f221f527a9d7b729ac68b4df98fed02eabe8b0049ae565386d SHA512 26a295f97557dcf01220722d587c0fb63f24fadb5820338843dd5ae80b170c423b010bba7d47b5ebb9eb4d19b66031454d614069283c7ecdb81a6d15e92f2077 WHIRLPOOL 0f4ef98d8945a8312474e6db9889ab1af6feeca927dbca0c980066e65bcb1c19b3dd77d0495847ac030f1027ba24e18f4582d3c7a516ce671200119bbd6494c5 +MISC ChangeLog 64431 SHA256 b07d80ed851cbd52c324a4c0073e2da9b899fcfa34fadc0898138363e1fdf78b SHA512 78342ef26e115a5c9fee0c8d0f8d1f721185139fc544f9781da2ea56d0fbc125b3661fd428be685f587d8142a6077c2f68617af8696a7ad80b9ca2476c4c0df1 WHIRLPOOL 88f703028684e25c3be5056aa22ef90d8f4372169491b8fff88472416e0b318e58036de49567b6248daa803e9cfc8d2fd7452500f30c329fc5d420f42f49bf4b MISC metadata.xml 2141 SHA256 d21a56048e94d30ebd8ee2a218ec3f19eee184ddb63fd240168348e0e82fde0a SHA512 2140c71ee89ff12de395799cc6f1968a92d9437b2cb7ea0d4aaf553fc073f038cc3c27c522922eb8a7706f40ca8e146de53efa8f57927e6aaf9bca732f9f14fe WHIRLPOOL c2ccc32563da1514c9d58ac358546e719967acd705a4dec862471b0900d3ff55e7d5b718a04e0ca05a70fc5d80ab4309d8fb9b7d86eea0de78531cf77eb0c661 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlU8tLsACgkQCaWpQKGI+9RQpwCeKtSfqfEthb+YoveE8JiB/dWo -acEAnAjDpXDybtLJbIJ+Xt+lV3f4zqUR -=xWzJ +iF4EAREIAAYFAlU9HP0ACgkQC77qH+pIQ6S68wD/ebWkJ5LWWuwNnYOA/fnIH5+t +J/3pMauzTQBqqhfahkcBAMkFeLKnGrtBnbYVavoLBWriSQhDT3pD7vrYJN96fkr7 +=FSNV -----END PGP SIGNATURE----- diff --git a/sys-apps/systemd/systemd-219_p112.ebuild b/sys-apps/systemd/systemd-219_p112.ebuild new file mode 100644 index 000000000000..491d074f8869 --- /dev/null +++ b/sys-apps/systemd/systemd-219_p112.ebuild @@ -0,0 +1,492 @@ +# 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-219_p112.ebuild,v 1.1 2015/04/26 17:14:33 floppym Exp $ + +EAPI=5 + +AUTOTOOLS_PRUNE_LIBTOOL_FILES=all +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +inherit autotools-utils bash-completion-r1 linux-info multilib \ + multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \ + user + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" +SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz + http://cgit.freedesktop.org/systemd/systemd/plain/tmpfiles.d/systemd.conf.m4?id=v219 -> systemd.conf.m4-v219" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/2" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http + idn importd introspection kdbus +kmod +lz4 lzma nat pam policykit python + qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb" +REQUIRED_USE="importd? ( curl gcrypt lzma )" + +MINKV="3.8" + +COMMON_DEPEND=">=sys-apps/util-linux-2.25:0= + sys-libs/libcap:0= + !=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}] ) + gudev? ( >=dev-libs/glib-2.34.3:2=[${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= + ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1: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:= ) + python? ( ${PYTHON_DEPS} ) + 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 ) + terminal? ( >=dev-libs/libevdev-1.2:0= + >=x11-libs/libxkbcommon-0.5:0= + >=x11-libs/libdrm-2.4:0= ) + 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-20130717-r1[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 + doc? ( >=dev-util/gtk-doc-1.18 ) + python? ( dev-python/lxml[${PYTHON_USEDEP}] ) + terminal? ( media-fonts/unifont[utils(+)] ) + test? ( >=sys-apps/dbus-1.6.8-r1:0 )" + +PATCHES=( "${FILESDIR}/218-Dont-enable-audit-by-default.patch" ) +S=${WORKDIR}/systemd-219 + +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() { + use python && python-single-r1_pkg_setup +} + +src_unpack() { + unpack ${P}.tar.xz + cp "${DISTDIR}/systemd.conf.m4-v219" "${S}/tmpfiles.d/systemd.conf.m4" || die +} + +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 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 + + # 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 doc gtk-doc) + $(multilib_native_use_enable elfutils) + $(use_enable gcrypt) + $(use_enable gudev) + $(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) + $(multilib_native_use_enable introspection) + $(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_with python) + $(multilib_native_use_enable python python-devel) + $(multilib_native_use_enable qrcode qrencode) + $(multilib_native_use_enable seccomp) + $(multilib_native_use_enable selinux) + $(multilib_native_use_enable terminal) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable test dbus) + $(multilib_native_use_enable xkb xkbcommon) + + # not supported (avoid automagic deps in the future) + --disable-chkconfig + + # hardcode a few paths to spare some deps + QUOTAON=/usr/sbin/quotaon + QUOTACHECK=/usr/sbin/quotacheck + + # 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" + ) + + if ! multilib_is_native_abi; then + myeconfargs+=( + MOUNT_{CFLAGS,LIBS}=' ' + + ac_cv_search_cap_init= + ac_cv_header_sys_capability_h=yes + ) + fi + + # 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 + # prerequisites for gudev + use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h} + + 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-libgudev_includeHEADERS + 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/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 +} + +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 + + 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 [[ ! -L "${ROOT}"/etc/mtab ]]; then + ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts." + ewarn "Not having it is not supported by upstream and will cause tools like 'df'" + ewarn "and 'mount' to not work properly. Please run:" + ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" + ewarn + 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 + + if ! has_version sys-apps/systemd-ui; then + elog "To get additional features, a number of optional runtime dependencies may" + elog "be installed:" + elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent" + fi + + if has_version sys-apps/openrc && + ! has_version sys-fs/udev-init-scripts; then + elog "If you plan to boot using OpenRC and udev or eudev, you" + elog "need to install the udev-init-scripts package." + 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 +} -- 2.26.2