| 1 |
commit: 15f426d9bcbb3ec26e6ceb2e544bd31a993036bd |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 12 01:03:19 2015 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 12 01:03:19 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15f426d9 |
| 7 |
|
| 8 |
www-servers/cherokee: remove older 1.2.103 version |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
www-servers/cherokee/Manifest | 2 - |
| 13 |
www-servers/cherokee/cherokee-1.2.103-r2.ebuild | 194 --------------------- |
| 14 |
.../cherokee/files/cherokee-1.2.103-linux3.patch | 36 ---- |
| 15 |
3 files changed, 232 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest |
| 18 |
index d62c419..8574268 100644 |
| 19 |
--- a/www-servers/cherokee/Manifest |
| 20 |
+++ b/www-servers/cherokee/Manifest |
| 21 |
@@ -1,3 +1 @@ |
| 22 |
-DIST cherokee-1.2.103.zip 5783906 SHA256 0e125cba2ad2d0dc48ecca3af4894b92ec5fab422a9d7d27fd0c7a74751e5f35 SHA512 63ba5d41f61d2816df7dce3b572616eca5fc09dd2e9dca9efa2cbf28a38d6d5e1840e4cd302a0eb5780b1a0abe7632232511c77d9e383f0b945d3eca960af4ab WHIRLPOOL 00f592bc41eecd6422a95d6e36bf5c46b4845afe2adad756635d0d2c1e5c1bfde03e633bcbde8cab207c31050dc055e26fcdbf69512a8b61422242905b792754 |
| 23 |
DIST cherokee-1.2.104.zip 6200164 SHA256 1acc80de22ed0aa4a0d95aa643ac92a2cce435480258081213214bec05da4098 SHA512 9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d WHIRLPOOL b0c13205014daee461538d0b7968bf255fd6633dbf3defeb2505ce463772c6f56b06ef91ff6b055bd589a15d19974d794fcbe039c1552b04a6bd1228a690f417 |
| 24 |
-DIST cherokee-ctk-master.zip 415092 SHA256 dede313f1d396f1deaf78d9fd9a1270820d2e91761efe827a207b46061f27993 SHA512 c933f15aa7197f5001b3120fd27898b2e97b78998e0bd0d68e7ced16a57950b7e85e4d731ca0420cd8a0fb292b4cd34b9497928183ccca22c9aa3a16285f9ef7 WHIRLPOOL 92453d3478ae238e5d9422fc2e8f0f1406576f9753ba0ed644ae8e093862b72c8c634bdaaeec4c0f725bdef8f4bc5c7113a916c2cdd8fbb0a14db61e54173c57 |
| 25 |
|
| 26 |
diff --git a/www-servers/cherokee/cherokee-1.2.103-r2.ebuild b/www-servers/cherokee/cherokee-1.2.103-r2.ebuild |
| 27 |
deleted file mode 100644 |
| 28 |
index 1d87b9e..0000000 |
| 29 |
--- a/www-servers/cherokee/cherokee-1.2.103-r2.ebuild |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,194 +0,0 @@ |
| 32 |
-# Copyright 1999-2015 Gentoo Foundation |
| 33 |
-# Distributed under the terms of the GNU General Public License v2 |
| 34 |
-# $Id$ |
| 35 |
- |
| 36 |
-EAPI="5" |
| 37 |
- |
| 38 |
-WANT_AUTOMAKE="1.11" |
| 39 |
- |
| 40 |
-PYTHON_COMPAT=( python2_7 ) |
| 41 |
- |
| 42 |
-inherit autotools python-r1 eutils multilib pam systemd user |
| 43 |
- |
| 44 |
-DESCRIPTION="An extremely fast and tiny web server" |
| 45 |
-SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip |
| 46 |
- https://github.com/cherokee/CTK/archive/master.zip -> ${PN}-ctk-master.zip" |
| 47 |
-HOMEPAGE="http://www.cherokee-project.com/" |
| 48 |
- |
| 49 |
-LICENSE="GPL-2" |
| 50 |
-SLOT="0" |
| 51 |
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" |
| 52 |
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs" |
| 53 |
- |
| 54 |
-COMMON_DEPEND="dev-libs/libpcre |
| 55 |
- >=sys-libs/zlib-1.1.4-r1 |
| 56 |
- ffmpeg? ( virtual/ffmpeg ) |
| 57 |
- geoip? ( dev-libs/geoip ) |
| 58 |
- ldap? ( net-nds/openldap ) |
| 59 |
- mysql? ( >=virtual/mysql-5 ) |
| 60 |
- nls? ( virtual/libintl ) |
| 61 |
- pam? ( virtual/pam ) |
| 62 |
- php? ( || ( |
| 63 |
- dev-lang/php[fpm] |
| 64 |
- dev-lang/php[cgi] |
| 65 |
- ) ) |
| 66 |
- ssl? ( dev-libs/openssl )" |
| 67 |
-DEPEND="${COMMON_DEPEND} |
| 68 |
- nls? ( sys-devel/gettext )" |
| 69 |
-RDEPEND="${COMMON_DEPEND} |
| 70 |
- rrdtool? ( net-analyzer/rrdtool )" |
| 71 |
- |
| 72 |
-RESTRICT="test" |
| 73 |
- |
| 74 |
-WEBROOT="/var/www/localhost" |
| 75 |
- |
| 76 |
-src_unpack() { |
| 77 |
- unpack ${A} |
| 78 |
- mv "webserver-${PV}" "${S}" || die |
| 79 |
- rmdir "${S}/admin/CTK" || die |
| 80 |
- mv "CTK-master" "${S}/admin/CTK" || die |
| 81 |
-} |
| 82 |
- |
| 83 |
-pkg_setup() { |
| 84 |
- enewgroup cherokee |
| 85 |
- enewuser cherokee -1 -1 /var/www cherokee |
| 86 |
-} |
| 87 |
- |
| 88 |
-src_prepare() { |
| 89 |
- python_setup |
| 90 |
- epatch \ |
| 91 |
- "${FILESDIR}/${PN}-1.2.99-gentoo.patch" \ |
| 92 |
- "${FILESDIR}/${PN}-1.2.103-linux3.patch" |
| 93 |
- |
| 94 |
- "${S}/po/admin/generate_POTFILESin.py" > po/admin/POTFILES.in |
| 95 |
- eautoreconf |
| 96 |
-} |
| 97 |
- |
| 98 |
-src_configure() { |
| 99 |
- local myconf |
| 100 |
- |
| 101 |
- if use admin ; then |
| 102 |
- myconf="${myconf} --enable-admin --with-python=/usr/bin/python" |
| 103 |
- else |
| 104 |
- myconf="${myconf} --disable-admin" |
| 105 |
- fi |
| 106 |
- |
| 107 |
- # Uses autodetect because --with-php requires path to php-{fpm,cgi}. |
| 108 |
- if ! use php ; then |
| 109 |
- myconf="${myconf} --without-php" |
| 110 |
- fi |
| 111 |
- |
| 112 |
- if use static ; then |
| 113 |
- myconf="${myconf} --enable-static-module=all" |
| 114 |
- fi |
| 115 |
- |
| 116 |
- local os="Unknown" |
| 117 |
- case "${CHOST}" in |
| 118 |
- *-freebsd*) |
| 119 |
- os="FreeBSD" ;; |
| 120 |
- *-netbsd*) |
| 121 |
- os="NetBSD" ;; |
| 122 |
- *-openbsd*) |
| 123 |
- os="OpenBSD" ;; |
| 124 |
- *) |
| 125 |
- os="Linux" ;; |
| 126 |
- esac |
| 127 |
- |
| 128 |
- econf \ |
| 129 |
- $(use_enable debug trace) \ |
| 130 |
- $(use_enable debug backtraces) \ |
| 131 |
- $(use_enable ipv6) \ |
| 132 |
- $(use_enable kernel_linux epoll) \ |
| 133 |
- $(use_enable nls) \ |
| 134 |
- $(use_enable pam) \ |
| 135 |
- $(use_enable static-libs static) \ |
| 136 |
- $(use_with ffmpeg) \ |
| 137 |
- $(use_with geoip) \ |
| 138 |
- $(use_with ldap) \ |
| 139 |
- $(use_with mysql) \ |
| 140 |
- $(use_with ssl libssl) \ |
| 141 |
- --disable-dependency-tracking \ |
| 142 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
| 143 |
- --enable-os-string="Gentoo ${os}" \ |
| 144 |
- --enable-tmpdir="${EPREFIX}/var/tmp" \ |
| 145 |
- --localstatedir="${EPREFIX}/var" \ |
| 146 |
- --with-wwwroot="${EPREFIX}${WEBROOT}/htdocs" \ |
| 147 |
- --with-cgiroot="${EPREFIX}${WEBROOT}/cgi-bin" \ |
| 148 |
- --with-wwwuser=cherokee \ |
| 149 |
- --with-wwwgroup=cherokee \ |
| 150 |
- ${myconf} |
| 151 |
-} |
| 152 |
- |
| 153 |
-src_install() { |
| 154 |
- emake DESTDIR="${D}" install |
| 155 |
- |
| 156 |
- if ! use static-libs ; then |
| 157 |
- find "${ED}" -name '*.la' -delete || die |
| 158 |
- elif ! use static ; then |
| 159 |
- find "${ED}/usr/$(get_libdir)/cherokee" '(' -name '*.la' -o -name '*.a' ')' -delete || die |
| 160 |
- fi |
| 161 |
- |
| 162 |
- dodoc AUTHORS NEWS README.rst |
| 163 |
- |
| 164 |
- if use pam ; then |
| 165 |
- pamd_mimic system-auth cherokee auth account session || die |
| 166 |
- fi |
| 167 |
- |
| 168 |
- newinitd "${FILESDIR}/${PN}-initd-1.2.99" ${PN} |
| 169 |
- newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN} |
| 170 |
- |
| 171 |
- if ! use admin ; then |
| 172 |
- rm -r \ |
| 173 |
- "${ED}"/usr/bin/cherokee-admin-launcher \ |
| 174 |
- "${ED}"/usr/bin/CTK-run \ |
| 175 |
- "${ED}"/usr/sbin/cherokee-admin \ |
| 176 |
- "${ED}"/usr/share/cherokee/admin || die |
| 177 |
- fi |
| 178 |
- |
| 179 |
- exeinto /usr/share/doc/${PF}/contrib |
| 180 |
- doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py} |
| 181 |
- |
| 182 |
- #move the htdocs to docdir, bug #429632 |
| 183 |
- docompress -x /usr/share/doc/"${PF}"/htdocs.dist |
| 184 |
- mv "${ED}"${WEBROOT}/htdocs \ |
| 185 |
- "${ED}"/usr/share/doc/"${PF}"/htdocs.dist |
| 186 |
- mkdir "${ED}"${WEBROOT}/htdocs |
| 187 |
- |
| 188 |
- keepdir \ |
| 189 |
- "${WEBROOT}"/htdocs \ |
| 190 |
- /var/log/cherokee \ |
| 191 |
- /var/lib/cherokee/graphs/images |
| 192 |
- fowners cherokee:cherokee \ |
| 193 |
- /var/log/cherokee \ |
| 194 |
- /var/lib/cherokee/graphs \ |
| 195 |
- /var/lib/cherokee/graphs/images |
| 196 |
- |
| 197 |
- # logrotate |
| 198 |
- insinto /etc/logrotate.d |
| 199 |
- newins "${FILESDIR}"/${PN}.logrotate-r1 ${PN} |
| 200 |
- |
| 201 |
- systemd_dounit "${FILESDIR}"/cherokee.service |
| 202 |
-} |
| 203 |
- |
| 204 |
-pkg_postinst() { |
| 205 |
- elog |
| 206 |
- if use admin ; then |
| 207 |
- elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090" |
| 208 |
- elog |
| 209 |
- elog "Cherokee currently supports configuration versioning, so from now on," |
| 210 |
- elog "whenever a change is made to the configuration file format," |
| 211 |
- elog "Cherokee-Admin will be able to automatically convert yours to the new" |
| 212 |
- elog "release. You simply have to load Cherokee-Admin and it will be converted" |
| 213 |
- elog "once you proceed to saving it." |
| 214 |
- elog |
| 215 |
- elog "There is also a command line utility that you can use to do the exact" |
| 216 |
- elog "same thing. Config format can change in different versions. It is" |
| 217 |
- elog "provided under:" |
| 218 |
- elog " ${EPREFIX}/usr/share/cherokee/admin/upgrade_config.py" |
| 219 |
- else |
| 220 |
- elog "Try USE=admin if you want an easy way to configure cherokee." |
| 221 |
- fi |
| 222 |
- elog |
| 223 |
- elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}." |
| 224 |
- elog |
| 225 |
-} |
| 226 |
|
| 227 |
diff --git a/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch b/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch |
| 228 |
deleted file mode 100644 |
| 229 |
index 7f96f68..0000000 |
| 230 |
--- a/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch |
| 231 |
+++ /dev/null |
| 232 |
@@ -1,36 +0,0 @@ |
| 233 |
-diff -Naur webserver-1.2.103.orig/admin/SystemStats.py webserver-1.2.103/admin/SystemStats.py |
| 234 |
---- webserver-1.2.103.orig/admin/SystemStats.py 2013-01-26 17:52:44.000000000 -0500 |
| 235 |
-+++ webserver-1.2.103/admin/SystemStats.py 2013-07-15 07:27:11.000000000 -0400 |
| 236 |
-@@ -39,7 +39,7 @@ |
| 237 |
- global _stats |
| 238 |
- |
| 239 |
- if not _stats: |
| 240 |
-- if sys.platform == 'linux2': |
| 241 |
-+ if sys.platform == 'linux2' or sys.platform == 'linux3': |
| 242 |
- _stats = System_stats__Linux() |
| 243 |
- elif sys.platform == 'darwin': |
| 244 |
- _stats = System_stats__Darwin() |
| 245 |
-diff -Naur webserver-1.2.103.orig/admin/util.py webserver-1.2.103/admin/util.py |
| 246 |
---- webserver-1.2.103.orig/admin/util.py 2013-01-26 17:52:44.000000000 -0500 |
| 247 |
-+++ webserver-1.2.103/admin/util.py 2013-07-15 07:29:12.000000000 -0400 |
| 248 |
-@@ -341,7 +341,7 @@ |
| 249 |
- def os_get_document_root(): |
| 250 |
- if sys.platform == 'darwin': |
| 251 |
- return "/Library/WebServer/Documents" |
| 252 |
-- elif sys.platform == 'linux2': |
| 253 |
-+ elif sys.platform == 'linux2' or sys.platform == 'linux3': |
| 254 |
- if os.path.exists ("/etc/redhat-release"): |
| 255 |
- return '/var/www' |
| 256 |
- elif os.path.exists ("/etc/fedora-release"): |
| 257 |
-diff -Naur webserver-1.2.103.orig/admin/wizards/php.py webserver-1.2.103/admin/wizards/php.py |
| 258 |
---- webserver-1.2.103.orig/admin/wizards/php.py 2013-01-26 17:52:44.000000000 -0500 |
| 259 |
-+++ webserver-1.2.103/admin/wizards/php.py 2013-07-15 07:29:47.000000000 -0400 |
| 260 |
-@@ -607,7 +607,7 @@ |
| 261 |
- first_group = str(root_group) |
| 262 |
- |
| 263 |
- # Systems |
| 264 |
-- if sys.platform == 'linux2': |
| 265 |
-+ if sys.platform == 'linux2' or sys.platform == 'linux3': |
| 266 |
- if os.getuid() == 0: |
| 267 |
- return root_group |
| 268 |
- return first_group |
Archives