cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove www/cherokee.

Browse Source 
Upstream is almost dead. The package is a webserver, so better safe than sorry.

Help jca@ sthen@. OK jca@ and MAINTAINER.
This commit is contained in:
juanfra 2016-09-03 23:38:57 +00:00
parent 6566cba082
commit a2982f040a
28 changed files with 9 additions and 1726 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.407 2016/09/03 20:04:42 naddy Exp $
# $OpenBSD: Makefile,v 1.408 2016/09/03 23:38:57 juanfra Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-2.252
PKGNAME = quirks-2.253
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

7
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.419 2016/09/03 20:04:42 naddy Exp $
# $OpenBSD: Quirks.pm,v 1.420 2016/09/03 23:38:57 juanfra Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -813,6 +813,11 @@ my $obsolete_reason = {
'mlite' => 3,
'hgd' => 3,
'gfortran' => 5,
'cherokee-main' => 3,
'cherokee-geoip' => 3,
'cherokee-ldap' => 3,
'cherokee-mysql' => 3,
'cherokee-streaming' => 3,
# KDE3 removals
'amarok' => 2,

3
www/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.791 2016/09/02 10:10:16 landry Exp $
# $OpenBSD: Makefile,v 1.792 2016/09/03 23:38:57 juanfra Exp $
SUBDIR =
SUBDIR += ajaxterm
@ -24,7 +24,6 @@
SUBDIR += cgicc
SUBDIR += cgiparse
SUBDIR += cgit
SUBDIR += cherokee
SUBDIR += chive
SUBDIR += chromium
SUBDIR += clearsilver

131
www/cherokee/Makefile
View File

