Version bump wrt bug #376047.

Package-Manager: portage-2.2.0_alpha99_p2/cvs/Linux x86_64

4 files changed, 61 insertions, 38 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index d98a8144f698..060c5fdca2a3 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.26 2012/04/04 04:09:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.27 2012/04/05 11:15:27 mgorny Exp $
+
+*systemd-44 (05 Apr 2012)
+
+  05 Apr 2012; Michał Górny <mgorny@gentoo.org> -systemd-43.ebuild,
+  +systemd-44.ebuild,
+  +files/0001-util-never-follow-symlinks-in-rm_rf_children.patch:
+  Version bump wrt bug #376047.
 
   04 Apr 2012; Michał Górny <mgorny@gentoo.org> systemd-29-r3.ebuild,
   systemd-29-r6.ebuild, systemd-39.ebuild, systemd-43.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 0a41d168e15e..bdba849d1047 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0001-util-never-follow-symlinks-in-rm_rf_children.patch 1262 RMD160 4b328f8d97887b773a95c520595ed2488a0922f7 SHA1 b212485909bae7f625e74809641385915a8bb110 SHA256 4bf6f7d0312f07614d2addece6b48f3301bb85de5f27c8b9729e11b1f4d9e36a
 AUX gentoo-run.conf 226 RMD160 3bea7b3d3fe3b3589d8bfdeaf52112ab46a67e82 SHA1 521d0d3ff408905075f42b3b00ccc77da2355c6a SHA256 a23fa3b35b4e9d5f1c41dc77cb5be1cec492eb903a57472df3d93a053db28ca7
 AUX update-etc-systemd-symlinks.path 119 RMD160 b2512605a2313af9fca6b611a32b66e2c435577a SHA1 70ddad85c6981b9a0a81f1d0f84f4b039951c543 SHA256 4dbbe99fdc4b7922ad6fb4c6f39c975a4b139e04b04a65e3c79650b364fdc02a
 AUX update-etc-systemd-symlinks.service 165 RMD160 aab6eb2ff82ae82be72c12682fda2bc62d7b2e51 SHA1 6a766b8ef0a97290431756c8bbabf242447c632e SHA256 77f199392367cefc6d70110b955fb5f2ebafaf21ea8ca355b1863a44f130bf69
 AUX update-etc-systemd-symlinks.sh 451 RMD160 94066bbc526f108e2a3a49ad3b8dc52eb1ed4ad7 SHA1 9ad3fa9e5bef1b7d10a54101ddedb299d0f875a7 SHA256 1ed27cf8c2ca5ab862b9d935eec613d1a21ceb4cc363a4bfdac6430387e350df
 DIST systemd-29.tar.bz2 810407 RMD160 49cf7906a768217190cdf61d102058b9c8762d40 SHA1 5dc36e8d900085af31a96a6bafaba228bc8225c7 SHA256 c41153c3ebab9e25b16fa1670946ce6dfdd1515608a37eedd80d2bbe46629971
 DIST systemd-39.tar.xz 890892 RMD160 99b7e141d08b4cba693a02260e543583877b244b SHA1 8357a61dcaf86391b5cfa5bdc07774c32061336b SHA256 cd053f97ab0ed4261ec44f247ec582566319339f523dbe79b79c68cfe5ad677f
-DIST systemd-43.tar.xz 852432 RMD160 8eeea1454b0cdfc202755979e34656ae3a4d99eb SHA1 5d2d36bbe34ae6391dd8b4e639dd207adb936d08 SHA256 3070e48e43bc0811fa8da5ba4832a11dac73b1625db94d42d4c15dc279335dd7
+DIST systemd-44.tar.xz 885636 RMD160 d81f0b72806884628b80af5e261dddf5dbc88025 SHA1 851869f1d991343995a9ca1243616c8bf4edfdad SHA256 7a5aac4b4b8b3a82bf59292f10e43d8f2c2d7039f34e95714f81d8edcb42233c
 EBUILD systemd-29-r3.ebuild 4218 RMD160 fcfe518679c4e02ac23478c19368043ed5c7f06e SHA1 df97d2be8bc1e440720bfc7d83f90b7d53903a86 SHA256 ddabd878473f6d1be9b0cf837e615ca22377ffa479b4cc0ccacdd8b201c560cf
 EBUILD systemd-29-r6.ebuild 5395 RMD160 0a9271787c5c9f2b8983e25089740aaed8724aea SHA1 53453523d3f014b1c8671a32001387720277e05c SHA256 cd52d7316ccaccf4fbc66ce9bd04254eb4171da58c139302a95e5acee4e6eb4d
 EBUILD systemd-39.ebuild 5506 RMD160 a2eacb649a2f3d7eef06c36fe7588d7940538b43 SHA1 db1685a072d240f730240e6f1a6c3b51d803ca9d SHA256 5b3dc33597b1d882f5754b179eccb1396a3a1f1e3e5aa973cad28cb8c3a381fa
