Keep the legacy /media directory for pmount wrt #501772 by "skaumo"

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 101 insertions, 11 deletions

diff --git a/sys-apps/pmount/ChangeLog b/sys-apps/pmount/ChangeLog
index 61640d57c9c7..499ce13acdb8 100644
--- a/sys-apps/pmount/ChangeLog
+++ b/sys-apps/pmount/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pmount
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.97 2013/09/25 07:23:50 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.98 2014/02/21 06:06:27 ssuominen Exp $
+
+*pmount-0.9.99_alpha-r3 (21 Feb 2014)
+
+  21 Feb 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +pmount-0.9.99_alpha-r3.ebuild:
+  Keep the legacy /media directory for pmount wrt #501772 by "skaumo"
 
 *pmount-0.9.99_alpha-r2 (25 Sep 2013)
 
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 0edd82cd0c4b..c4ea9e4e5515 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -6,16 +6,17 @@ AUX pmount-0.9.99_alpha-locale-regex.patch 749 SHA256 149a8e6cfaa5437d26f26d17ce
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 SHA256 ca06bd0c429d3db9382433f378d07bf763534f70fe71015322678e321b0679e5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9 WHIRLPOOL 18172b606f20f1b95ff0b60fa5c83de14c04fa2b774598fdf1ef21746c0cc77c63469ed436d752d7a172e90847b38635b08e3e80db28294fdf3d102408cbdfc9
 EBUILD pmount-0.9.99_alpha-r1.ebuild 2066 SHA256 4ef5681da5187fa0e2c09f87fc61f1285061c1c1576bf6f62e89997cd41516d8 SHA512 87c1ebf5fedd6da6890d0971ab4f596d39b1dfe300afc0da4139a42a29dfcee67a9c94b87c991ebc9ffbc8cccdf697532d43fbe8f144a1b839ca3365a772ad65 WHIRLPOOL daaff46005c9a5a517c09b4077d850a4f5d4bd80ef92f686143980bed31fbf860220c9ac6be526b3506b769c13198c618615012bf8719bfcafb186dfc0c37302
 EBUILD pmount-0.9.99_alpha-r2.ebuild 2125 SHA256 c73f0d4c7db7f0c0f60bd7adf4210fc838c224a9378dc17180e2b542b65f277c SHA512 5101452697b7877c50cb23a135352699b60a5c73301e84169fcc1e0d855b1e2b0fc44c74f74e36a6bf2ca36a078306882cd7ce32e7c58c77ac734b75d28540a1 WHIRLPOOL 020753878fc093a4de80ec153d80ab0e8640081e7826288b3989f3e536b8511734136e715302ea3d0b9b09cf22f283a9e523474f8a9fd21d0b2a63819d0dc7c6
-MISC ChangeLog 12309 SHA256 2adb73b6c6c06ee31e9dc0df13ce985b07f1b7b60569ef38afba3aa0de1ff249 SHA512 117ec9cc119bafffc621682bee5ab3c21c1448d329e8e7ebd60f9ed5609d009329848628898dd706ee63d9d41c9dd7da9c7a72c73e2dca1dfe316e194309cb15 WHIRLPOOL 39b5541ca70d69e06878f9e9b2cc4b3febf298b4267c7b06c1b12e397863cfd5401c3cde3eff9a40526382e53359b4c63a20a52a599a9a834e271aaa187656f1
+EBUILD pmount-0.9.99_alpha-r3.ebuild 2150 SHA256 0106e5a997562e4b0311dfd76f9b6774ed878be2d221b3a9273a40b9e43c9779 SHA512 bc7daadc0b9ba52c2e4461be63f1311abf1eef158c89ce0130e8b81c62a363118bc6c1018eb797e6c0475dd9d1c6f28265ea7535e0d06c10309f1aaf45a0a0d4 WHIRLPOOL 6a2417b56e947dffb07960b2a8c1b721d8243b6d70760d3c0af4d54beb9c2d70120f900fad08026929f40fc8f58df24ffbe895cc7546d6fee4bddc01e89cd7c8
+MISC ChangeLog 12507 SHA256 8946f2a4c8e7eff396abdd4217bf79d239487bce6e88cba9f13465b6dbfbbb13 SHA512 2959653d6dd7d45383c287be4cb5aaa80c80c3666253c08a3ebbda28fa14b630434f8c6501deb47b4dc5a581c0a7cf73817e912da2ce9f51ca0efe5bf472e27c WHIRLPOOL c581e2ed78422560fede86036409bd7afd9e3385562b5e5deb766962b07cc89cfee33007331c312d465139600dc36ab953dbcddf821d3d7191658afa9b50d615
 MISC metadata.xml 164 SHA256 66cdaff449660e99dfaee8d19b47413fc8ced6d5a1eccd3c842a48e9d9668d48 SHA512 87c2ce9c93ff1fdd7fb4768b89912acfceeeee0bbdb88d0cebdeb3e5f3b93e53bfbfbe2c1c3618629044a01af390d8fe9ec795472df58893df65503150dcf2e9 WHIRLPOOL d4c178d01829841a4f2e694280036c74f68c215c4ab64869f5a8ce2ee5005a30a204ab0e9189fd752563f392480c3c5e7fdd59cbecb40f7e51fe2ff8d1e4cd7a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSQo88AAoJEEdUh39IaPFN9tAH/RRh4et7yo3DGZzLUUXROTR8
