From 060c5710d48ed65cc33cceaef03d45e684725517 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Wed, 27 Dec 2006 02:37:48 +0000 Subject: Big new-maintainer cleanup. Bump to latest 0.5.6, remove old versions, remove dead files in $FILESDIR, add new init.d file that leave to cherokee to get into background. (Portage version: 2.1.2_rc4-r1) (Signed Manifest commit) --- www-servers/cherokee/Manifest | 78 +++-------- www-servers/cherokee/cherokee-0.5.2.ebuild | 105 --------------- www-servers/cherokee/cherokee-0.5.4.ebuild | 105 --------------- www-servers/cherokee/cherokee-0.5.5.ebuild | 105 --------------- .../cherokee/files/cherokee-0.4.17-cherokee.conf | 123 ----------------- www-servers/cherokee/files/cherokee-0.4.17-init.d | 30 ----- .../files/cherokee-0.4.21-no-handler_admin.diff | 28 ---- .../cherokee/files/cherokee-0.4.25-fix-static.diff | 21 --- .../files/cherokee-0.4.5-Makefile.am.patch | 22 --- .../cherokee/files/cherokee-0.4.5-cherokee.conf | 148 --------------------- www-servers/cherokee/files/cherokee-0.4.5-init.d | 30 ----- www-servers/cherokee/files/digest-cherokee-0.5.2 | 3 - www-servers/cherokee/files/digest-cherokee-0.5.4 | 3 - www-servers/cherokee/files/digest-cherokee-0.5.5 | 3 - 14 files changed, 19 insertions(+), 785 deletions(-) delete mode 100644 www-servers/cherokee/cherokee-0.5.2.ebuild delete mode 100644 www-servers/cherokee/cherokee-0.5.4.ebuild delete mode 100644 www-servers/cherokee/cherokee-0.5.5.ebuild delete mode 100644 www-servers/cherokee/files/cherokee-0.4.17-cherokee.conf delete mode 100644 www-servers/cherokee/files/cherokee-0.4.17-init.d delete mode 100644 www-servers/cherokee/files/cherokee-0.4.21-no-handler_admin.diff delete mode 100644 www-servers/cherokee/files/cherokee-0.4.25-fix-static.diff delete mode 100644 www-servers/cherokee/files/cherokee-0.4.5-Makefile.am.patch delete mode 100644 www-servers/cherokee/files/cherokee-0.4.5-cherokee.conf delete mode 100644 www-servers/cherokee/files/cherokee-0.4.5-init.d delete mode 100644 www-servers/cherokee/files/digest-cherokee-0.5.2 delete mode 100644 www-servers/cherokee/files/digest-cherokee-0.5.4 delete mode 100644 www-servers/cherokee/files/digest-cherokee-0.5.5 (limited to 'www-servers') diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest index a98aa8f9f91e..01b0e012b73d 100644 --- a/www-servers/cherokee/Manifest +++ b/www-servers/cherokee/Manifest @@ -1,70 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX cherokee-0.4.17-cherokee.conf 2611 RMD160 441af0dfa47c5763d9ecb2c11f6b406290c4a304 SHA1 12e6ee5db549a1eaf6c49f9163c53b5d9ae2e25a SHA256 25cef07b8af365bb2a5823403b14e5b3d05c7cae5883242e2c9a47ec2fea6399 -MD5 b44b2de7ebfdc07ee94d54a514a738f0 files/cherokee-0.4.17-cherokee.conf 2611 -RMD160 441af0dfa47c5763d9ecb2c11f6b406290c4a304 files/cherokee-0.4.17-cherokee.conf 2611 -SHA256 25cef07b8af365bb2a5823403b14e5b3d05c7cae5883242e2c9a47ec2fea6399 files/cherokee-0.4.17-cherokee.conf 2611 -AUX cherokee-0.4.17-init.d 789 RMD160 c6b6dac2177cd74c53abe46cee9716961992e0c0 SHA1 0a909cb5c5c759ad5f12fbfc9ce6fe900fbec04f SHA256 e1070c02cce1c5b7be9057f4a05c3661032b3d9803be0163d6afbfa262300062 -MD5 13c50109a3ebd047c357fcf95f70bed7 files/cherokee-0.4.17-init.d 789 -RMD160 c6b6dac2177cd74c53abe46cee9716961992e0c0 files/cherokee-0.4.17-init.d 789 -SHA256 e1070c02cce1c5b7be9057f4a05c3661032b3d9803be0163d6afbfa262300062 files/cherokee-0.4.17-init.d 789 -AUX cherokee-0.4.21-no-handler_admin.diff 1151 RMD160 a010ae5e819b5a5261f6043ffe5825b6451439fa SHA1 0b70b0f01a354718b47b9fa26374400d541ccb3a SHA256 8121a28f895bed2e7bf7ec2ea6b0c4ab5427b7e53171ae9c55ec4fd4398513b7 -MD5 e0af76fef298222ff6ad8e6e5aeb10d7 files/cherokee-0.4.21-no-handler_admin.diff 1151 -RMD160 a010ae5e819b5a5261f6043ffe5825b6451439fa files/cherokee-0.4.21-no-handler_admin.diff 1151 -SHA256 8121a28f895bed2e7bf7ec2ea6b0c4ab5427b7e53171ae9c55ec4fd4398513b7 files/cherokee-0.4.21-no-handler_admin.diff 1151 -AUX cherokee-0.4.25-fix-static.diff 728 RMD160 1050a97e0d1079c677b98fc80e6e0598eb50c4db SHA1 8e027ba31c0269fde2b7bb31eecebb6d2d7f6542 SHA256 757bae8f9b034bacb3c93ef6d6f5a90d0c4773a39114f02caa81118a087d2819 -MD5 29f1a34d26b0830d4a62b2b42241b64a files/cherokee-0.4.25-fix-static.diff 728 -RMD160 1050a97e0d1079c677b98fc80e6e0598eb50c4db files/cherokee-0.4.25-fix-static.diff 728 -SHA256 757bae8f9b034bacb3c93ef6d6f5a90d0c4773a39114f02caa81118a087d2819 files/cherokee-0.4.25-fix-static.diff 728 -AUX cherokee-0.4.5-Makefile.am.patch 956 RMD160 02bece0e5ce8d864e8a091b9c65aa045bc4af111 SHA1 6984488b40b84927fdae4f7a2de4f9d355605f9f SHA256 f41cfdac2a19f845db52f5c87d1390f9c1748ee7b7e1dfd982e0d7698b80c1ea -MD5 6da94000869b804248b03d61703b69bb files/cherokee-0.4.5-Makefile.am.patch 956 -RMD160 02bece0e5ce8d864e8a091b9c65aa045bc4af111 files/cherokee-0.4.5-Makefile.am.patch 956 -SHA256 f41cfdac2a19f845db52f5c87d1390f9c1748ee7b7e1dfd982e0d7698b80c1ea files/cherokee-0.4.5-Makefile.am.patch 956 -AUX cherokee-0.4.5-cherokee.conf 2769 RMD160 386569def6468f60da16bef9e3e6a7dfea5d7eea SHA1 d881193a056297a692a18ace0c3894578fd6875f SHA256 8539b59f4eeba27084256cca03e6283af4f795bdccacb2a44f565e0a3d0490b5 -MD5 8278b4acda7637c68885863ddd58f712 files/cherokee-0.4.5-cherokee.conf 2769 -RMD160 386569def6468f60da16bef9e3e6a7dfea5d7eea files/cherokee-0.4.5-cherokee.conf 2769 -SHA256 8539b59f4eeba27084256cca03e6283af4f795bdccacb2a44f565e0a3d0490b5 files/cherokee-0.4.5-cherokee.conf 2769 -AUX cherokee-0.4.5-init.d 787 RMD160 7e042b3a11c7bd6c7c1ba9c51bffe80f79c161f5 SHA1 80145328715ae6e04888cfb0f9f384170af07530 SHA256 ab3f9239cafd50e1f47b9c0236f168f4596b484eea479cd7243f48758204f433 -MD5 a9f08f404f9b738a52e2c82c7ed88e04 files/cherokee-0.4.5-init.d 787 -RMD160 7e042b3a11c7bd6c7c1ba9c51bffe80f79c161f5 files/cherokee-0.4.5-init.d 787 -SHA256 ab3f9239cafd50e1f47b9c0236f168f4596b484eea479cd7243f48758204f433 files/cherokee-0.4.5-init.d 787 -DIST cherokee-0.5.2.tar.gz 1547715 RMD160 d2bb2ad3f1b8179ead0322d5cddf970a452cc6fa SHA1 62ddca58d53c351b9f03b7336323c5d3c1506eaa SHA256 a572e3077091f759b3e42133a2e98b4d2f2af52ab8ab0ac27d66e97e572c7338 -DIST cherokee-0.5.4.tar.gz 1556342 RMD160 84420215c8eafef7bb4993d5d38d5ef3dd4ef5a8 SHA1 d71155e25e5b7bce8d84a60440d93ed9131db0d5 SHA256 f44f16e8cf581ba8a7b22e4c9631e432967f43c9af50cf706432e8ad58a9c331 -DIST cherokee-0.5.5.tar.gz 1559655 RMD160 04564efc2caa96f5622450ae9ab0b3d87adabbd3 SHA1 97829bf01f2300ffec1bb841d36550eedc89b337 SHA256 e9c6feee2a626a38cd69c726ed31ffbbf55d288386f50fe6f90fa63de410d67a -EBUILD cherokee-0.5.2.ebuild 2886 RMD160 99fee44826e87681098d1f17b3a3319a25b87825 SHA1 08a688ba90340dbe78485db3c1ffb6c771760449 SHA256 0fbdc29bf47d01a3cb91ac30288d782f71af6478bb49fcb7a408431c3dd31f8b -MD5 7c11c2d94f1deb88e69fc86de1fedd58 cherokee-0.5.2.ebuild 2886 -RMD160 99fee44826e87681098d1f17b3a3319a25b87825 cherokee-0.5.2.ebuild 2886 -SHA256 0fbdc29bf47d01a3cb91ac30288d782f71af6478bb49fcb7a408431c3dd31f8b cherokee-0.5.2.ebuild 2886 -EBUILD cherokee-0.5.4.ebuild 2886 RMD160 d9b0f62e1f89832e7fcd6efa3f249864fbeae6a2 SHA1 40b00b7b4bb878b89ca985ad97091e2847ddf0fd SHA256 329760ecae2f915f6e9298a0dded8757f8976419bccdf1795931be7742eb9769 -MD5 9a556504802ec1a7b210331601b02fc4 cherokee-0.5.4.ebuild 2886 -RMD160 d9b0f62e1f89832e7fcd6efa3f249864fbeae6a2 cherokee-0.5.4.ebuild 2886 -SHA256 329760ecae2f915f6e9298a0dded8757f8976419bccdf1795931be7742eb9769 cherokee-0.5.4.ebuild 2886 -EBUILD cherokee-0.5.5.ebuild 2893 RMD160 17d5a9e895b394a3c6c6ae120a388a79b519a9f9 SHA1 1c897f53d1f93b69d3a1838ce1565d00659425d3 SHA256 2ec052ae2aa43025f6098c43e69ecbd57b042d7e1f469176cfb799e2690de44e -MD5 b7e608dd5b7f29b912bfef58287aaa64 cherokee-0.5.5.ebuild 2893 -RMD160 17d5a9e895b394a3c6c6ae120a388a79b519a9f9 cherokee-0.5.5.ebuild 2893 -SHA256 2ec052ae2aa43025f6098c43e69ecbd57b042d7e1f469176cfb799e2690de44e cherokee-0.5.5.ebuild 2893 -MISC ChangeLog 10093 RMD160 ece7abcf8b45fc4a46b0afd38d3eff55bd59614e SHA1 f35949a84d3bf93bd18239d7c1a23e6d0af2ca71 SHA256 ca64bf9065ec5847847a6da985337311b1e43e466b78e33a8378ddefb1c261ee -MD5 0312e10998ac03e99e6e1f08389f248c ChangeLog 10093 -RMD160 ece7abcf8b45fc4a46b0afd38d3eff55bd59614e ChangeLog 10093 -SHA256 ca64bf9065ec5847847a6da985337311b1e43e466b78e33a8378ddefb1c261ee ChangeLog 10093 +AUX cherokee-initd-0.5.6 587 RMD160 50ab8f40e9258c96685373ad38f9440ca8b496b5 SHA1 b716cac0116c8177e8d0c8064b8500ed90619154 SHA256 09985375cc821db0c12fed621d505bad134acfb578432b1a940216f5e83a5551 +MD5 aa0a02cf30b359170185714c37341c80 files/cherokee-initd-0.5.6 587 +RMD160 50ab8f40e9258c96685373ad38f9440ca8b496b5 files/cherokee-initd-0.5.6 587 +SHA256 09985375cc821db0c12fed621d505bad134acfb578432b1a940216f5e83a5551 files/cherokee-initd-0.5.6 587 +DIST cherokee-0.5.6.tar.gz 1392282 RMD160 fd5661449bd845e3be1911490f02144a805f5c9f SHA1 5e437c2315782bc6ac1d98f8db3b7838313a229a SHA256 d19ac8a85c252ccfe04c06ce0ec9b03d036b27d07c6db4601ce7d6b33c4e9cc8 +EBUILD cherokee-0.5.6.ebuild 2403 RMD160 efacab6958ffe2ba4f9f7e242d4c17bb150e37cc SHA1 429c342bacab11b5263ce350154a4e78af8578ee SHA256 33339773a36abc60b55d01ae19713f23c804aee50d80e17a6522ef6328eecd5a +MD5 da71889cc1e70798e3b69aaea97ce091 cherokee-0.5.6.ebuild 2403 +RMD160 efacab6958ffe2ba4f9f7e242d4c17bb150e37cc cherokee-0.5.6.ebuild 2403 +SHA256 33339773a36abc60b55d01ae19713f23c804aee50d80e17a6522ef6328eecd5a cherokee-0.5.6.ebuild 2403 +MISC ChangeLog 10756 RMD160 85dededa2588ae12455095b76c43dbe13da1534c SHA1 578bbc5d8c779696666ed521ebbddc67189a93c1 SHA256 9d5e2e26fd9404336de3d8ee572a573235873478a52066524ab8f7ee13b7bb46 +MD5 1331a6ee17df48808538e94d6d8d9d43 ChangeLog 10756 +RMD160 85dededa2588ae12455095b76c43dbe13da1534c ChangeLog 10756 +SHA256 9d5e2e26fd9404336de3d8ee572a573235873478a52066524ab8f7ee13b7bb46 ChangeLog 10756 MISC metadata.xml 269 RMD160 2f424a28702cae549abf73acbdc5e83add6381a6 SHA1 896cbff4ed1d4357fbe5ed96f1747737d6949c3c SHA256 19de4ee447412c2935b1a069641f59a069077b66a7602eaa449b8d7d8fdf1a1f MD5 87a36685076539a89b31661a9b2564fe metadata.xml 269 RMD160 2f424a28702cae549abf73acbdc5e83add6381a6 metadata.xml 269 SHA256 19de4ee447412c2935b1a069641f59a069077b66a7602eaa449b8d7d8fdf1a1f metadata.xml 269 -MD5 e03221bcfd135eb8c1e2cdb5865f6910 files/digest-cherokee-0.5.2 247 -RMD160 a821bcadbb8bfb55dc647a437da67d1c8096d77b files/digest-cherokee-0.5.2 247 -SHA256 7ba231776f6d2240005a6512f0aa2df924bcb84f09316fe694ff74d89fc0cdda files/digest-cherokee-0.5.2 247 -MD5 c549ec8e08e21d47922e405ad282b4ec files/digest-cherokee-0.5.4 247 -RMD160 89111e6c0bb03d1ca7509acb21872b000ffc8501 files/digest-cherokee-0.5.4 247 -SHA256 5aeab6f6209a5bd42de87d19351d7991a25197512ba07743b529d9ac89962a6c files/digest-cherokee-0.5.4 247 -MD5 8ccddb44b7f3cf0b898fa9075c6b657d files/digest-cherokee-0.5.5 247 -RMD160 720e76b82f27096c32fcdb57059159d6829393e4 files/digest-cherokee-0.5.5 247 -SHA256 0a26db6f1e1c40cdd279b4b9e9fe2349950766cb247c093ed5846157e6b4d03a files/digest-cherokee-0.5.5 247 +MD5 a11b794774ef5b39f3468f5263455939 files/digest-cherokee-0.5.6 247 +RMD160 b7f7ce1c94fe9af7bc2846883d851b52bedbc6c8 files/digest-cherokee-0.5.6 247 +SHA256 f225430722ee46711c8426fb588ebfc1648f4e36488ca9af972ccf2f95e40b37 files/digest-cherokee-0.5.6 247 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFkdCSAiZjviIA2XgRAqYAAJ4yno0GhIliaNz6jW1OR1XZaQHjUgCeLSZg -IJBi21xrYh/vkxfsxhiR7/k= -=krzo +iD8DBQFFkdxcAiZjviIA2XgRAjA4AJ44uINidTWrMiFFJQvm4oOvsp89vACfYglR +einrsZI0X7mZXuHuFYdfElM= +=2hSG -----END PGP SIGNATURE----- diff --git a/www-servers/cherokee/cherokee-0.5.2.ebuild b/www-servers/cherokee/cherokee-0.5.2.ebuild deleted file mode 100644 index fcd5ed853660..000000000000 --- a/www-servers/cherokee/cherokee-0.5.2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.5.2.ebuild,v 1.2 2006/12/14 17:37:32 beu Exp $ - -inherit eutils pam - -NAME=cherokee -S="${WORKDIR}/${NAME}-${PV}" - -DESCRIPTION="An extremely fast and tiny web server." -SRC_URI="http://www.cherokee-project.com/download/${PV%.*}/${PV}/${NAME}-${PV}.tar.gz" -HOMEPAGE="http://www.cherokee-project.com/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc" -IUSE="ipv6 ssl gnutls static doc pam fastcgi scgi" - -RDEPEND=">=sys-libs/zlib-1.1.4-r1 - gnutls? ( net-libs/gnutls ) - ssl? ( dev-libs/openssl ) - pam? ( virtual/pam )" - -DEPEND="${RDEPEND} - >=sys-devel/automake-1.7.5" - -src_unpack() { - unpack ${A} - cd ${S} - - # remove "doc" from SUBDIRS so that html docs don't get installed - # to the wrong place (/usr/share/doc/cherokee) and we can install - # them conditionally via dohtml in src_install. - sed -i -e 's|\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \ - die "sed Makefile.in failed" - - # use cherokee user/group - sed -i -e 's|^#\(User \).*$|\1cherokee|' \ - -e 's|^#\(Group \).*$|\1cherokee|' cherokee.conf.sample.pre || \ - die "sed cherokee.conf failed" -} - -src_compile() { - local myconf - - if use ssl && use gnutls ; then - myconf="${myconf} --enable-tls=gnutls" - elif use ssl && ! use gnutls ; then - myconf="${myconf} --enable-tls=openssl" - else - myconf="${myconf} --disable-tls" - fi - - if use static ; then - myconf="${myconf} --enable-static --enable-static-module=all" - else - myconf="${myconf} --disable-static" - fi - - if use fastcgi ; then - myconf="${myconf} --enable-fcgi" - fi - - if use scgi ; then - myconf="${myconf} --enable-scgi" - fi - - econf \ - ${myconf} \ - $(use_enable pam) \ - $(use_enable ipv6) \ - --enable-os-string="Gentoo Linux" \ - --with-wwwroot=/var/www/localhost/htdocs \ - || die "configure failed" - - emake || die "emake failed" -} - -src_install () { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog INSTALL README TODO - use doc && dohtml -r doc/* - - newpamd pam.d_cherokee ${PN} || die "newpamd failed" - newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed" - - # be nice and don't overwrite a user's pre-existing index.html - # (unless they're the same). - if [[ -f ${ROOT}/var/www/localhost/htdocs/index.html ]] ; then - diff ${ROOT}/var/www/localhost/htdocs/index.html \ - ${D}/var/www/localhost/htdocs/index.html &>/dev/null || \ - mv ${D}/var/www/localhost/htdocs/{,cherokee-}index.html - fi -} - -pkg_postinst() { - enewgroup cherokee - enewuser cherokee -1 -1 /var/www/localhost cherokee - echo - einfo "Since version 0.4.30 /etc/cherokee/mime.conf is deprecated so" - einfo "you need to update your cherokee.conf with: " - einfo " ""MimeFile /etc/cherokee/mime.types" - einfo " ""MimeFile /etc/cherokee/mime.compression.types" - echo -} diff --git a/www-servers/cherokee/cherokee-0.5.4.ebuild b/www-servers/cherokee/cherokee-0.5.4.ebuild deleted file mode 100644 index e88172c6e575..000000000000 --- a/www-servers/cherokee/cherokee-0.5.4.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.5.4.ebuild,v 1.2 2006/12/14 17:37:32 beu Exp $ - -inherit eutils pam - -NAME=cherokee -S="${WORKDIR}/${NAME}-${PV}" - -DESCRIPTION="An extremely fast and tiny web server." -SRC_URI="http://www.cherokee-project.com/download/${PV%.*}/${PV}/${NAME}-${PV}.tar.gz" -HOMEPAGE="http://www.cherokee-project.com/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc" -IUSE="ipv6 ssl gnutls static doc pam fastcgi scgi" - -RDEPEND=">=sys-libs/zlib-1.1.4-r1 - gnutls? ( net-libs/gnutls ) - ssl? ( dev-libs/openssl ) - pam? ( virtual/pam )" - -DEPEND="${RDEPEND} - >=sys-devel/automake-1.7.5" - -src_unpack() { - unpack ${A} - cd ${S} - - # remove "doc" from SUBDIRS so that html docs don't get installed - # to the wrong place (/usr/share/doc/cherokee) and we can install - # them conditionally via dohtml in src_install. - sed -i -e 's|\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \ - die "sed Makefile.in failed" - - # use cherokee user/group - sed -i -e 's|^#\(User \).*$|\1cherokee|' \ - -e 's|^#\(Group \).*$|\1cherokee|' cherokee.conf.sample.pre || \ - die "sed cherokee.conf failed" -} - -src_compile() { - local myconf - - if use ssl && use gnutls ; then - myconf="${myconf} --enable-tls=gnutls" - elif use ssl && ! use gnutls ; then - myconf="${myconf} --enable-tls=openssl" - else - myconf="${myconf} --disable-tls" - fi - - if use static ; then - myconf="${myconf} --enable-static --enable-static-module=all" - else - myconf="${myconf} --disable-static" - fi - - if use fastcgi ; then - myconf="${myconf} --enable-fcgi" - fi - - if use scgi ; then - myconf="${myconf} --enable-scgi" - fi - - econf \ - ${myconf} \ - $(use_enable pam) \ - $(use_enable ipv6) \ - --enable-os-string="Gentoo Linux" \ - --with-wwwroot=/var/www/localhost/htdocs \ - || die "configure failed" - - emake || die "emake failed" -} - -src_install () { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog INSTALL README TODO - use doc && dohtml -r doc/* - - newpamd pam.d_cherokee ${PN} || die "newpamd failed" - newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed" - - # be nice and don't overwrite a user's pre-existing index.html - # (unless they're the same). - if [[ -f ${ROOT}/var/www/localhost/htdocs/index.html ]] ; then - diff ${ROOT}/var/www/localhost/htdocs/index.html \ - ${D}/var/www/localhost/htdocs/index.html &>/dev/null || \ - mv ${D}/var/www/localhost/htdocs/{,cherokee-}index.html - fi -} - -pkg_postinst() { - enewgroup cherokee - enewuser cherokee -1 -1 /var/www/localhost cherokee - echo - einfo "Since version 0.4.30 /etc/cherokee/mime.conf is deprecated so" - einfo "you need to update your cherokee.conf with: " - einfo " ""MimeFile /etc/cherokee/mime.types" - einfo " ""MimeFile /etc/cherokee/mime.compression.types" - echo -} diff --git a/www-servers/cherokee/cherokee-0.5.5.ebuild b/www-servers/cherokee/cherokee-0.5.5.ebuild deleted file mode 100644 index 08d3a5c1b8d7..000000000000 --- a/www-servers/cherokee/cherokee-0.5.5.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.5.5.ebuild,v 1.3 2006/12/14 17:37:32 beu Exp $ - -inherit eutils pam - -NAME=cherokee -S="${WORKDIR}/${NAME}-${PV}" - -DESCRIPTION="An extremely fast and tiny web server." -SRC_URI="http://www.cherokee-project.com/download/${PV%.*}/${PV}/${NAME}-${PV}.tar.gz" -HOMEPAGE="http://www.cherokee-project.com/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="ipv6 ssl gnutls static doc pam fastcgi scgi" - -RDEPEND=">=sys-libs/zlib-1.1.4-r1 - gnutls? ( net-libs/gnutls ) - ssl? ( dev-libs/openssl ) - pam? ( virtual/pam )" - -DEPEND="${RDEPEND} - >=sys-devel/automake-1.7.5" - -src_unpack() { - unpack ${A} - cd ${S} - - # remove "doc" from SUBDIRS so that html docs don't get installed - # to the wrong place (/usr/share/doc/cherokee) and we can install - # them conditionally via dohtml in src_install. - sed -i -e 's|\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \ - die "sed Makefile.in failed" - - # use cherokee user/group - sed -i -e 's|^#\(User \).*$|\1cherokee|' \ - -e 's|^#\(Group \).*$|\1cherokee|' cherokee.conf.sample.pre || \ - die "sed cherokee.conf failed" -} - -src_compile() { - local myconf - - if use ssl && use gnutls ; then - myconf="${myconf} --enable-tls=gnutls" - elif use ssl && ! use gnutls ; then - myconf="${myconf} --enable-tls=openssl" - else - myconf="${myconf} --disable-tls" - fi - - if use static ; then - myconf="${myconf} --enable-static --enable-static-module=all" - else - myconf="${myconf} --disable-static" - fi - - if use fastcgi ; then - myconf="${myconf} --enable-fcgi" - fi - - if use scgi ; then - myconf="${myconf} --enable-scgi" - fi - - econf \ - ${myconf} \ - $(use_enable pam) \ - $(use_enable ipv6) \ - --enable-os-string="Gentoo Linux" \ - --with-wwwroot=/var/www/localhost/htdocs \ - || die "configure failed" - - emake || die "emake failed" -} - -src_install () { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog INSTALL README TODO - use doc && dohtml -r doc/* - - newpamd pam.d_cherokee ${PN} || die "newpamd failed" - newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed" - - # be nice and don't overwrite a user's pre-existing index.html - # (unless they're the same). - if [[ -f ${ROOT}/var/www/localhost/htdocs/index.html ]] ; then - diff ${ROOT}/var/www/localhost/htdocs/index.html \ - ${D}/var/www/localhost/htdocs/index.html &>/dev/null || \ - mv ${D}/var/www/localhost/htdocs/{,cherokee-}index.html - fi -} - -pkg_postinst() { - enewgroup cherokee - enewuser cherokee -1 -1 /var/www/localhost cherokee - echo - einfo "Since version 0.4.30 /etc/cherokee/mime.conf is deprecated so" - einfo "you need to update your cherokee.conf with: " - einfo " ""MimeFile /etc/cherokee/mime.types" - einfo " ""MimeFile /etc/cherokee/mime.compression.types" - echo -} diff --git a/www-servers/cherokee/files/cherokee-0.4.17-cherokee.conf b/www-servers/cherokee/files/cherokee-0.4.17-cherokee.conf deleted file mode 100644 index f1ee6b988472..000000000000 --- a/www-servers/cherokee/files/cherokee-0.4.17-cherokee.conf +++ /dev/null @@ -1,123 +0,0 @@ -## -## cherokee.conf -- Cherokee HTTP server configuration file -## - -## -## Port: The port to which the standalone server listens. For -## ports < 1023, you will need cherokee to be run as root initially. -## Security: if you do start the server as root, be sure not to set -## "User" to root. -## -Port 80 - -## -## IPv6 support -## -IPv6 On - -## -## This directiveis used to tell the server which IP address to listen to. -## -#Listen 127.0.0.1 - -## -## If you wish cherokee to run as a different user or group, you must run -## cherokee as root initially and it will switch. -## -## Eg: User www-data -## Group www-data -## -## Eg: User 65534 -## Group 65534 -## -#User nobody -#Group nogroup - -## -## Chroot: -## -# Chroot /var/www - -## -## Timeout: The number of seconds before receives and sends time out. -## -Timeout 15 - -## -## KeepAlive: Whether or not to allow persistent connections (more than -## one request per connection). Set to "Off" to deactivate. -## -KeepAlive On - -## -## MaxKeepAliveRequests: The MaxKeepAliveRequests directive limits the -## number of requests allowed per connection when KeepAlive is on. -## We recommend that this setting be kept to a high value for maximum -## server performance. -## -MaxKeepAliveRequests 500 - -## -## DirectoryIndex: Name of the file or files to use as a pre-written HTML -## directory index. Separate multiple entries with commas. -## -DirectoryIndex index.php, index.html, index.htm, index.shtml - -## -## DocumentRoot: The directory out of which you will serve your -## documents. By default, all requests are taken from this directory, but -## symbolic links and aliases may be used to point to other locations. -## -DocumentRoot /var/www/localhost/htdocs - -## -## Hide Version: Hide the software version -## -HideVersion Off - -## -## Hide ServerName: Hide the software version and the server name -## -HideServerName Off - -## -## PidFile: The file in which the server should record its process -## identification number when it starts. -## -PidFile /var/run/cherokee.pid - -## -## Icons: Extension to icon file. -## -Icons /etc/cherokee/icons.conf - -## -## MimeFile: Mime types file. By default you should leave it -## commented -## -MimeFile /etc/cherokee/mime.conf - -## -## Load the GZip encoder plugin -## only used if the client support the encoding ("Accept-Encoding:") -## -# Encoder gzip { -# Allow html, htm, txt -# Deny jpg, png, gz -# } - -## -## Advanced settings, do not change if you are not sure.. -## -Include /etc/cherokee/advanced.conf - -## -## Include the module configuration: -## -Include /etc/cherokee/mods-enabled - -## -## Include the virtual host configuration: -## -Include /etc/cherokee/sites-enabled - diff --git a/www-servers/cherokee/files/cherokee-0.4.17-init.d b/www-servers/cherokee/files/cherokee-0.4.17-init.d deleted file mode 100644 index b94d6d757aae..000000000000 --- a/www-servers/cherokee/files/cherokee-0.4.17-init.d +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/files/cherokee-0.4.17-init.d,v 1.1 2004/08/08 11:14:13 stuart Exp $ - -PIDFILE=/var/run/cherokee.pid - -depend() { - need net -} - -start() { - ebegin "Starting Cherokee Web Server" - # make sure they can't break our startup by passing -d (which would - # cause incorrect PID to be written to pidfile), or the incorrect - # depot root - start-stop-daemon --start --quiet \ - --pidfile ${PIDFILE} --make-pidfile -b \ - --exec /usr/sbin/cherokee - eend $? -} - -stop() { - ebegin "Stopping Cherokee Web Server" - if [ -f ${PIDFILE} ]; then - start-stop-daemon --stop --quiet --pidfile ${PIDFILE} - fi - rm -f ${PIDFILE} - eend $? -} diff --git a/www-servers/cherokee/files/cherokee-0.4.21-no-handler_admin.diff b/www-servers/cherokee/files/cherokee-0.4.21-no-handler_admin.diff deleted file mode 100644 index a2bab544822b..000000000000 --- a/www-servers/cherokee/files/cherokee-0.4.21-no-handler_admin.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff --exclude='*~' --exclude='.*' -I '$Id:' -urN cherokee-0.4.21.orig/cherokee/Makefile.in cherokee-0.4.21/cherokee/Makefile.in ---- cherokee-0.4.21.orig/cherokee/Makefile.in 2005-05-13 03:48:44.000000000 -0400 -+++ cherokee-0.4.21/cherokee/Makefile.in 2005-05-13 04:05:18.000000000 -0400 -@@ -801,15 +801,15 @@ - # - # Handler admin - # --handler_admin = \ --handler_admin.c \ --handler_admin.h -- --libplugin_admin_la_LDFLAGS = -module -export-dynamic -avoid-version --libplugin_admin_la_SOURCES = $(handler_admin) --libplugin_admin_la_LIBADD = -lcherokee-config -lcherokee-client --@STATIC_HANDLER_ADMIN_TRUE@static_handler_admin_src = $(handler_admin) --@STATIC_HANDLER_ADMIN_FALSE@dynamic_handler_admin_lib = libplugin_admin.la -+# handler_admin = \ -+# handler_admin.c \ -+# handler_admin.h -+ -+# libplugin_admin_la_LDFLAGS = -module -export-dynamic -avoid-version -+# libplugin_admin_la_SOURCES = $(handler_admin) -+# libplugin_admin_la_LIBADD = -lcherokee-config -lcherokee-client -+# @STATIC_HANDLER_ADMIN_TRUE@static_handler_admin_src = $(handler_admin) -+# @STATIC_HANDLER_ADMIN_FALSE@dynamic_handler_admin_lib = libplugin_admin.la - - # - # Handler GNOME VFS diff --git a/www-servers/cherokee/files/cherokee-0.4.25-fix-static.diff b/www-servers/cherokee/files/cherokee-0.4.25-fix-static.diff deleted file mode 100644 index f4d2ab15e738..000000000000 --- a/www-servers/cherokee/files/cherokee-0.4.25-fix-static.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --exclude='*~' --exclude='.*' -I '$Id:' -urN cherokee-0.4.25.orig/cherokee/Makefile.am cherokee-0.4.25/cherokee/Makefile.am ---- cherokee-0.4.25.orig/cherokee/Makefile.am 2005-08-14 00:54:56.000000000 -0400 -+++ cherokee-0.4.25/cherokee/Makefile.am 2005-08-14 03:31:45.000000000 -0400 -@@ -148,8 +148,6 @@ - # Handler fastcgi - # - handler_fastcgi = \ --cgi.h \ --cgi.c \ - fastcgi.h \ - handler_fastcgi.c \ - handler_fastcgi.h \ -@@ -157,7 +155,7 @@ - fcgi_manager.c - - libplugin_fastcgi_la_LDFLAGS = -module -export-dynamic -avoid-version --libplugin_fastcgi_la_SOURCES = $(handler_fastcgi) -+libplugin_fastcgi_la_SOURCES = $(handler_fastcgi) cgi.h cgi.c - - if STATIC_HANDLER_FASTCGI - static_handler_fastcgi_src = $(handler_fastcgi) diff --git a/www-servers/cherokee/files/cherokee-0.4.5-Makefile.am.patch b/www-servers/cherokee/files/cherokee-0.4.5-Makefile.am.patch deleted file mode 100644 index 40bdd440bf8d..000000000000 --- a/www-servers/cherokee/files/cherokee-0.4.5-Makefile.am.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.am 2003-07-04 14:54:38.000000000 +0100 -+++ /tmp/Makefile.am 2003-10-05 11:04:55.000000000 +0100 -@@ -23,14 +23,14 @@ - - - install-data-local: -- @if test -f $(cherokeeconfdir)/cherokee.conf ; then \ -+ @if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \ - echo "$@ will not overwrite existing $(cherokeeconfdir)/cherokee.conf"; \ - else \ -- $(mkinstalldirs) $(cherokeeconfdir) \ -- echo "$(INSTALL_DATA) cherokee.conf.sample $(cherokeeconfdir)/cherokee.conf"; \ -- $(INSTALL_DATA) cherokee.conf.sample $(cherokeeconfdir)/cherokee.conf; \ -+ $(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir) ;\ -+ echo "$(INSTALL_DATA) cherokee.conf.sample $(DESTDIR)$(cherokeeconfdir)/cherokee.conf"; \ -+ $(INSTALL_DATA) cherokee.conf.sample $(DESTDIR)$(cherokeeconfdir)/cherokee.conf; \ - fi -- $(mkinstalldirs) $(localstatedir) -+ $(mkinstalldirs) $(DESTDIR)$(localstatedir) - - uninstall-local: - @if test -f $(cherokeeconfdir)/cherokee.conf ; then \ diff --git a/www-servers/cherokee/files/cherokee-0.4.5-cherokee.conf b/www-servers/cherokee/files/cherokee-0.4.5-cherokee.conf deleted file mode 100644 index fa67f8521c93..000000000000 --- a/www-servers/cherokee/files/cherokee-0.4.5-cherokee.conf +++ /dev/null @@ -1,148 +0,0 @@ -## -## cherokee.conf -- Cherokee HTTP server configuration file -## - -## -## Port: The port to which the standalone server listens. For -## ports < 1023, you will need cherokee to be run as root initially. -## -Port 80 - -## -## IPv6 support -## -IPv6 On - -## -## This directiveis used to tell the server which IP address to listen to. -## -#Listen 127.0.0.1 - -## -## If you wish cherokee to run as a different user or group, you must run -## cherokee as root initially and it will switch. -## -## Eg: User "www-data" -## Group "www-data" -## -## Eg: User 65534 -## Group 65534 -## -#User nobody -#Group nogroup - -## -## Timeout: The number of seconds before receives and sends time out. -## -Timeout 15 - -## -## KeepAlive: Whether or not to allow persistent connections (more than -## one request per connection). Set to "Off" to deactivate. -## -KeepAlive On - -## -## ThreadNumber: -## -# ThreadNumber 5 - -## -## DocumentRoot: The directory out of which you will serve your -## documents. By default, all requests are taken from this directory, but -## symbolic links and aliases may be used to point to other locations. -## -DocumentRoot /var/www/localhost/htdocs - -## -## Log: Turn On/Off the logging in to syslog -## -## Parameters: -## ncsa - AccessLog, ErrorLog -## w3c - LogFile -## -#Log w3c { -# LogFile /var/log/cherokee.w3c.log -#} -Log ncsa { - AccessLog /var/log/cherokee.access - ErrorLog /var/log/cherokee.error -} - -## -## Hide Versions: Hide the software version -## -HideVersion Off - -## -## PidFile: The file in which the server should record its process -## identification number when it starts. -## -PidFile /var/run/cherokee.pid - -## -## UserDir: The name of the directory which is appended onto a user's home -## directory if a ~user request is received. -## -## NOTE: Take in mind the permissions. If you have changed the User/Group -## the server maybe will have problems accessing the personal users' -## content. -## -UserDir public_html { - Handler common -} - -## -## MimeFile: Mime types file. By default you should leave it -## commented -## -#MimeFile /usr/share/cherokee/mime_types.txt - -## -## Load the GZip encoder plugin -## -Encoder gzip { - Allow html, htm, txt - Deny jpg, png, gz -} - -## -## Handler to directory configuration -## -Directory / { - Handler common -} - -Directory /icons { - Handler file - DocumentRoot /usr/share/cherokee/icons/ -} - -Directory /google { - Handler redir { - URL http://www.google.com/search?sourceid=cherokee-search&q= - } -} - -Directory /cgi-bin { - Handler cgi - DocumentRoot /var/www/localhost/cgi-bin/ -} - -#Directory /gnome { -# Handler gnomevfs { -# FileDir /var/www/compressed/ -# } -#} - -## -## Virtual servers -## -# Server tesoro.alobbs.com { -# DocumentRoot /var/www/tesoro.alobbs.com/htdocs -# -# Directory / { -# Handler common -# } -#} - diff --git a/www-servers/cherokee/files/cherokee-0.4.5-init.d b/www-servers/cherokee/files/cherokee-0.4.5-init.d deleted file mode 100644 index c5baf366e582..000000000000 --- a/www-servers/cherokee/files/cherokee-0.4.5-init.d +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/files/cherokee-0.4.5-init.d,v 1.1 2004/08/08 11:14:13 stuart Exp $ - -PIDFILE=/var/run/cherokee.pid - -depend() { - need net -} - -start() { - ebegin "Starting Cherokee Web Server" - # make sure they can't break our startup by passing -d (which would - # cause incorrect PID to be written to pidfile), or the incorrect - # depot root - start-stop-daemon --start --quiet \ - --pidfile ${PIDFILE} --make-pidfile -b \ - --exec /usr/bin/cherokee - eend $? -} - -stop() { - ebegin "Stopping Cherokee Web Server" - if [ -f ${PIDFILE} ]; then - start-stop-daemon --stop --quiet --pidfile ${PIDFILE} - fi - rm -f ${PIDFILE} - eend $? -} diff --git a/www-servers/cherokee/files/digest-cherokee-0.5.2 b/www-servers/cherokee/files/digest-cherokee-0.5.2 deleted file mode 100644 index 8b0118ee888e..000000000000 --- a/www-servers/cherokee/files/digest-cherokee-0.5.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d7a2a590864b8ec27b9b116a2c8f1c6f cherokee-0.5.2.tar.gz 1547715 -RMD160 d2bb2ad3f1b8179ead0322d5cddf970a452cc6fa cherokee-0.5.2.tar.gz 1547715 -SHA256 a572e3077091f759b3e42133a2e98b4d2f2af52ab8ab0ac27d66e97e572c7338 cherokee-0.5.2.tar.gz 1547715 diff --git a/www-servers/cherokee/files/digest-cherokee-0.5.4 b/www-servers/cherokee/files/digest-cherokee-0.5.4 deleted file mode 100644 index 4d539dfb9bf5..000000000000 --- a/www-servers/cherokee/files/digest-cherokee-0.5.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 4e207961bc8204a2e2026391649dd8af cherokee-0.5.4.tar.gz 1556342 -RMD160 84420215c8eafef7bb4993d5d38d5ef3dd4ef5a8 cherokee-0.5.4.tar.gz 1556342 -SHA256 f44f16e8cf581ba8a7b22e4c9631e432967f43c9af50cf706432e8ad58a9c331 cherokee-0.5.4.tar.gz 1556342 diff --git a/www-servers/cherokee/files/digest-cherokee-0.5.5 b/www-servers/cherokee/files/digest-cherokee-0.5.5 deleted file mode 100644 index 6e7d0591a1c8..000000000000 --- a/www-servers/cherokee/files/digest-cherokee-0.5.5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 fb891b3da7eb921c09a5eb93e296f5e1 cherokee-0.5.5.tar.gz 1559655 -RMD160 04564efc2caa96f5622450ae9ab0b3d87adabbd3 cherokee-0.5.5.tar.gz 1559655 -SHA256 e9c6feee2a626a38cd69c726ed31ffbbf55d288386f50fe6f90fa63de410d67a cherokee-0.5.5.tar.gz 1559655 -- cgit v1.2.3-65-gdbad