From c8a5256592425e949eafc41d51949449275d9023 Mon Sep 17 00:00:00 2001 From: sthen Date: Sun, 14 Apr 2013 20:21:15 +0000 Subject: [PATCH] update to hiawatha-9.0 --- www/hiawatha/Makefile | 5 ++--- www/hiawatha/distinfo | 4 ++-- .../patches/patch-config_hiawatha_conf_in | 16 +++++++------- .../patches/patch-config_php-fcgi_conf_in | 16 -------------- www/hiawatha/patches/patch-man_hiawatha_1_in | 21 ++++++++----------- www/hiawatha/patches/patch-src_serverconfig_c | 10 ++++----- www/hiawatha/pkg/PLIST | 6 +----- 7 files changed, 27 insertions(+), 51 deletions(-) delete mode 100644 www/hiawatha/patches/patch-config_php-fcgi_conf_in diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile index 49b419b5a07..6fb95c62268 100644 --- a/www/hiawatha/Makefile +++ b/www/hiawatha/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.34 2013/03/11 11:44:42 espie Exp $ +# $OpenBSD: Makefile,v 1.35 2013/04/14 20:21:15 sthen Exp $ COMMENT= secure webserver -DISTNAME= hiawatha-8.6 +DISTNAME= hiawatha-9.0 CATEGORIES= www net HOMEPAGE= http://www.hiawatha-webserver.org/ @@ -29,7 +29,6 @@ NO_TEST= Yes pre-configure: ${SUBST_CMD} ${WRKSRC}/config/hiawatha.conf.in \ ${WRKSRC}/config/cgi-wrapper.conf \ - ${WRKSRC}/config/php-fcgi.conf.in \ ${WRKSRC}/man/hiawatha.1.in post-install: diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo index 2703c9654ed..6d8d37ffa83 100644 --- a/www/hiawatha/distinfo +++ b/www/hiawatha/distinfo @@ -1,2 +1,2 @@ -SHA256 (hiawatha-8.6.tar.gz) = Gn+pjOZr61T8hJDMeHRh1xmpjLDkqByu36GKyLW6Ozs= -SIZE (hiawatha-8.6.tar.gz) = 656420 +SHA256 (hiawatha-9.0.tar.gz) = XkARmvsFCxFzclDAjYmse6dHJkVzikjAaqeZeaGXKfw= +SIZE (hiawatha-9.0.tar.gz) = 666274 diff --git a/www/hiawatha/patches/patch-config_hiawatha_conf_in b/www/hiawatha/patches/patch-config_hiawatha_conf_in index 082d1b36aa0..a8ce6c64c08 100644 --- a/www/hiawatha/patches/patch-config_hiawatha_conf_in +++ b/www/hiawatha/patches/patch-config_hiawatha_conf_in @@ -1,18 +1,18 @@ -$OpenBSD: patch-config_hiawatha_conf_in,v 1.1 2012/12/12 09:39:53 jasper Exp $ ---- config/hiawatha.conf.in.orig Wed Dec 12 09:12:05 2012 -+++ config/hiawatha.conf.in Wed Dec 12 09:13:06 2012 +$OpenBSD: patch-config_hiawatha_conf_in,v 1.2 2013/04/14 20:21:15 sthen Exp $ +--- config/hiawatha.conf.in.orig Sat Mar 30 22:41:13 2013 ++++ config/hiawatha.conf.in Sun Apr 14 21:06:01 2013 @@ -4,7 +4,7 @@ # GENERAL SETTINGS # -#ServerId = www-data +ServerId = _hiawatha:_hiawatha - ConnectionsTotal = 150 - ConnectionsPerIP = 10 + ConnectionsTotal = 250 + ConnectionsPerIP = 25 SystemLogfile = @LOG_DIR@/system.log -@@ -44,12 +44,13 @@ Binding { - # These settings can be used to run CGI applications. Use the 'php-fcgi' - # tool to start PHP as a FastCGI daemon. +@@ -43,12 +43,13 @@ Binding { + # COMMON GATEWAY INTERFACE (CGI) SETTINGS + # These settings can be used to run CGI applications. # -#CGIhandler = /usr/bin/perl:pl -#CGIhandler = /usr/bin/php-cgi:php diff --git a/www/hiawatha/patches/patch-config_php-fcgi_conf_in b/www/hiawatha/patches/patch-config_php-fcgi_conf_in deleted file mode 100644 index c520d966a0e..00000000000 --- a/www/hiawatha/patches/patch-config_php-fcgi_conf_in +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-config_php-fcgi_conf_in,v 1.1 2012/12/12 09:39:53 jasper Exp $ ---- config/php-fcgi.conf.in.orig Wed Dec 12 09:09:08 2012 -+++ config/php-fcgi.conf.in Wed Dec 12 09:09:11 2012 -@@ -19,7 +19,8 @@ MaxRequests = 100 - # PHP FastCGI servers to start. - # Server = ;;;[:][;] - # --#Server = /usr/bin/php5-cgi ; 3 ; /var/lib/hiawatha/php-fcgi.sock ; www-data --#Server = /usr/bin/php5-cgi ; 2 ; 127.0.0.1:2005 ; 1000:100,101 --#Server = /usr/bin/php5-cgi ; 3 ; 127.0.0.1:2005 ; www-data ; /etc/php5/cgi/php.ini --#Server = /usr/chroot|usr/bin/php5-cgi ; 1 ; 127.0.0.1:2005 ; www-data -+#Server = /usr/chroot|usr/bin/php5-cgi ; 127.0.0.1:2005 ; www-data -+#Server = ${LOCALBASE}/bin/php-fastcgi ; 127.0.0.1:2005 ; _hiawatha -+#Server = ${LOCALBASE}/bin/php-fastcgi ; 127.0.0.1:2005 ; 579:579,67 -+#Server = ${LOCALBASE}/bin/php-fastcgi ; 127.0.0.1:2005 ; _hiawatha ; /var/www/conf/php.ini -+#Server = /var/chroot|${LOCALBASE}/bin/php-fastcgi ; 127.0.0.1:2005 ; _hiawatha diff --git a/www/hiawatha/patches/patch-man_hiawatha_1_in b/www/hiawatha/patches/patch-man_hiawatha_1_in index 51db03325ee..8066ff57694 100644 --- a/www/hiawatha/patches/patch-man_hiawatha_1_in +++ b/www/hiawatha/patches/patch-man_hiawatha_1_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-man_hiawatha_1_in,v 1.1 2012/12/12 09:39:53 jasper Exp $ ---- man/hiawatha.1.in.orig Wed Dec 12 09:16:46 2012 -+++ man/hiawatha.1.in Wed Dec 12 09:19:41 2012 -@@ -150,12 +150,12 @@ Example: CGIextension = cgi +$OpenBSD: patch-man_hiawatha_1_in,v 1.2 2013/04/14 20:21:15 sthen Exp $ +--- man/hiawatha.1.in.orig Sat Mar 30 22:41:13 2013 ++++ man/hiawatha.1.in Sun Apr 14 21:05:40 2013 +@@ -147,12 +147,12 @@ Example: CGIextension = cgi .B CGIhandler = :[, , ...] Specify the handler for a CGI extension. A handler is an executable which will 'run' the CGI script. .br @@ -16,7 +16,7 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.1 2012/12/12 09:39:53 jasper Exp $ .TP .B ConnectionsPerIP = Maximum number of simultaneous connections per IP address. -@@ -185,7 +185,7 @@ Example: HideProxy = 192.168.10.20 +@@ -187,7 +187,7 @@ Example: HideProxy = 192.168.10.20 .B Include | Include another configurationfile or configurationfiles in a directory. .br @@ -25,7 +25,7 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.1 2012/12/12 09:39:53 jasper Exp $ .TP .B KickOnBan = yes|no Close all other connections that originate from the same IP in case of a ban. -@@ -267,7 +267,7 @@ Example: RequestLimitMask = deny 192.168.0.1 +@@ -272,7 +272,7 @@ Example: RequestLimitMask = deny 192.168.0.1 .B ServerId = |:[,, ...] The userid and groupid(s) the server will change to. If only a userid is specified, the groupid(s) will be looked up in /etc/passwd and /etc/group. The userid en groupid of user root are not allowed here. The userid or groupid can also be a name. .br @@ -34,7 +34,7 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.1 2012/12/12 09:39:53 jasper Exp $ .TP .B ServerString = The text behind 'Server:' in the HTTP header of a response. Use 'none' to completely remove the Server string from the HTTP header. -@@ -558,7 +558,7 @@ Example: Setenv PHPRC = /var/www/conf +@@ -557,7 +557,7 @@ Example: Setenv PHPRC = /var/www/conf .B ShowIndex = yes|no||xml Return a directory listing in HTML format for a directory request when the startfile does not exist. If you want to change the index layout completely, specify the path of a XSLT file. If the XSLT file is not found or 'xml' is used, Hiawatha will output the XML of the directory index. The content of a .hiawatha_index in that directory will be included in the XML. .br @@ -43,7 +43,7 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.1 2012/12/12 09:39:53 jasper Exp $ .br (requires that Hiawatha was not compiled with -DENABLE_XSLT=off) -@@ -928,7 +928,7 @@ and +@@ -922,7 +922,7 @@ and .B UseGZfile .SH MIMETYPES @@ -52,7 +52,7 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.1 2012/12/12 09:39:53 jasper Exp $ .TP .B [ ...] Example: image/jpeg jpg jpeg jpe -@@ -955,15 +955,15 @@ Unban all IP addresses. +@@ -949,13 +949,13 @@ Unban all IP addresses. Clear the internal cache (requires that Hiawatha was not compiled with -DENABLE_CACHE=off). .SH FILES @@ -67,9 +67,6 @@ $OpenBSD: patch-man_hiawatha_1_in,v 1.1 2012/12/12 09:39:53 jasper Exp $ .br -.B /etc/hiawatha/cgi-wrapper.conf +.B ${SYSCONFDIR}/hiawatha/cgi-wrapper.conf - .br --.B /etc/hiawatha/php-fcgi.conf -+.B ${SYSCONFDIR}/hiawatha/php-fcgi.conf .SH SEE ALSO diff --git a/www/hiawatha/patches/patch-src_serverconfig_c b/www/hiawatha/patches/patch-src_serverconfig_c index 1c65382adea..ca61bc6ab52 100644 --- a/www/hiawatha/patches/patch-src_serverconfig_c +++ b/www/hiawatha/patches/patch-src_serverconfig_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_serverconfig_c,v 1.1 2012/12/12 09:39:53 jasper Exp $ ---- src/serverconfig.c.orig Wed Oct 31 19:16:45 2012 -+++ src/serverconfig.c Wed Dec 12 09:05:41 2012 +$OpenBSD: patch-src_serverconfig_c,v 1.2 2013/04/14 20:21:15 sthen Exp $ +--- src/serverconfig.c.orig Sat Mar 30 22:41:13 2013 ++++ src/serverconfig.c Sun Apr 14 21:04:44 2013 @@ -29,7 +29,7 @@ #include "libstr.h" #include "libfs.h" @@ -8,9 +8,9 @@ $OpenBSD: patch-src_serverconfig_c,v 1.1 2012/12/12 09:39:53 jasper Exp $ -#define ID_NOBODY 65534 +#define ID_HIAWATHA 579 #define MAX_LENGTH_CONFIGLINE 512 - #define MAX_CACHE_SIZE 50 + #define MAX_CACHE_SIZE 100 #define MAX_UPLOAD_SIZE 100 -@@ -261,8 +261,8 @@ t_config *default_config(void) { +@@ -263,8 +263,8 @@ t_config *default_config(void) { config->tomahawk_port = NULL; #endif diff --git a/www/hiawatha/pkg/PLIST b/www/hiawatha/pkg/PLIST index 4e3b294a48d..c1ebe7e4fa5 100644 --- a/www/hiawatha/pkg/PLIST +++ b/www/hiawatha/pkg/PLIST @@ -1,18 +1,16 @@ -@comment $OpenBSD: PLIST,v 1.13 2012/12/12 09:39:53 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.14 2013/04/14 20:21:15 sthen Exp $ @newgroup _hiawatha:579 @newuser _hiawatha:579:579:daemon:Hiawatha HTTP Server:/nonexistent:/sbin/nologin %%SHARED%% @bin bin/ssi-cgi @man man/man1/cgi-wrapper.1 @man man/man1/hiawatha.1 -@man man/man1/php-fcgi.1 @man man/man1/ssi-cgi.1 @man man/man1/wigwam.1 @mode u+s @bin sbin/cgi-wrapper @mode @bin sbin/hiawatha -@bin sbin/php-fcgi @bin sbin/wigwam share/examples/hiawatha/ @sample ${SYSCONFDIR}/hiawatha/ @@ -37,6 +35,4 @@ share/examples/hiawatha/index.xslt @group share/examples/hiawatha/mimetype.conf @sample ${SYSCONFDIR}/hiawatha/mimetype.conf -share/examples/hiawatha/php-fcgi.conf -@sample ${SYSCONFDIR}/hiawatha/php-fcgi.conf @rcscript ${RCDIR}/hiawatha