Check for pcre extension in PHP. Work on defaulting some security to MythWeb default install. (masked version)

Package-Manager: portage-2.1.1

6 files changed, 55 insertions, 27 deletions

diff --git a/www-apps/mythweb/ChangeLog b/www-apps/mythweb/ChangeLog
index 64709aa52a3e..be786e533f61 100644
--- a/www-apps/mythweb/ChangeLog
+++ b/www-apps/mythweb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/mythweb
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/ChangeLog,v 1.22 2006/09/16 02:06:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/ChangeLog,v 1.23 2006/09/16 06:05:08 cardoe Exp $
+
+  16 Sep 2006; Doug Goldstein <cardoe@gentoo.org>
+  +files/postinstall-en-0.20.txt, mythweb-0.19.ebuild,
+  mythweb-0.19_p10505.ebuild, mythweb-0.20_p11188.ebuild:
+  Check for pcre extension in PHP. Work on defaulting some security to MythWeb
+  default install. (masked version)
 
   16 Sep 2006; Doug Goldstein <cardoe@gentoo.org> mythweb-0.19.ebuild,
   mythweb-0.19_p10505.ebuild:
diff --git a/www-apps/mythweb/Manifest b/www-apps/mythweb/Manifest
index 86bca904a5b1..3374f5800ae4 100644
--- a/www-apps/mythweb/Manifest
+++ b/www-apps/mythweb/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX postinstall-en-0.20.txt 576 RMD160 b627a3df85d93938df920ad248358cbeaa329d89 SHA1 c62eb7594adaa82332d2dc44528fa431468f3ce4 SHA256 b58cd5a6deb07daedaa96a78cebfa70b001ebae1611394ab9a1bce7b3db01ee2
+MD5 92ce82da8177a4ae23237543b634de0d files/postinstall-en-0.20.txt 576
+RMD160 b627a3df85d93938df920ad248358cbeaa329d89 files/postinstall-en-0.20.txt 576
+SHA256 b58cd5a6deb07daedaa96a78cebfa70b001ebae1611394ab9a1bce7b3db01ee2 files/postinstall-en-0.20.txt 576
 AUX postinstall-en.txt 381 RMD160 a37193bdd96ec44fa70a40712383fd1f67b4dd91 SHA1 dd6a8c42b578d9679b2394d012e1cb43324ce684 SHA256 7ec6045dea3544df639f99c6296d108d61b3c2e1eac1c141d276619607a5f6d7
 MD5 67c131deae039971648b7a6921fbf7d2 files/postinstall-en.txt 381
 RMD160 a37193bdd96ec44fa70a40712383fd1f67b4dd91 files/postinstall-en.txt 381
@@ -9,22 +13,22 @@ DIST mythplugins-0.19-rev10505.patch.bz2 11567 RMD160 aa95e04ded39efdc92a3682138
 DIST mythplugins-0.19.tar.bz2 5418591 RMD160 33e65196760476713cf91f1edf94b1e082475bfb SHA1 67851c0662bb1beb03abc4c15f0968db622a72b4 SHA256 5dd3df0204bf22cbf5f9ee0a636bcbe4ea6fd8754dd23af78f35fc1feec8c0e7
 DIST mythplugins-0.20.tar.bz2 17852531 RMD160 0c3c1a3c94d4feb429b88f0b7b73ea23917940f3 SHA1 aae3680c6e8c738e91795ffb40c71a44c7960f8b SHA256 b038e715fc322ef914055508ed1394c38b31b415f62e972f9626409a69223a43
 DIST mythplugins-0.20_svn11188.patch.bz2 1171 RMD160 02dc08c850f6ab3384b850607b209d7dbbe1a13d SHA1 39742acfda97909aa1e18256f0231beb71e863e3 SHA256 7cafc56eaf7f70ab987bfa9e9b16be989033225ef06ed5ab2cf775fca398edff
