Fix installing pam_systemd.so to /lib*/security. Also, backport a few other fixes.

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

5 files changed, 53 insertions, 18 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 1997fe661c8a..d5a6f5c6a04d 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,16 @@
 # 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.20 2012/01/14 21:17:23 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.21 2012/01/21 15:55:11 mgorny Exp $
+
+*systemd-38-r1 (21 Jan 2012)
+*systemd-37-r4 (21 Jan 2012)
+*systemd-29-r6 (21 Jan 2012)
+
+  21 Jan 2012; Michał Górny <mgorny@gentoo.org> -systemd-29-r5.ebuild,
+  +systemd-29-r6.ebuild, -systemd-37-r3.ebuild, +systemd-37-r4.ebuild,
+  -systemd-38.ebuild, +systemd-38-r1.ebuild:
+  Fix installing pam_systemd.so to /lib*/security. Also, backport a few other
+  fixes.
 
   14 Jan 2012; William Hubbs <williamh@gentoo.org> systemd-29-r3.ebuild,
   systemd-29-r5.ebuild, systemd-37-r1.ebuild, systemd-37-r3.ebuild,
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 3c34d835d342..358feeca4580 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gentoo-run.conf 226 RMD160 3bea7b3d3fe3b3589d8bfdeaf52112ab46a67e82 SHA1 521d0d3ff408905075f42b3b00ccc77da2355c6a SHA256 a23fa3b35b4e9d5f1c41dc77cb5be1cec492eb903a57472df3d93a053db28ca7
 AUX update-etc-systemd-symlinks.path 119 RMD160 b2512605a2313af9fca6b611a32b66e2c435577a SHA1 70ddad85c6981b9a0a81f1d0f84f4b039951c543 SHA256 4dbbe99fdc4b7922ad6fb4c6f39c975a4b139e04b04a65e3c79650b364fdc02a
@@ -9,16 +9,18 @@ DIST systemd-29.tar.bz2 810407 RMD160 49cf7906a768217190cdf61d102058b9c8762d40 S
 DIST systemd-37.tar.bz2 931101 RMD160 d0b15083fe938039972f38a30c757ed8b10a5998 SHA1 02665bcb8c609193170579537c3a94013519405c SHA256 b38492bde73649cc3520953354ef446c268169c1d342614183655e9ee1a1bbc5
 DIST systemd-38.tar.xz 875736 RMD160 16f427fc4d6036a36d50a22ff2cf1f78c37cbeac SHA1 868e0702279b1b1ff638475d67e103c8a979118b SHA256 cd21eddc23457323fcb8775813a985d7bc429a63ea5adc6950a8bbe421e30d13
 EBUILD systemd-29-r3.ebuild 4168 RMD160 ec3b586586dd8851959a1578c3b3381bc7614c22 SHA1 bd90e1d39ac64f64f50d52d0c10363672e4f3d8a SHA256 f57c09fa9a7e161d3e889deee7fc024187c9904fc049029bcadaa0d03f07c8df
-EBUILD systemd-29-r5.ebuild 5015 RMD160 a87a60d8af598226ad7b354c91005fd474cb41a5 SHA1 5dfac6f01af64e94260124b3e4a7dd973886fbdc SHA256 945d97131a5b516e0b2d5946ef1aaef2019832ac69fa2e5ccbf1eb9a068765f2
+EBUILD systemd-29-r6.ebuild 5343 RMD160 df19c4926cfa9952188a0687027fc6f774b6030b SHA1 357c2b02f2fe969af8f8efd2fa763d770dd9283b SHA256 43dfe5c7d1be9e3460fcf22c6521966eb8e2e80d98152623d34a5e58757602c0
 EBUILD systemd-37-r1.ebuild 4185 RMD160 89a98a51a259bd824467fd424ba7d5e46c74aee3 SHA1 2a983ef2677d6c3084f1116ca66ba217cb9eb1e3 SHA256 998fa499314a93a818996f075f162ba1f94f79754513447e4420528fd2e85d21
