diff options
author | 2013-04-14 07:53:27 +0000 | |
---|---|---|
committer | 2013-04-14 07:53:27 +0000 | |
commit | 7797a5585d0f8cdba38d5a7b0f11f470fc1920ea (patch) | |
tree | 61ab4914e28909aa4285a26b2b016b4e19a083f7 /sys-apps/systemd | |
parent | Version bump. (diff) | |
download | historical-7797a5585d0f8cdba38d5a7b0f11f470fc1920ea.tar.gz historical-7797a5585d0f8cdba38d5a7b0f11f470fc1920ea.tar.bz2 historical-7797a5585d0f8cdba38d5a7b0f11f470fc1920ea.zip |
Version bump. Mostly bugfixes and minor features in the new release.
Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!
Diffstat (limited to 'sys-apps/systemd')
-rw-r--r-- | sys-apps/systemd/ChangeLog | 8 | ||||
-rw-r--r-- | sys-apps/systemd/Manifest | 23 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-201.ebuild (renamed from sys-apps/systemd/systemd-198-r5.ebuild) | 91 |
3 files changed, 73 insertions, 49 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 1266f9b511cd..cdbebfd3040e 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.113 2013/04/06 01:39:15 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.114 2013/04/14 07:53:10 mgorny Exp $ + +*systemd-201 (14 Apr 2013) + + 14 Apr 2013; Michał Górny <mgorny@gentoo.org> +systemd-201.ebuild, + -systemd-198-r5.ebuild: + Version bump. Mostly bugfixes and minor features in the new release. 06 Apr 2013; Mike Gilbert <floppym@gentoo.org> metadata.xml, systemd-200-r1.ebuild, systemd-9999.ebuild: diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index ecc74611518b..1142fc3da08d 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -15,17 +15,30 @@ AUX var-run.mount 536 SHA256 55b9e277560b875475535f8121ad45e7fcee836bb48efe2c4f3 DIST systemd-197.tar.xz 2054644 SHA256 e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5 SHA512 df158f85dee4c38dc2ff305bc03eee3b71d77eb683ab2739549282f7d552af4d2a247f52241f68e1b7c88c668bce93531986a39937a99cac401791ec95916769 WHIRLPOOL 027fc6aa5972988173721b120b8c1f371bc02d3066e04ea0923d6cc70778a3381f600a865aa136b5789755fbd5358e97304da265f8937d789a28b33cc778df46 DIST systemd-198.tar.xz 2140964 SHA256 444492355e5ff0ad99e0691ecaff1081ee8d45901580f47ba8b74e56107c71bf SHA512 29b07d934dbcda876feddf2b93c1f35f4bdceb0ba76dd18563e79da65a794b2450b283b6ec93b09828cc8fe918e007511f3bb2218fb0bcb3cb2fdbf940d3cf71 WHIRLPOOL 9e124534121086b666e285adff44778d03f42d52c13ef78281728882d79fa32fdd58e27c41d7f8402a62b20bff65fdf1a4a3ee4680c1327cf7895169c66c07c7 DIST systemd-200.tar.xz 2109864 SHA256 9a08baa8fa5c48f0aab683b2f771e4be75c3c852afc45e5cb4df06428ac8c217 SHA512 6ad440f91dfa5a739a29d07c4144a2faad627a523c4f893656693cdfbdf2a6048f84d96e06ebe805ec18d04e5a1760c9efdcec738654d006a348c0385a983833 WHIRLPOOL 7969f2410aad42c60ba5b979727f5e90be62a5826aabfeb3103b8284115120a5c8c944d0631eabff719dfb84a4096b6eebe8e6dc3718ee47a3672dc1089be371 +DIST systemd-201.tar.xz 2128876 SHA256 d6299f1a0bc2122002d731808d3825c6b566d1ffe899c03ed5ebec7e70c8cc10 SHA512 e181b0bd0d0169890f99733d5e61ca506115b50d702b24895add5240ef3929ed9add87b0d3fd34a3366c1830339f6e4b5aa50f763f6d7d75b80ce677d35c385d WHIRLPOOL 84465cc8b3a97c2fbf120c8515ced6a759c1dec2df525b92a552308e1060475bf889de92a05ad470a2d56b582e3190dcc37aa4d009c8a0714411894cfed99376 EBUILD systemd-197-r1.ebuild 6496 SHA256 0069c8127574ee382c55b790a3ef807c1db064057dc7ab9a24aec195e8907aa5 SHA512 ce8fdb78c5cce5e34474b12e29bed83814746949b676025e8780206ac716c1dab863be31f3d83db02de09be00a5ac26ebe70ca2474ea2e244f4903bbd5e6871a WHIRLPOOL 2f316c077c6fa23d02e12985131a915947aac265009094ff851d65cc403ca10aefbc8c3f3b6ced4ce6f9c551f52223ca01ec46545bc4b3cccd78633c04534dc1 EBUILD systemd-198-r1.ebuild 6869 SHA256 bd68d6866eed550d86f04c1f365caf2256fb9f552711073864833599a55eb632 SHA512 76394453ded9cdbf364f79c0e1426ee575b3ad88e38dc53661db0ae87b03fafaaae6720c3f231340995af4db73172515e5a0fd6c997ec42d70a4edb70041eb51 WHIRLPOOL a82174d69c02fcbb6ed5c262c6a58706181f047bb306a053500f5833d3819e272282a0bf5d88ca4116e719b8cb50fefaefe105570bd4f35e26ece1caf741fa72 -EBUILD systemd-198-r5.ebuild 7203 SHA256 e919cc434b34107294156166236558170d093db7633adcb9664403b8e975cf2a SHA512 8b20498ad093a387fffc0b338fd4a48441ee38bce903e6ee41c919b4b8d9eee4b2b157aee376f880396fd5dfd01702785db50cd13ff6c11dfee82ee6fe42a850 WHIRLPOOL 7c8409b9c0ea08bc9d1021267cd0613df49d8aaa16399711e87bf6c7d30f2de4d29592ef57c6bf4d23146edbdf73231bb809176181cfc5bed489cc42dfb1e461 EBUILD systemd-200-r1.ebuild 7304 SHA256 321931cf7a04ba7a681b6457d136e016a04ed6c40fe9fb1aadfddc359ec9eae8 SHA512 ed6a3ff8c3b37b3e50dce30e19d78f3c6cfa0fc8a730ddbe0665806c389460de30e60c5abfdc33cf50c61922d240cbc08f2ee7d06ca5e919ecf272ca3da484a4 WHIRLPOOL e497c7f8447475ee6f915779bfaac196470398e4292326c560f393f53600054bbe283ba96a2f2fbcf959358d405acec7de61aa5e248857b723f7280de34e45a4 +EBUILD systemd-201.ebuild 7300 SHA256 c8484921053079ba6f113a9d7466883a8a86ae68a787070f92b9faa29bf123db SHA512 745d84aad480b0d99899f3c1711d4ddbc07482a0ffc51a08d40c8471e66174437661e1dbd6babb3ddd47d5103ed2f5e4558b163661bc350f50be174d8cea79cd WHIRLPOOL 5dbb8a2f9df365dfd6cd2c9a0ea158abf7b34c1c47a237aa6dea75de6f4ea2dd56908f48ae3fe88ddb59eab1a8912ecea874f423d937c8f5fdef543d86243172 EBUILD systemd-9999.ebuild 7912 SHA256 57f9763917ad6741f845ffc5b0576b0100ea37490caab05236dad3c2bef46a8a SHA512 952797a6cb592af738e6c997b1374e616a78e2568625c0cbcc941a7e7c1ca9a822c47b6ecad149805e65167a287117f09561b32d3ff83fcf1a2a38cdbfbd09b5 WHIRLPOOL 673d1d405cb904e056611ce106c576cf4603f4ed132b64ee295eb760667cbe9dba55898eec9971188f0c7580dd481a337afed1b3a3dbab4f44a04caf09510841 -MISC ChangeLog 21836 SHA256 3d24adf90a78577ba5cf335fe20b1b245a732dc549cba6de4843697eb22b9dcd SHA512 9a555e7e9be66987794b7c48373375336c096c8939d762edfc0196f105ddf6ada93f42ea2c3bd3553103d1152dc2fc3564ea7d2be913feaae6667eec05558d5b WHIRLPOOL 41a6619c4367a20aa42b39c8be480cb7d77af44c32539d9552d1d2f4171709a3a410a4bc2418dfa868731a0f32bfb2be347df44415062a8930c895b9f7524e05 +MISC ChangeLog 22032 SHA256 10df3f8ee51a62e2c9db6ef81f7893587d228d260e0cea55f5f5e9d03a569c9e SHA512 23f724151e4ba7be0ff76807ee8fb02de468da5df26bbd3317d4cde1fab3f2d0ea50f43f7e1f4e287f1b4322f9662a8bd84e2a5a42618c715b608aaa52b90efc WHIRLPOOL 87187e03bd8724b4cafa92326f8142f86fa80d6b5bf1e47f8f9f02c81bc92715402bf82dde9242a11e17f425533e6713375fd12ed907808e4b94f34eeb69c2f6 MISC metadata.xml 1006 SHA256 d84e6f4b410953584e039109fb733281441733c3670a1e60bdf9458bbb013a2f SHA512 04efd3c8aa7850e58a734d7288ee207975b38da1bf82a2736f14312e420d42da91fb237d3710876c9f76867486daf151bae9ecf952df06618849de039e64b51d WHIRLPOOL 35953aac5c1683bf4cd6aeb875e1d27949293eb1827d4693be60e490585853ef46ed1e5e5009ce0cf7687f233f2dbfe8e0840f2898505da1a0ed8d72f0cbd134 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlFffMUACgkQC77qH+pIQ6Q5ZgD/WfGYfuYqw6pRuHBR0ZHczscT -mxzSX7SvVZiUmj+hX/IBALJNq+vXvnag0RtcnB7mPgXc3rbfjM5eWE8KybYHoORP -=GGQN +iQJ8BAEBCABmBQJRamDCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5 +NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDmVcQAJGuy6PnZDWiQoycjc14Uer1 +blxz8A+LXX4S+R26RM38bua4eMEI9QNiTHr+8WSuJ6tvnhS0HV3x9oXKp/Q3+U09 +QcWGQM4Qw1P2R8tI7wr0PLGmNevWiBcQ2BTT4eNVlDCoMlPeh6zzbnudCsENbR8q +KDFouyDtFAtiin43GTL5ctbT2l8/cY8Zl4xK7saBGCy6it2I+Ph+tMjdun5mTOxn +MFX0gaNAEW485/Y0tO4tVjeWNgJRHZJCcmdWXH7GkNLbWUyx0Hr4cgreytbQY4MA +uAgsRIqSacPVpQbJTXO9MJn4VoxuAEqJBL5mmZf20D05CoOTBIF0Obvc3W+aWM5Y +t2nVxRuTKAa43ySTJg8QzHmsIq8cHI94gL+bDY4zdZtisgmbyrROWuo6yE0tYSr+ +WiFQJfpdzTZAWcinO8UoqkjpMtpjvHYlLIaUzM7Z1I0qkMqzXtSVCk0TQpjOjhNT +l+e1xtpwaUiSexGFxId0sCGzQJpEe93QQCHTbvL0qQHcQ1/2eNl5hyekaJwfEVJ2 +zCFjWtDXjGoCVLeFj57T/2x42XUphDz6VMwkLmQHFZQ/E5T2KfEw16elx3xnvmHK +mFkz3iBKidcb9j1qBcbpT4QmAzbrhMNgUoH+1x/6Ng2Rod9v4Hnm2ITh82lt6Qoh +Ib7WvAg4T8xMGRJbf9VS +=a/2A -----END PGP SIGNATURE----- diff --git a/sys-apps/systemd/systemd-198-r5.ebuild b/sys-apps/systemd/systemd-201.ebuild index 924021fcc599..bed82a215003 100644 --- a/sys-apps/systemd/systemd-198-r5.ebuild +++ b/sys-apps/systemd/systemd-201.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild,v 1.3 2013/03/26 16:24:26 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-201.ebuild,v 1.1 2013/04/14 07:53:10 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit autotools-utils linux-info multilib pam python-single-r1 systemd udev user +inherit autotools-utils linux-info multilib pam python-single-r1 systemd toolchain-funcs udev user DESCRIPTION="System and service manager for Linux" HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" @@ -14,8 +14,8 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1 MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc64 ~x86" -IUSE="acl audit cryptsetup doc efi gcrypt gudev http - introspection +kmod lzma pam python qrcode selinux static-libs +IUSE="acl audit cryptsetup doc gcrypt gudev http + introspection +kmod lzma openrc pam python qrcode selinux static-libs tcpd vanilla xattr" MINKV="2.6.39" @@ -39,8 +39,10 @@ COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1 tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr )" +# baselayout-2.2 has /run RDEPEND="${COMMON_DEPEND} - >=sys-apps/hwids-20130309-r1[udev] + >=sys-apps/baselayout-2.2 + openrc? ( >=sys-fs/udev-init-scripts-25 ) || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 @@ -49,6 +51,8 @@ RDEPEND="${COMMON_DEPEND} !<sys-libs/glibc-2.10 !sys-fs/udev" +PDEPEND=">=sys-apps/hwids-20130326.1[udev]" + # sys-fs/quota is necessary to store correct paths in unit files DEPEND="${COMMON_DEPEND} app-arch/xz-utils @@ -61,24 +65,6 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 )" -# eautomake -DEPEND="${DEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-libs/gobject-introspection - >=dev-libs/libgcrypt-1.4.5 - >=dev-util/gtk-doc-1.18" - -src_prepare() { - local PATCHES=( - "${FILESDIR}"/198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch - "${FILESDIR}"/198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch - ) - autotools-utils_src_prepare - - eautomake -} - src_configure() { local myeconfargs=( --localstatedir=/var @@ -87,22 +73,22 @@ src_configure() { --with-rootprefix=/usr --with-rootlibdir=/usr/$(get_libdir) # but pam modules have to lie in /lib* - --with-pamlibdir=/$(get_libdir)/security + --with-pamlibdir=$(getpam_mod_dir) # make sure we get /bin:/sbin in $PATH --enable-split-usr - # no deps - --enable-keymap # disable sysv compatibility --with-sysvinit-path= --with-sysvrcnd-path= # just text files --enable-polkit + # no deps + --enable-keymap + --enable-efi # optional components/dependencies $(use_enable acl) $(use_enable audit) $(use_enable cryptsetup libcryptsetup) $(use_enable doc gtk-doc) - $(use_enable efi) $(use_enable gcrypt) $(use_enable gudev) $(use_enable http microhttpd) @@ -121,6 +107,9 @@ src_configure() { # Keep using the one where the rules were installed. MY_UDEVDIR=$(get_udevdir) + # Work around bug 463846. + tc-export CC + autotools-utils_src_configure } @@ -134,6 +123,13 @@ src_install() { udevlibexecdir="${MY_UDEVDIR}" \ dist_udevhwdb_DATA= + # keep udev working without initramfs, for openrc compat + dodir /bin /sbin + mv "${D}"/usr/lib/systemd/systemd-udevd "${D}"/sbin/udevd || die + mv "${D}"/usr/bin/udevadm "${D}"/bin/udevadm || die + dosym ../../../sbin/udevd /usr/lib/systemd/systemd-udevd + dosym ../../bin/udevadm /usr/bin/udevadm + # zsh completion insinto /usr/share/zsh/site-functions newins shell-completion/systemd-zsh-completion.zsh "_${PN}" @@ -141,11 +137,6 @@ src_install() { # remove pam.d plugin .la-file prune_libtool_files --modules - # move nss_myhostname to rootfs (bug #460640) - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/libnss_myhostname* "${D}"/$(get_libdir)/ \ - || die "Unable to move nss_myhostname to rootfs" - # compat for init= use dosym ../usr/lib/systemd/systemd /bin/systemd dosym ../lib/systemd/systemd /usr/bin/systemd @@ -168,16 +159,19 @@ src_install() { fi # Disable storing coredumps in journald, bug #433457 - mv "${D}"/usr/lib/sysctl.d/coredump.conf \ - "${D}"/etc/sysctl.d/coredump.conf.disabled || die + 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 # Check whether we won't break user's system. - [[ -x "${D}"/bin/systemd ]] || die '/bin/systemd symlink broken, aborting.' - [[ -x "${D}"/usr/bin/systemd ]] || die '/usr/bin/systemd symlink broken, aborting.' + local x + for x in /bin/systemd /usr/bin/systemd \ + /usr/bin/udevadm /usr/lib/systemd/systemd-udevd + do + [[ -x ${D}${x} ]] || die "${x} symlink broken, aborting." + done } pkg_preinst() { @@ -213,7 +207,12 @@ pkg_postinst() { fi systemd_update_catalog - mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble." + # 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 + if [[ ! -L "${ROOT}"/etc/mtab ]]; then ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." ewarn "It is known to cause users being unable to unmount user mounts. If you don't" @@ -226,13 +225,19 @@ pkg_postinst() { elog "be installed:" optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \ 'sys-apps/systemd-ui' - elog - ewarn "Please note this is a work-in-progress and many packages in Gentoo" - ewarn "do not supply systemd unit files yet. You are testing it on your own" - ewarn "responsibility. Please remember than you can pass:" - ewarn " init=/sbin/init" - ewarn "to your kernel to boot using sysvinit / OpenRC." + # read null-terminated argv[0] from PID 1 + # and see which path to systemd was used (if any) + local init_path + IFS= read -r -d '' init_path < /proc/1/cmdline + if [[ ${init_path} == */bin/systemd ]]; then + ewarn + ewarn "You are using a compatibility symlink to run systemd. The symlink" + ewarn "will be removed in near future. Please update your bootloader" + ewarn "to use:" + ewarn + ewarn " init=/usr/lib/systemd/systemd" + fi } pkg_prerm() { |