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

instead of lynx -dump, use ftp -o- | sed to strip out html tags (for

Browse Source 
apachectl status / fullstatus)

ok ajacoutot@
This commit is contained in:
sthen 2014-07-16 14:41:19 +00:00
parent 29d1848661
commit b7e7b4903f
4 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/apache-httpd-openbsd/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2014/05/09 11:40:44 florian Exp $
# $OpenBSD: Makefile,v 1.4 2014/07/16 14:41:20 sthen Exp $
COMMENT= OpenBSD improved and secured version of Apache 1.3
DISTNAME= apache-httpd-openbsd-1.3.20140502
REVISION= 0
CATEGORIES= www
HOMEPAGE= https://github.com/fobser/apache-httpd-openbsd

23
www/apache-httpd-openbsd/patches/patch-src_support_apachectl Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_support_apachectl,v 1.1 2014/07/16 14:41:20 sthen Exp $
--- src/support/apachectl.orig Wed Jul 16 15:30:14 2014
+++ src/support/apachectl Wed Jul 16 15:30:43 2014
@@ -30,7 +30,7 @@ HTTPD='/usr/local/apache/src/httpd'
# a command that outputs a formatted text version of the HTML at the
# url given on the command line. Designed for lynx, however other
# programs may work.
-LYNX="lynx -dump"
+LYNX="dump_html"
#
# the URL to your server's mod_status status page. If you do not
# have one, then status and fullstatus will not work.
@@ -38,6 +38,10 @@ STATUSURL="http://localhost/server-status"
#
# -------------------- --------------------
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
+
+dump_html() {
+ ftp -Vo- "$1" | sed 's,<[^>]*>,,g'
+}
ERROR=0
ARGV="$@"

4
www/apache-httpd/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.47 2014/07/12 14:11:32 pascal Exp $
# $OpenBSD: Makefile,v 1.48 2014/07/16 14:41:19 sthen Exp $
COMMENT= apache HTTP server
V= 2.2.27
PKGNAME= apache-httpd-${V}
DISTNAME= httpd-${V}
REVISION= 2
REVISION= 3
CATEGORIES= www net

28
www/apache-httpd/patches/patch-support_apachectl_in
View File

@ -1,7 +1,27 @@
$OpenBSD: patch-support_apachectl_in,v 1.2 2007/03/25 17:40:55 deanna Exp $
--- support/apachectl.in.orig Tue Jul 11 23:38:44 2006
+++ support/apachectl.in Sun Mar 25 13:21:04 2007
@@ -82,8 +82,8 @@ start|stop|restart|graceful|graceful-stop)
$OpenBSD: patch-support_apachectl_in,v 1.3 2014/07/16 14:41:20 sthen Exp $
--- support/apachectl.in.orig Wed Jul 12 04:38:44 2006
+++ support/apachectl.in Wed Jul 16 15:25:38 2014
@@ -51,7 +51,7 @@ fi
# a command that outputs a formatted text version of the HTML at the
# url given on the command line. Designed for lynx, however other
# programs may work.
-LYNX="@LYNX_PATH@ -dump"
+LYNX="dump_html"
#
# the URL to your server's mod_status status page. If you do not
# have one, then status and fullstatus will not work.
@@ -65,6 +65,10 @@ ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@"
# -------------------- --------------------
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
+dump_html() {
+ ftp -Vo- "$1" | sed 's,<[^>]*>,,g'
+}
+
# Set the maximum number of file descriptors allowed per child process.
if [ "x$ULIMIT_MAX_FILES" != "x" ] ; then
$ULIMIT_MAX_FILES
@@ -82,8 +86,8 @@ start|stop|restart|graceful|graceful-stop)
;;
startssl|sslstart|start-SSL)
echo The startssl option is no longer supported.