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

- bugfix update to hiawatha-6.7

Browse Source 
- use SUBST_CMD
This commit is contained in:
ajacoutot 2008-05-29 07:53:03 +00:00
parent c88ef39eea
commit 7affab1d2b
6 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/hiawatha/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.16 2008/04/29 08:47:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2008/05/29 07:53:03 ajacoutot Exp $
COMMENT= secure webserver
DISTNAME= hiawatha-6.6
DISTNAME= hiawatha-6.7
CATEGORIES= www net
HOMEPAGE= http://hiawatha.leisink.org
@ -32,10 +32,7 @@ CONFIGURE_ARGS= --localstatedir=/var \
--enable-xslt
pre-configure:
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g;' \
-e 's,!!PREFIX!!,${PREFIX},g;' \
-e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' \
${WRKSRC}/etc/hiawatha/httpd.conf.in \
${SUBST_CMD} ${WRKSRC}/etc/hiawatha/httpd.conf.in \
${WRKSRC}/etc/hiawatha/cgi-wrapper.conf \
${WRKSRC}/doc/hiawatha.1.in

10
www/hiawatha/distinfo
View File

@ -1,5 +1,5 @@
MD5 (hiawatha-6.6.tar.gz) = +Qir+HaRYx9vC7vJmUyq5A==
RMD160 (hiawatha-6.6.tar.gz) = iP8PftyKTY5HCc2/vhxuef+exxk=
SHA1 (hiawatha-6.6.tar.gz) = l9coDQm/nS2yMTWUzKAl/9tl8ys=
SHA256 (hiawatha-6.6.tar.gz) = 7wyKHwsXJXKIxgRwak15jMz/uCJd4XKw2yTgMCbaQxc=
SIZE (hiawatha-6.6.tar.gz) = 235389
MD5 (hiawatha-6.7.tar.gz) = UThYYr/thFS1N541ebcPSA==
RMD160 (hiawatha-6.7.tar.gz) = 10OVylRSyuT6I4jgj5zTkW/9sTg=
SHA1 (hiawatha-6.7.tar.gz) = GK1/CgCE8omtqCLxxbS06xNvEkQ=
SHA256 (hiawatha-6.7.tar.gz) = 9PhdDNAZpqRRLQRGk0cYMiPQIgGCmACmUUMIoKDUgD8=
SIZE (hiawatha-6.7.tar.gz) = 236804

8
www/hiawatha/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.9 2008/04/29 08:47:43 ajacoutot Exp $
--- Makefile.in.orig Fri Apr 25 16:48:45 2008
+++ Makefile.in Tue Apr 29 10:10:37 2008
@@ -1164,9 +1164,8 @@ info: info-am
$OpenBSD: patch-Makefile_in,v 1.10 2008/05/29 07:53:03 ajacoutot Exp $
--- Makefile.in.orig Tue May 20 00:43:13 2008
+++ Makefile.in Thu May 29 09:46:30 2008
@@ -1166,9 +1166,8 @@ info: info-am
info-am:

