Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src install as bozohttpd/bozohttpd.8 as well as httpd.



details:   https://anonhg.NetBSD.org/src/rev/f2027d6e0ebd
branches:  trunk
changeset: 337475:f2027d6e0ebd
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Apr 16 02:32:33 2015 +0000

description:
install as bozohttpd/bozohttpd.8 as well as httpd.

diffstat:

 distrib/sets/lists/base/mi |   3 ++-
 distrib/sets/lists/man/mi  |  11 +++++++----
 libexec/httpd/Makefile     |   9 +++++----
 libexec/httpd/bozohttpd.8  |  20 +++++++++-----------
 4 files changed, 23 insertions(+), 20 deletions(-)

diffs (161 lines):

diff -r cd774e4bc184 -r f2027d6e0ebd distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Thu Apr 16 01:07:24 2015 +0000
+++ b/distrib/sets/lists/base/mi        Thu Apr 16 02:32:33 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1099 2015/03/28 14:09:58 jmcneill Exp $
+# $NetBSD: mi,v 1.1100 2015/04/16 02:32:33 mrg Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -1254,6 +1254,7 @@
 ./usr/libexec/atf-format                       base-obsolete           obsolete
 ./usr/libexec/atf-killpg                       base-obsolete           obsolete
 ./usr/libexec/atrun                            base-cron-bin
+./usr/libexec/bozohttpd                                base-netutil-bin
 ./usr/libexec/ching                            base-games-usr
 ./usr/libexec/comsat                           base-mail-bin
 ./usr/libexec/cpp0                             base-obsolete           obsolete
diff -r cd774e4bc184 -r f2027d6e0ebd distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Thu Apr 16 01:07:24 2015 +0000
+++ b/distrib/sets/lists/man/mi Thu Apr 16 02:32:33 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1498 2015/03/22 09:57:42 ast Exp $
+# $NetBSD: mi,v 1.1499 2015/04/16 02:32:33 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -452,8 +452,8 @@
 ./usr/share/man/cat1/ps.0                      man-util-catman         .cat
 ./usr/share/man/cat1/pstat.0                   man-obsolete            obsolete
 ./usr/share/man/cat1/pushd.0                   man-util-catman         .cat
+./usr/share/man/cat1/pwait.0                   man-util-catman         .cat
 ./usr/share/man/cat1/pwd.0                     man-util-catman         .cat
-./usr/share/man/cat1/pwait.0                   man-util-catman         .cat
 ./usr/share/man/cat1/pwhash.0                  man-util-catman         .cat
 ./usr/share/man/cat1/qsafe.0                   man-util-catman         crypto,.cat
 ./usr/share/man/cat1/qsieve.0                  man-util-catman         crypto,.cat
@@ -2329,6 +2329,7 @@
 ./usr/share/man/cat8/bootptest.0               man-bootserver-catman   .cat
 ./usr/share/man/cat8/bootselect.0              man-obsolete            obsolete
 ./usr/share/man/cat8/bounce.0                  man-postfix-catman      postfix,.cat
+./usr/share/man/cat8/bozohttpd.0               man-netutil-catman      .cat
 ./usr/share/man/cat8/brconfig.0                        man-netutil-catman      .cat
 ./usr/share/man/cat8/btattach.0                        man-sysutil-catman      .cat
 ./usr/share/man/cat8/btconfig.0                        man-sysutil-catman      .cat
@@ -3570,8 +3571,8 @@
 ./usr/share/man/html1/progress.html            man-util-htmlman        html
 ./usr/share/man/html1/ps.html                  man-util-htmlman        html
 ./usr/share/man/html1/pushd.html               man-util-htmlman        html
+./usr/share/man/html1/pwait.html               man-util-htmlman        html
 ./usr/share/man/html1/pwd.html                 man-util-htmlman        html
-./usr/share/man/html1/pwait.html               man-util-htmlman        html
 ./usr/share/man/html1/pwhash.html              man-util-htmlman        html
 ./usr/share/man/html1/qsafe.html               man-util-htmlman        crypto,html
 ./usr/share/man/html1/qsieve.html              man-util-htmlman        crypto,html
@@ -5256,6 +5257,7 @@
 ./usr/share/man/html8/bootpgw.html             man-bootserver-htmlman  html
 ./usr/share/man/html8/bootptest.html           man-bootserver-htmlman  html
 ./usr/share/man/html8/bounce.html              man-postfix-htmlman     postfix,html
+./usr/share/man/html8/bozohttpd.html           man-netutil-htmlman     html
 ./usr/share/man/html8/brconfig.html            man-netutil-htmlman     html
 ./usr/share/man/html8/btattach.html            man-sysutil-htmlman     html
 ./usr/share/man/html8/btconfig.html            man-sysutil-htmlman     html