-EBUILD systemd-37-r3.ebuild 5032 RMD160 271601250c5d72a11de89f41c5bad16829efabbc SHA1 291b4abd657ab89962d5f691b6db939b15ea9342 SHA256 149c9700ef7268b7d7cb0f7df88128e39febb4805a772cbb1ef4f4ccc9966757
-EBUILD systemd-38.ebuild 5170 RMD160 ee0cba51e8ff7492fd66b6b0cd6ff6af6570122e SHA1 25c5335027b2c6d5f1c70effbd152ee4db903e1c SHA256 55d6ffba36b93a1f6c50fea4a7532a07e5625f75440435c482de50e024114c6f
-MISC ChangeLog 3968 RMD160 6a932d66029ec5119dafd9d0a7bd618b5efb19ae SHA1 b05337abb2bdebfa08d5641c73d1ac536525a4f7 SHA256 4fd1f5f00e02e06f5d7304cb394b6e982b971a6be63d3f333d06fd6feb03551d
+EBUILD systemd-37-r4.ebuild 5360 RMD160 491cfaf421adec3f69ca942454b7a12c138a9f87 SHA1 b0d638cab91e539c0a219a5e5a1e1d4f9a4fd95f SHA256 fe08cf069f32e602b924c399649cc217a605126bd99e342c1a28351f30662edf
+EBUILD systemd-38-r1.ebuild 5457 RMD160 c6012463024bcd0d6fdc3e2d9b5895e00d31d0ee SHA1 37f186225866269fe5fc2c0b8ed952c24011d3c8 SHA256 f5334e664e337523b50754105f2a79dbbf61c0ae45e601fcb38892ac7ae77201
+MISC ChangeLog 4331 RMD160 de499318a2a26670e33f354edbb038e05fab724c SHA1 7407c8e26a4487b6c33f5761e30233f72e8bfd9b SHA256 2ac8ac05484d0c2f0d0ab6aaa27c45a818ca2fb12bb2bfd125a381b865dc5fda
 MISC metadata.xml 502 RMD160 1cbf039eefa26495068305b7a3ef801b04904561 SHA1 70e619acb0be857af4f668555b5405b1c0fa8d2b SHA256 c4e473de103cd2168c5730797a9835d88c675456b2743af3dcc33c65c4d1ea7f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8R76gACgkQblQW9DDEZTgOAACfUCh14VLSJD6uTWI0rSLumEuV
-tjwAn0l6FtDgsk0PBXXNyPSFu1JJbXa8
-=meXj
+iJwEAQEIAAYFAk8a4EkACgkQfXuS5UK5QB0Z+gP/TvZv3u4l4D/Je4B2fGl4QdnG
+lJ2PBfs+FpzSxMs1MkbTmmHP6lRG+XsxV1rW424ru5GBFyMhBOX0u6RfFBM5iRRb
+1FuxeFUH0bAOWhfaKzgHHezMfEwRLfIPKL6x8q4Pc66I9YA2uiLrqH2yyxH39qVL
+ow658EsqBcxK5GVr+nM=
+=vq7N
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-29-r5.ebuild b/sys-apps/systemd/systemd-29-r6.ebuild
index 85b04eb4cdf2..5415105a10b5 100644
--- a/sys-apps/systemd/systemd-29-r5.ebuild
+++ b/sys-apps/systemd/systemd-29-r6.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-29-r5.ebuild,v 1.2 2012/01/14 21:17:23 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-29-r6.ebuild,v 1.1 2012/01/21 15:55:11 mgorny Exp $
 
 EAPI=4
 
@@ -15,7 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="audit cryptsetup gtk pam plymouth selinux tcpd"
 
+# We need to depend on sysvinit for sulogin which is used in the rescue
+# mode. Bug #399615.
+
 COMMON_DEPEND=">=sys-apps/dbus-1.4.10
+	sys-apps/sysvinit
 	>=sys-apps/util-linux-2.19
 	>=sys-fs/udev-171
 	sys-libs/libcap
@@ -67,7 +71,10 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--with-distro=gentoo
+		# install everything to /usr
 		--with-rootdir=/usr
+		# but pam modules have to lie in /lib*
+		--with-pamlibdir=/$(get_libdir)/security
 		--localstatedir=/var
 		--docdir=/tmp/docs
 		$(use_enable audit)
