diff options
author | Mike Gilbert <floppym@gentoo.org> | 2015-03-11 16:39:23 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2015-03-11 16:39:23 +0000 |
commit | 4698d712854690aba31a13b803f5d930a6fdcc08 (patch) | |
tree | a7d39dbe3ad6f44f7f8dae0e9bf8cfe64693c150 | |
parent | Version bumps, remove previous versions for old branches as some changelogs r... (diff) | |
download | historical-4698d712854690aba31a13b803f5d930a6fdcc08.tar.gz historical-4698d712854690aba31a13b803f5d930a6fdcc08.tar.bz2 historical-4698d712854690aba31a13b803f5d930a6fdcc08.zip |
Grab missing systemd.conf.m4 from git to fix optional ACL support, bug 542644 by poncho.
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
-rw-r--r-- | sys-apps/systemd/ChangeLog | 8 | ||||
-rw-r--r-- | sys-apps/systemd/Manifest | 20 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-219-r2.ebuild | 491 |
3 files changed, 504 insertions, 15 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 83e965ac9afa..8a4021f22b71 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.354 2015/03/02 09:31:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.355 2015/03/11 16:39:20 floppym Exp $ + +*systemd-219-r2 (11 Mar 2015) + + 11 Mar 2015; Mike Gilbert <floppym@gentoo.org> +systemd-219-r2.ebuild: + Grab missing systemd.conf.m4 from git to fix optional ACL support, bug 542644 + by poncho. 02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> systemd-216-r3.ebuild: Stable for ppc, wrt bug #525112 diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 34ba8e32720c..96c0d4b4017a 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -12,28 +12,20 @@ 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.conf.m4-v219 1493 SHA256 90ee489b6e34945e5cda27a269e1247644382084f5a145a2df691282007c6768 SHA512 a117c40229af3ba2a0cec4c3db01728c3cab49bb6403fc84cb34f8a09979d98f7a200cd28bf2bbc7a71cbad856edf31190fba30a9d5810c55911746457bbf31a WHIRLPOOL a1604a4fdf5e2d4a4505252859c64d0a3c131b4bb371cff8c75331438f291f138d2732d939947988ab95b040e377412db84fbf6c45866fee028a2aac70e8eb9f EBUILD systemd-215-r3.ebuild 16088 SHA256 29066774eada0721a1c48aa49273ce79052f76679fc1ac398519d77a0d012400 SHA512 1535b50eadca16d59fed82c2df29be8ed3fdfaa09daa73daf754a22a03858033a3f522292e23adede305ade08057471c9b368f7bf5403c2133524ca3612ef678 WHIRLPOOL 900f36eb522e48bffbe1a9dc121834f63b0030a3ee87ed467b1f7e9b34cc1d0373408c217da0dea40aed116bae627b175ba65d1fcf16a0d4836da947bc934fda EBUILD systemd-216-r3.ebuild 16093 SHA256 9f88b1d4783369255800cc80b5eaebbc566a4adea3042a6276557e8bb8a92169 SHA512 cc33de505ffda60e5e4adb5f5813839a10b0d6814eb37d45c61b85718200499a47618dca7e95887be7b7930dfa473bdb1f4cee0f876e9a58eedc67d441bfc548 WHIRLPOOL 14543c470b49c3b6fd23a63a555a614a3ad0ce0f436ea9bef7136bf824908bc29fc172b701debd4cd80531ba57470a38182ff16c13c67e5feaa8ead9e2d1e415 EBUILD systemd-216-r4.ebuild 16027 SHA256 c95f0d46695377e552be65a5037bf101de264246ffb82b1ca322b6b3015f4bdd SHA512 eee0e7dd2b913991137673a87d185a440a7b3ac0da66b844a77dc1845740a215409ac7c798d825fa160d1a116d9171cdee96d7d7ccc69fa00fc004a0d0f5b63e WHIRLPOOL 22aa0778741fa5a14f60ac0d91c9d80c4b94d9c880bac92fb531fbb5b9f1fb61061ca6b3253c2b500989e6eae1c1a72adbd7d3a1d228dd18880e0cdd4428eb48 EBUILD systemd-218-r3.ebuild 15068 SHA256 200897ae4bc92789be51ef6c2bb9436577715cf862432d40255856493d67cbf5 SHA512 8353c8e3e80cadefc254ef1582cef44ab175cd4237e2e5abf123f11db238f73f8ee5b8049c36f1bd3f8127ad1aa3e48b6b8533c72139065063fa6986c916fabf WHIRLPOOL bf464c79603b12855d093c52ccdf78aff98b1c71d22d158c6f65785add2336e46a863e4b29ac56892952ee5888bf9a7b192c862b2aa7e7f9918b17ed539b5760 EBUILD systemd-219-r1.ebuild 15246 SHA256 fc237f42b1565304eb47a314a1c2ef146901d3d566b4e5764e165adaa637e683 SHA512 ba766a1cf56b26eec5d0524dfcb08f572c2b4537db40be51e7c18ab9553e014f3c2da62822ecd998d1b2b427f1d32c53406eafac1166d3a0721c6b851827e2a8 WHIRLPOOL 055ced4cedd0eb3adabf86dc09da6effadec256410a50e9182a1427fc89aa605e3fd7683317bfed2f454fa83ff7594e60daac8104135f807f3cd235b0af36db0 +EBUILD systemd-219-r2.ebuild 15473 SHA256 52118446fd85545632a4f51c2e870344f07281f90efe027965d3d60d0a0f49b1 SHA512 b1cb3c1226f9f9dd471f2f244772a54483eae0291d47201cbcec32de4e5d786747835974217f14de233cc4e972d41842c1d27d1e5ee05e2553a70eeacf0d18a0 WHIRLPOOL d067324181cb19844118e6bb3f936e40a1a76d486a49711ef1b1de0921b277cccad93e1149e1c3bbcc0d2126b37b300f0683a440eca1d6acd9c1b644b8996041 EBUILD systemd-9999.ebuild 15691 SHA256 f2b56cabd7cd0f97ff00a67515abbd5bdd9422b3d7c41b963036e048c81bf24b SHA512 7eb3f684ed49a90b19ccd213dbfcbacb78ee5d4e437b1337a9d2a393fda8b09b6826d211cfbb4272fcf87d4cf6ebf29372698326d6cb95fd11b10f75771a308e WHIRLPOOL 037482811aff70ce7e6329176b55de34c093db4d8b4af92dedfc087f4f95adda49ec2413694c9852962b859716f172705180feaf6cedec564feed26949c8c7eb -MISC ChangeLog 62885 SHA256 a6dc00b37aadec17033b2799bd712cb853eb1664a9325bea45f29e9df0035677 SHA512 66db7437e28dfb4ed14e74b2fb50fcc3971e2543f4211b575e11080d67483e60d4be74b56870d016745daf1b412893f80cca574e6f3b1248542e713f64614a14 WHIRLPOOL 8f7b57b0ff2be0c1a82fb17067746abf8abeb8c112521f491ab9e5f60707bdd42f21a9e2727db602e9d2e910d7378945cc87f07d1242c091b010b258055224d6 +MISC ChangeLog 63087 SHA256 50f415f09123db57e07eb93d02d11e547dfb16d6415191fda88c066e909d4a5c SHA512 0101eda0143dd1cdd0dbd99215c5624a23395287ef6e9343de21c6587756a47bc7ff877e2724a2d05376518232f6f48cd72eda6afa428d00c30d42e84021a09f WHIRLPOOL fe67b7c749a30329d395fcab384167d4a8d4a134281eea40fe3ff5e2a37c6a8ea4245a025645bc95c736ad9b988b62e6f7cda2f9a2b5dab1e28e718a375c4146 MISC metadata.xml 2030 SHA256 d93812a931646fa7d2c33a529fc55669a0d488ad1a2347ddbb43fca47119824d SHA512 8d919761eebd0bc1a1cccf64b742146414d88e50967e0dc368b1de641573574724fdc66e704c94c3072f6fd3a41369fd2fd1c8bca231f2ea69617fe552d41aac WHIRLPOOL ff7f5c42c2944f27ffe065fdb176eb3c779b52e66bce9525f7a47e328c5b883dad687c77cb3b53a741fda6d6fc2640bb59e47e3aab0097b609e9ab8edccf677d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU9C3rAAoJELp701BxlEWf43gQAIUufL1s/LcUJzT/l3alqD9i -P1Ox95Ri3AptbegnhH7k3jDFnGk3MVQ0g0KZlr05l+aBTGpD9/DKA9RhieHGM3eJ -gDaZNqdaXjKH+wPv68mvn8iJb6VubhhyXh3zdTuNPCwWfKkB+YkbVJiUuGrECL48 -Esmypyq9MH0TxKlS7M2FrJjNo7/F4gmVQwoqejiQ02P+3xa3/qEYqqLjRAtftv+Y -5Y7hLQK7DUZehDT8hU0fmMWaWzB94AIxiiD77JZOeIWfkrBZzl1u9yBofAvp9Ukw -etLGP/cd+zQPdmsKW5uEfDUk2Az3wGEZ0JnM5dpcHhWCglZ+asbmUJNq4nAby4Yh -DIwJULTSca4Tr07ioKkKQVzokrxCs/q1Cp2up1linXn3QDvE+cSEZaBQdWFH8JWU -icjnWJ/fFmF49BvD+NOEX+/JJfGueGtbBPrcSE2mAhlUa1hwmwC0A1LpfZwC8sK2 -hyt7isgh5e+lg0fMGRi/kbGtdauWZQsNVRGRwxIu+Myjr06sjSVhuE832BJDRE8U -vHGKXWDH1BDzP9GtvZR5M8CjwwUtCZ/8UKb+NyLKK24n8lP3FwTZEKT4f3J5fgWI -ScWJLMvpf4a5udYn5Bvh6+9kFaOunuvVWvwB0ceIw1oOCtWCGJqBYvkUNn0E+LRt -9mXw1KPM44aABJBu6w1a -=HUd7 +iF4EAREIAAYFAlUAb7oACgkQC77qH+pIQ6QtfwEAm8qYxIlKn68qr2MR0Ej9gboy +dmhbSHub+0wKYmA9QZ4A/RgxYqEfVoDxRiWeGuhC5VihZAwyL9Yinhb4SJU0xgBD +=+yGq -----END PGP SIGNATURE----- diff --git a/sys-apps/systemd/systemd-219-r2.ebuild b/sys-apps/systemd/systemd-219-r2.ebuild new file mode 100644 index 000000000000..78ac0b64fb89 --- /dev/null +++ b/sys-apps/systemd/systemd-219-r2.ebuild @@ -0,0 +1,491 @@ +# 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-r2.ebuild,v 1.1 2015/03/11 16:39:20 floppym Exp $ + +EAPI=5 + +AUTOTOOLS_PRUNE_LIBTOOL_FILES=all +PYTHON_COMPAT=( python{2_7,3_2,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= + 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}] ) + 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-libs/glibc-2.14 + !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" ) + +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 +} |