diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index 6ccd604ef..d44da82d3 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -1,5 +1,5 @@ PORTNAME= bozohttpd -DISTVERSION= 20240126 +DISTVERSION= 20260503 CATEGORIES= www MASTER_SITES= http://eterna23.net/bozohttpd/ diff --git a/www/bozohttpd/distinfo b/www/bozohttpd/distinfo index 6274e6aec..96ca683a5 100644 --- a/www/bozohttpd/distinfo +++ b/www/bozohttpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1762476678 -SHA256 (bozohttpd-20240126.tar.bz2) = 576267bc5681c52b650294c3f2a85b8c8d8c239e75e71aaba7973771f852b56d -SIZE (bozohttpd-20240126.tar.bz2) = 62621 +TIMESTAMP = 1779866571 +SHA256 (bozohttpd-20260503.tar.bz2) = 2a2e6d62b68d219434973937a8febd17741f22e98c741f6c922b22f13f7523cd +SIZE (bozohttpd-20260503.tar.bz2) = 63355 diff --git a/www/bozohttpd/files/patch-Makefile b/www/bozohttpd/files/patch-Makefile index c55ab1918..0ab631a98 100644 --- a/www/bozohttpd/files/patch-Makefile +++ b/www/bozohttpd/files/patch-Makefile @@ -1,15 +1,6 @@ ---- Makefile.orig 2024-02-04 05:55:04 UTC -+++ Makefile -@@ -14,7 +14,7 @@ - # NO_SSL_SUPPORT /* don't support ssl (https) */ - # DO_HTPASSWD /* support .htpasswd files */ - # NO_LUA_SUPPORT /* don't support Lua for dynamic content */ --# NO_BLOCKLIST_SUPPORT /* don't support blocklist */ -+# NO_BLACKLIST_SUPPORT /* don't support blocklist */ - # - # other system specific defines: - # HAVE_NBUTIL_H /* netbsd compat is in -@@ -24,22 +24,19 @@ +--- Makefile.orig 2026-05-27 07:27:27.357331000 +0000 ++++ Makefile 2026-05-27 07:31:13.815614000 +0000 +@@ -24,21 +24,19 @@ # for setting CFLAGS relevant to your make, eg # % make COPTS="-DDO_HTPASSWD" @@ -28,20 +19,20 @@ -DPADD= ${LIBBLOCKLIST} ${LIBCRYPT} ${LIBLUA} ${LIBM} - WARNS?= 4 - ++ +BINDIR=$(PREFIX)/bin +MANDIR=$(PREFIX)/share/man/man + + LINTFLAGS+= -X 193 # statement not reached + .if defined(.OS.MAKE) - OPSYS= ${.OS.MAKE} - .else -@@ -50,9 +47,6 @@ LDADD+= -lnbutil - CPPFLAGS+= -DHAVE_NBUTIL_H +@@ -52,9 +50,6 @@ LDADD+= -lnbutil .endif -- + -LDADD+= -lssl -lcrypto -DPADD+= ${LIBSSL} ${LIBCRYPTO} - +- # # Build release things. + # diff --git a/www/bozohttpd/files/patch-bozohttpd.8 b/www/bozohttpd/files/patch-bozohttpd.8 index 8f3e84e15..1bcbfda89 100644 --- a/www/bozohttpd/files/patch-bozohttpd.8 +++ b/www/bozohttpd/files/patch-bozohttpd.8 @@ -1,35 +1,6 @@ ---- bozohttpd.8.orig 2024-02-04 05:55:04 UTC -+++ bozohttpd.8 -@@ -373,12 +373,26 @@ and 4 in the case of - .Fl C - and 4 in the case of - .Fl M . ) -+.Ss DEFAULT CONFIGURATION -+On -+.Fx , -+.Nm -+can be enabled as the default web server by adding the following options to -+.Pa /etc/rc.conf -+: -+.Bd -literal -+bozohttpd_enable (bool): Set it to "YES" to enable bozohttpd. -+ Default is "NO". -+bozohttpd_flags (str): Options to pass to bozohttpd. -+ Default is "-b -t /var/empty -U nobody /". -+ The last argument, slashdir, is required. -+.Ed - .Ss INETD CONFIGURATION - As - .Nm --uses -+normally uses - .Xr inetd 8 --by default to process incoming TCP connections for HTTP requests -+to process incoming TCP connections for HTTP requests - (but see the - .Fl b - option), -@@ -390,8 +404,8 @@ entry would be: +--- bozohttpd.8.orig 2026-05-27 07:39:51.425388000 +0000 ++++ bozohttpd.8 2026-05-27 07:44:11.821068000 +0000 +@@ -416,8 +416,8 @@ .Xr inetd.conf 5 entry would be: .Bd -literal @@ -40,91 +11,16 @@ .Ed .Pp This would serve web pages from -@@ -405,7 +419,7 @@ Using the - default of 40. - .Pp - Using the --.Nx -+.Fx - .Xr inetd 8 , - you can provide multiple IP-address based HTTP servers by having multiple - listening ports with different configurations. -@@ -457,15 +471,15 @@ On - .Ed - .Pp - On --.Nx , -+.Fx , - the --.Xr pwhash 1 -+.Xr openssl-passwd 1 - utility may be used to generate hashed passwords. - .Pp --While -+While the -+.Fx -+port of - .Nm --distributed with --.Nx - has support for HTTP Basic Authorization enabled by default, - in the portable distribution it is excluded. - Compile -@@ -475,21 +489,21 @@ It may require linking with the crypt library, using - on the compiler command line to enable this support. - It may require linking with the crypt library, using - .Dq -lcrypt . --.Ss BLOCKLIST SUPPORT -+.Ss BLACKLIST SUPPORT - On --.Nx , -+.Fx , - .Nm - supports --.Xr blocklistd 8 -+.Xr blacklistd 8 - by default. - The support can be disabled with the --.Dq -DNO_BLOCKLIST_SUPPORT -+.Dq -DNO_BLACKLIST_SUPPORT - compilation option. - .Pp - Upon occurrence, - .Nm - reports two HTTP status codes to --.Xr blocklistd 8 -+.Xr blacklistd 8 - as failures: - .Em 401 - (``Unauthorized'') -@@ -501,7 +515,7 @@ A successful authorization decreases the counter kept - is the one received upon authorization failure with the - HTTP Basic Authorization mechanism. - A successful authorization decreases the counter kept by --.Xr blocklistd 8 . -+.Xr blacklistd 8 . - .Pp - Note that the implementation of the HTTP Basic Authorization mechanism - uses a redirection; a status code -@@ -510,7 +524,7 @@ is reported as two failures to - Therefore, a single authorization failure of - .Pa .htpasswd - is reported as two failures to --.Xr blocklistd 8 , -+.Xr blacklistd 8 , - but no failures are recorded upon successful authorization - due to the decrease of the failure counter. - .Ss SSL SUPPORT -@@ -603,7 +617,7 @@ entry like: +@@ -645,7 +645,7 @@ .Xr inetd.conf 5 entry like: .Bd -literal -http stream tcp nowait:600 _httpd /usr/libexec/httpd httpd -v /var/vroot /var/www -+http stream tcp nowait:600 www /usr/local/bin/bozohttpd httpd -v /var/vroot /var/www ++http stream tcp nowait:600 www /usr/local/bin/bozohttpd -v /var/vroot /var/www .Ed .Pp and inside -@@ -621,7 +635,7 @@ Typically this will be like: +@@ -663,7 +663,7 @@ option to specify a CGI handler for a particular file type. Typically this will be like: .Bd -literal @@ -133,7 +29,7 @@ .Ed .Pp Note that a plain script interpreter can not be used directly as a cgihandler, -@@ -634,7 +648,7 @@ It would be invoked like: +@@ -676,7 +676,7 @@ .Pp It would be invoked like: .Bd -literal @@ -142,12 +38,3 @@ .Ed and the script could look like: .Bd -literal -@@ -821,7 +835,7 @@ provided support for - .An Jukka Ruohonen - .Aq Mt jruoho@NetBSD.org - provided support for --.Xr blocklistd 8 -+.Xr blacklistd 8 - .It - .An Thor Lancelot Simon - .Aq Mt tls@NetBSD.org