@@ -106,6 +113,7 @@ src_install() {
 	# 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
 
 	# Create /run/lock as required by new baselay/OpenRC compat.
 	insinto /usr/lib/tmpfiles.d
@@ -129,7 +137,7 @@ optfeature() {
 }
 
 pkg_postinst() {
-	mkdir -p "${ROOT}"/run
+	mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble."
 	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"
diff --git a/sys-apps/systemd/systemd-37-r3.ebuild b/sys-apps/systemd/systemd-37-r4.ebuild
index eab43a9781f5..3b1679eed5d9 100644
--- a/sys-apps/systemd/systemd-37-r3.ebuild
+++ b/sys-apps/systemd/systemd-37-r4.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-37-r3.ebuild,v 1.2 2012/01/14 21:17:23 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-37-r4.ebuild,v 1.1 2012/01/21 15:55:11 mgorny Exp $
 
 EAPI=4
 
@@ -15,7 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="acl audit cryptsetup gtk pam plymouth selinux tcpd"
 
+# We need to depend on sysvinit for sulogin which is used in the rescue
+# mode. Bug #399615.
+
 COMMON_DEPEND=">=sys-apps/dbus-1.4.10
+	sys-apps/sysvinit
 	>=sys-apps/util-linux-2.19
 	>=sys-fs/udev-172
 	sys-libs/libcap
@@ -33,7 +37,7 @@ COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	tcpd? ( sys-apps/tcp-wrappers )"
 
 # Vala-0.10 doesn't work with libnotify 0.7.1
-VALASLOT="0.12"
+VALASLOT="0.14"
 # A little higher than upstream requires
 # but I had real trouble with 2.6.37 and systemd.
 MINKV="2.6.38"
@@ -70,8 +74,11 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--with-distro=gentoo
+		# install everything to /usr
 		--with-rootdir=/usr
 		--with-rootlibdir=/usr/$(get_libdir)
+		# but pam modules have to lie in /lib*
+		--with-pamlibdir=/$(get_libdir)/security
 		--localstatedir=/var
 		--docdir=/tmp/docs
 		$(use_enable acl)
@@ -108,6 +115,7 @@ src_install() {
 	# 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
 
 	# Create /run/lock as required by new baselay/OpenRC compat.
 	insinto /usr/lib/tmpfiles.d
@@ -131,7 +139,7 @@ optfeature() {
 }
 
 pkg_postinst() {
-	mkdir -p "${ROOT}"/run
+	mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble."
 	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"
diff --git a/sys-apps/systemd/systemd-38.ebuild b/sys-apps/systemd/systemd-38-r1.ebuild
index 271df6d70651..48758ee52aa5 100644
--- a/sys-apps/systemd/systemd-38.ebuild
+++ b/sys-apps/systemd/systemd-38-r1.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-38.ebuild,v 1.2 2012/01/14 21:17:23 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-38-r1.ebuild,v 1.1 2012/01/21 15:55:11 mgorny Exp $
 
 EAPI=4
 
@@ -15,7 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="acl audit cryptsetup gtk lzma pam plymouth selinux tcpd"
 
+# We need to depend on sysvinit for sulogin which is used in the rescue
+# mode. Bug #399615.
+
 COMMON_DEPEND=">=sys-apps/dbus-1.4.10
+	sys-apps/sysvinit
 	>=sys-apps/util-linux-2.19
 	>=sys-fs/udev-172
 	sys-libs/libcap
@@ -35,7 +39,7 @@ COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	tcpd? ( sys-apps/tcp-wrappers )"
 
 # Vala-0.10 doesn't work with libnotify 0.7.1
-VALASLOT="0.12"
+VALASLOT="0.14"
 # A little higher than upstream requires
 # but I had real trouble with 2.6.37 and systemd.
 MINKV="2.6.38"
@@ -73,8 +77,11 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--with-distro=gentoo
+		# 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
 		--localstatedir=/var
 		--docdir=/tmp/docs
 		$(use_enable acl)
@@ -136,7 +143,7 @@ optfeature() {
 }
 
 pkg_postinst() {
-	mkdir -p "${ROOT}"/run
+	mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble."
 	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"