-EBUILD mythweb-0.19.ebuild 1011 RMD160 706d44eb7ea7f9307a79508263fb79e5b09dfa6c SHA1 7e5f9b160d4e4ed4234b677f02156b8145aa8a44 SHA256 b91cadeb4efa39cb4c276c5ccb434fa49d5e9d8f370de235ae564a69754de6be
-MD5 bd88ccbecc602440adcaceca9973f771 mythweb-0.19.ebuild 1011
-RMD160 706d44eb7ea7f9307a79508263fb79e5b09dfa6c mythweb-0.19.ebuild 1011
-SHA256 b91cadeb4efa39cb4c276c5ccb434fa49d5e9d8f370de235ae564a69754de6be mythweb-0.19.ebuild 1011
-EBUILD mythweb-0.19_p10505.ebuild 1303 RMD160 f8c6765dd933e76cdfcb96f3e1708b479452e5ae SHA1 f7bfa88c1683d3765cc730f013216b4621aed032 SHA256 ef4ec0ae32a2f241b7b772968b2bf4fe52911754f7fff91e5c9629e1d10efc79
-MD5 b916df68f778fba31c6bc016bc23befc mythweb-0.19_p10505.ebuild 1303
-RMD160 f8c6765dd933e76cdfcb96f3e1708b479452e5ae mythweb-0.19_p10505.ebuild 1303
-SHA256 ef4ec0ae32a2f241b7b772968b2bf4fe52911754f7fff91e5c9629e1d10efc79 mythweb-0.19_p10505.ebuild 1303
-EBUILD mythweb-0.20_p11188.ebuild 1418 RMD160 165d138798eb68ac7771299907b8ed033d76d64f SHA1 54873463df5889c55727e26e27869f041dea5423 SHA256 6beaa57c41cf4dc69c418264bc7b0a7a564bb26157d41c86ebe05abef35df698
-MD5 e46032813a5489d5dcb41e496215187e mythweb-0.20_p11188.ebuild 1418
-RMD160 165d138798eb68ac7771299907b8ed033d76d64f mythweb-0.20_p11188.ebuild 1418
-SHA256 6beaa57c41cf4dc69c418264bc7b0a7a564bb26157d41c86ebe05abef35df698 mythweb-0.20_p11188.ebuild 1418
-MISC ChangeLog 5407 RMD160 46244efce3b831692a3fb2a61530c291878ca097 SHA1 840c25b1cae859e1c81986c2d28eae28b4a7e311 SHA256 c77522ec150d50d922126e38b0a8412fdbed82681e5fa0cbd329733857d7971a
-MD5 e569619079eede5317a455031759a71d ChangeLog 5407
-RMD160 46244efce3b831692a3fb2a61530c291878ca097 ChangeLog 5407
-SHA256 c77522ec150d50d922126e38b0a8412fdbed82681e5fa0cbd329733857d7971a ChangeLog 5407
+EBUILD mythweb-0.19.ebuild 1016 RMD160 610b2b2ca40936eff77b551d17f0efeb386fc23f SHA1 74b8d1546a54b901f76fd11ce9f5b41ee280012a SHA256 6c6f043f8449fdc8c8df6cc8eda7c46781706c59576a3c6ce7fcba9184f655b3
+MD5 d74973be2143b5aaacb573103bce145c mythweb-0.19.ebuild 1016
+RMD160 610b2b2ca40936eff77b551d17f0efeb386fc23f mythweb-0.19.ebuild 1016
+SHA256 6c6f043f8449fdc8c8df6cc8eda7c46781706c59576a3c6ce7fcba9184f655b3 mythweb-0.19.ebuild 1016
+EBUILD mythweb-0.19_p10505.ebuild 1308 RMD160 ca52db37d2ae00ce7b8f984145ad69a31421c6b1 SHA1 dd568019d94ca18c8d10ed2ba775610cf34c8422 SHA256 a3f0d64cff6e1b6f66159a095a643a1a3f6520f6125418c0703f16abe876d580
+MD5 fea1c05ca4f8a4ff0613ab6515631809 mythweb-0.19_p10505.ebuild 1308
+RMD160 ca52db37d2ae00ce7b8f984145ad69a31421c6b1 mythweb-0.19_p10505.ebuild 1308
+SHA256 a3f0d64cff6e1b6f66159a095a643a1a3f6520f6125418c0703f16abe876d580 mythweb-0.19_p10505.ebuild 1308
+EBUILD mythweb-0.20_p11188.ebuild 1474 RMD160 df8539c3362a357251ab9c6e9be671057b90a2f8 SHA1 f2e46e3770947b820bd13e235608cc596fc2325a SHA256 0712ef8728ab560035cc341084f5e1436e2ebae0d0a54012a64f039c3e603bc7
+MD5 be18c5e3ad942af0b874db39bd93ee9b mythweb-0.20_p11188.ebuild 1474
+RMD160 df8539c3362a357251ab9c6e9be671057b90a2f8 mythweb-0.20_p11188.ebuild 1474
+SHA256 0712ef8728ab560035cc341084f5e1436e2ebae0d0a54012a64f039c3e603bc7 mythweb-0.20_p11188.ebuild 1474
+MISC ChangeLog 5686 RMD160 75ec52bd29b10335d5664a5e6a0ea41e37ef7461 SHA1 ca66602019ad020cc4951801a3a665e961a90ec5 SHA256 94950f1b4303395c8dcce43ee3d09f472a15244a72cc05569dd14446c43efa96
+MD5 760d072ea98c108ba295d1d6d095f2bc ChangeLog 5686
+RMD160 75ec52bd29b10335d5664a5e6a0ea41e37ef7461 ChangeLog 5686
+SHA256 94950f1b4303395c8dcce43ee3d09f472a15244a72cc05569dd14446c43efa96 ChangeLog 5686
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -41,7 +45,7 @@ SHA256 e058d19123d30ea3bec22808ce607f8b0d18fdfaa487dc05892e5b1e2112c0f4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFC1xJoeSe8B0zEfwRAmHFAJwN3KLbpYjKe8wiy/c5IClj++88aQCgi2ng
-+OaAzLbccyY1glJc46OgsVs=
-=ZxlW
+iD8DBQFFC5QRoeSe8B0zEfwRAjt8AJ9NF1ugtPrNm1DOnkwACJxWSj6HOACfWf/5
+2bzfkDCgW2kG8bOQiwWDZSE=
+=k0h+
 -----END PGP SIGNATURE-----
