Date: Tue, 12 Jul 2005 02:00:26 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/83274: Update port: www/cherokee to 0.4.24 Message-ID: <20050712020026.7d4544f2.tkato432@yahoo.com> Resent-Message-ID: <200507111710.j6BHAEOR058648@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 83274 >Category: ports >Synopsis: Update port: www/cherokee to 0.4.24 >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: Mon Jul 11 17:10:14 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p11 i386 >Organization: >Environment: >Description: - Update to version 0.4.24 New file: files/patch-Makefile.in files/patch-cherokee-fdpoll-kqueue.c Remove file: files/patch-cherokee-config_protocol_scanner.c files/patch-cherokee-validator_pam.c >How-To-Repeat: >Fix: diff -urN /usr/ports/www/cherokee/Makefile www/cherokee/Makefile --- /usr/ports/www/cherokee/Makefile Fri May 27 13:32:17 2005 +++ www/cherokee/Makefile Tue Jul 12 01:17:33 2005 @@ -6,7 +6,7 @@ # PORTNAME= cherokee -PORTVERSION= 0.4.23 +PORTVERSION= 0.4.24 CATEGORIES= www MASTER_SITES= http://www.0x50.org/download/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION} @@ -18,7 +18,6 @@ USE_GNOME= gnomehack gnometarget pkgconfig USE_GETOPT_LONG= yes -USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER= 15 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" @@ -42,15 +41,11 @@ .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 -PLIST_SUB+= PAM="" PAM5="@comment " +PLIST_SUB+= PAM="" .else -PLIST_SUB+= PAM="@comment " PAM5="" +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 \ @@ -70,7 +65,13 @@ @${ECHO_MSG} " `pwd` " post-install: - ${INSTALL_DATA} ${WRKSRC}/doc/Intro.txt ${DATADIR} +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR} +.endif + ${INSTALL_DATA} ${WRKSRC}/doc/develop/Intro.txt ${DATADIR} @${ECHO_MSG} " " @${ECHO_MSG} " Dont forget to read the doc " @${ECHO_MSG} " ${PREFIX}/share/cherokee/Intro.txt" diff -urN /usr/ports/www/cherokee/distinfo www/cherokee/distinfo --- /usr/ports/www/cherokee/distinfo Fri May 27 13:32:17 2005 +++ www/cherokee/distinfo Mon Jul 11 15:28:17 2005 @@ -1,2 +1,2 @@ -MD5 (cherokee-0.4.23.tar.gz) = 915416b891a7ac60d4d7a0868c305bd2 -SIZE (cherokee-0.4.23.tar.gz) = 1340107 +MD5 (cherokee-0.4.24.tar.gz) = dc51a96e46835fd2644048b12255bb81 +SIZE (cherokee-0.4.24.tar.gz) = 1402157 diff -urN /usr/ports/www/cherokee/files/patch-Makefile.in www/cherokee/files/patch-Makefile.in --- /usr/ports/www/cherokee/files/patch-Makefile.in Thu Jan 1 09:00:00 1970 +++ www/cherokee/files/patch-Makefile.in Tue Jul 12 01:18:38 2005 @@ -0,0 +1,30 @@ +--- Makefile.in.orig Thu Jul 7 23:03:20 2005 ++++ Makefile.in Tue Jul 12 01:18:30 2005 +@@ -305,7 +305,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = m4 contrib www doc icons qa cherokee cget ++SUBDIRS = m4 contrib www icons qa cherokee cget + bin_SCRIPTS = cherokee-config + SUFFIXES = .sample.pre .sample + +@@ -961,7 +961,7 @@ + + + .sample.pre.sample: +- $(top_builddir)/cherokee_replace $< $@ "%sysconfdir%" "${sysconfdir}" "%datadir%" "${datadir}" "%prefix%" "${prefix}" "%wwwroot%" "${WWW_ROOT}" ++ true $< $@ "%sysconfdir%" "${sysconfdir}" "%datadir%" "${datadir}" "%prefix%" "${prefix}" "%wwwroot%" "${WWW_ROOT}" + + install-data-local-config: + @$(mkinstalldirs) $(DESTDIR)$(pkgincludedir); +@@ -999,9 +999,6 @@ + echo "$@ will not overwrite existing $(cherokeeconfdir)/mime.conf"; \ + else \ + $(INSTALL_DATA) $(top_srcdir)/mime.conf.sample $(DESTDIR)$(cherokeeconfdir)/mime.conf; \ +- fi +- @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 + @if test -f $(DESTDIR)$(cherokeeconfdir)/sites-available/default ; then \ + echo "$@ will not overwrite existing $(cherokeeconfdir)/sites-available/default"; \ diff -urN /usr/ports/www/cherokee/files/patch-cherokee-buffer.c www/cherokee/files/patch-cherokee-buffer.c --- /usr/ports/www/cherokee/files/patch-cherokee-buffer.c Fri May 27 02:22:05 2005 +++ www/cherokee/files/patch-cherokee-buffer.c Thu Jan 1 09:00:00 1970 @@ -1,13 +0,0 @@ ---- cherokee/buffer.c.orig Tue May 24 00:46:59 2005 -+++ cherokee/buffer.c Tue May 24 16:18:01 2005 -@@ -39,6 +39,10 @@ - #include "util.h" - #include "crc32.h" - -+#ifndef va_copy -+#define va_copy(to,fr) ((to)=(fr)) -+#endif -+ - #define BUFFER_VA_LEN 200 - - #define TO_HEX(c) (c>9? c+'a'-10 : c+'0') diff -urN /usr/ports/www/cherokee/files/patch-cherokee-config_protocol_scanner.c www/cherokee/files/patch-cherokee-config_protocol_scanner.c --- /usr/ports/www/cherokee/files/patch-cherokee-config_protocol_scanner.c Fri May 27 02:22:05 2005 +++ www/cherokee/files/patch-cherokee-config_protocol_scanner.c Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- cherokee/config_protocol_scanner.c.orig Sat May 21 02:14:14 2005 -+++ cherokee/config_protocol_scanner.c Tue May 24 16:15:26 2005 -@@ -782,7 +782,7 @@ - case 6: - YY_RULE_SETUP - #line 47 "config_protocol_scanner.l" --{ yy_config_protocol_lval.number = atoll(yy_config_protocol_text); return T_NUM; } -+{ yy_config_protocol_lval.number = strtoll(yy_config_protocol_text, (char **)NULL, 10); return T_NUM; } - YY_BREAK - case 7: - /* rule 7 can match eol */ diff -urN /usr/ports/www/cherokee/files/patch-cherokee-fdpoll-kqueue.c www/cherokee/files/patch-cherokee-fdpoll-kqueue.c --- /usr/ports/www/cherokee/files/patch-cherokee-fdpoll-kqueue.c Thu Jan 1 09:00:00 1970 +++ www/cherokee/files/patch-cherokee-fdpoll-kqueue.c Mon Jul 11 15:42:04 2005 @@ -0,0 +1,11 @@ +--- cherokee/fdpoll-kqueue.c.orig Fri May 27 02:42:27 2005 ++++ cherokee/fdpoll-kqueue.c Mon Jul 11 15:41:35 2005 +@@ -92,7 +92,7 @@ + */ + index = fdp->nchanges; + if ( index > FDPOLL(fdp)->nfiles) { +- PRINT_ERROR ("ERROR: Maximum number of fd exeeded\n"); ++ PRINT_ERROR_S ("ERROR: Maximum number of fd exeeded\n"); + return ret_error; + } + fdp->idx_fd_chlist[fd] = index; 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 Sat Apr 23 20:48:02 2005 +++ www/cherokee/files/patch-cherokee-validator_pam.c Thu Jan 1 09:00:00 1970 @@ -1,12 +0,0 @@ ---- 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/pkg-plist www/cherokee/pkg-plist --- /usr/ports/www/cherokee/pkg-plist Fri May 27 13:32:18 2005 +++ www/cherokee/pkg-plist Tue Jul 12 01:16:55 2005 @@ -9,14 +9,13 @@ etc/cherokee/sites-available/default etc/cherokee/sites-available/example.com etc/cherokee/sites-enabled/default -%%PAM5%%etc/pam.d/cherokee include/cherokee/admin_client.h include/cherokee/buffer.h include/cherokee/cherokee-config.h include/cherokee/cherokee.h include/cherokee/common.h -include/cherokee/config_value.h include/cherokee/connection.h +include/cherokee/connection_info.h include/cherokee/downloader.h include/cherokee/encoder.h include/cherokee/fdpoll.h @@ -51,7 +50,6 @@ lib/cherokee/libplugin_plain.so lib/cherokee/libplugin_read_config.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 @@ -94,10 +92,36 @@ %%DATADIR%%/icons/text.png %%DATADIR%%/icons/unknown.png %%DATADIR%%/mime_types.txt +%%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html +%%PORTDOCS%%%%DOCSDIR%%/CGI_Executing.html +%%PORTDOCS%%%%DOCSDIR%%/Cget.html +%%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html +%%PORTDOCS%%%%DOCSDIR%%/Compiling_and_Installing.html +%%PORTDOCS%%%%DOCSDIR%%/Configuration.html +%%PORTDOCS%%%%DOCSDIR%%/Current_events.html +%%PORTDOCS%%%%DOCSDIR%%/Directory_configuration.html +%%PORTDOCS%%%%DOCSDIR%%/Directory_listing.html +%%PORTDOCS%%%%DOCSDIR%%/Extension_configuration.html +%%PORTDOCS%%%%DOCSDIR%%/FastCGI.html +%%PORTDOCS%%%%DOCSDIR%%/File_sending.html +%%PORTDOCS%%%%DOCSDIR%%/How_to_generate_SSL_keys.html +%%PORTDOCS%%%%DOCSDIR%%/Icons_configuration.html +%%PORTDOCS%%%%DOCSDIR%%/Main_Page.html +%%PORTDOCS%%%%DOCSDIR%%/Mime_types_configuration.html +%%PORTDOCS%%%%DOCSDIR%%/PHP_execution.html +%%PORTDOCS%%%%DOCSDIR%%/Redirections.html +%%PORTDOCS%%%%DOCSDIR%%/Server-conf-small.png +%%PORTDOCS%%%%DOCSDIR%%/Server_configuration.html +%%PORTDOCS%%%%DOCSDIR%%/U-Cherokee.html +%%PORTDOCS%%%%DOCSDIR%%/WebApplications.html +%%PORTDOCS%%%%DOCSDIR%%/WebSites.html +%%PORTDOCS%%%%DOCSDIR%%/cherokee.png +%%PORTDOCS%%%%DOCSDIR%%/index.html www/images/cherokee-logo.png www/images/powered_by_cherokee.png www/images/top-layer.png www/index.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%%/deps @dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050712020026.7d4544f2.tkato432>