-EBUILD systemd-43.ebuild 5359 RMD160 b3a535de2f0c347a45084e70b80fcead0b3ab169 SHA1 bb513a1197378dbbff056979bc9fb7ad2c9d2902 SHA256 25fc48fe948137cf7c569d265f45f4c3bb571b61e7bf28e5b02facaf25160351
-MISC ChangeLog 5019 RMD160 e9cb8253a5e2e8400d1a1137aab6cffc273afd46 SHA1 532e4ae166346e9dd2c773a6d00b535aa43bc831 SHA256 08a5ac78ba60dca4e6bf52a037d8ad68f3d4363ffa6b7a6d37b9760b6ebb3365
+EBUILD systemd-44.ebuild 5141 RMD160 d2595e54fd0e376ccc1fb4f0202e11d324c3b1ae SHA1 14b82d7e60334da27db572b544855f5305a106c3 SHA256 3a28f488eaee2aac19691cc336b25cfc0740db8f73c462a673afc0979ab4ca75
+MISC ChangeLog 5237 RMD160 f0e03236bd27f956fff89e9fa03840742664db20 SHA1 c0acf7fc84ac72a93c573ae7461d3d7c55e1d382 SHA256 ed6f0a1d77d7dfcf8f0da95c5188a329a8f83c16995c839980d674c896dd8ff8
 MISC metadata.xml 502 RMD160 1cbf039eefa26495068305b7a3ef801b04904561 SHA1 70e619acb0be857af4f668555b5405b1c0fa8d2b SHA256 c4e473de103cd2168c5730797a9835d88c675456b2743af3dcc33c65c4d1ea7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk97yXQACgkQfXuS5UK5QB00ggQAsNGW3hCejY99r4k+/SLrl2ld