diff --git a/www-apps/mythweb/files/postinstall-en-0.20.txt b/www-apps/mythweb/files/postinstall-en-0.20.txt
new file mode 100644
index 000000000000..e3d7f7962b44
--- /dev/null
+++ b/www-apps/mythweb/files/postinstall-en-0.20.txt
@@ -0,0 +1,16 @@
+You should modify ${MY_INSTALLDIR}/.htaccess to fit your needs.
+
+****************************************************
+In order to prevent unauthorized access to your Myth
+installation, MythWeb has been installed requiring
+authentication by default but with no valid users.
+You can add users by using these instructions:
+
+Run htpasswd2 as follows to set your username and 
+password.
+
+# htpasswd2 -c ${MY_INSTALLDIR}/.htpasswd <username>
+
+If you already have an .htpasswd file you'd like to
+use, copy it to ${MY_INSTALLDIR}
+*****************************************************
diff --git a/www-apps/mythweb/mythweb-0.19.ebuild b/www-apps/mythweb/mythweb-0.19.ebuild
index ae04a356ced7..470ac58a9be4 100644
--- a/www-apps/mythweb/mythweb-0.19.ebuild
+++ b/www-apps/mythweb/mythweb-0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.19.ebuild,v 1.6 2006/09/16 02:06:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.19.ebuild,v 1.7 2006/09/16 06:05:08 cardoe Exp $
 
 inherit webapp depend.php
 
@@ -19,7 +19,7 @@ pkg_setup() {
 	webapp_pkg_setup
 
 	if has_version 'dev-lang/php' ; then
-		require_php_with_use session mysql
+		require_php_with_use session mysql pcre
 	fi
 }
 
diff --git a/www-apps/mythweb/mythweb-0.19_p10505.ebuild b/www-apps/mythweb/mythweb-0.19_p10505.ebuild
index 10a2a0cedf13..f20a24f5a049 100644
--- a/www-apps/mythweb/mythweb-0.19_p10505.ebuild
+++ b/www-apps/mythweb/mythweb-0.19_p10505.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.19_p10505.ebuild,v 1.3 2006/09/16 02:06:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.19_p10505.ebuild,v 1.4 2006/09/16 06:05:08 cardoe Exp $
 
 inherit webapp depend.php
 
@@ -23,7 +23,7 @@ pkg_setup() {
 	webapp_pkg_setup
 
 	if has_version 'dev-lang/php' ; then
-		require_php_with_use session mysql
+		require_php_with_use session mysql pcre
 	fi
 }
 
diff --git a/www-apps/mythweb/mythweb-0.20_p11188.ebuild b/www-apps/mythweb/mythweb-0.20_p11188.ebuild
index 7e8988845830..11445d8105a6 100644
--- a/www-apps/mythweb/mythweb-0.20_p11188.ebuild
+++ b/www-apps/mythweb/mythweb-0.20_p11188.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.20_p11188.ebuild,v 1.1 2006/09/14 21:16:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.20_p11188.ebuild,v 1.2 2006/09/16 06:05:08 cardoe Exp $
 
 inherit webapp depend.php
 
@@ -30,7 +30,7 @@ pkg_setup() {
 	webapp_pkg_setup
 
 	if has_version 'dev-lang/php' ; then
-		require_php_with_use session mysql
+		require_php_with_use session mysql pcre
 	fi
 }
 
@@ -56,7 +56,9 @@ src_install() {
 	webapp_serverowned ${MY_HTDOCSDIR}/data
 
 	webapp_configfile ${MY_HTDOCSDIR}/.htaccess
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_configfile ${MY_HTDOCSDIR}/.htpasswd
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-0.20.txt
 
 	webapp_src_install
 }