This diff updates www/hiawatha to the latest available version.
Use 'patch -E'.
--
Antoine
diff -ruN --exclude CVS /usr/ports/www/hiawatha/Makefile hiawatha/Makefile
--- /usr/ports/www/hiawatha/Makefile Sun Dec 31 20:15:51 2006
+++ hiawatha/Makefile Sat Feb 17 19:34:15 2007
@@ -2,8 +2,7 @@
COMMENT= "secure webserver"
-DISTNAME= hiawatha-5.4
-PKGNAME= ${DISTNAME}p0
+DISTNAME= hiawatha-5.6
CATEGORIES= www net
HOMEPAGE= http://hiawatha.leisink.org
@@ -30,8 +29,8 @@
perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g;' \
-e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' \
${WRKSRC}/etc/hiawatha/httpd.conf.in \
- ${WRKSRC}/etc/hiawatha/cgi_wrapper.conf \
- ${WRKSRC}/doc/cgi_wrapper.1 \
+ ${WRKSRC}/etc/hiawatha/cgi-wrapper.conf \
+ ${WRKSRC}/doc/cgi-wrapper.1 \
${WRKSRC}/doc/hiawatha.1
post-install:
diff -ruN --exclude CVS /usr/ports/www/hiawatha/distinfo hiawatha/distinfo
--- /usr/ports/www/hiawatha/distinfo Sun Dec 31 11:32:42 2006
+++ hiawatha/distinfo Sat Feb 17 19:08:02 2007
@@ -1,4 +1,5 @@
-MD5 (hiawatha-5.4.tar.gz) = afabfddfd7525e95dbe893eacb1ee325
-RMD160 (hiawatha-5.4.tar.gz) = 370f138e3678abdfd5e03617f57b439c9b91b7c5
-SHA1 (hiawatha-5.4.tar.gz) = c98d91dd3b8ab18abc514e9ebe8506a3b12b3cc8
-SIZE (hiawatha-5.4.tar.gz) = 184894
+MD5 (hiawatha-5.6.tar.gz) = 3c471a19793e838b58201d711f19d0c3
+RMD160 (hiawatha-5.6.tar.gz) = 2e8b11938ebb2919e8071ba99e58a2c2214c93db
+SHA1 (hiawatha-5.6.tar.gz) = f6a460b88ebfd34dc087adbaa0116a24c2af3956
+SHA256 (hiawatha-5.6.tar.gz) =
27f570eb41409606cdf16b77e73293587e2337a7c4f2981eae0a019dc461991a
+SIZE (hiawatha-5.6.tar.gz) = 194423
diff -ruN --exclude CVS /usr/ports/www/hiawatha/patches/patch-Makefile_in
hiawatha/patches/patch-Makefile_in
--- /usr/ports/www/hiawatha/patches/patch-Makefile_in Sun Dec 31 11:32:42 2006
+++ hiawatha/patches/patch-Makefile_in Sat Feb 17 19:24:12 2007
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/12/31 10:32:42 ajacoutot Exp $
---- Makefile.in.orig Sat Dec 16 14:37:10 2006
-+++ Makefile.in Wed Dec 20 12:07:53 2006
-@@ -727,9 +727,8 @@ info: info-am
+--- Makefile.in.orig Sat Feb 17 19:22:27 2007
++++ Makefile.in Sat Feb 17 19:23:01 2007
+@@ -785,9 +785,8 @@ info: info-am
info-am:
@@ -10,5 +10,5 @@
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-exec-am: install-sbinPROGRAMS
-
+ install-exec-am: install-sbinPROGRAMS install-sbinSCRIPTS
+ @$(NORMAL_INSTALL)
diff -ruN --exclude CVS /usr/ports/www/hiawatha/patches/patch-doc_cgi-wrapper_1
hiawatha/patches/patch-doc_cgi-wrapper_1
--- /usr/ports/www/hiawatha/patches/patch-doc_cgi-wrapper_1 Thu Jan 1
01:00:00 1970
+++ hiawatha/patches/patch-doc_cgi-wrapper_1 Sat Feb 17 19:23:35 2007
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/cgi-wrapper.1.orig Sat Feb 17 19:16:27 2007
++++ doc/cgi-wrapper.1 Sat Feb 17 19:17:10 2007
+@@ -11,7 +11,7 @@ cgi-wrapper
+ The CGI-wrapper can be used to run certain CGI programs with a different
userid then the webserver's userid. To function properly, the CGI-wrapper
binary needs the su-bit. To prevent abuse, it has the necessary security
checks. As a result, the CGI-wrapper can only be executed by the Hiawatha
webserver.
+
+ .SH CONFIGURATION
+-The CGI-wrapper can be configured via the configuration file
/etc/hiawatha/cgi-wrapper.conf. The following options are available:
++The CGI-wrapper can be configured via the configuration file
!!SYSCONFDIR!!/hiawatha/cgi-wrapper.conf. The following options are available:
+ .TP
+ .B CGIhandler = <CGI handler>[, <CGI handler>, ...]
+ Normally, only files inside the DocumentRoot will be executed. CGI-handlers
are usually not inside this directory. Use this option to specify binaries that
are outside the DocumentRoot and the CGI-wrapper is still allowed to execute.
diff -ruN --exclude CVS /usr/ports/www/hiawatha/patches/patch-doc_cgi_wrapper_1
hiawatha/patches/patch-doc_cgi_wrapper_1
--- /usr/ports/www/hiawatha/patches/patch-doc_cgi_wrapper_1 Sun Dec 31
11:32:42 2006
+++ hiawatha/patches/patch-doc_cgi_wrapper_1 Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-doc_cgi_wrapper_1,v 1.1.1.1 2006/12/31 10:32:42 ajacoutot Exp $
---- doc/cgi_wrapper.1.orig Wed Dec 20 14:42:36 2006
-+++ doc/cgi_wrapper.1 Wed Dec 20 14:39:44 2006
-@@ -9,7 +9,7 @@ cgi_wrapper
- The CGI wrapper is part of the Hiawatha webserver. See hiawatha(1) for more
information about Hiawatha.
-
- .SH CGI WRAPPER
--The CGI wrapper can be used to run certain CGI programs with a different
userid then Hiawatha's userid. It replaces the HostId option in previous
versions. To function properly, the CGI wrapper binary needs the su-bit. To
prevent abuse, it has the necessary security checks. As a result, the CGI
wrapper can only be executed by Hiawatha. Via the configuration file
(/etc/hiawatha/cgi_wrapper.conf), you can specify what the CGI wrapper is
allowed to execute.
-+The CGI wrapper can be used to run certain CGI programs with a different
userid then Hiawatha's userid. It replaces the HostId option in previous
versions. To function properly, the CGI wrapper binary needs the su-bit. To
prevent abuse, it has the necessary security checks. As a result, the CGI
wrapper can only be executed by Hiawatha. Via the configuration file
(!!SYSCONFDIR!!/hiawatha/cgi_wrapper.conf), you can specify what the CGI
wrapper is allowed to execute.
- .br
-
- The following options are available:
diff -ruN --exclude CVS /usr/ports/www/hiawatha/patches/patch-doc_hiawatha_1
hiawatha/patches/patch-doc_hiawatha_1
--- /usr/ports/www/hiawatha/patches/patch-doc_hiawatha_1 Sun Dec 31
11:32:42 2006
+++ hiawatha/patches/patch-doc_hiawatha_1 Sat Feb 17 19:24:42 2007
@@ -1,7 +1,7 @@
$OpenBSD: patch-doc_hiawatha_1,v 1.1.1.1 2006/12/31 10:32:42 ajacoutot Exp $
---- doc/hiawatha.1.orig Thu Dec 28 13:27:50 2006
-+++ doc/hiawatha.1 Fri Dec 29 07:25:00 2006
-@@ -21,7 +21,7 @@ hiawatha \- Advanced and secure webserve
+--- doc/hiawatha.1.orig Sat Feb 17 19:17:43 2007
++++ doc/hiawatha.1 Sat Feb 17 19:22:12 2007
+@@ -23,7 +23,7 @@ hiawatha \- Advanced and secure webserve
Hiawatha is a secure webserver for Unix. It has been written with 'being
secure' as its main goal. Hiawatha has lots of features that no other webserver
has. This and the fact that Hiawatha's source code is free of security-bugs,
makes Hiawatha the most secure webserver available.
.br
@@ -10,16 +10,16 @@
.\" ==========[ Configuration files
]==========================================
.SH CONFIGURATION FILES
-@@ -151,7 +151,7 @@ Example: CGIhandler = /usr/bin/php4-cgi:
+@@ -150,7 +150,7 @@ Example: CGIhandler = /usr/bin/php4-cgi:
.B CGIwrapper = <CGI wrapper>
- Specify the wrapper for CGI processes. A secure CGI wrapper is included in
the Hiawatha package. See cgi_wrapper(1) for more information.
+ Specify the wrapper for CGI processes. A secure CGI wrapper is included in
the Hiawatha package. See cgi-wrapper(1) for more information.
.br
--Example: CGIwrapper = /usr/sbin/cgi_wrapper
-+Example: CGIwrapper = !!LOCALBASE!!/sbin/cgi_wrapper
+-Example: CGIwrapper = /usr/sbin/cgi-wrapper
++Example: CGIwrapper = !!LOCALBASE!!/sbin/cgi-wrapper
.TP
- .B CommandChannel = <portnumber>,<password>
- The port and the password for the CommandChannel. You can use telnet to
connect to the CommandChannel. The password must be encrypted with the crypt(3)
function. You can only connect to the CommandChannel from localhost. Type
'help' in the CommandChannel for more information. This feature must be
switched on during compilation of Hiawatha.
-@@ -179,7 +179,7 @@ Example: GarbageLogfile = /var/log/hiawa
+ .B CommandChannel = <portnumber>,<MD5 hash of password>
+ The port and the password for the CommandChannel. You can use telnet to
connect to the CommandChannel (localhost:<portnumber>). Type 'help' in the
CommandChannel for more information.
+@@ -183,7 +183,7 @@ Example: GarbageLogfile = /var/log/hiawa
.B Include <filename>
Include another configurationfile.
.br
@@ -28,17 +28,26 @@
.TP
.B KickOnBan = yes|no
Close all other connections that originate from the same IP in case of a ban.
-@@ -214,7 +214,7 @@ Default = /var/run/hiawatha.pid, example
+@@ -223,7 +223,7 @@ Default = /var/run/hiawatha.pid, example
.B ServerId = <userid>|<userid>:<groupid>[,<groupid>, ...]
- 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 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 'root' are not allowed here.
.br
-Default = 65534:65534, example: ServerId = www-data
+Default = 579:579, example: ServerId = www-data
.TP
.B ServerKey = <SSL certificate file>
The file containing the SSL private key and certificate. These will be used
for all SSL bindings that don't have their own certificate file. See ServerKey
and UseSSL in the BINDING section.
-@@ -566,13 +566,13 @@ and
- .B StartFile
+@@ -251,7 +251,7 @@ Default = /var/log/hiawatha/system.log,
+ .B ThrottleConfig = <configurationfile>
+ The location of the throttle configurationfile. It the path is omitted,
Hiawatha's configurationfile directory will be used.
+ .br
+-Default = throttle.conf, example: ThrottleConfig =
/etc/somewhere/throttle.conf
++Default = throttle.conf, example: ThrottleConfig =
/etc/somewhere/throttle.conf
+ .TP
+ .B TimeForCGI = <time>
+ Maximum time in seconds for a CGI-process to finish its job.
+@@ -580,13 +580,13 @@ and
+ .B UseGZfile
.SH MIMETYPES
-Specify the mimetypes of files in /etc/hiawatha/mimetypes.conf.
@@ -53,7 +62,7 @@
.TP
.B <main-mimetype>/[<sub-mimetype>]:<uploadspeed in kB/s>
Example: audio/mpeg:30 or video/:30
-@@ -599,15 +599,15 @@ Will unban all clients.
+@@ -613,15 +613,15 @@ Will unban all clients.
Will disconnect all clients.
.SH FILES
@@ -69,8 +78,8 @@
-.B /etc/hiawatha/throttle.conf
+.B !!SYSCONFDIR!!/hiawatha/throttle.conf
.br
--.B /etc/hiawatha/cgi_wrapper.conf
-+.B !!SYSCONFDIR!!/hiawatha/cgi_wrapper.conf
+-.B /etc/hiawatha/cgi-wrapper.conf
++.B !!SYSCONFDIR!!/hiawatha/cgi-wrapper.conf
+
.SH SEE ALSO
- cgi_wrapper(1)
diff -ruN --exclude CVS
/usr/ports/www/hiawatha/patches/patch-etc_hiawatha_cgi-wrapper_conf
hiawatha/patches/patch-etc_hiawatha_cgi-wrapper_conf
--- /usr/ports/www/hiawatha/patches/patch-etc_hiawatha_cgi-wrapper_conf Thu Jan
1 01:00:00 1970
+++ hiawatha/patches/patch-etc_hiawatha_cgi-wrapper_conf Sat Feb 17
19:31:46 2007
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- etc/hiawatha/cgi-wrapper.conf.orig Sat Feb 17 19:25:38 2007
++++ etc/hiawatha/cgi-wrapper.conf Sat Feb 17 19:28:03 2007
+@@ -4,9 +4,9 @@
+
+ # CGIhandler = /path/to/cgi_handler
+ #
+-#CGIhandler = /usr/bin/php-cgi
++#CGIhandler = !!LOCALBASE!!/bin/php
+ #CGIhandler = /usr/bin/perl
+-#CGIhandler = /usr/bin/python
++#CGIhandler = !!LOCALBASE!!/bin/python
+
+ # Wrap = <wrap-id>:<cgiroot>:<userid>[:<group>]
+ #
diff -ruN --exclude CVS
/usr/ports/www/hiawatha/patches/patch-etc_hiawatha_cgi_wrapper_conf
hiawatha/patches/patch-etc_hiawatha_cgi_wrapper_conf
--- /usr/ports/www/hiawatha/patches/patch-etc_hiawatha_cgi_wrapper_conf Sun Dec
31 11:32:42 2006
+++ hiawatha/patches/patch-etc_hiawatha_cgi_wrapper_conf Thu Jan 1
01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-etc_hiawatha_cgi_wrapper_conf,v 1.1.1.1 2006/12/31 10:32:42
ajacoutot Exp $
---- etc/hiawatha/cgi_wrapper.conf.orig Wed Dec 20 14:27:46 2006
-+++ etc/hiawatha/cgi_wrapper.conf Wed Dec 20 14:28:20 2006
-@@ -2,7 +2,7 @@
-
- # CGIhandler = /path/to/cgihandler
- #
--#CGIhandler = /usr/bin/php4-cgi
-+#CGIhandler = !!LOCALBASE!!/bin/php
- #CGIhandler = /usr/bin/perl
-
- # Wrap = <wrap-id>:<cgiroot>:<userid>[:<group>]
diff -ruN --exclude CVS
/usr/ports/www/hiawatha/patches/patch-etc_hiawatha_httpd_conf_in
hiawatha/patches/patch-etc_hiawatha_httpd_conf_in
--- /usr/ports/www/hiawatha/patches/patch-etc_hiawatha_httpd_conf_in Sun Dec
31 11:32:42 2006
+++ hiawatha/patches/patch-etc_hiawatha_httpd_conf_in Sat Feb 17 19:31:46 2007
@@ -1,20 +1,24 @@
$OpenBSD: patch-etc_hiawatha_httpd_conf_in,v 1.1.1.1 2006/12/31 10:32:42
ajacoutot Exp $
---- etc/hiawatha/httpd.conf.in.orig Thu Dec 7 11:11:51 2006
-+++ etc/hiawatha/httpd.conf.in Wed Dec 20 14:57:37 2006
-@@ -7,13 +7,13 @@ Binding {
- # TimeForRequest = 3,20
- }
+--- etc/hiawatha/httpd.conf.in.orig Sat Feb 17 19:25:56 2007
++++ etc/hiawatha/httpd.conf.in Sat Feb 17 19:29:43 2007
+@@ -4,7 +4,7 @@
+ # GENERAL SETTINGS
+ #
-ServerId = 33:33
+ServerId = _hiawatha:_hiawatha
ConnectionsTotal = 150
ConnectionsPerIP = 10
SystemLogfile = @logdir@/system.log
--#CGIhandler = /usr/bin/php4-cgi:php
+@@ -45,9 +45,9 @@ Binding {
+ # These settings can be used to run CGI applications. Use the 'php-fcgi'
+ # tool to start PHP as a FastCGI daemon.
+ #
+-#CGIhandler = /usr/bin/php-cgi:php
+#CGIhandler = !!LOCALBASE!!/bin/php:php
#CGIhandler = /usr/bin/perl:pl
-#CGIhandler = /usr/bin/python:py
+#CGIhandler = !!LOCALBASE!!/bin/python:py
+ #CGIextension = cgi
+ #
#TimeForCGI = 5
- #BanOnMaxPerIP = 2
-
diff -ruN --exclude CVS /usr/ports/www/hiawatha/patches/patch-serverconfig_c
hiawatha/patches/patch-serverconfig_c
--- /usr/ports/www/hiawatha/patches/patch-serverconfig_c Sun Dec 31
11:32:42 2006
+++ hiawatha/patches/patch-serverconfig_c Sat Feb 17 19:31:46 2007
@@ -1,23 +1,23 @@
$OpenBSD: patch-serverconfig_c,v 1.1.1.1 2006/12/31 10:32:42 ajacoutot Exp $
---- serverconfig.c.orig Sun Dec 24 13:08:08 2006
-+++ serverconfig.c Thu Dec 28 07:39:33 2006
-@@ -19,7 +19,7 @@
- #define mc_NO_BINDING -5
- #define mc_REQUIRE -6
+--- serverconfig.c.orig Sat Feb 17 19:30:11 2007
++++ serverconfig.c Sat Feb 17 19:31:38 2007
+@@ -13,7 +13,7 @@
+ #include "libstr.h"
+ #include "libfs.h"
--#define id_NOBODY 65534
-+#define id_HIAWATHA 579
+-#define ID_NOBODY 65534
++#define ID_HIAWATHA 579
+ #define MAX_LENGTH_CONFIGLINE 512
+ #define MAX_CACHE_SIZE 50
- enum t_section { syntax_error = -1, none, binding, virtualhost, directory,
fcgi_server };
- enum t_section_type { tag, bracket, end };
-@@ -171,8 +171,8 @@ t_config *default_config(void) {
+@@ -178,8 +178,8 @@ t_config *default_config(void) {
#endif
config->server_root = NULL;
-- config->server_uid = (uid_t)id_NOBODY;
-- config->server_gid = (gid_t)id_NOBODY;
-+ config->server_uid = (uid_t)id_HIAWATHA;
-+ config->server_gid = (gid_t)id_HIAWATHA;
+- config->server_uid = (uid_t)ID_NOBODY;
+- config->server_gid = (gid_t)ID_NOBODY;
++ config->server_uid = (uid_t)ID_HIAWATHA;
++ config->server_gid = (gid_t)ID_HIAWATHA;
config->server_string = "Hiawatha v"VERSION;
config->groups.number = 0;
config->groups.array = NULL;
diff -ruN --exclude CVS /usr/ports/www/hiawatha/pkg/PLIST hiawatha/pkg/PLIST
--- /usr/ports/www/hiawatha/pkg/PLIST Sun Dec 31 11:32:42 2006
+++ hiawatha/pkg/PLIST Sat Feb 17 19:40:23 2007
@@ -1,14 +1,20 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/12/31 10:32:42 ajacoutot Exp $
@newgroup _hiawatha:579
@newuser _hiawatha:579:579:daemon:Hiawatha HTTP
Server:/nonexistent:/sbin/nologin
[EMAIL PROTECTED] man/man1/cgi_wrapper.1
[EMAIL PROTECTED] man/man1/cgi-wrapper.1
@man man/man1/hiawatha.1
-sbin/cgi_wrapper
[EMAIL PROTECTED] man/man1/php-fcgi.1
[EMAIL PROTECTED] man/man1/wigwam.1
[EMAIL PROTECTED] o+s
+sbin/cgi-wrapper
[EMAIL PROTECTED]
sbin/hiawatha
+sbin/newroot
+sbin/php-fcgi
sbin/wigwam
share/examples/hiawatha/
@sample ${SYSCONFDIR}/hiawatha/
-share/examples/hiawatha/cgi_wrapper.conf
+share/examples/hiawatha/cgi-wrapper.conf
@sample ${SYSCONFDIR}/hiawatha/cgi_wrapper.conf
share/examples/hiawatha/httpd.conf
@sample ${SYSCONFDIR}/hiawatha/httpd.conf
@@ -17,6 +23,7 @@
@sample /var/hiawatha/index.html
share/examples/hiawatha/mimetype.conf
@sample ${SYSCONFDIR}/hiawatha/mimetype.conf
+share/examples/hiawatha/php-fcgi.conf
share/examples/hiawatha/throttle.conf
@sample ${SYSCONFDIR}/hiawatha/throttle.conf
@sample /var/log/hiawatha/
diff -ruN --exclude CVS /usr/ports/www/hiawatha/pkg/PLIST.orig
hiawatha/pkg/PLIST.orig
--- /usr/ports/www/hiawatha/pkg/PLIST.orig Thu Jan 1 01:00:00 1970
+++ hiawatha/pkg/PLIST.orig Sat Feb 17 19:07:17 2007
@@ -0,0 +1,22 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.1.1.1 2006/12/31 10:32:42 ajacoutot Exp $
[EMAIL PROTECTED] _hiawatha:579
[EMAIL PROTECTED] _hiawatha:579:579:daemon:Hiawatha HTTP
Server:/nonexistent:/sbin/nologin
[EMAIL PROTECTED] man/man1/cgi_wrapper.1
[EMAIL PROTECTED] man/man1/hiawatha.1
+sbin/cgi_wrapper
+sbin/hiawatha
+sbin/wigwam
+share/examples/hiawatha/
[EMAIL PROTECTED] ${SYSCONFDIR}/hiawatha/
+share/examples/hiawatha/cgi_wrapper.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/hiawatha/cgi_wrapper.conf
+share/examples/hiawatha/httpd.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/hiawatha/httpd.conf
[EMAIL PROTECTED] /var/hiawatha/
+share/examples/hiawatha/index.html
[EMAIL PROTECTED] /var/hiawatha/index.html
+share/examples/hiawatha/mimetype.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/hiawatha/mimetype.conf
+share/examples/hiawatha/throttle.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/hiawatha/throttle.conf
[EMAIL PROTECTED] /var/log/hiawatha/