-qqaz6DO3CQ9Fdl3ofeonAUT42XN5Vgt17t1cDZnAdbPdV8tpP5TS1ho5ITmb/UZW
-9FmCRhTrVVHWiSN/eav/hmMSTAlQOLjiSriXAxe2Tzh0mK0z4p14ifTwlcDMgWXO
-ZBs3BZSW+3ouUvgz7D0=
-=d3h5
+iJwEAQEIAAYFAk99fuYACgkQfXuS5UK5QB0PMgP+Kk3mSahu+2fTY4dzf4fotolc
+1VppcAm/vsg2bytfTrb7k3WS6E67aRp25awtWBLzn2hXTWo19x9ijiCp40/yMcw6
+M7mHtMzOMnFs9fyK0WgUseFCv1I7gQeixIWqk6K7hSp4Rywp1zqW8qgbVLKVTe8s
+zd2kgRZgyKE/SmImZxk=
+=Hvav
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/files/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/sys-apps/systemd/files/0001-util-never-follow-symlinks-in-rm_rf_children.patch
new file mode 100644
index 000000000000..7ac9251b35e8
--- /dev/null
+++ b/sys-apps/systemd/files/0001-util-never-follow-symlinks-in-rm_rf_children.patch
@@ -0,0 +1,32 @@
+From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt@redhat.com>
+Date: Fri, 2 Mar 2012 10:39:10 +0100
+Subject: [PATCH] util: never follow symlinks in rm_rf_children()
+
+The function checks if the entry is a directory before recursing, but
+there is a window between the check and the open, during which the
+directory could be replaced with a symlink.
+
+CVE-2012-1174
+https://bugzilla.redhat.com/show_bug.cgi?id=803358
+---
+ src/util.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/util.c b/src/util.c
+index 20cbc2b..dfc1dc6 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) {
+                 if (is_dir) {
+                         int subdir_fd;
+ 
+-                        if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
++                        subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
++                        if (subdir_fd < 0) {
+                                 if (ret == 0 && errno != ENOENT)
+                                         ret = -errno;
+                                 continue;
+-- 
+1.7.9.4
+
diff --git a/sys-apps/systemd/systemd-43.ebuild b/sys-apps/systemd/systemd-44.ebuild
index 68171d0cc3e2..4216d8f6795e 100644
--- a/sys-apps/systemd/systemd-43.ebuild
+++ b/sys-apps/systemd/systemd-44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-43.ebuild,v 1.3 2012/04/04 04:09:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-44.ebuild,v 1.1 2012/04/05 11:15:27 mgorny Exp $
 
 EAPI=4
 
@@ -13,10 +13,11 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="acl audit cryptsetup gtk lzma pam plymouth selinux tcpd"
+IUSE="acl audit cryptsetup lzma pam plymouth selinux tcpd"
+
+# We need to depend on sysvinit for sulogin which is used in the rescue
+# mode. Bug #399615.
 
-# Vala-0.10 doesn't work with libnotify 0.7.1
-VALASLOT="0.14"
 # A little higher than upstream requires
 # but I had real trouble with 2.6.37 and systemd.
 MINKV="2.6.38"
@@ -32,13 +33,6 @@ RDEPEND=">=sys-apps/dbus-1.4.10
 	acl? ( sys-apps/acl )
 	audit? ( >=sys-process/audit-2 )
 	cryptsetup? ( sys-fs/cryptsetup )
-	gtk? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26
-		dev-libs/libgee:0
-		x11-libs/gtk+:2
-		>=x11-libs/libnotify-0.7
-		!sys-apps/systemd-ui )
 	lzma? ( app-arch/xz-utils )
 	pam? ( virtual/pam )
 	plymouth? ( sys-boot/plymouth )
@@ -51,27 +45,18 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	dev-util/gperf
 	dev-util/intltool
-	gtk? ( dev-lang/vala:${VALASLOT} )
 	>=sys-kernel/linux-headers-${MINKV}"
 
-# Due to vala being broken.
-AUTOTOOLS_IN_SOURCE_BUILD=1
+PATCHES=(
+	# bug #408879: Session Logout File Deletion Weakness (CVE-2012-1174)
+	"${FILESDIR}"/0001-util-never-follow-symlinks-in-rm_rf_children.patch
+)
 
 pkg_setup() {
 	enewgroup lock # used by var-lock.mount
 	enewgroup tty 5 # used by mount-setup for /dev/pts
 }
 
-src_prepare() {
-	# Force the rebuild of .vala sources
-	touch src/*.vala || die
-
-	# Fix hardcoded path in .vala.
-	sed -i -e 's:/lib/systemd:/usr/lib/systemd:g' src/*.vala || die
-
-	autotools-utils_src_prepare
-}
-
 src_configure() {
 	local myeconfargs=(
 		--with-distro=gentoo
@@ -86,18 +71,15 @@ src_configure() {
 		$(use_enable acl)
 		$(use_enable audit)
 		$(use_enable cryptsetup libcryptsetup)
-		$(use_enable gtk)
 		$(use_enable lzma xz)
 		$(use_enable pam)
 		$(use_enable plymouth)
 		$(use_enable selinux)
 		$(use_enable tcpd tcpwrap)
+		# now in sys-apps/systemd-ui
+		--disable-gtk
 	)
 
-	if use gtk; then
-		export VALAC="$(type -p valac-${VALASLOT})"
-	fi
-
 	autotools-utils_src_configure
 }
 
@@ -161,6 +143,7 @@ pkg_postinst() {
 	elog "be installed:"
 	optfeature 'dev-python/dbus-python' 'for systemd-analyze'
 	optfeature 'dev-python/pycairo[svg]' 'for systemd-analyze plotting ability'
+	optfeature 'sys-apps/systemd-ui' 'for GTK+ systemadm UI and gnome-ask-password-agent'
 	elog
 
 	ewarn "Please note this is a work-in-progress and many packages in Gentoo"