-iWPswL9owJttt1lKgsx9WpkuDMrY8xy46Elc+wJw7i43AxQvdo7OsaRA5zh334yE
-v1N6n255odGW50fSCCllPm4C8/URmA3WKPIyww8kiegUVVm74wQr6QkH96XtXsNn
-BAA1UTFo7fIRaASsskeTbnZRgVCA4OQGvCGPs4LyqD0HknhAtqx4Adbn5Dqhm+Et
-iU0rRthhm9PcIv+I4Bc1BmQmK+ZUZXot7Q+xly81KcB4KTPqgnrqrqx1kyijaJsu
-1fmlkSQrzuTd1LStNIhnibZwRXQNMCR+dIYv8cDwklQ49HnMKzM+/lVAgO4s6ws=
-=DcGD
+iQEcBAEBCAAGBQJTBuxmAAoJEEdUh39IaPFN4BQIAI8jp7y16zZujN3u/SwlFG3c
+hcU3zJ8LBWBNX7HlCMjKXk3opMAU9Rb8ixCZCQCuqW/yXqmSdfvSCOZXoAKrDu3x
+IH+cfU8qWbBnb26G7BVWvCZ4ugj59KUl+jbvwltZsercCkOkFJ9pgoPOIg3+geA1
+M5mZB1jncm6+ObDfZ4Cvft9k//POFcB4oS7GeuHuhA3HIh/QTpV+CD2yE0TjzT6U
+xBNNSg8qqJfYhGMEZpI2TFFNdXcxOKNB6xUrXypPs9VwTg4Psfm2Gs2EoF3gglSk
+SYJxoNoex1s4fK7FCsFs+eI2y8W+iT0hb3u/qOmjno4IGTyZwix6AOFYbm8ehVM=
+=/mQp
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r3.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r3.ebuild
new file mode 100644
index 000000000000..5e02c653c5c5
--- /dev/null
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.99_alpha-r3.ebuild,v 1.1 2014/02/21 06:06:27 ssuominen Exp $
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Policy based mounter that gives the ability to mount removable devices as a user"
+HOMEPAGE="http://pmount.alioth.debian.org/"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2"
+#SRC_URI="http://alioth.debian.org/frs/download.php/3530/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="crypt"
+
+RDEPEND=">=sys-apps/util-linux-2.17.2
+	crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext"
+
+S=${WORKDIR}/${P/_/-}
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	# Restore default value from pmount <= 0.9.23 wrt #393633
+	sed -i -e '/^not_physically_logged_allow/s:=.*:= yes:' etc/pmount.conf || die
+
+	cat <<-EOF > po/POTFILES.skip
+	src/conffile.c
+	src/configuration.c
+	src/loop.c
+	EOF
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch \
+		"${FILESDIR}"/${P}-locale-regex.patch
+}
+
+src_configure() {
+	econf --disable-hal
+}
+
+src_test() {
+	local testdir=${S}/tests/check_fstab
+
+	ln -s $testdir/a $testdir/b && ln -s $testdir/d $testdir/c && \
+		ln -s $testdir/c $testdir/e \
+		|| die "Unable to create fake symlinks required for testsuite"
+
+	emake check
+}
+
+src_install () {
+	# Must be run SETUID+SETGID, bug #250106
+	exeinto /usr/bin
+	exeopts -m 6710 -g plugdev
+	doexe src/{p,pu}mount
+
+	dodoc AUTHORS ChangeLog TODO
+	doman man/{{p,pu}mount.1,pmount.conf.5}
+
+	insinto /etc
+	doins etc/pmount.{allow,conf}
+
+	keepdir /media #501772
+}
+
+pkg_postinst() {
+	elog
+	elog "This package has been installed setuid and setgid."
+
+	elog "The permissions are as such that only users that belong to the plugdev"
+	elog "group are allowed to run this. But if a script run by root mounts a"
+	elog "device, members of the plugdev group will have access to it."
+	elog
+	elog "Please add your user to the plugdev group to be able to mount USB drives"
+}