@ -1,131 +0,0 @@
# $OpenBSD: Makefile,v 1.59 2016/03/19 23:59:15 naddy Exp $
COMMENT-main = fast, flexible and easy to configure web server
COMMENT-geoip = GeoIP module for Cherokee web server
COMMENT-ldap = LDAP module for Cherokee web server
COMMENT-mysql = MySQL module for Cherokee web server
COMMENT-streaming = Streaming module for Cherokee web server
DIR = 1.2
VERSION = ${DIR}.101
DISTNAME = cherokee-${VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-ldap = cherokee-ldap-${VERSION}
PKGNAME-mysql = cherokee-mysql-${VERSION}
PKGNAME-geoip = cherokee-geoip-${VERSION}
PKGNAME-streaming = cherokee-streaming-${VERSION}
REVISION-main = 6
REVISION-geoip = 3
REVISION-ldap = 6
REVISION-mysql = 6
REVISION-streaming = 5
SHARED_LIBS = cherokee-base 0.0 \
cherokee-client 0.0 \
cherokee-server 0.0
CATEGORIES = www
HOMEPAGE = http://www.cherokee-project.com/
MAINTAINER = Fernando Quintero <fernando.a.quintero@gmail.com>
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = ${HOMEPAGE}download/${DIR}/${VERSION}/ \
http://ftp.heanet.ie/mirrors/cherokee/${DIR}/${VERSION}/ \
http://www.ring.gr.jp/archives/net/cherokee/${DIR}/${VERSION}/ \
http://cherokee.osuosl.org/${DIR}/${VERSION}/
MULTI_PACKAGES =-main -ldap -mysql -geoip -streaming
MODULES = lang/php \
lang/python
BUILD_DEPENDS = textproc/py-docutils \
lang/php/${MODPHP_VERSION},-fastcgi
LIB_DEPENDS-main = devel/pcre
WANTLIB-main = c crypto pcre pthread ssl
RUN_DEPENDS-main = ${RUN_DEPENDS} \
www/spawn-fcgi \
net/rrdtool
LIB_DEPENDS-geoip = net/GeoIP
WANTLIB-geoip = crypto GeoIP>=6
RUN_DEPENDS-geoip = ${BASE_PKGPATH}
LIB_DEPENDS-ldap = databases/openldap
WANTLIB-ldap = crypto lber-2.4 ldap-2.4 sasl2 ssl
RUN_DEPENDS-ldap = ${BASE_PKGPATH}
LIB_DEPENDS-mysql = databases/mariadb
WANTLIB-mysql = crypto m mysqlclient pthread ssl stdc++ z
RUN_DEPENDS-mysql = ${BASE_PKGPATH}
LIB_DEPENDS-streaming = graphics/ffmpeg>=20121026 \
archivers/bzip2
WANTLIB-streaming += avcodec avformat avutil bz2 crypto m gsm
WANTLIB-streaming += mp3lame ogg pthread speex vorbis vorbisenc
WANTLIB-streaming += vpx x264 xvidcore z opus ssl
WANTLIB-streaming += stdc++ swresample x265
RUN_DEPENDS-streaming = ${BASE_PKGPATH}
USE_GMAKE = Yes
LIBTOOL_FLAGS = --tag=disable-static
FAKE_FLAGS = cherokeeconfdir="${PREFIX}/share/examples/cherokee/etc" \
cherokeewwwdir="${PREFIX}/share/examples/cherokee/www" \
cherokeewwwimagesdir="${PREFIX}/share/examples/cherokee/www/images"
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.68
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_header_execinfo_h=no
CONFIGURE_ARGS = --disable-static \
--enable-tmpdir=/tmp \
--sysconfdir=${SYSCONFDIR} \
--with-cgiroot=/var/cherokee/cgi-bin \
--with-wwwroot=/var/cherokee \
--with-wwwuser=_cherokee \
--with-wwwgroup=_cherokee \
--disable-nls \
--disable-pam \
--with-ffmpeg \
--with-geoip \
--with-ldap \
--with-mysql \
--with-php=${LOCALBASE}/bin/php-fastcgi-${MODPHP_VERSION} \
--with-python=${MODPY_BIN}
.ifdef DEBUG
CONFIGURE_ARGS += --enable-trace
.endif
MODPY_ADJ_FILES=admin/CTK/CTK-run.pre admin/upgrade_config.py \
cherokee/cherokee-admin-launcher \
cherokee/cherokee-tweak doc/test_images.py \
po/po_stats.py admin/server.py qa/run-tests.py \
contrib/tracelor.py
LANGUAGES = en es de nl sv_SE zh_CN fr pt_BR pl ca it gl
pre-configure:
@${SUBST_CMD} ${WRKSRC}/cherokee/main_admin.c
post-install:
cd ${PREFIX}/share/cherokee/admin && find . -name "*.py" | \
xargs ${MODPY_BIN} ${MODPY_LIBDIR}/py_compile.py
touch ${PREFIX}/share/examples/cherokee/blank
.for i in ${LANGUAGES}
${INSTALL_DATA_DIR} ${PREFIX}/share/locale/$i/LC_MESSAGES
${INSTALL_DATA} ${WRKSRC}/po/admin/$i.gmo \
${PREFIX}/share/locale/$i/LC_MESSAGES/cherokee.mo
.endfor
@find ${PREFIX}/lib/cherokee -name '*.la' -print | xargs rm
.include <bsd.port.mk>

2
www/cherokee/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (cherokee-1.2.101.tar.gz) = ykZas3ckefyEOzj/xFETvyTYv66Rhc3VF2sJnVoX/rg=
SIZE (cherokee-1.2.101.tar.gz) = 6320209

22
www/cherokee/patches/patch-Makefile_in
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.4 2012/12/12 02:17:40 brad Exp $
--- Makefile.in.orig Tue Oct 18 15:38:21 2011
+++ Makefile.in Wed Oct 19 13:44:04 2011
@@ -1055,10 +1055,6 @@ uninstall-local-config:
fi
install-data-local: $(CONFS) install-data-local-config
- @$(mkinstalldirs) $(DESTDIR)$(localstatedir)
- @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
- @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
- @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/cherokee/graphs/images
@$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)
@$(mkinstalldirs) $(DESTDIR)$(cherokeeadmindir)
@if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \
@@ -1076,7 +1072,6 @@ install-data-local: $(CONFS) install-data-local-config
@if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \
$(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \
fi
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)
uninstall-local: uninstall-local-config
@if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \

11
www/cherokee/patches/patch-admin_configured_py_pre
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-admin_configured_py_pre,v 1.3 2010/12/20 07:51:58 ajacoutot Exp $
--- admin/configured.py.pre.orig Sun Dec 5 04:52:33 2010
+++ admin/configured.py.pre Wed Dec 15 16:37:42 2010
@@ -25,6 +25,6 @@ CHEROKEE_CONFDIR = join (SYSCONFDIR, "cherokee")
CHEROKEE_VAR_LOG = join (LOCALSTATE, "log")
CHEROKEE_VAR_RUN = join (LOCALSTATE, "run")
CHEROKEE_VAR_LIB = join (LOCALSTATE, "lib/cherokee")
-CHEROKEE_RRD_DIR = join (LOCALSTATE, "lib/cherokee/graphs")
+CHEROKEE_RRD_DIR = join (LOCALSTATE, "db/cherokee/graphs")
CHEROKEE_OWS_DIR = join (LOCALSTATE, "lib/cherokee/ows")
CHEROKEE_OWS_ROOT = join (LOCALSTATE, "lib/cherokee/ows/root")

13
www/cherokee/patches/patch-admin_wizards_php_py
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-admin_wizards_php_py,v 1.3 2012/12/12 02:17:40 brad Exp $
--- admin/wizards/php.py.orig Wed Oct 12 14:07:44 2011
+++ admin/wizards/php.py Wed Oct 19 13:52:56 2011
@@ -88,7 +88,8 @@ STD_ETC_PATHS = ['/etc/php.ini',
'/opt/local/etc/php*/php.ini',
'/etc/php*/*/php.ini',
'/etc/php*/php.ini',
- '/usr/local/lib*/php.ini']
+ '/usr/local/lib*/php.ini',
+ '/var/www/conf/php.ini']
CFG_PREFIX = 'tmp!wizard!php'

14
www/cherokee/patches/patch-cherokee_Makefile_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-cherokee_Makefile_in,v 1.9 2012/12/12 02:17:40 brad Exp $
--- cherokee/Makefile.in.orig Tue Oct 18 15:38:20 2011
+++ cherokee/Makefile.in Wed Oct 19 13:44:04 2011
@@ -1430,8 +1430,8 @@ $(common_ldflags) \
-module \
-avoid-version \
-export-dynamic \
-$(module_ldflags_w32)
-
+$(module_ldflags_w32) \
+-Wl,-rpath,${PREFIX}/lib/cherokee
#
# Rule directory

12
www/cherokee/patches/patch-cherokee_common-internal_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-cherokee_common-internal_h,v 1.1 2013/04/25 15:57:18 sthen Exp $
--- cherokee/common-internal.h.orig Thu Apr 25 09:35:31 2013
+++ cherokee/common-internal.h Thu Apr 25 09:46:45 2013
@@ -239,6 +239,8 @@ char *strcasestr(char *s, char *find);
# define TIME_MAX ((time_t)INT_MAX)
# elif (SIZEOF_TIME_T == SIZEOF_LONG)
# define TIME_MAX ((time_t)LONG_MAX)
+# elif (SIZEOF_TIME_T == SIZEOF_LONG_LONG)
+# define TIME_MAX ((time_t)LLONG_MAX)
# else
# error "Can't define TIME_MAX"
# endif

27
www/cherokee/patches/patch-cherokee_conf_sample_pre
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-cherokee_conf_sample_pre,v 1.7 2012/12/12 02:17:40 brad Exp $
--- cherokee.conf.sample.pre.orig Wed Oct 12 14:07:44 2011
+++ cherokee.conf.sample.pre Wed Oct 19 13:49:33 2011
@@ -13,6 +13,9 @@
#
server!bind!1!port = 80
server!timeout = 15
+server!user = _cherokee
+server!group = _cherokee
+server!ipv6 = 0
server!keepalive = 1
server!keepalive_max_requests = 500
server!server_tokens = full
@@ -27,11 +30,11 @@ vserver!1!directory_index = index.html
vserver!1!logger = combined
vserver!1!logger!access!type = file
-vserver!1!logger!access!filename = %localstatedir%/log/cherokee.access
+vserver!1!logger!access!filename = %localstatedir%/log/cherokee/cherokee.access
vserver!1!logger!access!buffsize = 16384
vserver!1!error_writer!type = file
-vserver!1!error_writer!filename = %localstatedir%/log/cherokee.error
+vserver!1!error_writer!filename = %localstatedir%/log/cherokee/cherokee.error
vserver!1!rule!1!match = default
vserver!1!rule!1!handler = common

75
www/cherokee/patches/patch-cherokee_handler_streaming_c
View File

