diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213.ebuild index 10cffa7a99..58687dad0a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.108 2014/05/03 17:35:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.114 2014/06/11 15:13:06 floppym Exp $ EAPI=5 @@ -35,9 +35,9 @@ SLOT="0/2" KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl - test vanilla xattr openrc" + test xattr" -MINKV="3.0" +MINKV="3.10" COMMON_DEPEND=">=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= @@ -76,7 +76,6 @@ RDEPEND="${COMMON_DEPEND} # sys-apps/daemon: the daemon only (+ build-time lib dep for tests) PDEPEND=">=sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] - openrc? ( >=sys-fs/udev-init-scripts-25 ) policykit? ( sys-auth/polkit )" DEPEND="${COMMON_DEPEND} @@ -85,7 +84,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.50 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 - >=sys-kernel/linux-headers-3.13 + >=sys-kernel/linux-headers-${MINKV} virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[${PYTHON_USEDEP}] ) @@ -132,7 +131,6 @@ pkg_pretend() { ~!GRKERNSEC_PROC" use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use pam && CONFIG_CHECK+=" ~AUDITSYSCALL" use xattr && CONFIG_CHECK+=" ~TMPFS_XATTR" kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER" @@ -238,6 +236,8 @@ multilib_src_configure() { --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" --with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces" + + --with-ntp-servers="0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org" ) if use firmware-loader; then @@ -276,6 +276,7 @@ multilib_src_configure() { --disable-qrencode --disable-seccomp --disable-selinux + --disable-timesyncd --disable-tests --disable-xattr --disable-xz diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index 29d22cd67c..7f5b1c173b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.108 2014/05/03 17:35:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.114 2014/06/11 15:13:06 floppym Exp $ EAPI=5 @@ -35,9 +35,9 @@ SLOT="0/2" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl - test vanilla xattr openrc" + test xattr" -MINKV="3.0" +MINKV="3.10" COMMON_DEPEND=">=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= @@ -76,7 +76,6 @@ RDEPEND="${COMMON_DEPEND} # sys-apps/daemon: the daemon only (+ build-time lib dep for tests) PDEPEND=">=sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] - openrc? ( >=sys-fs/udev-init-scripts-25 ) policykit? ( sys-auth/polkit )" DEPEND="${COMMON_DEPEND} @@ -85,7 +84,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.50 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 - >=sys-kernel/linux-headers-3.13 + >=sys-kernel/linux-headers-${MINKV} virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[${PYTHON_USEDEP}] ) @@ -127,7 +126,6 @@ pkg_pretend() { ~!GRKERNSEC_PROC" use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use pam && CONFIG_CHECK+=" ~AUDITSYSCALL" use xattr && CONFIG_CHECK+=" ~TMPFS_XATTR" kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER" @@ -233,6 +231,8 @@ multilib_src_configure() { --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" --with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces" + + --with-ntp-servers="0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org" ) if use firmware-loader; then @@ -271,6 +271,7 @@ multilib_src_configure() { --disable-qrencode --disable-seccomp --disable-selinux + --disable-timesyncd --disable-tests --disable-xattr --disable-xz @@ -451,6 +452,10 @@ migrate_net_name_slot() { pkg_postinst() { enewgroup systemd-journal + enewgroup systemd-network + enewuser systemd-network -1 -1 -1 systemd-network + enewgroup systemd-timesync + enewuser systemd-timesync -1 -1 -1 systemd-timesync if use http; then enewgroup systemd-journal-gateway enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway