Patches for apache-httpd and apache-httpd-openbsd to cope with lynx
removal; use ftp | sed to strip out html tags instead. Not identical
but looks reasonable, and I don't think anyone can rely on lynx
dump output to stay identical either.
OK?
Index: apache-httpd/Makefile
===================================================================
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- apache-httpd/Makefile 12 Jul 2014 14:11:32 -0000 1.47
+++ apache-httpd/Makefile 16 Jul 2014 14:31:00 -0000
@@ -5,7 +5,7 @@ COMMENT= apache HTTP server
V= 2.2.27
PKGNAME= apache-httpd-${V}
DISTNAME= httpd-${V}
-REVISION= 2
+REVISION= 3
CATEGORIES= www net
Index: apache-httpd/patches/patch-support_apachectl_in
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-support_apachectl_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-support_apachectl_in
--- apache-httpd/patches/patch-support_apachectl_in 25 Mar 2007 17:40:55
-0000 1.2
+++ apache-httpd/patches/patch-support_apachectl_in 16 Jul 2014 14:31:00
-0000
@@ -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)
+--- 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.
Index: apache-httpd-openbsd/Makefile
===================================================================
RCS file: /cvs/ports/www/apache-httpd-openbsd/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- apache-httpd-openbsd/Makefile 9 May 2014 11:40:44 -0000 1.3
+++ apache-httpd-openbsd/Makefile 16 Jul 2014 14:31:00 -0000
@@ -3,6 +3,7 @@
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
Index: apache-httpd-openbsd/patches/patch-src_support_apachectl
===================================================================
RCS file: apache-httpd-openbsd/patches/patch-src_support_apachectl
diff -N apache-httpd-openbsd/patches/patch-src_support_apachectl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ apache-httpd-openbsd/patches/patch-src_support_apachectl 16 Jul 2014
14:31:00 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- 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="$@"