@ -1,75 +0,0 @@
$OpenBSD: patch-cherokee_handler_streaming_c,v 1.2 2013/01/26 12:47:44 brad Exp $
Update for newer FFmpeg API.
--- cherokee/handler_streaming.c.orig Fri Jan 18 03:22:41 2013
+++ cherokee/handler_streaming.c Fri Jan 18 03:39:40 2013
@@ -110,10 +110,6 @@ cherokee_handler_streaming_free (cherokee_handler_stre
cherokee_handler_file_free (hdl->handler_file);
}
- if (hdl->avformat != NULL) {
- av_close_input_file (hdl->avformat);
- }
-
cherokee_buffer_mrproper (&hdl->local_file);
return ret_ok;
}
@@ -312,14 +308,14 @@ open_media_file (cherokee_handler_streaming_t *hdl)
/* Open the media stream
*/
- re = av_open_input_file (&hdl->avformat, hdl->local_file.buf, NULL, 0, NULL);
+ re = avformat_open_input (&hdl->avformat, hdl->local_file.buf, NULL, NULL);
if (re != 0) {
goto error;
}
/* Read the info
*/
- re = av_find_stream_info (hdl->avformat);
+ re = avformat_find_stream_info (hdl->avformat, NULL);
if (re < 0) {
goto error;
}
@@ -327,7 +323,7 @@ open_media_file (cherokee_handler_streaming_t *hdl)
return ret_ok;
error:
if (hdl->avformat != NULL) {
- av_close_input_file (hdl->avformat);
+ avformat_close_input (&hdl->avformat);
hdl->avformat = NULL;
}
@@ -380,7 +376,7 @@ set_auto_rate (cherokee_handler_streaming_t *hdl)
if (likely (secs > 0)) {
long tmp;
- tmp = (hdl->avformat->file_size / secs);
+ tmp = (hdl->handler_file->info->st_size / secs);
if (tmp > rate) {
rate = tmp;
TRACE(ENTRIES, "New rate: %d bytes/s\n", rate);
@@ -471,7 +467,7 @@ cherokee_handler_streaming_init (cherokee_handler_stre
ret = seek_mp3 (hdl);
if (unlikely (ret != ret_ok)) {
- return ret_error;
+ goto out;
}
}
@@ -480,6 +476,13 @@ cherokee_handler_streaming_init (cherokee_handler_stre
if (props->auto_rate) {
set_auto_rate (hdl);
}
+
+out:
+ /* Close our ffmpeg handle, all information has been gathered
+ */
+ if (hdl->avformat != NULL) {
+ avformat_close_input (&hdl->avformat);
+ }
return ret_ok;
}

12
www/cherokee/patches/patch-cherokee_main_admin_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-cherokee_main_admin_c,v 1.2 2012/12/12 02:17:40 brad Exp $
--- cherokee/main_admin.c.orig Wed Oct 12 14:07:44 2011
+++ cherokee/main_admin.c Wed Oct 19 13:51:21 2011
@@ -554,7 +554,7 @@ check_for_python (void)
int re;
pid_t pid;
int exitcode = -1;
- char const *args[] = {"env", "python", "-c", "raise SystemExit", NULL};
+ char const *args[] = {"env", "python${MODPY_VERSION}", "-c", "raise SystemExit", NULL};
pid = fork();
if (pid == -1) {

14
www/cherokee/patches/patch-cherokee_validator_ldap_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-cherokee_validator_ldap_c,v 1.1 2014/07/23 20:14:07 jca Exp $
Fix for CVE-2014-4668.
--- cherokee/validator_ldap.c.orig Tue Jul 22 12:40:31 2014
+++ cherokee/validator_ldap.c Tue Jul 22 12:41:11 2014
@@ -331,7 +331,8 @@ cherokee_validator_ldap_check (cherokee_validator_ldap
/* Sanity checks
*/
if ((conn->validator == NULL) ||
- cherokee_buffer_is_empty (&conn->validator->user))
+ cherokee_buffer_is_empty (&conn->validator->user) ||
+ cherokee_buffer_is_empty (&conn->validator->passwd))
return ret_error;
size = cherokee_buffer_cnt_cspn (&conn->validator->user, 0, "*()");

11
www/cherokee/patches/patch-configure_in
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-configure_in,v 1.1 2013/04/25 15:57:18 sthen Exp $
--- configure.in.orig Thu Apr 25 16:49:19 2013
+++ configure.in Thu Apr 25 16:49:31 2013
@@ -274,6 +274,7 @@ AC_CHECK_TYPE(wchar_t, unsigned short)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
AC_CHECK_SIZEOF(unsigned int)
AC_CHECK_SIZEOF(unsigned long)
AC_CHECK_SIZEOF(unsigned long long)

14
www/cherokee/patches/patch-constants_h_pre
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-constants_h_pre,v 1.3 2012/12/12 02:17:40 brad Exp $
--- constants.h.pre.orig Wed Oct 12 14:07:44 2011
+++ constants.h.pre Wed Oct 19 13:47:36 2011
@@ -10,8 +10,8 @@
# define CHEROKEE_DOCDIR "%docdir%"
# define CHEROKEE_VAR_RUN "%localstatedir%/run"
-# define CHEROKEE_FLCACHE "%localstatedir%/lib/cherokee/flcache"
-# define CHEROKEE_RRD_DIR "%localstatedir%/lib/cherokee/graphs"
+# define CHEROKEE_FLCACHE "%localstatedir%/db/cherokee/flcache"
+# define CHEROKEE_RRD_DIR "%localstatedir%/db/cherokee/graphs"
# define CHEROKEE_CONFDIR "%sysconfdir%/cherokee"
# define CHEROKEE_SERVER "%prefix%/sbin/cherokee"

3
www/cherokee/pkg/DESCR-geoip
View File

@ -1,3 +0,0 @@
Cherokee is a very fast, flexible and easy to configure Web Server.
This package contains the GeoIP rules for Cherokee.

4
www/cherokee/pkg/DESCR-ldap
View File

@ -1,4 +0,0 @@
Cherokee is a very fast, flexible and easy to configure Web Server.
This package contains the LDAP validator allows you to authenticate a
user using the Lightweight Directory Access Protocol v3.

5
www/cherokee/pkg/DESCR-main
View File

@ -1,5 +0,0 @@
Cherokee is a very fast, flexible and easy to configure Web Server. It
supports the widespread technologies nowadays: FastCGI, SCGI, PHP, CGI,
TLS and SSL encrypted connections, Virtual hosts, Authentication, on the
fly encoding, Load balancing, Apache compatible log files, and much
more.

4
www/cherokee/pkg/DESCR-mysql
View File

@ -1,4 +0,0 @@
Cherokee is a very fast, flexible and easy to configure Web Server.
This package contains the MySQL validator allows you to authenticate a
user against a MySQL database.

4
www/cherokee/pkg/DESCR-streaming
View File

@ -1,4 +0,0 @@
Cherokee is a very fast, flexible and easy to configure Web Server.
This package contains the streaming module, which allows you to stream
video files.

5
www/cherokee/pkg/MESSAGE-main
View File

@ -1,5 +0,0 @@
To complete the installation, you need to configure cherokee. As root:
# ${TRUEPREFIX}/sbin/cherokee-admin -b[IP] -p[PORT]
(by default it will bind to 127.0.0.1 on port 9090).

2
www/cherokee/pkg/PLIST-geoip
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PLIST-geoip,v 1.2 2012/12/12 02:17:40 brad Exp $
lib/cherokee/libplugin_geoip.so

2
www/cherokee/pkg/PLIST-ldap
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PLIST-ldap,v 1.2 2012/12/12 02:17:40 brad Exp $
lib/cherokee/libplugin_ldap.so

1317
www/cherokee/pkg/PLIST-main
View File

File diff suppressed because it is too large Load Diff

3
www/cherokee/pkg/PLIST-mysql
View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PLIST-mysql,v 1.4 2012/12/12 02:17:40 brad Exp $
lib/cherokee/libplugin_dbslayer.so
lib/cherokee/libplugin_mysql.so

2
www/cherokee/pkg/PLIST-streaming
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PLIST-streaming,v 1.2 2012/12/12 02:17:40 brad Exp $
lib/cherokee/libplugin_streaming.so

12
www/cherokee/pkg/cherokee.rc
View File

@ -1,12 +0,0 @@
#!/bin/sh
#
# $OpenBSD: cherokee.rc,v 1.6 2015/07/15 23:29:57 ajacoutot Exp $
daemon="${TRUEPREFIX}/sbin/cherokee -d"
. /etc/rc.d/rc.subr
# extra space injected in the process list
pexp="${TRUEPREFIX}/sbin/cherokee ${daemon_flags:+ ${daemon_flags}}"
rc_cmd $1