From: Mike Gilbert Date: Sat, 17 Jan 2015 20:51:35 +0000 (+0000) Subject: Don't enable audit by default, bug 536870. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb1ce587925a9a96192755370eeef9ae38d9eee2;p=gentoo.git Don't enable audit by default, bug 536870. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 2956bacffabd..e6ef234149f9 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.337 2015/01/08 20:44:11 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.338 2015/01/17 20:51:30 floppym Exp $ + +*systemd-218-r2 (17 Jan 2015) + + 17 Jan 2015; Mike Gilbert + +files/218-Dont-enable-audit-by-default.patch, +systemd-218-r2.ebuild: + Don't enable audit by default, bug 536870. 08 Jan 2015; Markus Meier systemd-216-r2.ebuild: arm stable, bug #525112 diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 20a2fb9aa38c..5c282bb91606 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -6,6 +6,7 @@ AUX 215-0002-endian-explicitly-include-endian.h-wherever-we-want-.patch 1485 SHA AUX 215-0003-udev-exclude-MD-from-block-device-ownership-event-lo.patch 2892 SHA256 6f2a59488e384aab809a4d31df0b088b2f052f53d68a6fe34117c3af336c9e1c SHA512 4ec1f99760a416f7825e1ab760779ce1be70d2c6c583dda7d3b22b076507fc26209d04a6a8312d73db74a65035dcc5c5147d6784ea7292be402ea565919ef59e WHIRLPOOL 11d9df38a05e0bc8c9ff3a48dd34ffa91277464d1c5f874e19cb2c1f152957ab88caf520d079671bc907adc6a546c279f7e54dca33c2e0e502fc3f6593ebbb0a AUX 216-lz4-build.patch 592 SHA256 c914d38894f6743361e511378b43aaa632bd2abc9b1f87bea58af389a80c3dbc SHA512 9dc7eb596448b49ac99189cd1fefe6921945feeeb0e0e15068bd580fd2045641b9afda092a706bbd4dfe11c9af0a7c91d4f754cf4e59973a909036dc1b706365 WHIRLPOOL d9051cb0dff1b32b5d8caf47d98f14fea047b4630e69422def572cfce566e8a3205d02b6311c3886b2afb9ec4e687eb0e9b1881f3cba1a1f222adc1bea045e8c AUX 217-systemd-consoled.service.in 444 SHA256 c576b19723087b9068593053e101c4fb047d451ee200586149fdf8b21917e797 SHA512 19b182bbdde7645626d661b3e753356483b4c40e19e5790cabf7b94a0c5322eddb151336f7f61347fd52d664b1ecfedbd9e0d55f4f08143e87777503f08bf686 WHIRLPOOL 2d2e4b63fb4cadb60ca855984c61d16b85483653bf241e4f6179ea5fc38276faf68de01140109f7280a45683e8a54034e7b653dbd14d76a04929f093a03833d7 +AUX 218-Dont-enable-audit-by-default.patch 1027 SHA256 760365637ea7528623fa1685d454ecdbd2dbae29990062e0bb234a5e662b2123 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0 WHIRLPOOL 14c689ba78c7b4221657931fb909d9d37ab14078ade593986f1abaf643e82b5b0677dddd69134bdbf6e087b4f694d252d7cd6558c671d061a80f7dc3c99e5175 DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f19adc32754b69a0945124505 SHA512 58de0bf7c43c309c2f8e4b7af16b46608a4ea39cbb280496fe5d43d76ea25545484f4ef62efce18be487c69134e4a038d8787f2c262484f92f7fc6feb3ae2f11 WHIRLPOOL 07389822b9f09cd91f360f3cbdcd0b5bf46ba1750dd1a4ad44fd2813436ef40b447b954d33582ffe83aebde618ecbeac4d2f3231d8afbf3975caf84f52b1053a DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494 DIST systemd-217.tar.xz 3694524 SHA256 a031e6fbcdc7077b37338bae8074d9428ee2fa98033beb4923a62871890f7498 SHA512 7a0b13330b621ec179499018bfbe9619a91cdbd120ae2067e19cbb9bbc25c80dd0f80aac217d823be1332054439bc9b2153ac78fc1eb231fa0fd55cb3bf7a70f WHIRLPOOL f22674a629b7b928875b6b06b0cffaf5874cdcb90c44787279cd8ff2a798e5bc525c1058f8b2bfe746d100c4d7686e36a6f604276d5735f7554122e4caad6689 @@ -15,13 +16,14 @@ EBUILD systemd-215-r3.ebuild 16088 SHA256 29066774eada0721a1c48aa49273ce79052f76 EBUILD systemd-216-r2.ebuild 16052 SHA256 99f24b3d604762727852c9367e157ccb5bfc0005acdf923c645599ae0fbebc27 SHA512 65c3d9a1f9e2d8886182a4cc219cc485825e72f6453c6a9903b3e8fc0f9fcd21c2798783df24fd692263f1ee7e57984d043122849501a5736f25d9c2666d51aa WHIRLPOOL 9f5ef2cadd44621cf5866e529e5abee3f69b2d21ba9ffeff8b33f893ba274c1eca2ff15336dae0ca8a187c42f843ef7c3a328bf4f5b00b8747719ab714ffbb75 EBUILD systemd-217-r4.ebuild 15912 SHA256 561c2ce6d447d5815490ecdd06cd1fc370cee040a667b3d02c39e38364845014 SHA512 fc18b1e2b86ca161aa36874d3cebe6c5f410195785db7b40bba953d71d784e06f3041a8b8055aaf44b0039526a66d5f9b5b201cafac622eae2ab1949d9902470 WHIRLPOOL d51381ae93216140567ba6b114a89b087e77f6db9c6882256b90a914709f7c61b5c4420e58289e51529751da9251302b689c272da3a74b906b01548109785399 EBUILD systemd-218-r1.ebuild 15926 SHA256 b1423ef151904973217a0ad1913eb2b6c046874a11785d66711ef17d77154e95 SHA512 9312fe83c60754c8214b4f6ed7ebfffa2045c7566ab09532266b9f5d1284299360109df441065cee10ffc8b04060d7e1e33c12ab5d8ba3b28091f7bfaa41e6fc WHIRLPOOL f03ee2c5c6e89d86b93a9f1cd62b6a656212196e3c90c203131898367594be535b277b597db12f70c64a93fa6fb9f96d945872779a0985267e6cb492c923c8e5 +EBUILD systemd-218-r2.ebuild 15992 SHA256 c1ff23e9984004b48fb8c214b681b3f674926253fd7724dfae3c1b80f8757e41 SHA512 200d21d568ba21bc2377ef302714faf244d6bf826b7dc9e10d758478487a0bc7c660c598ad445f3a7c8ef66a9ecb75100d98e1826a6e4cc1665d986af7741f48 WHIRLPOOL 9457ad9b72e9360ac6879fcbb18a6fbfcb59394a4936a2a27b0146c0d0de26a2866146b9b283acdba6df907b8b60c16c9a1fc1d31cd9b01cb9973885fab8df52 EBUILD systemd-9999.ebuild 16314 SHA256 4f1814a103c388da85a8e65e6c0d1359b5d8ae28fd81a1e5a6718667b4221512 SHA512 9e1a59e3cd8c516955b072414f74eba1c34764ba20fa02851bf67785dabf2f7ee11150ac546150118677c0a1597c9f80120b8132d5f15b1a1c2c7ce1960f0c0f WHIRLPOOL 85acbf7a0c5265997e5814e364bc03ffe481d2b26cefe2a35d474d3d6bd16521d77702e3ab5d8c9e0f30048ed389e0b73c3f8df10b41f6859de3fbc64cb6ef29 -MISC ChangeLog 60292 SHA256 592f426a3e83d4888369201a1c39057efa1d7772ad39e39474068b1b434a32ef SHA512 22516fb7c9689245bc30f0e2207945da5e8674beb28ead5874aa6330360e8e41b939b168d796e8e200b9690005ded7a405fef5c91bff3ca06b60b2ea3f55b3d8 WHIRLPOOL 24403b9ff7416b00f2e985dcf730754783d175cc6c48ec0a3f27f76ef4ab4175bb19ef80954e282d516bb76757a1b75877c5cad9934b5c0e3cf7418c90caddb1 +MISC ChangeLog 60492 SHA256 990357ea4544dd7344189edb028df187f1f5b401f4d6054e9798e4fbbb38bf33 SHA512 cda67cb1e371bbb1f40155a2827c88fc344ac751fa59375c4a212e7db9edf211fee92b9cbf249c829b3262b3e149e0a5b5def608fb626a744a522dab59a632ed WHIRLPOOL fd79c5f4e41be77807d33444adbe0f0cd07b5652ae24055ed73b243c2b2c4fbe9a2f5d3ac244a5a7381c8178e3ebb1919f03752bb2aa0fdf838161a6470afdff MISC metadata.xml 1560 SHA256 324b6648be6be5d66bd83621c4f60ff8fa7ca1bb7a5951f06a303869546bba5f SHA512 1af44b819ae101735ed53f3560fb72245db816d55f8309b4ed9e0e7ed98a6c8012c478acf141f66a14a4b3c5092abdfd314468de2cd62f3f1b05cf2081f7c0b3 WHIRLPOOL 06e876f88111c5a23ed08d92d67076620e0bc1d88a10d733a17cbd66f8ce0d21b3a56ed10f976fd0450e66d3e1d728696c081376e35a6f6834af4c365db26e98 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSu7B0ACgkQkKaRLQcq0GJWoQCffR+I16TA0fwOGzXYQjbQe/Bp -a1YAn3rETfl4/h51C4iJ7k63Huy7AteF -=PeV5 +iF4EAREIAAYFAlS6y1YACgkQC77qH+pIQ6SVJQD/dIHpMovWeNmzDGBfL4B/Nolr +dWhY+NwAwpu5JfhE0yYA/0+jwZr3F3Uq+sPA+a1b3FhN9GjGPbRH3Pk5VpAqztLq +=0F8g -----END PGP SIGNATURE----- diff --git a/sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch b/sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch new file mode 100644 index 000000000000..f44b4be85d50 --- /dev/null +++ b/sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch @@ -0,0 +1,30 @@ +From: Martin Pitt +Date: Sun, 28 Dec 2014 12:49:35 +0100 +Subject: Don't enable audit by default + +It causes flooding of dmesg and syslog, suppressing actually important +messages. + +Don't enable it for now, until a better solution is found: +http://lists.freedesktop.org/archives/systemd-devel/2014-December/026591.html + +Bug-Debian: https://bugs.debian.org/773528 +--- + src/journal/journald-audit.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c +index 69742fa..25ef743 100644 +--- a/src/journal/journald-audit.c ++++ b/src/journal/journald-audit.c +@@ -542,10 +542,5 @@ int server_open_audit(Server *s) { + if (r < 0) + return log_error_errno(r, "Failed to add audit fd to event loop: %m"); + +- /* We are listening now, try to enable audit */ +- r = enable_audit(s->audit_fd, true); +- if (r < 0) +- log_warning_errno(r, "Failed to issue audit enable call: %m"); +- + return 0; + } diff --git a/sys-apps/systemd/systemd-218-r2.ebuild b/sys-apps/systemd/systemd-218-r2.ebuild new file mode 100644 index 000000000000..bc4bd5d42a55 --- /dev/null +++ b/sys-apps/systemd/systemd-218-r2.ebuild @@ -0,0 +1,509 @@ +# 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-218-r2.ebuild,v 1.1 2015/01/17 20:51:30 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" + +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 introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp + selinux ssl sysv-utils terminal test vanilla xkb" + +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= ) + 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}] ) + 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-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 -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service + rm -rf "${D}"/etc/systemd/system/network-online.target.wants +} + +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 +}