Hopefully last qa fix. Because wt can act as its own webserver and can't depend on apache or any other webserver users being installed, we need to create its own user/group and tell cmake to set ownership of /var/run/wt and other data directories to user/group wt.

Package-Manager: portage-2.1.11.23/cvs/Linux x86_64

3 files changed, 32 insertions, 11 deletions

diff --git a/net-libs/wt/ChangeLog b/net-libs/wt/ChangeLog
index 45273b23db6f..60f97c29119d 100644
--- a/net-libs/wt/ChangeLog
+++ b/net-libs/wt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/wt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/ChangeLog,v 1.13 2012/10/02 08:08:40 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/ChangeLog,v 1.14 2012/10/02 10:26:37 mattm Exp $
+
+  02 Oct 2012; Matthew Marlowe <mattm@gentoo.org> wt-3.2.2_p1.ebuild:
+  Hopefully last qa fix.  Because wt can act as its own webserver and can't
+  depend on apache or any other webserver users being installed, we need to
+  create its own user/group and tell cmake to set ownership of /var/run/wt and
+  other data directories to user/group wt.
 
   02 Oct 2012; Matthew Marlowe <mattm@gentoo.org> wt-3.2.2_p1.ebuild:
   Hopeful fix for the QA install issues associated with cmake eclass and net-
diff --git a/net-libs/wt/Manifest b/net-libs/wt/Manifest
index 8b7f0399cba5..c4563585e7db 100644
--- a/net-libs/wt/Manifest
+++ b/net-libs/wt/Manifest
@@ -5,17 +5,17 @@ AUX wt-fix-automagic.patch 8672 SHA256 991db3f4c7ff8715828f7f24c0d6ac6b5629da538
 DIST wt-3.2.0.tar.gz 17781351 SHA256 b461073096e1284bde6900392fee776fd50da048294073cb2e1e6ab5c024ec56 SHA512 d6df3cd3f0bdacf5d460b03573b3a54485a8dc23d9bc401afc15902c08c17c9b8a10d45e40bbe14e8b023497476ee8d2765776b96f08fa0aa12e5f6a8a102d14 WHIRLPOOL 33554f53a6e6493bc43f6bb69ef4f9445865cdb142dec22d428bb5ae2f06dbfa4c563788e095bdccbead681b0e4aef431c7537a2592178d0799a4d803b651534
 DIST wt-3.2.2-p1.tar.gz 17312758 SHA256 1610b1950eda3614a12e915f5968d7b8659eb17231622681c9a1eafc586c8f05 SHA512 4ffce2ab65fc8286a9d54194cdd4efaa521245f78fa6cce9b24694611cbf392b7d8072e02c8d75115f40594893086c5646ec3926f2e8c8e404369bdd30df0164 WHIRLPOOL 48d2cd14866a510350cec6afce18466abaa9cc12af8b55bc6986ca89fbd5f8998b1ce328cac0b706b06fc497e4580d444cfd64e0553d72e90573cc3aa9558d93
 EBUILD wt-3.2.0-r1.ebuild 2551 SHA256 45733b2d07023fbb985085ceb3c3aea3551adf82c6b26a4746afcb91fc5b7a62 SHA512 017833ebef3c8710394c7afb30803a4879e0845faa90fe33b7d13488930ad60936241e78bdaf32c03a22de5ee9dded90b27853afc4926b0698c195bb6c29106e WHIRLPOOL 4d3a3d95fbdbe3a60bb51c79aefa0e8acebc841ef42e078d3ebdd253cb9e68763a3a27676a97218746441df7b5fb20bd0d8ac8b41b09818c9e284a9e312f8fbe
-EBUILD wt-3.2.2_p1.ebuild 2831 SHA256 f586fc7fc706f6cca29d434293c4ba84cf3118bf84cdfb1cf5434fa81d76716a SHA512 7972b4e17133dbd80640bab1868a34d1a12b0bfbbcb278478596665f2fc26de003c5307d71015fdd002e7c47ea0719256d1207fbc0c24c7934127f143404c72b WHIRLPOOL 6b584fce30386a6ba602bfab991d3a8a4744bbb961440eb858c9e833736ddc10ae0bb7f6c4d48bceac670f3dc632cd253ba65bb948c1c17b5154753449b8318b
-MISC ChangeLog 2583 SHA256 3bf95499fa2e9c16b5200cc58f2cc13913d1f0b23eaec0fdaea9be011638c835 SHA512 884240f0334b87feb107f07cc6be789801d763d6ad968d44338730b0ae02021d258897e2923e60628f4b1e3a49c695d74cc14bf2b98effece2a8dfb798221b86 WHIRLPOOL 601731a1e81ddd8d0a4dd45fc839724852c67d9a2082d8b16976836ab6550d329e214ef58ba199724cb690956cba5175a6bd31567f8d178fc8bff0e54349545e
+EBUILD wt-3.2.2_p1.ebuild 3067 SHA256 0265c69e62ae98883e269201c722f538ca7e1cd034d1fba17a6fe27104b50aae SHA512 5baeba5cf462eb5353428a4b1e3dab388f99e7d595341b18b3568de5bb55ce57db54be548a3ffc3aba5d6ec37369557b678bacf9c37e5e0d32ebb75fbdc49917 WHIRLPOOL 522ed5faad3fc6ee6f3aa4da29bf5a60fc49eb7fd065bf50f5d1b975d00e6dcdecf81a7c112d907c5626fb86247476f7b9d129d54087ca1af5849a4234d02262
+MISC ChangeLog 2928 SHA256 2796dd5cd71ba28e57491c8e067f116b45c78650903e485bbe28707e3361a7f7 SHA512 d355f9f8ec322e152e99cc6550fb92db5da800dfc8a3f6bf8f7e5efe40e54d965cf365c89474e93dc775ae29ae9bff78ef94adaeedf719204555b2c4b5f423d7 WHIRLPOOL e230ee4efd1a7d2182880493522e7e648f33c0cfde9c51cdf2bd9e7fa4cd5bdd7ceaddb598da2fb8d25080a3e15d9cb3fbef240e4cd25854a8ac860262695ece
 MISC metadata.xml 659 SHA256 d9b27ad5d75e6e1f82062eb4c261e1d4a1f447339487c0cd5523d8bff267d224 SHA512 d6edeba32e15e4d8b92570e655f5205266f62d2922b49c4beac055ce4a095f611a2cf487759d58cd7985704a21a5274061336dc56890e2f9344205f0866cd87d WHIRLPOOL bd64a339f9609ba280c92c0a0349601ead9e75de0cfb03edb95d6103ce33d9871aff57a58f161bd3dd5c5aadcecbe06fe8c10f3d6fc807e8b800c834d788f9ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQaqEPAAoJEC1LWXx4YDenLpUH/1sHoZ36FUKEsDBpkNPR/mFy
