From 199fbca39a7dd7501cf20e138ea0c72e2b79c9be Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Thu, 20 Oct 2011 17:10:09 +0000 Subject: [PATCH] Version bumped. Package-Manager: portage-2.1.10.29/cvs/Linux x86_64 --- www-servers/cherokee/ChangeLog | 7 +- www-servers/cherokee/Manifest | 30 +-- www-servers/cherokee/cherokee-1.2.101.ebuild | 193 +++++++++++++++++++ 3 files changed, 215 insertions(+), 15 deletions(-) create mode 100644 www-servers/cherokee/cherokee-1.2.101.ebuild diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog index bff13b8856b3..96bb0239b0e3 100644 --- a/www-servers/cherokee/ChangeLog +++ b/www-servers/cherokee/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/cherokee # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.87 2011/10/17 16:24:30 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.88 2011/10/20 17:10:08 matsuu Exp $ + +*cherokee-1.2.101 (20 Oct 2011) + + 20 Oct 2011; MATSUU Takuto +cherokee-1.2.101.ebuild: + Version bumped. *cherokee-1.2.100 (17 Oct 2011) diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest index be3293ec7ed9..56527666215b 100644 --- a/www-servers/cherokee/Manifest +++ b/www-servers/cherokee/Manifest @@ -7,25 +7,27 @@ AUX cherokee-confd-1.2.98 144 RMD160 05e5dc30e647624c27d0ebb6015d0ca1d4278593 SH AUX cherokee-initd-1.2.99 1185 RMD160 d93399b6efe894248933ab45ccecb83738106d83 SHA1 e8d975c93682773e0f074261a54fbac773058e4d SHA256 f1cf6e6094948f0ab248a5533c0a19c08c8f6f5bcfa004072e3ecf1b2b2ace83 AUX cherokee.logrotate 346 RMD160 4e6af617cd12f48eb6f2cb3925177c899451e223 SHA1 ec7c688287773bc366a9b854108d46894541ad38 SHA256 099d13bf37f469a565f0fb4837a2136abb2e6e94c5000fc03d88eca611b4f930 DIST cherokee-1.2.100.tar.gz 6281629 RMD160 1282692dac135f73bf0604e2c2ca753baa2f40b3 SHA1 2ed95504c7f156227f9b688a901608be21cf3dff SHA256 1d691374bf395f3bd8a0bdaadc5dce2ad9251161ae92a214ff6de08369b15d36 +DIST cherokee-1.2.101.tar.gz 6320209 RMD160 dd3dedc352ba17bdcefd8e200143b8ffa19ad035 SHA1 b27f149c7d7111207ac8c3cd8a4856c05490d136 SHA256 ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8 DIST cherokee-1.2.99.tar.gz 6179707 RMD160 59ba7eb005a4013959afcb826faa0a778e5cc4b2 SHA1 db602b03e531b98492ca0b6535a9630f08d8528a SHA256 0e8cfb90095082f369bc5315a6232b76b42799c8adc716ff46fe7d02bbc0e783 EBUILD cherokee-1.2.100.ebuild 5148 RMD160 fd52adfab6dfe7ee1bda442936af4de49a098765 SHA1 06d2cec000b4e30c3f383a00c2efddb92ed32764 SHA256 a32535eb94d646d119d799d07453113113db1d2a252c6ef98f304374b1c83890 +EBUILD cherokee-1.2.101.ebuild 5148 RMD160 105b2ae720768986bb69d1066e5919e2ae8d1624 SHA1 46c09fc1fccbd147dfd5a6c758cd37d01ae52244 SHA256 5e381901f8eb677de80e8077f561047dfc0b13d3157a90666b0a6ed26075b72d EBUILD cherokee-1.2.99.ebuild 5139 RMD160 e5fbac07e43d770f274509dd0e421564ba27a9bc SHA1 b24d4107d5bf711c580d74f5c3192dbd6a98cd5a SHA256 6f428fe5b8114b7169607b1b6d659b3c5d575511f51f8be9cb0e7380f9c1dbec -MISC ChangeLog 20850 RMD160 7c00dea4d4a416627586d880be041ea95976e4fc SHA1 74afcbd7cdb7ef5143ada143ac4beedef1cd3db3 SHA256 af48030ea349af5b6a6d9b4d4940f5be8f5130bfd52b66f5d5f70f329754de04 +MISC ChangeLog 20977 RMD160 fbf8ad45f3e31d34e91fb712a3264b9178428f5d SHA1 3781e466a01b974759ad7b3705f5f33723c94232 SHA256 2c80c74583183025687f7d717aaba183da0cfc8a6cf9849a351bd997b5bfe77a MISC metadata.xml 488 RMD160 6689708f9508ed17b4f67284e8fef3512161b432 SHA1 c7a8168a8e6b119bee60b536552f378cf670130b SHA256 4ee7f5937c157209c4d78429188bcfc36b9c063252760215ce2e70da1ff95496 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOnFbHAAoJECaGw+YFKA1p8AwP/AwwKvVPWpHFmxVxZJMAG8hC -V0FLntpDHW+NZrLIx9o6WrEP8eYFOgLmx80f7SkutCt98bhD8i+h8FLe2ovbuMbO -yTcg7y7rcsri8mdloYxcWKYTN2oxdqgA2k9U/AIVnEiqcbbXUF6E8ZavVM+X8bKL -VKjUE8HmlNZCc8l+7j/AhEdM7mje8Wal58acf9ZjWUcIErsGi7ww96PgQAq7Bm4v -YOYx6M3wMpqNjIAQeWoe9katPWYdxbCPajkcDkFVwuo9Kcwl/mJDhU4twr2CefNw -Gdu9hVI3HHzEcN+JJ7sshV0/vBsR/3KVEMa+zBZDV2uwGOmiAPklbKh+hPN5DSWu -2t/CEQ/F2lFlBE960/mqLtEpczupwei6CVA/62J6NL+nSfTZ0gSQXbnqLxR0RU0X -+kthipdPklDOJdO9+KYDnymjGl3eNy3dS3h6Z2BDD9z7g7QBYnnhPbp0SJbi2MDB -km/O48BkbeJutndGd3HAD3c+ycYAmHPSmbczEBudYlgS6bu38DN9248cmH28HV/+ -U3KLgPf4+wWHiPQcg7odUeBt5Krfm7zTZPRaqF28h5JBF+mJVkRqCXHdsf5a6y8O -G8J6J16UraRJDg9BPWjB5AYipPByJStZa9y4zSmKASoQA+wFxq3/5Y2JNr/MrZ2p -HoKQ9i2tswjsD+fMLGDV -=hu3K +iQIcBAEBAgAGBQJOoFX6AAoJECaGw+YFKA1pAUIP/1idmekjCQZJgCXYcHuXS8mZ +zflaNhyHrUcj7LqPPX1VtaJ5dPAcQbt37VPStGlcBzLO4dxHm2GEMP1NxM16s7Sn +iMRi9fOTZIOQJNENG7zQtTH/9r0sZJowKxIl6xnZWHYdXXUzvJ3RsYyESBEWaMFh +0/McHIIYxCCvygk8U/leTa7FuKghc1YkQcoAsEq89b+h/hXy3EtfHYb5ne7BKTMw +XMw4yXa7ESGZ+fpZd84DRd4qbNOLgCAnFzElDPXXnuseAIDHJzpDRirEpJfI4gRj +fbt0e0selJgJRFv+lv2FXOisqz51B89QqS2KZ/Nt6gb3SMsVZfr8IoFvXWe0Q8kI +XGpHZVJ5ZVDAYlsje+tl3U/xfoYhRHy5ZtEB0yjtziN7kPCngjR3tnzG76rK1eu6 +2hkmCjODcl9XUxqlRD//gsj93Hnl3Jgsmf3u4DMJL0kX/zZ4GI6SMZD3GchNVNvL +T2Um3zggGe7/SVdCK8+P8aud0w5fz8qrXppScQf735D4DPosUzZkr2T6s2YJA1GQ +SKdDhbm9OhwIWJdLliwGIuMGrjxQeE+rbozoZAxQQbsThmhDLAvWgdq2dQdKhrvy +53MYvtc0ZYPQSeID3kk8lf+u2zb003XKrECpxQcFy8FloFQ1CyXIChIER06LDot9 +WM2qftHQ9IDpdaFquJiL +=6GaR -----END PGP SIGNATURE----- diff --git a/www-servers/cherokee/cherokee-1.2.101.ebuild b/www-servers/cherokee/cherokee-1.2.101.ebuild new file mode 100644 index 000000000000..d7ad69421ea2 --- /dev/null +++ b/www-servers/cherokee/cherokee-1.2.101.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.101.ebuild,v 1.1 2011/10/20 17:10:09 matsuu Exp $ + +EAPI="3" +PYTHON_DEPEND="admin? 2" +PYTHON_USE_WITH="threads" + +inherit eutils multilib pam python versionator + +DESCRIPTION="An extremely fast and tiny web server." +SRC_URI="http://www.cherokee-project.com/download/$(get_version_component_range 1-2)/${PV}/${P}.tar.gz" +HOMEPAGE="http://www.cherokee-project.com/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="admin coverpage ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs" + +COMMON_DEPEND="dev-libs/libpcre + >=sys-libs/zlib-1.1.4-r1 + ffmpeg? ( virtual/ffmpeg ) + geoip? ( dev-libs/geoip ) + ldap? ( net-nds/openldap ) + mysql? ( >=virtual/mysql-5 ) + nls? ( virtual/libintl ) + pam? ( virtual/pam ) + php? ( || ( + dev-lang/php[fpm] + dev-lang/php[cgi] + ) ) + ssl? ( dev-libs/openssl )" +DEPEND="${COMMON_DEPEND} + nls? ( sys-devel/gettext )" +RDEPEND="${COMMON_DEPEND} + rrdtool? ( net-analyzer/rrdtool )" + +RESTRICT="test" + +pkg_setup() { + python_pkg_setup + + python_set_active_version 2 + + enewgroup cherokee + enewuser cherokee -1 -1 /var/www cherokee +} + +src_prepare() { + epatch \ + "${FILESDIR}/${PN}-1.2.99-gentoo.patch" \ + "${FILESDIR}/${PN}-1.2.98-linux3.patch" + + python_convert_shebangs -r 2 . +} + +src_configure() { + local myconf + + if use admin ; then + myconf="${myconf} --enable-admin --with-python=$(PYTHON -2)" + else + myconf="${myconf} --disable-admin --without-python" + fi + + # Uses autodetect because --with-php requires path to php-{fpm,cgi}. + if ! use php ; then + myconf="${myconf} --without-php" + fi + + if use static ; then + myconf="${myconf} --enable-static-module=all" + fi + + local os="Unknown" + case "${CHOST}" in + *-freebsd*) + os="FreeBSD" ;; + *-netbsd*) + os="NetBSD" ;; + *-openbsd*) + os="OpenBSD" ;; + *) + os="Linux" ;; + esac + + # This make cherokee 1.2 sad + # $(use_enable threads pthread) \ + econf \ + $(use_enable debug trace) \ + $(use_enable debug backtraces) \ + $(use_enable ipv6) \ + $(use_enable kernel_linux epoll) \ + $(use_enable nls) \ + $(use_enable pam) \ + $(use_enable static-libs static) \ + $(use_with ffmpeg) \ + $(use_with geoip) \ + $(use_with ldap) \ + $(use_with mysql) \ + $(use_with ssl libssl) \ + --disable-dependency-tracking \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --enable-os-string="Gentoo ${os}" \ + --enable-tmpdir="${EPREFIX}/var/tmp" \ + --localstatedir="${EPREFIX}/var" \ + --with-wwwroot="${EPREFIX}/var/www/localhost/htdocs" \ + --with-cgiroot="${EPREFIX}/var/www/localhost/cgi-bin" \ + --with-wwwuser=cherokee \ + --with-wwwgroup=cherokee \ + ${myconf} || die "configure failed" +} + +src_test() { + emake test || die +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + if ! use static-libs ; then + find "${ED}" -name '*.la' -delete || die + elif ! use static ; then + find "${ED}/usr/$(get_libdir)/cherokee" '(' -name '*.la' -o -name '*.a' ')' -delete || die + fi + + dodoc AUTHORS ChangeLog README || die + + if use pam ; then + pamd_mimic system-auth cherokee auth account session || die + fi + + newinitd "${FILESDIR}/${PN}-initd-1.2.99" ${PN} || die "newinitd ${PN} failed" + newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN} || die "newconfd ${PN} failed" + + if ! use admin ; then + rm -r \ + "${ED}"/usr/bin/cherokee-admin-launcher \ + "${ED}"/usr/bin/CTK-run \ + "${ED}"/usr/sbin/cherokee-admin \ + "${ED}"/usr/share/cherokee/admin || die + fi + + exeinto /usr/share/doc/${PF}/contrib + doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py} || die + + keepdir \ + /var/www/localhost/htdocs \ + /var/log/cherokee \ + /var/lib/cherokee/graphs/images || die + fowners cherokee:cherokee \ + /var/log/cherokee \ + /var/lib/cherokee/graphs \ + /var/lib/cherokee/graphs/images || die + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotate ${PN} || die + + if ! use coverpage ; then + rm -r "${ED}"/var/www/localhost/htdocs/* || die + fi +} + +pkg_postinst() { + elog + if use admin ; then + python_mod_optimize "${EPREFIX}/usr/share/cherokee/admin/" + elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090" + elog + elog "Cherokee currently supports configuration versioning, so from now on," + elog "whenever a change is made to the configuration file format," + elog "Cherokee-Admin will be able to automatically convert yours to the new" + elog "release. You simply have to load Cherokee-Admin and it will be converted" + elog "once you proceed to saving it." + elog + elog "There is also a command line utility that you can use to do the exact" + elog "same thing. Config format can change in different versions. It is" + elog "provided under:" + elog " ${EPREFIX}/usr/share/cherokee/admin/upgrade_config.py" + else + elog "Try USE=admin if you want an easy way to configure cherokee." + fi + elog + elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}." + elog +} + +pkg_postrm() { + if use admin ; then + python_mod_cleanup "${EPREFIX}/usr/share/cherokee/admin/" + fi +} -- 2.26.2