* [gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/
@ 2015-10-12 1:04 Anthony G. Basile
0 siblings, 0 replies; 7+ messages in thread
From: Anthony G. Basile @ 2015-10-12 1:04 UTC (permalink / raw
To: gentoo-commits
commit: d3fe3614718c6b8a325e838a9a8a9e0a15d7fda1
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 01:10:07 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 01:10:07 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3fe3614
www-servers/cherokee: add libressl support
Package-Manager: portage-2.2.20.1
www-servers/cherokee/cherokee-1.2.104.ebuild | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild b/www-servers/cherokee/cherokee-1.2.104.ebuild
index a78bc08..16b7110 100644
--- a/www-servers/cherokee/cherokee-1.2.104.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.cherokee-project.com/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs"
+IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap libressl mysql nls pam php rrdtool ssl static static-libs"
COMMON_DEPEND="dev-libs/libpcre
>=sys-libs/zlib-1.1.4-r1
@@ -31,7 +31,11 @@ COMMON_DEPEND="dev-libs/libpcre
dev-lang/php[fpm]
dev-lang/php[cgi]
) )
- ssl? ( dev-libs/openssl )"
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ "
DEPEND="${COMMON_DEPEND}
nls? ( sys-devel/gettext )"
RDEPEND="${COMMON_DEPEND}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/
@ 2015-10-12 1:06 Anthony G. Basile
0 siblings, 0 replies; 7+ messages in thread
From: Anthony G. Basile @ 2015-10-12 1:06 UTC (permalink / raw
To: gentoo-commits
commit: 37c4dbc827282f57a21030df02f083dfeb4d026f
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 01:12:35 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 01:12:35 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c4dbc8
www-servers/cherokee: allow any slot for php.
Package-Manager: portage-2.2.20.1
www-servers/cherokee/cherokee-1.2.104.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild b/www-servers/cherokee/cherokee-1.2.104.ebuild
index 16b7110..6d4655b 100644
--- a/www-servers/cherokee/cherokee-1.2.104.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104.ebuild
@@ -28,8 +28,8 @@ COMMON_DEPEND="dev-libs/libpcre
nls? ( virtual/libintl )
pam? ( virtual/pam )
php? ( || (
- dev-lang/php[fpm]
- dev-lang/php[cgi]
+ dev-lang/php:*[fpm]
+ dev-lang/php:*[cgi]
) )
ssl? (
!libressl? ( dev-libs/openssl:0 )
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/
@ 2017-04-21 7:33 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2017-04-21 7:33 UTC (permalink / raw
To: gentoo-commits
commit: a2cb0a17ffc55a340ff461dfe7d172be0be07e0c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 07:32:16 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 07:32:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2cb0a17
www-servers/cherokee: [QA] Add missing python metadata variables
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-servers/cherokee/cherokee-1.2.104.ebuild | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild b/www-servers/cherokee/cherokee-1.2.104.ebuild
index a791ec440a8..adff732826e 100644
--- a/www-servers/cherokee/cherokee-1.2.104.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -17,8 +17,12 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap libressl mysql nls pam php rrdtool ssl static static-libs"
+RDEPEND=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-COMMON_DEPEND="dev-libs/libpcre
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/libpcre
>=sys-libs/zlib-1.1.4-r1
ffmpeg? ( virtual/ffmpeg )
geoip? ( dev-libs/geoip )
@@ -31,8 +35,8 @@ COMMON_DEPEND="dev-libs/libpcre
dev-lang/php:*[cgi]
) )
ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
)
"
DEPEND="${COMMON_DEPEND}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/
@ 2019-02-26 17:47 Brian Evans
0 siblings, 0 replies; 7+ messages in thread
From: Brian Evans @ 2019-02-26 17:47 UTC (permalink / raw
To: gentoo-commits
commit: ec39e30795cbd9220b1d87a2afac6d7da88d0828
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 17:47:06 2019 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 17:47:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec39e307
www-servers/cherokee: Revbump for dependencies and EAPI
Non-maintainer commit
Closes: https://bugs.gentoo.org/666084
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
...e-1.2.104.ebuild => cherokee-1.2.104-r1.ebuild} | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
similarity index 93%
rename from www-servers/cherokee/cherokee-1.2.104.ebuild
rename to www-servers/cherokee/cherokee-1.2.104-r1.ebuild
index adff732826e..0908c4897ba 100644
--- a/www-servers/cherokee/cherokee-1.2.104.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
WANT_AUTOMAKE="1.11"
PYTHON_COMPAT=( python2_7 )
-inherit autotools python-r1 eutils multilib pam systemd user
+inherit autotools python-r1 pam systemd user
DESCRIPTION="An extremely fast and tiny web server"
SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip"
@@ -27,7 +27,7 @@ COMMON_DEPEND="
ffmpeg? ( virtual/ffmpeg )
geoip? ( dev-libs/geoip )
ldap? ( net-nds/openldap )
- mysql? ( >=virtual/mysql-5 )
+ mysql? ( dev-db/mysql-connector-c:0= )
nls? ( virtual/libintl )
pam? ( virtual/pam )
php? ( || (
@@ -35,7 +35,7 @@ COMMON_DEPEND="
dev-lang/php:*[cgi]
) )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
+ !libressl? ( <dev-libs/openssl-1.1.0:0= )
libressl? ( dev-libs/libressl:0= )
)
"
@@ -48,10 +48,8 @@ RESTRICT="test"
WEBROOT="/var/www/localhost"
-src_unpack() {
- unpack ${A}
- mv "webserver-${PV}" "${S}" || die
-}
+PATCHES=( "${FILESDIR}/${PN}-1.2.99-gentoo.patch" )
+S="${WORKDIR}/webserver-${PV}"
pkg_setup() {
enewgroup cherokee
@@ -60,8 +58,7 @@ pkg_setup() {
src_prepare() {
python_setup
- epatch \
- "${FILESDIR}/${PN}-1.2.99-gentoo.patch"
+ default
"${S}/po/admin/generate_POTFILESin.py" > po/admin/POTFILES.in
eautoreconf
@@ -123,7 +120,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install
+ default
if ! use static-libs ; then
find "${ED}" -name '*.la' -delete || die
@@ -171,6 +168,9 @@ src_install() {
newins "${FILESDIR}"/${PN}.logrotate-r1 ${PN}
systemd_dounit "${FILESDIR}"/cherokee.service
+
+ # Fix QA error - not important if it fails
+ rmdir "${ED}"/var/run
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/
@ 2019-10-12 18:15 Mikle Kolyada
0 siblings, 0 replies; 7+ messages in thread
From: Mikle Kolyada @ 2019-10-12 18:15 UTC (permalink / raw
To: gentoo-commits
commit: 061a9a1f86047240770d9aebf51dd5f27718f350
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 18:14:56 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 18:14:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=061a9a1f
www-servers/cherokee: migrate to sys-libs/pam
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
www-servers/cherokee/cherokee-1.2.104-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
index 0908c4897ba..d73f066ac20 100644
--- a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="
ldap? ( net-nds/openldap )
mysql? ( dev-db/mysql-connector-c:0= )
nls? ( virtual/libintl )
- pam? ( virtual/pam )
+ pam? ( sys-libs/pam )
php? ( || (
dev-lang/php:*[fpm]
dev-lang/php:*[cgi]
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/
@ 2020-04-26 11:00 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2020-04-26 11:00 UTC (permalink / raw
To: gentoo-commits
commit: b02d95d505e7b12edf5d81e750a82e1efed82a72
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 10:59:24 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 10:59:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b02d95d5
www-servers/cherokee: Replace virtual/ffmpeg
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../cherokee/{cherokee-1.2.104-r1.ebuild => cherokee-1.2.104-r2.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
similarity index 99%
rename from www-servers/cherokee/cherokee-1.2.104-r1.ebuild
rename to www-servers/cherokee/cherokee-1.2.104-r2.ebuild
index 89557f2f8b9..c93835e180e 100644
--- a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
${PYTHON_DEPS}
dev-libs/libpcre
>=sys-libs/zlib-1.1.4-r1
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? ( media-video/ffmpeg )
geoip? ( dev-libs/geoip )
ldap? ( net-nds/openldap )
mysql? ( dev-db/mysql-connector-c:0= )
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/
@ 2020-07-28 18:20 Aaron Bauman
0 siblings, 0 replies; 7+ messages in thread
From: Aaron Bauman @ 2020-07-28 18:20 UTC (permalink / raw
To: gentoo-commits
commit: 5cef516c09efabe862c45a24b1f66665d73ba72f
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jul 28 13:53:16 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 18:20:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cef516c
www-servers/cherokee: use HTTPS, add app-arch/unzip dependency
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16879
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
www-servers/cherokee/cherokee-1.2.104-r2.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/www-servers/cherokee/cherokee-1.2.104-r2.ebuild b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
index c93835e180e..431f42db0e9 100644
--- a/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
@@ -11,7 +11,7 @@ inherit autotools python-r1 pam systemd user
DESCRIPTION="An extremely fast and tiny web server"
SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip"
-HOMEPAGE="http://www.cherokee-project.com/"
+HOMEPAGE="https://www.cherokee-project.com/"
LICENSE="GPL-2"
SLOT="0"
@@ -43,6 +43,7 @@ DEPEND="${COMMON_DEPEND}
nls? ( sys-devel/gettext )"
RDEPEND="${COMMON_DEPEND}
rrdtool? ( net-analyzer/rrdtool )"
+BDEPEND="app-arch/unzip"
RESTRICT="test"
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-07-28 18:20 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-12 1:06 [gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2020-07-28 18:20 Aaron Bauman
2020-04-26 11:00 David Seifert
2019-10-12 18:15 Mikle Kolyada
2019-02-26 17:47 Brian Evans
2017-04-21 7:33 David Seifert
2015-10-12 1:04 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox