diff options
author | Michał Górny <mgorny@gentoo.org> | 2013-03-27 07:54:25 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2013-03-27 07:54:25 +0000 |
commit | c1ffb58f5eb786764eda014a087145a06b9e9bc6 (patch) | |
tree | b67152b7cfc0407ab6fd64f7e3652f48f832dd61 /sys-apps | |
parent | Mask new sys-apps/systemd before it is committed. (diff) | |
download | historical-c1ffb58f5eb786764eda014a087145a06b9e9bc6.tar.gz historical-c1ffb58f5eb786764eda014a087145a06b9e9bc6.tar.bz2 historical-c1ffb58f5eb786764eda014a087145a06b9e9bc6.zip |
Version bump.
Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/systemd/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/systemd/Manifest | 32 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-199.ebuild | 231 |
3 files changed, 254 insertions, 16 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 61af3e592f21..48dbb720c743 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,11 @@ # 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.100 2013/03/26 22:02:45 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.101 2013/03/27 07:54:17 mgorny Exp $ + +*systemd-199 (27 Mar 2013) + + 27 Mar 2013; Michał Górny <mgorny@gentoo.org> +systemd-199.ebuild: + Version bump. 26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild: Move nss_myhostname back to /usr -- it seems that nss handles this well. diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 5f92ab1ef578..66b353608040 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -13,28 +13,30 @@ AUX var-lock.mount 541 SHA256 2929247db87c75b82d651ae902183b2a9fab48052b422008fa AUX var-run.mount 536 SHA256 55b9e277560b875475535f8121ad45e7fcee836bb48efe2c4f361ff89d450888 SHA512 173097fc2318be854b09ee5244d1dd6291cf6c6ad0c18f1bbbb12b186d309a4299d3866e52659f91a37ff2541583d85754841e55c35ea93dd1916dce0bebb1f6 WHIRLPOOL 47cfff43bdadd7ea59d920dee102283d5eeae6ecfb64aeaf7ee23890f3483cb3f3fdb43ad014bb074122b34d86bf6a6a707a42819b6ee7fd66506808a0557a01 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-199.tar.xz 2101604 SHA256 8c4462a04f3ecf7f083782e5e0687913b1d33c6444bf20fa2f31df9222965fed SHA512 fd0174b69b9709bc93123956389f2264edd7105b60b58487473a39f1c0022a2e91ef6ccf01841406ab51262dbb583a03bc3ee351b664ed698cfa9e2f38fd24a4 WHIRLPOOL 1383e1fffbbf847186275dae72e9700a8d12dddf5ed7fd969ef637bcef68375071ff0383e015063621e28166a5739dfb26bba32aa8392a3bcbc0f0e6935e41a4 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-199.ebuild 6698 SHA256 8a6473fbb1938b27ac61720b31bcd62bb40f1da770776fe6bb240ae74fd87ce1 SHA512 e7bd6b32226e521e22ebac7ca4fd30fab97ed62709bf96d0ec6d49df1987efc6ef940b49dc767315768b2d71b1b75a135b81a206531f122226aaf21e45fcf72b WHIRLPOOL 733d9efe5f9c93d4258a3c1c40f6880a028a34ae1e782e4eeb547a52d6f5e6e687f9fa5d2400d322b8c00c0f36f36e8fe06edeee09c08d57a189708c297d86a2 EBUILD systemd-9999.ebuild 7328 SHA256 bdde88448fe5980cebccf76325f8675185af1e44fe74d3e06fcba039027d381e SHA512 aba2fe9724386f90d37e3f0721e8e3be2d11d6e4b9b069bd82882fa362046c98c7cadd51cafc2e5f3d12425b1bfb24dce9194528fd28ae287a69cd680ed1cfb2 WHIRLPOOL 7813e22bcb1ccf22767575973372fb4f27133271d09b69dd4065e5bbdd4a8eee51084fd5208b46dcd13a1a241d9d32c52ac8ebf0712fdd692e568b98d5768b0a -MISC ChangeLog 19642 SHA256 c07ccd8ab4aa451ab637239de58e5c00ef5847ebe45dfb8cee5edc4b930e9127 SHA512 29c02e50fb0872f6d0abf52209bb38b250ede60597db7c38680859ab0f5a97080ee018e5bc27bb4566134e4ddc9379d29b3480305608d8610bcd1d50fbc6a6e1 WHIRLPOOL 92b607ca801ba69998c12b2c6857265f794ad6533a65959e80aa63870d0d498951be7b2b10258a06091f3fe4f95a5d6848fd6bb32334222c29b43954c924ebd9 +MISC ChangeLog 19758 SHA256 834ba9dc7f17e9df748b28f0dde98e8abaeb6a7176df5ab3eeea7ca3d1457b62 SHA512 2fa87a952775244bfef704d433a446b5b447255270ff1c3d65bc7b3edcd03a1ab07a3f70324522a1ba47a3d7b6a4da6a330168c99235b7c9f8cd79f134b3f144 WHIRLPOOL a595b56a4a0432a21f2e22c03b11f657372f9ef97e56d3c2a9938b83f0240e59085c69ee6edd6b02496056417c719c9f602947446021e01db2cb3892c3aca3a3 MISC metadata.xml 931 SHA256 62b80c12536efbf1d14d93155aa18e3af1011709efd96c66c0176300d6a468b3 SHA512 ca3eedc144f671828d3555820d4effaccd24e86dedb894fd173d044c08a4213166f2dfe6c58fb6b80cdfa79e5ab2a9a3918971b49b433947389580b75f77ad97 WHIRLPOOL fd5185112548fea3c9f3710e53e073366a2285b6e0e3d30a653db24b9e868cfb57f839ca90ffd9955e0d4b6d687e9946f01ef1f8dd3b724fd1b1197a0285bc1e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQJ8BAEBCABmBQJRUhs/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJRUqXqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5 -NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDQacP/jxx23NP0rX8oOdv1egmpKhc -WcjNDJryzj3vLe8iQlVwG4FScX5bOM+J7utilKQzBqzflYKi3+XFzJ5Om5dGaWiR -nshyk6J057F7F/ewaQdxce9Cx/AjW9fb9mieKi9ZdqHy2cRcbG8RW703g7LS08Hl -ghtgD4p9QICwEw0XfL6ThmABE6p+grQsEaqLboW+JSPMH0QePb+yCr6EsBCMSKF/ -AUvpUJkR6sJ1Ul+Vt73DrdpwOlETB1pQj/+SJ6r8xkkdBJtgP4nT/QuDtQ9JrTOs -OXtmWug/qQMg2N3VRAL0nLYyrar3J6IDF9sNeeEqcr0nHecxVo1gVbMj06g4+fN+ -8hKVBFdUra7AF44DK+a6qmdp3dvNmaDOQvSYoHYCthg9ACYKj/K7eBbAPAQAxf3x -RJaF7DuuSOnLFUH3++ckX4a0Nhw6ZmaZNZla2huYHZKEgsT5AHxVXA/5aS2LxxoL -yFOC5l7vgje03gp29csLbn6APu0uT5X4BL016kbZNXM9RPMITufYrJNph+eW+CaO -eYZ92UFP2OpCq2vD9xe3pu1RUHUTOI2h4ElxlEfPzDVog3OEwAFeZXvTf5XY5LLI -dFAUEdN/GSg8PnDAB7OmWUlJtI4SiQ8rzCjaRogMEDAcB4qzlgbmkE+2bjVtV0l3 -aDXpdBGVYnWtTtDKvm0V -=+noB +NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDUp0P+wfXDeVNbxeTqHKQZuEFk8aK +Yw2hcZbOi48VAsZDvYriQXernZGsndqP6/TXrf5+NNQiZ8VILofuHds+hwQ2GFZR +dZqLUs//uVCPp5isHqmhVeQ/3D8eLy28MElglKqCaNXQkERhN+pPE4/FdJt2l0Rk +xLPMfZ0FP2cv/VZ6kgkND6wCs/6b4ZqartBRs4731GDOV1kJ6XF1NGgaeApnwZn1 +xK1sqH1c+cKkjeTJ1pcLTsNj1gEIg/mdsEnTVrrYVzgPmJecb2Tu34YrTLWoTfIH +gQESz6T2UeUU3Bn0v1shXL+DhpM/3FZD+kJM8lu1LzGNBdzr1++xs3OjIucgNtcR +0qpXQ3bqnbjRxmI7qdGx3vng5jkcJ8f/dn/ibMQdmYnXL6qjbl1uElDzsI1B2dku +K7BwpFg0AQzjM8MiEEEPvDRkzm/w0HZypCtA99uj3Q7eEp98MZ0E5eSSXdSOsSwH +8f/pkZdubPZItsEECyRrC9w5RBPJ3EMklE0Zmv9N903TelVkHNvnp9zb4Zcy9LWR +FhBRjICiBAvI9dICj+gEd1ZEpj5JK4VXzGLXdFBePo8CZWGCl3F2eWZ2jyy0lo1+ +CG2u8l/5YtgjY2vDztidUh7nL9CHn4cwbaY188u+Sc7yQO718Ya1QFFfxtaJUId4 +7VGwdlti5tfRWDmqVBxs +=l95C -----END PGP SIGNATURE----- diff --git a/sys-apps/systemd/systemd-199.ebuild b/sys-apps/systemd/systemd-199.ebuild new file mode 100644 index 000000000000..5f069266fc6e --- /dev/null +++ b/sys-apps/systemd/systemd-199.ebuild @@ -0,0 +1,231 @@ +# 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-199.ebuild,v 1.1 2013/03/27 07:54:17 mgorny Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +inherit autotools-utils linux-info multilib pam python-single-r1 systemd 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" + +LICENSE="GPL-2 LGPL-2.1 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86" +IUSE="acl audit cryptsetup doc gcrypt gudev http + introspection +kmod lzma pam python qrcode selinux static-libs + tcpd vanilla xattr" + +MINKV="2.6.39" + +COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1 + >=sys-apps/util-linux-2.20 + sys-libs/libcap + acl? ( sys-apps/acl ) + audit? ( >=sys-process/audit-2 ) + cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) + gudev? ( >=dev-libs/glib-2 ) + http? ( net-libs/libmicrohttpd ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) + kmod? ( >=sys-apps/kmod-12 ) + lzma? ( app-arch/xz-utils ) + pam? ( virtual/pam ) + python? ( ${PYTHON_DEPS} ) + qrcode? ( media-gfx/qrencode ) + selinux? ( sys-libs/libselinux ) + tcpd? ( sys-apps/tcp-wrappers ) + xattr? ( sys-apps/attr )" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + >=sys-apps/baselayout-2.2 + >=sys-apps/hwids-20130309-r1[udev] + || ( + >=sys-apps/util-linux-2.22 + <sys-apps/sysvinit-2.88-r4 + ) + !sys-auth/nss-myhostname + !<sys-libs/glibc-2.10 + !sys-fs/udev" + +# sys-fs/quota is necessary to store correct paths in unit files +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/gperf + >=dev-util/intltool-0.50 + sys-fs/quota + >=sys-kernel/linux-headers-${MINKV} + virtual/pkgconfig + doc? ( >=dev-util/gtk-doc-1.18 )" + +src_prepare() { + + autotools-utils_src_prepare +} + +src_configure() { + local myeconfargs=( + --localstatedir=/var + --with-firmware-path="/lib/firmware/updates:/lib/firmware" + # install everything to /usr + --with-rootprefix=/usr + --with-rootlibdir=/usr/$(get_libdir) + # but pam modules have to lie in /lib* + --with-pamlibdir=/$(get_libdir)/security + # make sure we get /bin:/sbin in $PATH + --enable-split-usr + # 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 gcrypt) + $(use_enable gudev) + $(use_enable http microhttpd) + $(use_enable introspection) + $(use_enable kmod) + $(use_enable lzma xz) + $(use_enable pam) + $(use_with python) + $(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python}) + $(use_enable qrcode qrencode) + $(use_enable selinux) + $(use_enable tcpd tcpwrap) + $(use_enable xattr) + ) + + # Keep using the one where the rules were installed. + MY_UDEVDIR=$(get_udevdir) + + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile \ + udevlibexecdir="${MY_UDEVDIR}" +} + +src_install() { + autotools-utils_src_install -j1 \ + udevlibexecdir="${MY_UDEVDIR}" \ + dist_udevhwdb_DATA= + + # zsh completion + insinto /usr/share/zsh/site-functions + newins shell-completion/systemd-zsh-completion.zsh "_${PN}" + + # remove pam.d plugin .la-file + prune_libtool_files --modules + + # compat for init= use + dosym ../usr/lib/systemd/systemd /bin/systemd + dosym ../lib/systemd/systemd /usr/bin/systemd + # rsyslog.service depends on it... + dosym ../usr/bin/systemctl /bin/systemctl + + # 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 + + if ! use vanilla; then + # Create /run/lock as required by new baselay/OpenRC compat. + systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf + + # Add mount-rules for /var/lock and /var/run, bug #433607 + systemd_dounit "${FILESDIR}"/var-{lock,run}.mount + systemd_enable_service sysinit.target var-lock.mount + systemd_enable_service sysinit.target var-run.mount + 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 + + # 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.' +} + +pkg_preinst() { + local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS + ~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD + ~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" + kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required" + check_extra_config +} + +optfeature() { + local i desc=${1} text + shift + + text=" [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}" + shift + + for i; do + elog "${text}" + text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}" + done + elog "${text} (${desc})" +} + +pkg_postinst() { + # for udev rules + enewgroup dialout + + enewgroup systemd-journal + if use http; then + enewgroup systemd-journal-gateway + enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway + fi + systemd_update_catalog + + 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" + ewarn "require that specific feature, please call:" + ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" + ewarn + fi + + elog "To get additional features, a number of optional runtime dependencies may" + elog "be installed:" + optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \ + 'sys-apps/systemd-ui' + + # 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() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} |