-LS8ZM1Q54l3Ruc9LB3mgr3A2Fn4GNF7Zj02HW/M19H3tJfeFqM4djM7P1vWjsqyh
-H5tAQXvh81+gDY1x2iPSDMnAu3P9VWmexuRVYhL0iEzrFCIS1zhawzoXdO9or7FM
-OZq07LygPNw1Ajl99+igjU9RFh9j69aEBA+iDjF4t5pT9qBgLl0Mb0RF0A3UJwdo
-NauJXe8ykFjfjFKE78kJsh7RA0afR7blXzo4haw3d+1KoOHhgGZ1Oz3t32jbWF7l
-RcNc18HrmJjMxPmuZKqrdr81tMdV5FemkFTxd53XtGO+AUBPpk18hyPlkP9fTPs=
-=HBVT
+iQEcBAEBCAAGBQJQasFjAAoJEC1LWXx4YDennLYIAJv+jjX92Gnv8F3RX9pzi//B
+r1G/YxrZkIEBbj5g5yI29xtgN2TCGY3oIM10wYhDVLqLxyiMTXFAmg+hXicbrzuw
+4vc09Pp0ovrqZBktCXzl3ujMj17D6vU12yOhVYX6+BWN1sWBEgLorR9CCbA5irlX
+giio4xqHGJkbTO9TSSbG+u5o4BB5MxDtGJTXyo7YbxiLugcVUljzEVfSHo4CPFGq
+U9Cuy6CaoyQ2HsXPlCZIyZ/0JdQyWme0iVY/Lsv9Iu0r65tFrc9/gFEACugJNOkW
+rkzf88VGFrfNewcbiHZlLLwrNAkYrB41iPuDXCKEvmFclQKsdomvFy9LWTu89bo=
+=Hn7S
 -----END PGP SIGNATURE-----
diff --git a/net-libs/wt/wt-3.2.2_p1.ebuild b/net-libs/wt/wt-3.2.2_p1.ebuild
index d69cb219cd32..39cf6fb87525 100644
--- a/net-libs/wt/wt-3.2.2_p1.ebuild
+++ b/net-libs/wt/wt-3.2.2_p1.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/net-libs/wt/wt-3.2.2_p1.ebuild,v 1.2 2012/10/02 08:08:40 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wt/wt-3.2.2_p1.ebuild,v 1.3 2012/10/02 10:26:37 mattm Exp $
 
 EAPI="2"
 
@@ -45,6 +45,9 @@ pkg_setup() {
 	if use test && use !sqlite; then
 		ewarn "Tests need sqlite, disabling."
 	fi
+
+	enewgroup wt
+	enewuser wt -1 -1 /var/lib/wt/home wt
 }
 
 src_prepare() {
@@ -72,6 +75,8 @@ src_configure() {
 		-DSHARED_LIBS=ON
 		-DMULTI_THREADED=ON
 		-DUSE_SYSTEM_SQLITE3=ON
+		-DWEBUSER=wt
+		-DWEBGROUP=wt
 		$(cmake-utils_use extjs ENABLE_EXT)
 		$(cmake-utils_use graphicsmagick ENABLE_GM)
 		$(cmake-utils_use pdf ENABLE_HARU)
@@ -101,6 +106,10 @@ src_install() {
 	cmake-utils_src_install
 
 	use doc && dohtml -A pdf,xhtml -r doc/*
+
+	dodir \
+		/var/lib/wt \
+		/var/lib/wt/home
 }
 
 pkg_postinst() {
@@ -110,4 +119,10 @@ pkg_postinst() {
 		elog "You can use spawn-fcgi to spawn the witty-processes and run them"
 		elog "in a chroot environment."
 	fi
+
+	chown -R wt:wt "${ROOT}"/var/lib/wt
+	chmod 0750 \
+		"${ROOT}"/var/lib/wt \
+		"${ROOT}"/var/lib/wt/home
+
 }