@@ -6339,8 +6341,8 @@
 ./usr/share/man/man1/ps.1                      man-util-man            .man
 ./usr/share/man/man1/pstat.1                   man-obsolete            obsolete
 ./usr/share/man/man1/pushd.1                   man-util-man            .man
+./usr/share/man/man1/pwait.1                   man-util-man            .man
 ./usr/share/man/man1/pwd.1                     man-util-man            .man
-./usr/share/man/man1/pwait.1                   man-util-man            .man
 ./usr/share/man/man1/pwhash.1                  man-util-man            .man
 ./usr/share/man/man1/qsafe.1                   man-util-man            crypto,.man
 ./usr/share/man/man1/qsieve.1                  man-util-man            crypto,.man
@@ -8218,6 +8220,7 @@
 ./usr/share/man/man8/bootptest.8               man-bootserver-man      .man
 ./usr/share/man/man8/bootselect.8              man-obsolete            obsolete
 ./usr/share/man/man8/bounce.8                  man-postfix-man         postfix,.man
+./usr/share/man/man8/bozohttpd.8               man-netutil-man         .man
 ./usr/share/man/man8/brconfig.8                        man-netutil-man         .man
 ./usr/share/man/man8/btattach.8                        man-sysutil-man         .man
 ./usr/share/man/man8/btconfig.8                        man-sysutil-man         .man
diff -r cd774e4bc184 -r f2027d6e0ebd libexec/httpd/Makefile
--- a/libexec/httpd/Makefile    Thu Apr 16 01:07:24 2015 +0000
+++ b/libexec/httpd/Makefile    Thu Apr 16 02:32:33 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.22 2014/07/08 13:59:39 mrg Exp $
+#      $NetBSD: Makefile,v 1.23 2015/04/16 02:32:33 mrg Exp $
 #
 #      $eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
 #
@@ -20,9 +20,10 @@
 #   % make COPTS="-DDO_HTPASSWD"
 
 COPTS+=        -DDO_HTPASSWD
-PROG=  httpd
-MAN=   httpd.8
-BUILDSYMLINKS+=bozohttpd.8 httpd.8
+PROG=  bozohttpd
+LINKS= ${BINDIR}/bozohttpd ${BINDIR}/httpd
+MAN=   bozohttpd.8
+MLINKS+=bozohttpd.8 httpd.8
 SRCS=  bozohttpd.c ssl-bozo.c auth-bozo.c cgi-bozo.c daemon-bozo.c \
        tilde-luzah-bozo.c dir-index-bozo.c content-bozo.c lua-bozo.c
 SRCS+= main.c
diff -r cd774e4bc184 -r f2027d6e0ebd libexec/httpd/bozohttpd.8
--- a/libexec/httpd/bozohttpd.8 Thu Apr 16 01:07:24 2015 +0000
+++ b/libexec/httpd/bozohttpd.8 Thu Apr 16 02:32:33 2015 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: bozohttpd.8,v 1.49 2015/03/20 19:54:53 mrg Exp $
+.\"    $NetBSD: bozohttpd.8,v 1.50 2015/04/16 02:32:33 mrg Exp $
 .\"
 .\"    $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
@@ -26,11 +26,11 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 20, 2015
-.Dt HTTPD 8
+.Dd April 15, 2015
+.Dt BOZOHTTPD 8
 .Os
 .Sh NAME
-.Nm httpd
+.Nm bozohttpd
 .Nd hyper text transfer protocol version 1.1 daemon
 .Sh SYNOPSIS
 .Nm
@@ -497,11 +497,8 @@
 .Xr inetd.conf 5 ,
 .Xr inetd 8
 .Sh HISTORY
-The
 .Nm
-program is actually called
-.Dq bozohttpd .
-It was first written in perl, based on another perl http server
+was first written in perl, based on another perl http server
 called
 .Dq tinyhttpd .
 It was then rewritten from scratch in perl, and then once again in C.
@@ -513,7 +510,7 @@
 and regular code audits.
 This manual documents
 .Nm
-version 20141225.
+version 20150320.
 .Sh AUTHORS
 .An -nosplit
 .Nm
@@ -546,8 +543,9 @@
 .It
 .An Alistair G. Crooks
 .Aq Mt agc%NetBSD.org@localhost
-cleaned up many internal interfaces, made bozohttpd linkable as a
-library and provided the Lua binding.
+cleaned up many internal interfaces, made
+.Nm
+linkable as a library and provided the Lua binding.
 .It
 .An DEGROOTE Arnaud
 .Aq Mt degroote%NetBSD.org@localhost



Home | Main Index | Thread Index | Old Index