From: Luca Longinotti Date: Mon, 15 Jan 2007 19:20:16 +0000 (+0000) Subject: Cleanup. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a547228d03f66230c3f0824ce620e64f9566eb7b;p=gentoo.git Cleanup. Package-Manager: portage-2.1.2_rc4-r8 --- diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest index 4519251a50a0..842f31cc773a 100644 --- a/www-apache/mod_suphp/Manifest +++ b/www-apache/mod_suphp/Manifest @@ -2,46 +2,23 @@ AUX 70_mod_suphp.conf 1647 RMD160 5ce6c57e1b9874f96a13a4246646a113c72800b5 SHA1 MD5 8c9cc137769da71d444c2208209857a7 files/70_mod_suphp.conf 1647 RMD160 5ce6c57e1b9874f96a13a4246646a113c72800b5 files/70_mod_suphp.conf 1647 SHA256 eee1940f1f96c95d00bf5fabf65cc1e2b13d27da390c85eba540273e380292b1 files/70_mod_suphp.conf 1647 -AUX suphp-apache22-compat.patch 2393 RMD160 88b5e6fd1727f234545f2c613222bac0db8e4048 SHA1 094b40c9e5d531b9bc3cb2eb2256819302feaa3f SHA256 56a62662bec13ee7021890695af23d53102b9b09ce2172292ab0f5ff000cac52 -MD5 326471608e497bc910d8e30007730619 files/suphp-apache22-compat.patch 2393 -RMD160 88b5e6fd1727f234545f2c613222bac0db8e4048 files/suphp-apache22-compat.patch 2393 -SHA256 56a62662bec13ee7021890695af23d53102b9b09ce2172292ab0f5ff000cac52 files/suphp-apache22-compat.patch 2393 -AUX suphp-mod_userdir.patch 7129 RMD160 5e1f75607471b1e14e8a49de5c7a748a26db1dbe SHA1 241e37912c38bc8e2d35c970f8e1e43e1cf22d45 SHA256 5abcc15eec0c741ecb480c2a7f5e3539d24f571908fc4b579ab6d2548ebd015a -MD5 21d3f8cc9f51ac60cff909cacd3e9337 files/suphp-mod_userdir.patch 7129 -RMD160 5e1f75607471b1e14e8a49de5c7a748a26db1dbe files/suphp-mod_userdir.patch 7129 -SHA256 5abcc15eec0c741ecb480c2a7f5e3539d24f571908fc4b579ab6d2548ebd015a files/suphp-mod_userdir.patch 7129 AUX suphp.conf 905 RMD160 a95a7ed6f3d135ea6ab6e6ecaa272b735a306f43 SHA1 33d586b5cdb661cf7ceba6987e88dda849886374 SHA256 8a1dd8bee95dc8ab599cdcca966a583e7fbde5c41b377aa208e1f60af54b6dd7 MD5 4c2c4f6d464975c72a932c9eef2e3461 files/suphp.conf 905 RMD160 a95a7ed6f3d135ea6ab6e6ecaa272b735a306f43 files/suphp.conf 905 SHA256 8a1dd8bee95dc8ab599cdcca966a583e7fbde5c41b377aa208e1f60af54b6dd7 files/suphp.conf 905 -DIST suphp-0.6.1.tar.gz 361372 RMD160 c4a77b32ab8ca7f263800c6a745e22cb13959adb SHA1 fddb792dcfee8195e29197b6685666cc0b75e466 SHA256 fd838e3ec24846db2733ee54117c84348c21a2c41990b7a51eadf1b1df041443 DIST suphp-0.6.2.tar.gz 372228 RMD160 6cafc7ef9bb261ee34bed08976a5e4a929f25a73 SHA1 3aaf232ca722a495c10caac2b573c215bfc80253 SHA256 1bb9c6af84bb901c8a39611354e49e5bcd79185eb37b02878dc0840facf0ccfc -EBUILD mod_suphp-0.6.1-r1.ebuild 3072 RMD160 b21501b53f1755d1e1ccfa25c2f010eda4d58665 SHA1 fc76cf62ec0eba8805e130e0330272685588e2c0 SHA256 88df83b5d85688d10e7328441fb4611a74368a61c5225a4b36b54b3b155a4eff -MD5 162f4df7ab005009a2fd448570012081 mod_suphp-0.6.1-r1.ebuild 3072 -RMD160 b21501b53f1755d1e1ccfa25c2f010eda4d58665 mod_suphp-0.6.1-r1.ebuild 3072 -SHA256 88df83b5d85688d10e7328441fb4611a74368a61c5225a4b36b54b3b155a4eff mod_suphp-0.6.1-r1.ebuild 3072 -EBUILD mod_suphp-0.6.1-r2.ebuild 3118 RMD160 cc2244bf6e5fb43ad7e43e825a2f7b64aba7d927 SHA1 0b74d0526e8b59934f02ab1a11de95f161f2c9bd SHA256 3fce53af5d090346391e6db59c0e8af77b47ebc08b59b19f58cfbb02cf710105 -MD5 bb18af8a54bc69ee98eeb7217e082775 mod_suphp-0.6.1-r2.ebuild 3118 -RMD160 cc2244bf6e5fb43ad7e43e825a2f7b64aba7d927 mod_suphp-0.6.1-r2.ebuild 3118 -SHA256 3fce53af5d090346391e6db59c0e8af77b47ebc08b59b19f58cfbb02cf710105 mod_suphp-0.6.1-r2.ebuild 3118 -EBUILD mod_suphp-0.6.2.ebuild 2696 RMD160 74c335913b0e7f25481c3006903c823d190b7cbd SHA1 52c9c9f310370892a815aa52ae9274340bb1af10 SHA256 ee4c6630a432c45342d4f03f9b99c41d6204b8a8f94c64d04a05d38a1de4cf9f -MD5 d79e93fd1d51991367932ae45fc93599 mod_suphp-0.6.2.ebuild 2696 -RMD160 74c335913b0e7f25481c3006903c823d190b7cbd mod_suphp-0.6.2.ebuild 2696 -SHA256 ee4c6630a432c45342d4f03f9b99c41d6204b8a8f94c64d04a05d38a1de4cf9f mod_suphp-0.6.2.ebuild 2696 -MISC ChangeLog 1817 RMD160 f6eb73c5fa93b25bdaccc4ce6c740222c9323268 SHA1 2562ebf5147f597eec2d8bdd6711b7b1f632dc5d SHA256 664d83b5edb2ee29be1591cc018326d648426bb3da75e222d1cdbc22e3fa4204 -MD5 1fb6bb93fb3039fd1b03d0d70c48e508 ChangeLog 1817 -RMD160 f6eb73c5fa93b25bdaccc4ce6c740222c9323268 ChangeLog 1817 -SHA256 664d83b5edb2ee29be1591cc018326d648426bb3da75e222d1cdbc22e3fa4204 ChangeLog 1817 -MISC metadata.xml 231 RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce SHA1 66b21c56c3a98e5a4b489dc000ff1d5956ab63d0 SHA256 79cc89f7b494dc5097d6dc5fedeb567e0dbc13e2adfcbe3f80082ad4625b38b3 -MD5 94cc9443fa6aead0b11dda55a10e117e metadata.xml 231 -RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce metadata.xml 231 -SHA256 79cc89f7b494dc5097d6dc5fedeb567e0dbc13e2adfcbe3f80082ad4625b38b3 metadata.xml 231 -MD5 e13102858fd8132c87bfc61e2d089691 files/digest-mod_suphp-0.6.1-r1 235 -RMD160 8faac9395fa8a523aab5d1d427fb92e7ca7bb933 files/digest-mod_suphp-0.6.1-r1 235 -SHA256 59a2c8876291b3a883b38e3840cd5fed86f7fc44d53ec2aece917411d7ea1617 files/digest-mod_suphp-0.6.1-r1 235 -MD5 e13102858fd8132c87bfc61e2d089691 files/digest-mod_suphp-0.6.1-r2 235 -RMD160 8faac9395fa8a523aab5d1d427fb92e7ca7bb933 files/digest-mod_suphp-0.6.1-r2 235 -SHA256 59a2c8876291b3a883b38e3840cd5fed86f7fc44d53ec2aece917411d7ea1617 files/digest-mod_suphp-0.6.1-r2 235 +EBUILD mod_suphp-0.6.2.ebuild 2719 RMD160 e39796c766df6151098c1457e4aadbce7eac5435 SHA1 79f61a1dd6e3d9128a69595f50cac2c2eee6b012 SHA256 f3f991b24e31817fef02fefd6b10c2ff4fb06c54a00d6dff7ebaf5f9c269f60e +MD5 b37391f5e14f12f3311fb0715403a4ed mod_suphp-0.6.2.ebuild 2719 +RMD160 e39796c766df6151098c1457e4aadbce7eac5435 mod_suphp-0.6.2.ebuild 2719 +SHA256 f3f991b24e31817fef02fefd6b10c2ff4fb06c54a00d6dff7ebaf5f9c269f60e mod_suphp-0.6.2.ebuild 2719 +MISC ChangeLog 2046 RMD160 23e597a392b9989b9ea3b8f724144b131913f305 SHA1 22606309f72582b2ac07923b2a1a22ece73a746b SHA256 3ffca98190ff642b42c88379d1284659b3c25880cdda74e08fd273849a9c4f95 +MD5 973a6b838889af2eb3d6060805f55249 ChangeLog 2046 +RMD160 23e597a392b9989b9ea3b8f724144b131913f305 ChangeLog 2046 +SHA256 3ffca98190ff642b42c88379d1284659b3c25880cdda74e08fd273849a9c4f95 ChangeLog 2046 +MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d +MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229 +RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229 +SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d metadata.xml 229 MD5 7f9d140384540bad41b6f073efbc2fb3 files/digest-mod_suphp-0.6.2 235 RMD160 51b68629cdbc429e670350bce536fb38062d84bc files/digest-mod_suphp-0.6.2 235 SHA256 fd48db267dabf6a98dd56da51bbd59d42877c187302952276a20cd315b42f255 files/digest-mod_suphp-0.6.2 235 diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r1 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r1 deleted file mode 100644 index 678c9c1d791b..000000000000 --- a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7eb8ae29404392d9eb07c69d5242d716 suphp-0.6.1.tar.gz 361372 -RMD160 c4a77b32ab8ca7f263800c6a745e22cb13959adb suphp-0.6.1.tar.gz 361372 -SHA256 fd838e3ec24846db2733ee54117c84348c21a2c41990b7a51eadf1b1df041443 suphp-0.6.1.tar.gz 361372 diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r2 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r2 deleted file mode 100644 index 678c9c1d791b..000000000000 --- a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7eb8ae29404392d9eb07c69d5242d716 suphp-0.6.1.tar.gz 361372 -RMD160 c4a77b32ab8ca7f263800c6a745e22cb13959adb suphp-0.6.1.tar.gz 361372 -SHA256 fd838e3ec24846db2733ee54117c84348c21a2c41990b7a51eadf1b1df041443 suphp-0.6.1.tar.gz 361372 diff --git a/www-apache/mod_suphp/files/suphp-apache22-compat.patch b/www-apache/mod_suphp/files/suphp-apache22-compat.patch deleted file mode 100644 index 7a2c3ac4c718..000000000000 --- a/www-apache/mod_suphp/files/suphp-apache22-compat.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- src/apache2/mod_suphp.c Sat Jan 7 19:03:59 2006 -+++ src/apache2/mod_suphp.c Sat Jan 7 19:20:32 2006 -@@ -56,7 +56,7 @@ - return -1; - - rv = apr_bucket_read(b, &bucket_data, &bucket_data_len, APR_BLOCK_READ); -- if (!APR_STATUS_IS_SUCCESS(rv) || (bucket_data_len == 0)) -+ if ((rv != APR_SUCCESS) || (bucket_data_len == 0)) - { - return 0; - } -@@ -558,7 +558,9 @@ - return rv; - } - -- APR_BRIGADE_FOREACH(bucket, bb) -+ -+ bucket = APR_BRIGADE_FIRST(bb); -+ while (bucket != APR_BRIGADE_SENTINEL(bb)) - { - const char *data; - apr_size_t len; -@@ -582,6 +584,8 @@ - { - child_stopped_reading = 1; - } -+ -+ bucket = APR_BUCKET_NEXT(bucket); - } - apr_brigade_cleanup(bb); - } -@@ -634,12 +638,15 @@ - - const char *buf; - apr_size_t blen; -- APR_BRIGADE_FOREACH(b, bb) -+ b = APR_BRIGADE_FIRST(bb); -+ while (b != APR_BRIGADE_SENTINEL(bb)) - { - if (APR_BUCKET_IS_EOS(b)) - break; - if (apr_bucket_read(b, &buf, &blen, APR_BLOCK_READ) != APR_SUCCESS) - break; -+ -+ b = APR_BUCKET_NEXT(b); - } - apr_brigade_destroy(bb); - suphp_log_script_err(r, proc->err); -@@ -655,12 +662,14 @@ - /* empty brigade (script output) */ - const char *buf; - apr_size_t blen; -- APR_BRIGADE_FOREACH(b, bb) -+ b = APR_BRIGADE_FIRST(bb); -+ while (b != APR_BRIGADE_SENTINEL(bb)) - { - if (APR_BUCKET_IS_EOS(b)) - break; - if (apr_bucket_read(b, &buf, &blen, APR_BLOCK_READ) != APR_SUCCESS) - break; -+ b = APR_BUCKET_NEXT(b); - } - apr_brigade_destroy(bb); - return HTTP_MOVED_TEMPORARILY; ---- configure 2006-03-04 19:06:30.000000000 +0100 -+++ configure 2006-03-04 19:05:37.000000000 +0100 -@@ -20425,7 +20425,7 @@ - | cut -f2 -d"/" \ - | cut -f1 -d" "` - major_version=`echo $APACHE_VERSION|cut -f1,2 -d.` -- if test "$major_version" = "2.0"; then -+ if test "$major_version" = "2.0" || test "$major_version" = "2.2"; then - APACHE_VERSION_2=true - APACHE_VERSION_1_3=false - else diff --git a/www-apache/mod_suphp/files/suphp-mod_userdir.patch b/www-apache/mod_suphp/files/suphp-mod_userdir.patch deleted file mode 100644 index b4f6f19e7e30..000000000000 --- a/www-apache/mod_suphp/files/suphp-mod_userdir.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff -ur suphp-0.6.1/doc/CONFIG suphp-0.6.1-userdir/doc/CONFIG ---- suphp-0.6.1/doc/CONFIG 2005-11-26 14:45:49.000000000 -0500 -+++ suphp-0.6.1-userdir/doc/CONFIG 2005-12-02 15:07:41.000000000 -0500 -@@ -95,6 +95,11 @@ - Minimum GID allowed to execute scripts. - Defaults to compile-time value. - -+handle_userdir: -+ Handle sites created by mod_userdir. -+ Scripts on userdir sites will be executed with the permissions -+ of the owner of the site. This option only affects force and paranoid mode. -+ This option is enabled by default. - - 3. Handlers - -diff -ur suphp-0.6.1/doc/suphp.conf-example suphp-0.6.1-userdir/doc/suphp.conf-example ---- suphp-0.6.1/doc/suphp.conf-example 2005-11-26 14:45:49.000000000 -0500 -+++ suphp-0.6.1-userdir/doc/suphp.conf-example 2005-12-02 15:07:41.000000000 -0500 -@@ -38,6 +38,8 @@ - ; Minimum GID - min_gid=100 - -+; Use correct permissions for mod_userdir sites -+handle_userdir=true - - [handlers] - ;Handler for php-scripts -diff -ur suphp-0.6.1/src/Application.cpp suphp-0.6.1-userdir/src/Application.cpp ---- suphp-0.6.1/src/Application.cpp 2005-11-26 14:45:49.000000000 -0500 -+++ suphp-0.6.1-userdir/src/Application.cpp 2005-12-02 17:18:27.000000000 -0500 -@@ -19,6 +19,7 @@ - */ - - #include -+#include - - #include "config.h" - -@@ -300,29 +301,33 @@ - // Paranoid and force mode - - #if (defined(OPT_USERGROUP_PARANOID) || defined(OPT_USERGROUP_FORCE)) -- std::string targetUsername, targetGroupname; -- try { -- targetUsername = environment.getVar("SUPHP_USER"); -- targetGroupname = environment.getVar("SUPHP_GROUP"); -- } catch (KeyNotFoundException& e) { -- throw SecurityException( -+ if (config.getHandleUserdir() && checkUserDir(environment.getVar("SUPHP_URI"),targetUser)) { -+ targetGroup = targetUser.getGroupInfo(); -+ } else { -+ std::string targetUsername, targetGroupname; -+ try { -+ targetUsername = environment.getVar("SUPHP_USER"); -+ targetGroupname = environment.getVar("SUPHP_GROUP"); -+ } catch (KeyNotFoundException& e) { -+ throw SecurityException( - "Environment variable SUPHP_USER or SUPHP_GROUP not set", - __FILE__, __LINE__); -- } -+ } - -- if (targetUsername[0] == '#' && targetUsername.find_first_not_of( -+ if (targetUsername[0] == '#' && targetUsername.find_first_not_of( - "0123456789", 1) == std::string::npos) { -- targetUser = api.getUserInfo(Util::strToInt(targetUsername.substr(1))); -- } else { -- targetUser = api.getUserInfo(targetUsername); -- } -+ targetUser = api.getUserInfo(Util::strToInt(targetUsername.substr(1))); -+ } else { -+ targetUser = api.getUserInfo(targetUsername); -+ } - -- if (targetGroupname[0] == '#' && targetGroupname.find_first_not_of( -+ if (targetGroupname[0] == '#' && targetGroupname.find_first_not_of( - "0123456789", 1) == std::string::npos) { -- targetGroup = api.getGroupInfo( -+ targetGroup = api.getGroupInfo( - Util::strToInt(targetGroupname.substr(1))); -- } else { -- targetGroup = api.getGroupInfo(targetGroupname); -+ } else { -+ targetGroup = api.getGroupInfo(targetGroupname); -+ } - } - #endif // OPT_USERGROUP_PARANOID || OPT_USERGROUP_FORCE - -@@ -473,6 +478,28 @@ - } - } - -+bool suPHP::Application::checkUserDir(const std::string& url, UserInfo& user) const { -+ -+ if (url.length() <= 2 || url[1] != '~') -+ return false; -+ -+ API& api = API_Helper::getSystemAPI(); -+ std::string topDir; -+ std::istringstream strm(url); -+ -+ for (int i = 0; i < 2; i++) -+ if (!std::getline(strm, topDir, '/')) -+ return false; -+ -+ std::string userName = topDir.substr(1,topDir.length()); -+ -+ try { -+ user = api.getUserInfo(userName); -+ return true; -+ } catch (LookupException& e) { -+ return false; -+ } -+} - - int main(int argc, char **argv) { - try { -diff -ur suphp-0.6.1/src/Application.hpp suphp-0.6.1-userdir/src/Application.hpp ---- suphp-0.6.1/src/Application.hpp 2005-11-26 14:45:49.000000000 -0500 -+++ suphp-0.6.1-userdir/src/Application.hpp 2005-12-02 15:07:41.000000000 -0500 -@@ -39,6 +39,7 @@ - #include "SystemException.hpp" - #include "SoftException.hpp" - #include "SecurityException.hpp" -+#include "UserInfo.hpp" - - namespace suPHP { - /** -@@ -107,6 +108,12 @@ - const Configuration& config) const - throw (SoftException); - -+ /** -+ * Checks if a given URL is a userdir -+ * associated user is assigned to the user parameter -+ */ -+ bool checkUserDir(const std::string& url, -+ UserInfo& user) const; - - public: - /** -diff -ur suphp-0.6.1/src/Configuration.cpp suphp-0.6.1-userdir/src/Configuration.cpp ---- suphp-0.6.1/src/Configuration.cpp 2005-11-26 14:45:49.000000000 -0500 -+++ suphp-0.6.1-userdir/src/Configuration.cpp 2005-12-02 17:22:46.000000000 -0500 -@@ -112,6 +112,7 @@ - #endif - this->umask = 0077; - this->chroot_path = ""; -+ this->handle_userdir = true; - } - - void suPHP::Configuration::readFromFile(File& file) -@@ -157,6 +158,8 @@ - this->umask = Util::octalStrToInt(value); - else if (key == "chroot") - this->chroot_path = value; -+ else if (key == "handle_userdir") -+ this->handle_userdir = this->strToBool(value); - else - throw ParsingException("Unknown option \"" + key + - "\" in section [global]", -@@ -250,3 +253,7 @@ - std::string suPHP::Configuration::getChrootPath() const { - return this->chroot_path; - } -+ -+bool suPHP::Configuration::getHandleUserdir() const { -+ return this->handle_userdir; -+} -diff -ur suphp-0.6.1/src/Configuration.hpp suphp-0.6.1-userdir/src/Configuration.hpp ---- suphp-0.6.1/src/Configuration.hpp 2005-11-26 14:45:49.000000000 -0500 -+++ suphp-0.6.1-userdir/src/Configuration.hpp 2005-12-02 15:07:41.000000000 -0500 -@@ -57,7 +57,8 @@ - int min_gid; - int umask; - std::string chroot_path; -- -+ bool handle_userdir; -+ - /** - * Converts string to bool - */ -@@ -165,6 +166,12 @@ - * Return chroot path - */ - std::string getChrootPath() const; -+ -+ /** -+ * Return whether to correctly handle mod_userdir sites -+ */ -+ bool getHandleUserdir() const; -+ - }; - }; - -diff -ur suphp-0.6.1/src/apache/mod_suphp.c suphp-0.6.1-userdir/src/apache/mod_suphp.c ---- suphp-0.6.1/src/apache/mod_suphp.c 2005-11-26 14:45:49.000000000 -0500 -+++ suphp-0.6.1-userdir/src/apache/mod_suphp.c 2005-12-02 15:07:41.000000000 -0500 -@@ -444,7 +444,10 @@ - } - } - } -- -+ -+ /* for mod_userdir checking */ -+ apr_table_setn(r->subprocess_env, "SUPHP_URI", apr_pstrdup(p, r->uri)); -+ - if (auth_user && auth_pass) { - ap_table_setn(r->subprocess_env, "SUPHP_AUTH_USER", auth_user); - ap_table_setn(r->subprocess_env, "SUPHP_AUTH_PW", auth_pass); -diff -ur suphp-0.6.1/src/apache2/mod_suphp.c suphp-0.6.1-userdir/src/apache2/mod_suphp.c ---- suphp-0.6.1/src/apache2/mod_suphp.c 2005-11-26 14:45:49.000000000 -0500 -+++ suphp-0.6.1-userdir/src/apache2/mod_suphp.c 2005-12-02 15:07:41.000000000 -0500 -@@ -461,6 +461,10 @@ - } - } - -+ /* for mod_userdir checking */ -+ apr_table_setn(r->subprocess_env, "SUPHP_URI", -+ apr_pstrdup(r->pool, r->uri)); -+ - if (auth_user && auth_pass) - { - apr_table_setn(r->subprocess_env, "SUPHP_AUTH_USER", auth_user); diff --git a/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild deleted file mode 100644 index 13a1d9ff15ea..000000000000 --- a/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.1-r1.ebuild,v 1.5 2006/11/29 05:22:18 vericgar Exp $ - -inherit apache-module eutils - -MY_P="${P/mod_/}" - -SETIDMODES="mode-force mode-owner mode-paranoid" - -DESCRIPTION="A PHP wrapper for Apache." -HOMEPAGE="http://www.suphp.org/" -SRC_URI="http://www.suphp.org/download/${MY_P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="checkpath ${SETIDMODES}" -SLOT="0" - -S="${WORKDIR}/${MY_P}" - -APXS1_S="${S}/src/apache" -APACHE1_MOD_CONF="70_${PN}" -APACHE1_MOD_DEFINE="SUPHP" - -APXS2_S="${S}/src/apache2" -APACHE2_MOD_CONF="70_${PN}" -APACHE2_MOD_DEFINE="SUPHP" - -need_apache 2.0 - -pkg_setup() { - modecnt=0 - for mode in ${SETIDMODES}; do - if use ${mode}; then - if [[ ${modecnt} -eq 0 ]]; then - SUPHP_SETIDMODE=${mode/mode-} - let modecnt++ - elif [[ ${modecnt} -ge 1 ]]; then - die "You can only select ONE mode in your USE flags!" - fi - fi - done - - if [[ ${modecnt} -eq 0 ]]; then - ewarn - ewarn "No mode selected, defaulting to paranoid!" - ewarn - ewarn "If you want to choose another mode, put mode-force OR mode-owner" - ewarn "into your USE flags and run emerge again." - ewarn - SUPHP_SETIDMODE=paranoid - fi - - einfo - einfo "Using ${SUPHP_SETIDMODE/mode-} mode" - einfo - einfo "You can manipulate several configure options of this" - einfo "ebuild through environment variables:" - einfo - einfo "SUPHP_MINUID: Minimum UID, which is allowed to run scripts (default: 1000)" - einfo "SUPHP_MINGID: Minimum GID, which is allowed to run scripts (default: 100)" - einfo "SUPHP_APACHEUSER: Name of the user Apache is running as (default: apache)" - einfo "SUPHP_LOGFILE: Path to suPHP logfile (default: /var/log/apache2/suphp_log)" - einfo - - : ${SUPHP_MINUID:=1000} - : ${SUPHP_MINGID:=100} - : ${SUPHP_APACHEUSER:="apache"} - : ${SUPHP_LOGFILE:="/var/log/apache2/suphp_log"} -} - -src_unpack() { - unpack ${A} - - cd "${S}" - - epatch "${FILESDIR}/suphp-apache22-compat.patch" - if has_version ">=dev-libs/apr-1.0.0" ; then - sed -e "s|apr-config|apr-1-config|g" -i configure - fi -} - -src_compile() { - local myargs= - use checkpath || myargs="${myargs} --disable-checkpath" - - myargs="${myargs} \ - --with-setid-mode=${SUPHP_SETIDMODE} \ - --with-min-uid=${SUPHP_MINUID} \ - --with-min-gid=${SUPHP_MINGID} \ - --with-apache-user=${SUPHP_APACHEUSER} \ - --with-logfile=${SUPHP_LOGFILE} \ - --with-apxs=${APXS2}" - if has_version ">=dev-libs/apr-1.0.0" ; then - CFLAGS="$(apr-1-config --includes) $(apu-1-config --includes)" \ - econf ${myargs} || die "econf failed" - else - CFLAGS="$(apr-config --includes) $(apu-config --includes)" \ - econf ${myargs} || die "econf failed" - fi - - emake || die "make failed" -} - -src_install() { - apache-module_src_install - dosbin src/suphp - - dodoc ChangeLog doc/CONFIG - - docinto apache - dodoc doc/apache/CONFIG doc/apache/INSTALL - - insinto /etc - doins "${FILESDIR}/suphp.conf" -} - -pkg_postinst() { - # make suphp setuid - chmod 4755 /usr/sbin/suphp -} diff --git a/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild deleted file mode 100644 index 32da975f5fb1..000000000000 --- a/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.1-r2.ebuild,v 1.3 2006/11/29 05:22:18 vericgar Exp $ - -inherit apache-module eutils - -MY_P="${P/mod_/}" - -SETIDMODES="mode-force mode-owner mode-paranoid" - -DESCRIPTION="A PHP wrapper for Apache." -HOMEPAGE="http://www.suphp.org/" -SRC_URI="http://www.suphp.org/download/${MY_P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="checkpath ${SETIDMODES}" -SLOT="0" - -S="${WORKDIR}/${MY_P}" - -APXS1_S="${S}/src/apache" -APACHE1_MOD_CONF="70_${PN}" -APACHE1_MOD_DEFINE="SUPHP" - -APXS2_S="${S}/src/apache2" -APACHE2_MOD_CONF="70_${PN}" -APACHE2_MOD_DEFINE="SUPHP" - -need_apache 2.0 - -pkg_setup() { - modecnt=0 - for mode in ${SETIDMODES}; do - if use ${mode}; then - if [[ ${modecnt} -eq 0 ]]; then - SUPHP_SETIDMODE=${mode/mode-} - let modecnt++ - elif [[ ${modecnt} -ge 1 ]]; then - die "You can only select ONE mode in your USE flags!" - fi - fi - done - - if [[ ${modecnt} -eq 0 ]]; then - ewarn - ewarn "No mode selected, defaulting to paranoid!" - ewarn - ewarn "If you want to choose another mode, put mode-force OR mode-owner" - ewarn "into your USE flags and run emerge again." - ewarn - SUPHP_SETIDMODE=paranoid - fi - - einfo - einfo "Using ${SUPHP_SETIDMODE/mode-} mode" - einfo - einfo "You can manipulate several configure options of this" - einfo "ebuild through environment variables:" - einfo - einfo "SUPHP_MINUID: Minimum UID, which is allowed to run scripts (default: 1000)" - einfo "SUPHP_MINGID: Minimum GID, which is allowed to run scripts (default: 100)" - einfo "SUPHP_APACHEUSER: Name of the user Apache is running as (default: apache)" - einfo "SUPHP_LOGFILE: Path to suPHP logfile (default: /var/log/apache2/suphp_log)" - einfo - - : ${SUPHP_MINUID:=1000} - : ${SUPHP_MINGID:=100} - : ${SUPHP_APACHEUSER:="apache"} - : ${SUPHP_LOGFILE:="/var/log/apache2/suphp_log"} -} - -src_unpack() { - unpack ${A} - - cd "${S}" - - epatch "${FILESDIR}/suphp-mod_userdir.patch" - epatch "${FILESDIR}/suphp-apache22-compat.patch" - if has_version ">=dev-libs/apr-1.0.0" ; then - sed -e "s|apr-config|apr-1-config|g" -i configure - fi -} - -src_compile() { - local myargs= - use checkpath || myargs="${myargs} --disable-checkpath" - - myargs="${myargs} \ - --with-setid-mode=${SUPHP_SETIDMODE} \ - --with-min-uid=${SUPHP_MINUID} \ - --with-min-gid=${SUPHP_MINGID} \ - --with-apache-user=${SUPHP_APACHEUSER} \ - --with-logfile=${SUPHP_LOGFILE} \ - --with-apxs=${APXS2}" - if has_version ">=dev-libs/apr-1.0.0" ; then - CFLAGS="$(apr-1-config --includes) $(apu-1-config --includes)" \ - econf ${myargs} || die "econf failed" - else - CFLAGS="$(apr-config --includes) $(apu-config --includes)" \ - econf ${myargs} || die "econf failed" - fi - - emake || die "make failed" -} - -src_install() { - apache-module_src_install - dosbin src/suphp - - dodoc ChangeLog doc/CONFIG - - docinto apache - dodoc doc/apache/CONFIG doc/apache/INSTALL - - insinto /etc - doins "${FILESDIR}/suphp.conf" -} - -pkg_postinst() { - # make suphp setuid - chmod 4755 /usr/sbin/suphp -}