34
www/hiawatha/patches/patch-doc_hiawatha_1_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_hiawatha_1_in,v 1.1 2008/04/29 08:47:43 ajacoutot Exp $
--- doc/hiawatha.1.in.orig Tue Apr 29 10:19:44 2008
+++ doc/hiawatha.1.in Tue Apr 29 10:24:00 2008
$OpenBSD: patch-doc_hiawatha_1_in,v 1.2 2008/05/29 07:53:03 ajacoutot Exp $
--- doc/hiawatha.1.in.orig Fri May 23 13:31:17 2008
+++ doc/hiawatha.1.in Thu May 29 09:46:30 2008
@@ -23,7 +23,7 @@ hiawatha \- Advanced and secure webserver
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,31 +10,31 @@ $OpenBSD: patch-doc_hiawatha_1_in,v 1.1 2008/04/29 08:47:43 ajacoutot Exp $
.\" ==========[ Configuration files ]==========================================
.SH CONFIGURATION FILES
@@ -145,12 +145,12 @@ Example: CGIextension = cgi
@@ -150,12 +150,12 @@ Example: CGIextension = cgi
.B CGIhandler = <CGI handler>:<extension>[, <extension>, ...]
Specify the handler for a CGI extension. A handler is an executable which will 'run' the CGI script.
.br
-Example: CGIhandler = /usr/bin/php4-cgi:php,php4
+Example: CGIhandler = !!LOCALBASE!!/bin/php-fastcgi:php,php5
+Example: CGIhandler = ${LOCALBASE}/bin/php-fastcgi:php,php5
.TP
.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).
.br
-Example: CGIwrapper = /usr/sbin/cgi-wrapper
+Example: CGIwrapper = !!PREFIX!!/sbin/cgi-wrapper
+Example: CGIwrapper = ${PREFIX}/sbin/cgi-wrapper
.TP
.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 = @logdir@/garbage.log
@@ -188,7 +188,7 @@ Example: GarbageLogfile = @logdir@/garbage.log
.B Include <filename>
Include another configurationfile.
.br
-Example: Include /etc/hiawatha/hosts.conf
+Example: Include !!SYSCONFDIR!!/hiawatha/hosts.conf
+Example: Include ${SYSCONFDIR}/hiawatha/hosts.conf
.TP
.B KickOnBan = yes|no
Close all other connections that originate from the same IP in case of a ban.
@@ -235,7 +235,7 @@ Default = @pidfiledir@/hiawatha.pid, example: PIDfile
@@ -240,7 +240,7 @@ Default = @pidfiledir@/hiawatha.pid, example: PIDfile
.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 en groupid of user root are not allowed here.
.br
@ -43,33 +43,33 @@ $OpenBSD: patch-doc_hiawatha_1_in,v 1.1 2008/04/29 08:47:43 ajacoutot Exp $
.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 BINDING CONFIGURATION).
@@ -785,7 +785,7 @@ and
@@ -790,7 +790,7 @@ and
.B UseGZfile
.SH MIMETYPES
-Specify the mimetypes of files in /etc/hiawatha/mimetypes.conf.
+Specify the mimetypes of files in !!SYSCONFDIR!!/hiawatha/mimetypes.conf.
+Specify the mimetypes of files in ${SYSCONFDIR}/hiawatha/mimetypes.conf.
.TP
.B <mimetype> <extension> [<extension> ...]
Example: image/jpeg jpg jpeg jpe
@@ -809,15 +809,15 @@ Will unban all clients.
@@ -814,15 +814,15 @@ Will unban all clients.
Will close all open logfiles
.SH FILES
-.B /usr/sbin/hiawatha
+.B !!PREFIX!!/sbin/hiawatha
+.B ${PREFIX}/sbin/hiawatha
.br
-.B /etc/hiawatha/httpd.conf
+.B !!SYSCONFDIR!!/hiawatha/httpd.conf
+.B ${SYSCONFDIR}/hiawatha/httpd.conf
.br
-.B /etc/hiawatha/mime.types
+.B !!SYSCONFDIR!!/hiawatha/mime.types
+.B ${SYSCONFDIR}/hiawatha/mime.types
.br
-.B /etc/hiawatha/cgi-wrapper.conf
+.B !!SYSCONFDIR!!/hiawatha/cgi-wrapper.conf
+.B ${SYSCONFDIR}/hiawatha/cgi-wrapper.conf
.br
-.B /etc/hiawatha/php-fcgi.conf
+.B !!SYSCONFDIR!!/hiawatha/php-fcgi.conf
+.B ${SYSCONFDIR}/hiawatha/php-fcgi.conf
.SH SEE ALSO

6
www/hiawatha/patches/patch-etc_hiawatha_cgi-wrapper_conf
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-etc_hiawatha_cgi-wrapper_conf,v 1.3 2008/03/15 10:16:30 ajacoutot Exp $
$OpenBSD: patch-etc_hiawatha_cgi-wrapper_conf,v 1.4 2008/05/29 07:53:03 ajacoutot Exp $
--- etc/hiawatha/cgi-wrapper.conf.orig Wed Feb 13 09:27:41 2008
+++ etc/hiawatha/cgi-wrapper.conf Sat Mar 8 21:22:31 2008
@@ -4,9 +4,9 @@
@ -6,10 +6,10 @@ $OpenBSD: patch-etc_hiawatha_cgi-wrapper_conf,v 1.3 2008/03/15 10:16:30 ajacouto
# CGIhandler = /path/to/cgi-handler
#
-#CGIhandler = /usr/bin/php-cgi
+#CGIhandler = !!LOCALBASE!!/bin/php
+#CGIhandler = ${LOCALBASE}/bin/php
#CGIhandler = /usr/bin/perl
-#CGIhandler = /usr/bin/python
+#CGIhandler = !!LOCALBASE!!/bin/python
+#CGIhandler = ${LOCALBASE}/bin/python
# Wrap = <wrap-id>;<cgiroot>;<userid>[:<group>]
#

12
www/hiawatha/patches/patch-etc_hiawatha_httpd_conf_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-etc_hiawatha_httpd_conf_in,v 1.2 2007/03/26 06:57:56 ajacoutot Exp $
--- 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
$OpenBSD: patch-etc_hiawatha_httpd_conf_in,v 1.3 2008/05/29 07:53:03 ajacoutot Exp $
--- etc/hiawatha/httpd.conf.in.orig Thu May 29 09:41:45 2008
+++ etc/hiawatha/httpd.conf.in Thu May 29 09:43:19 2008
@@ -4,7 +4,7 @@
# GENERAL SETTINGS
#
-ServerId = 33:33
-#ServerId = www-data
+ServerId = _hiawatha:_hiawatha
ConnectionsTotal = 150
ConnectionsPerIP = 10
@ -15,10 +15,10 @@ $OpenBSD: patch-etc_hiawatha_httpd_conf_in,v 1.2 2007/03/26 06:57:56 ajacoutot E
# tool to start PHP as a FastCGI daemon.
#
-#CGIhandler = /usr/bin/php-cgi:php
+#CGIhandler = !!LOCALBASE!!/bin/php:php
+#CGIhandler = ${LOCALBASE}/bin/php-cgi:php
#CGIhandler = /usr/bin/perl:pl
-#CGIhandler = /usr/bin/python:py
+#CGIhandler = !!LOCALBASE!!/bin/python:py
+#CGIhandler = ${LOCALBASE}/bin/python:py
#CGIextension = cgi
#
#TimeForCGI = 5