ports/79977: Update port: www/cherokee to 0.4.19 (fix ports/79484)
KATO Tsuguru
tkato432 at yahoo.com
Fri Apr 15 16:10:30 UTC 2005
>Number: 79977
>Category: ports
>Synopsis: Update port: www/cherokee to 0.4.19 (fix ports/79484)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 15 16:10:28 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.11-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 0.4.19
New file:
files/patch-cherokee-socket.h
files/patch-cherokee-validator_pam.c
Remove file:
files/patch-cherokee.conf.sample.pre
files/patch-src::socket.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/www/cherokee/Makefile www/cherokee/Makefile
--- /usr/ports/www/cherokee/Makefile Sat Sep 18 21:27:24 2004
+++ www/cherokee/Makefile Fri Apr 15 13:24:36 2005
@@ -6,34 +6,59 @@
#
PORTNAME= cherokee
-PORTVERSION= 0.4.17
+PORTVERSION= 0.4.19
CATEGORIES= www
-MASTER_SITES= ftp://laurel.datsi.fi.upm.es/pub/linux/cherokee/%SUBDIR%/
+MASTER_SITES= http://www.0x50.org/download/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= An extremely fast and flexible web server
-LIB_DEPENDS= gnutls.12:${PORTSDIR}/security/gnutls
+LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_GNOME= gnomehack gnometarget pkgconfig
USE_GETOPT_LONG= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_LIBTOOL_VER= 15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
+CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www
INSTALLS_SHLIB= yes
MAN1= cherokee-config.1 cherokee.1
-CPPFLAGS= ${PTHREAD_CFLAGS}
-LDFLAGS= ${PTHREAD_LIBS}
+CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.if defined(WITHOUT_GNUTLS)
+USE_OPENSSL= yes
+CONFIGURE_ARGS+= --enable-tls=openssl
+LDFLAGS+= -lssl -lcrypto
+.else
+LIB_DEPENDS+= gnutls.12:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+= --enable-tls=gnutls
+.endif
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502126
-BROKEN= "Broken pkg-plist"
+.if ${OSVERSION} < 500000
+PLIST_SUB+= PAM=""
+.else
+PLIST_SUB+= PAM="@comment "
.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|$$(top_builddir)/sherokee_reinplace|true|g' \
+ ${WRKSRC}/Makefile.in
+
+pre-build:
+.for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example
+ @cd ${BUILD_WRKSRC} && ${SED} -e \
+ 's:%sysconfdir%:${PREFIX}/etc:g ; \
+ s:%datadir%:${PREFIX}/share:g ; \
+ s:%wwwroot%:${PREFIX}/www:g ; \
+ s:%prefix%:${PREFIX}:g' < ${file}.sample.pre > ${file}.sample
+.endfor
pre-install:
@if [ ! -f ${PREFIX}/www ]; then \
diff -urN /usr/ports/www/cherokee/distinfo www/cherokee/distinfo
--- /usr/ports/www/cherokee/distinfo Sun Jul 18 12:53:58 2004
+++ www/cherokee/distinfo Fri Apr 15 12:49:38 2005
@@ -1,2 +1,2 @@
-MD5 (cherokee-0.4.17.tar.gz) = 2cf8c8eb973e6b3e5578406b467f23b5
-SIZE (cherokee-0.4.17.tar.gz) = 800872
+MD5 (cherokee-0.4.19.tar.gz) = ecd2b9e52450bdd70f0eed8f0c803871
+SIZE (cherokee-0.4.19.tar.gz) = 1024984
diff -urN /usr/ports/www/cherokee/files/patch-cherokee-socket.h www/cherokee/files/patch-cherokee-socket.h
--- /usr/ports/www/cherokee/files/patch-cherokee-socket.h Thu Jan 1 09:00:00 1970
+++ www/cherokee/files/patch-cherokee-socket.h Fri Apr 1 13:12:49 2005
@@ -0,0 +1,19 @@
+--- cherokee/socket.h.orig Sun Mar 6 08:09:33 2005
++++ cherokee/socket.h Fri Apr 1 13:09:44 2005
+@@ -45,12 +45,12 @@
+ # include <sys/socket.h>
+ #endif
+
+-#ifdef HAVE_ARPA_INET_H
+-# include <arpa/inet.h>
+-#endif
+-
+ #ifdef HAVE_NETINET_IN_H
+ # include <netinet/in.h>
++#endif
++
++#ifdef HAVE_ARPA_INET_H
++# include <arpa/inet.h>
+ #endif
+
+ #if defined(HAVE_GNUTLS)
diff -urN /usr/ports/www/cherokee/files/patch-cherokee-validator_pam.c www/cherokee/files/patch-cherokee-validator_pam.c
--- /usr/ports/www/cherokee/files/patch-cherokee-validator_pam.c Thu Jan 1 09:00:00 1970
+++ www/cherokee/files/patch-cherokee-validator_pam.c Fri Apr 1 14:51:55 2005
@@ -0,0 +1,12 @@
+--- cherokee/validator_pam.c.orig Wed Mar 30 02:15:14 2005
++++ cherokee/validator_pam.c Fri Apr 1 14:51:10 2005
+@@ -27,6 +27,9 @@
+
+ #include <security/pam_appl.h>
+
++#include "connection.h"
++#include "connection-protected.h"
++
+
+ cherokee_module_info_t cherokee_pam_info = {
+ cherokee_validator, /* type */
diff -urN /usr/ports/www/cherokee/files/patch-cherokee.conf.sample.pre www/cherokee/files/patch-cherokee.conf.sample.pre
--- /usr/ports/www/cherokee/files/patch-cherokee.conf.sample.pre Sun Jul 18 03:58:41 2004
+++ www/cherokee/files/patch-cherokee.conf.sample.pre Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- cherokee.conf.sample.pre.orig Tue Jun 29 05:54:01 2004
-+++ cherokee.conf.sample.pre Sat Jul 17 22:19:43 2004
-@@ -68,7 +68,7 @@
- ## 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
-+DocumentRoot /usr/local/www/data
-
- ##
- ## Hide Version: Hide the software version
diff -urN /usr/ports/www/cherokee/files/patch-src::socket.h www/cherokee/files/patch-src::socket.h
--- /usr/ports/www/cherokee/files/patch-src::socket.h Sun Jul 18 03:58:41 2004
+++ www/cherokee/files/patch-src::socket.h Thu Jan 1 09:00:00 1970
@@ -1,19 +0,0 @@
---- src/socket.h.orig Sat Jun 19 23:03:54 2004
-+++ src/socket.h Sat Jul 17 20:36:02 2004
-@@ -45,12 +45,12 @@
- # include <sys/socket.h>
- #endif
-
--#ifdef HAVE_ARPA_INET_H
--# include <arpa/inet.h>
--#endif
--
- #ifdef HAVE_NETINET_IN_H
- # include <netinet/in.h>
-+#endif
-+
-+#ifdef HAVE_ARPA_INET_H
-+# include <arpa/inet.h>
- #endif
-
- #if defined(HAVE_GNUTLS)
diff -urN /usr/ports/www/cherokee/pkg-descr www/cherokee/pkg-descr
--- /usr/ports/www/cherokee/pkg-descr Sun Jul 18 12:53:58 2004
+++ www/cherokee/pkg-descr Fri Apr 15 12:39:21 2005
@@ -3,4 +3,4 @@
provides only the most basic HTTP functionality, but is extremely fast and
small.
-WWW: http://www.alobbs.com/cherokee/
+WWW: http://www.0x50.org/
diff -urN /usr/ports/www/cherokee/pkg-plist www/cherokee/pkg-plist
--- /usr/ports/www/cherokee/pkg-plist Sat Feb 19 23:25:15 2005
+++ www/cherokee/pkg-plist Fri Apr 1 22:13:34 2005
@@ -1,4 +1,4 @@
-bin/cherokee-bench
+bin/cget
bin/cherokee-config
bin/cherokee-panic
etc/cherokee/advanced.conf
@@ -9,99 +9,62 @@
etc/cherokee/sites-available/default
etc/cherokee/sites-available/example.com
etc/cherokee/sites-enabled/default
-include/cherokee/access.h
-include/cherokee/avl.h
include/cherokee/buffer.h
include/cherokee/cherokee-config.h
+include/cherokee/cherokee.h
include/cherokee/common.h
include/cherokee/connection.h
-include/cherokee/crc32.h
+include/cherokee/downloader.h
include/cherokee/encoder.h
-include/cherokee/encoder_table.h
include/cherokee/fdpoll.h
include/cherokee/handler.h
-include/cherokee/handler_table.h
-include/cherokee/handler_table_entry.h
include/cherokee/header.h
include/cherokee/http.h
-include/cherokee/icons.h
include/cherokee/list.h
-include/cherokee/list_ext.h
-include/cherokee/log.h
+include/cherokee/list_merge_sort.h
include/cherokee/logger.h
-include/cherokee/logger_table.h
-include/cherokee/match.h
-include/cherokee/matching_list.h
+include/cherokee/macros.h
include/cherokee/mime.h
-include/cherokee/mmap.h
include/cherokee/module.h
include/cherokee/module_loader.h
include/cherokee/server.h
-include/cherokee/socket.h
include/cherokee/table.h
-include/cherokee/tdate_parse.h
-include/cherokee/thread.h
-include/cherokee/validator.h
-include/cherokee/virtual_server.h
-lib/cherokee/libcherokee_cgi.a
-lib/cherokee/libcherokee_cgi.la
-lib/cherokee/libcherokee_cgi.so
-lib/cherokee/libcherokee_combined.a
-lib/cherokee/libcherokee_combined.la
-lib/cherokee/libcherokee_combined.so
-lib/cherokee/libcherokee_common.a
-lib/cherokee/libcherokee_common.la
-lib/cherokee/libcherokee_common.so
-lib/cherokee/libcherokee_dirlist.a
-lib/cherokee/libcherokee_dirlist.la
-lib/cherokee/libcherokee_dirlist.so
-lib/cherokee/libcherokee_file.a
-lib/cherokee/libcherokee_file.la
-lib/cherokee/libcherokee_file.so
-lib/cherokee/libcherokee_gotls.a
-lib/cherokee/libcherokee_gotls.la
-lib/cherokee/libcherokee_gotls.so
-lib/cherokee/libcherokee_gzip.a
-lib/cherokee/libcherokee_gzip.la
-lib/cherokee/libcherokee_gzip.so
-lib/cherokee/libcherokee_mono.a
-lib/cherokee/libcherokee_mono.la
-lib/cherokee/libcherokee_mono.so
-lib/cherokee/libcherokee_ncsa.a
-lib/cherokee/libcherokee_ncsa.la
-lib/cherokee/libcherokee_ncsa.so
-lib/cherokee/libcherokee_nn.a
-lib/cherokee/libcherokee_nn.la
-lib/cherokee/libcherokee_nn.so
-lib/cherokee/libcherokee_pam.a
-lib/cherokee/libcherokee_pam.la
-lib/cherokee/libcherokee_pam.so
-lib/cherokee/libcherokee_phpcgi.a
-lib/cherokee/libcherokee_phpcgi.la
-lib/cherokee/libcherokee_phpcgi.so
-lib/cherokee/libcherokee_plain.a
-lib/cherokee/libcherokee_plain.la
-lib/cherokee/libcherokee_plain.so
-lib/cherokee/libcherokee_redir.a
-lib/cherokee/libcherokee_redir.la
-lib/cherokee/libcherokee_redir.so
-lib/cherokee/libcherokee_remote_control.a
-lib/cherokee/libcherokee_remote_control.la
-lib/cherokee/libcherokee_remote_control.so
-lib/cherokee/libcherokee_server_info.a
-lib/cherokee/libcherokee_server_info.la
-lib/cherokee/libcherokee_server_info.so
-lib/cherokee/libcherokee_w3c.a
-lib/cherokee/libcherokee_w3c.la
-lib/cherokee/libcherokee_w3c.so
-lib/libcherokee.a
-lib/libcherokee.la
-lib/libcherokee.so
-lib/libcherokee.so.0
+include/cherokee/url.h
+include/cherokee/util.h
+lib/cherokee/libplugin_cgi.so
+lib/cherokee/libplugin_combined.so
+lib/cherokee/libplugin_common.so
+lib/cherokee/libplugin_dirlist.so
+lib/cherokee/libplugin_error_redir.so
+lib/cherokee/libplugin_file.so
+lib/cherokee/libplugin_gzip.so
+lib/cherokee/libplugin_ncsa.so
+lib/cherokee/libplugin_nn.so
+%%PAM%%lib/cherokee/libplugin_pam.so
+lib/cherokee/libplugin_phpcgi.so
+lib/cherokee/libplugin_plain.so
+lib/cherokee/libplugin_redir.so
+lib/cherokee/libplugin_remote_control.so
+lib/cherokee/libplugin_server_info.so
+lib/cherokee/libplugin_w3c.so
+lib/libcherokee-base.a
+lib/libcherokee-base.so
+lib/libcherokee-base.so.0
+lib/libcherokee-client.a
+lib/libcherokee-client.so
+lib/libcherokee-client.so.0
+lib/libcherokee-server.a
+lib/libcherokee-server.so
+lib/libcherokee-server.so.0
libdata/pkgconfig/cherokee.pc
sbin/cherokee
share/aclocal/cherokee.m4
%%DATADIR%%/Intro.txt
+%%DATADIR%%/deps/combined.deps
+%%DATADIR%%/deps/common.deps
+%%DATADIR%%/deps/error_redir.deps
+%%DATADIR%%/deps/nn.deps
+%%DATADIR%%/deps/phpcgi.deps
%%DATADIR%%/icons/back.png
%%DATADIR%%/icons/binary.png
%%DATADIR%%/icons/blank.png
@@ -109,6 +72,8 @@
%%DATADIR%%/icons/compressed.png
%%DATADIR%%/icons/folder.png
%%DATADIR%%/icons/image.png
+%%DATADIR%%/icons/iso.png
+%%DATADIR%%/icons/java.png
%%DATADIR%%/icons/movie.png
%%DATADIR%%/icons/pdf.png
%%DATADIR%%/icons/ps.png
@@ -120,6 +85,7 @@
%%DATADIR%%/icons/unknown.png
%%DATADIR%%/mime_types.txt
@dirrm %%DATADIR%%/icons
+ at dirrm %%DATADIR%%/deps
@dirrm %%DATADIR%%
@dirrm lib/cherokee
@dirrm include/cherokee
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list