diff options
author | Mike Gilbert <floppym@gentoo.org> | 2016-12-05 12:59:10 -0500 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2016-12-05 13:03:12 -0500 |
commit | e5e9ae366834041d5b5b63a9a26a982966bad7b5 (patch) | |
tree | 1c7abcb20162eef856a5208d86386586a5494fd2 /sys-apps/systemd | |
parent | net-voip/ekiga: Add upstream bug reference (diff) | |
download | gentoo-e5e9ae366834041d5b5b63a9a26a982966bad7b5.tar.gz gentoo-e5e9ae366834041d5b5b63a9a26a982966bad7b5.tar.bz2 gentoo-e5e9ae366834041d5b5b63a9a26a982966bad7b5.zip |
sys-apps/systemd: remove old
Package-Manager: portage-2.3.2_p13
Diffstat (limited to 'sys-apps/systemd')
-rw-r--r-- | sys-apps/systemd/Manifest | 6 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-228-r1.ebuild | 489 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-229.ebuild | 501 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-230-r2.ebuild | 504 |
4 files changed, 0 insertions, 1500 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index c17ad0ee55ec..2a3528a9b554 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,11 +1,5 @@ DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b09075010a97c7aa08eee3fd59b SHA512 c183cce8532ccb4716b84587c96a626eea390202a5469b9d89c8cee7f703e40d7c584e05f29501d375b8cd2a1409d011de564df16f54e27f66b3c3007a6e5bd4 WHIRLPOOL 4d0bcf3ddfecd3354d9f4ab13851f8da6baf31e89e64d3b1ac671159f16f23597d88cc2525aece2f867c140fc97e80bce086a5af91f84b8095e2503c13995e6d DIST systemd-226.tar.gz 3914162 SHA256 baff6a938c5579769330d0224280bf1a1ff5920151d7201545fc9880b6326c67 SHA512 565331661e7d144dcdf1505f9a1a70b20a9b904567478593a8fa47ed18f9eb68a9339cf32f117ede994676a84d0cfe3fcedbc9b8d8c964445b741a32271e5584 WHIRLPOOL 9f0d7b761ad84f0bb557a22738d7fcc1b6515340db776790d9199401017747a62c24de214300c1f00fb33f86284f3498cadbece713d6e66a30903475f6bce273 -DIST systemd-228.tar.gz 4034401 SHA256 dd124ff561a07e6439ed2b3713f38ca914df7747f110ce86deea17b56d245ae6 SHA512 e54f282f550854dc082a4788709905e5767b75d2057e18d749b54821f2e44e0a8d1349b1a9180036cc854ecccaf5ff86b3b1dba4d3c2ce1b1fc766930ea4c0ea WHIRLPOOL 16b28367edc29a74f5b08691839da39a02d55bf5bcdffef55bfb1a2e8065eeecbe22a2b661e2d5f161f008d05baa000aff60d662d65db380d6c3fe0c1380eea1 -DIST systemd-229-patches.tar.gz 10782 SHA256 bd688e614177903bbf0204a00afebcb39760c3c694e7a6dd71544290677bfb5a SHA512 b0a7be84827f1553dccc00a0100c2f79160cc5285ce1582e7093e790a373d34b2a94f2805df5ade37a17285ae2f7d02890a495c2cc57e3475a3bdc831f05db52 WHIRLPOOL 643daee4fd23a5a326419cc769f8735d82bffa5ae1d9e9019ed4adfb04aba343f1459761c1d9b6ab3482e1a50cd7b0976a77ecc0bfb7075839000551d35bcb3f -DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392 -DIST systemd-230-man.tar.gz 29191 SHA256 e09ddd909d7aedbf2c1fac7a8f487fd6d0fab0745867c4b948bf8d2cc18fb7a0 SHA512 0ba2f5b0f17ee824df0f6a07d1cbd6fcf7b29d0532a79e2f4cd7cce9e723b14910743badf534cb602729adfc0203e7e8e119bc59beec9fe0f293d5afcfb7cf0c WHIRLPOOL d71fb97e53c08aa4e5d28ca186a417a725d26c287d60372075fa70da9e2ec2796767af55fe4f312e6153566b042b06c02b2e2950eb7188561815a6a3d0b79f9b -DIST systemd-230-patches.tar.gz 11858 SHA256 7a40071ffa2e43dda5ac2dfc91a263b0599b32dd5590d968e1077bebfce5654b SHA512 302420aabedd07b5a0b00b1f2e7500913586e867e548bde4ef6ee81cb3bd1682bdeac061111f9d8e120f4111cde2c709ed02922d56b0940d5603daff18003215 WHIRLPOOL 44f5ecaa5655e8eba3832b662fd30c7c6ca22f5d34f5d538587aa90b437457e149cd8f99bd83aec863991ec9fb5aef867218ad73a333580fe22f322ab4e3746f -DIST systemd-230.tar.gz 4288027 SHA256 46b07568142adcd017c62e6230d39eb10d219ed3b2f13ffc12d9a3a6b1c840cd SHA512 a0057c5258055a6b4000eb762ab2ec3c5329361711540f7124ba5c4b1119a1b531ad336ddef3bbe5d08218c8d7f1fd175c86d61357ac72935a932921cff28a96 WHIRLPOOL 95404535eb85d3b8c20dc13b12427a9da1f92729eb9e66a58d7e990f09fee28762be00088897bf1bf485d9a34619799ff0171a161824cc8f135ac2438e978d1e DIST systemd-231-man.tar.gz 29466 SHA256 aecf91c13333e1791d026b82360d55b4783f8d281c6e80bfe9d6bbf0bac633e4 SHA512 6c359f88da3e5dc01745f7255c021aafe495d9ca16c74277cbcfa05a6903093ec2c4746a34504d04f2aff464eeaa5518519577c831a08f4336552c6b6e05fdfd WHIRLPOOL 55371b404bfc945abc38d4cef5c555223abbee0993d56b506c896a851ba9ce283f0a020fe24ea273d3674f8a9dbe79b843d32eed93a59b2597b7bad113fbc3e1 DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1 DIST systemd-232-man.tar.gz 30579 SHA256 23fee775eece788322841e61d6b3bd8c0c13f54a94a40124af816b27cd9f7b69 SHA512 533ab1a41533b080aad2de7f8579b9b97081668e60cb94fc305316a43e9b0ebb85a959199e0d07278010e437e254b7eebc35f76aabb4bf3cb39a70dcb834a06f WHIRLPOOL 0c13be0a8546f720e72977549fc49ab000377e630856eb5541b948c8105cf4994bba6e694297f3c5cff596293e2a0f857f1346964c6878b32c14fb83a3ce9335 diff --git a/sys-apps/systemd/systemd-228-r1.ebuild b/sys-apps/systemd/systemd-228-r1.ebuild deleted file mode 100644 index 35d05b2f3e78..000000000000 --- a/sys-apps/systemd/systemd-228-r1.ebuild +++ /dev/null @@ -1,489 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -fi - -inherit autotools bash-completion-r1 linux-info multilib \ - multilib-minimal pam systemd toolchain-funcs udev user - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://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.11" - -COMMON_DEPEND=">=sys-apps/util-linux-2.27.1: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_p131: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-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) - !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} - virtual/pkgconfig - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) - test? ( >=sys-apps/dbus-1.6.8-r1:0 ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 -" - -pkg_pretend() { - local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS - ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE - ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS - ~TIMERFD ~TMPFS_XATTR ~UNIX - ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" - - 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 - epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch" - epatch "${FILESDIR}/228-noclean-tmp.patch" - epatch "${FILESDIR}/CVE-2015-7510.patch" - epatch_user - eautoreconf -} - -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 - - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - - 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 - # disable -fuse-ld=gold since Gentoo supports explicit linker - # choice and forcing gold is undesired, #539998 - # ld.gold may collide with user's LDFLAGS, #545168 - # ld.gold breaks sparc, #573874 - cc_cv_LDFLAGS__Wl__fuse_ld_gold=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 - KILL=/bin/kill - 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 - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -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 - - # Needed for bus-related tests - local -x SANDBOX_WRITE=${SANDBOX_WRITE} - addwrite /sys/fs/kdbus - - 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 -} diff --git a/sys-apps/systemd/systemd-229.ebuild b/sys-apps/systemd/systemd-229.ebuild deleted file mode 100644 index 28dadb7cf4b1..000000000000 --- a/sys-apps/systemd/systemd-229.ebuild +++ /dev/null @@ -1,501 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -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 - https://dev.gentoo.org/~floppym/dist/${P}-patches.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -fi - -inherit autotools bash-completion-r1 linux-info \ - multilib-minimal pam systemd toolchain-funcs udev user - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://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.11" - -COMMON_DEPEND=">=sys-apps/util-linux-2.27.1: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_p131: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 -# laptop-mode-tools: https://github.com/systemd/systemd/issues/2684 -RDEPEND="${COMMON_DEPEND} - >=sys-apps/baselayout-2.2 - selinux? ( sec-policy/selinux-base-policy[systemd] ) - || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) - !sys-auth/nss-myhostname - !sys-fs/eudev - !sys-fs/udev - !app-laptop/laptop-mode-tools" - -# 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} - virtual/pkgconfig - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) - test? ( >=sys-apps/dbus-1.6.8-r1:0 ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 -" - -pkg_pretend() { - local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS - ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE - ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS - ~TIMERFD ~TMPFS_XATTR ~UNIX - ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" - - 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 - - local PATCHES=( - "${FILESDIR}/218-Dont-enable-audit-by-default.patch" - "${FILESDIR}/228-noclean-tmp.patch" - "${FILESDIR}/linux-headers-if.h.patch" - "${FILESDIR}/229-sysmacros.patch" - ) - [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - - default - - eautoreconf -} - -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 - - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - - 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 - # disable -fuse-ld=gold since Gentoo supports explicit linker - # choice and forcing gold is undesired, #539998 - # ld.gold may collide with user's LDFLAGS, #545168 - # ld.gold breaks sparc, #573874 - cc_cv_LDFLAGS__Wl__fuse_ld_gold=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 - KILL=/bin/kill - 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 - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -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 - - # Needed for bus-related tests - local -x SANDBOX_WRITE=${SANDBOX_WRITE} - addwrite /sys/fs/kdbus - - 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 -f "${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-coredump - 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 -} diff --git a/sys-apps/systemd/systemd-230-r2.ebuild b/sys-apps/systemd/systemd-230-r2.ebuild deleted file mode 100644 index 91b4c0dbdaa3..000000000000 --- a/sys-apps/systemd/systemd-230-r2.ebuild +++ /dev/null @@ -1,504 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -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 - !doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz ) - https://dev.gentoo.org/~floppym/dist/${P}-patches.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -fi - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit autotools bash-completion-r1 linux-info multilib-minimal pam python-any-r1 systemd toolchain-funcs udev user - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0/2" -IUSE="acl apparmor audit cryptsetup curl doc 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.11" - -COMMON_DEPEND=">=sys-apps/util-linux-2.27.1: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_p131: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 - selinux? ( sec-policy/selinux-base-policy[systemd] ) - || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) - !sys-auth/nss-myhostname - !<sys-kernel/dracut-044 - !sys-fs/eudev - !sys-fs/udev" - -# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) -PDEPEND=">=sys-apps/dbus-1.8.8: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} - virtual/pkgconfig - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) - test? ( >=sys-apps/dbus-1.6.8-r1:0 ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') ) -" - -python_check_deps() { - has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS - ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE - ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS - ~TIMERFD ~TMPFS_XATTR ~UNIX - ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" - - 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 - - local PATCHES=( - "${FILESDIR}/218-Dont-enable-audit-by-default.patch" - "${FILESDIR}/228-noclean-tmp.patch" - ) - [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - - default - - eautoreconf -} - -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 - - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - - use doc && python_setup - - 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 - # disable -fuse-ld=gold since Gentoo supports explicit linker - # choice and forcing gold is undesired, #539998 - # ld.gold may collide with user's LDFLAGS, #545168 - # ld.gold breaks sparc, #573874 - cc_cv_LDFLAGS__Wl__fuse_ld_gold=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 - - # 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) - $(multilib_native_use_with doc python) - - # hardcode a few paths to spare some deps - KILL=/bin/kill - 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" - - # Breaks screen, tmux, etc. - --without-kill-user-processes - ) - - # Work around bug 463846. - tc-export CC - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -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 - - # Needed for bus-related tests - local -x SANDBOX_WRITE=${SANDBOX_WRITE} - addwrite /sys/fs/kdbus - - 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 -} - -multilib_src_install_all() { - prune_libtool_files --modules - einstalldocs - - if [[ ${PV} != 9999 ]]; then - use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7 - fi - - 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 - - # 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 -f "${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-coredump - newusergroup systemd-journal-gateway - newusergroup systemd-journal-remote - newusergroup systemd-journal-upload - newusergroup systemd-network - newusergroup systemd-resolve - newusergroup systemd-timesync - - 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 -} |