network/bozohttpd: Updated for version 20240126.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 37 insertions, 26 deletions

diff --git a/network/bozohttpd/bozohttpd.SlackBuild b/network/bozohttpd/bozohttpd.SlackBuild
index 806f57d4c0..18e3d5e69a 100644
--- a/network/bozohttpd/bozohttpd.SlackBuild
+++ b/network/bozohttpd/bozohttpd.SlackBuild
@@ -24,6 +24,7 @@
 
 # Now maintained by B. Watson <urchlay@slackware.uk>.
 
+# 20240206 bkw: Update for v20240126.
 # 20230103 bkw: Update for v20220517.
 # 20210911 bkw: Update for v20210227.
 # 20201102 bkw: Update for v20201014.
@@ -51,7 +52,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bozohttpd
-VERSION=${VERSION:-20220517}
+VERSION=${VERSION:-20240126}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -75,16 +76,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -199,6 +196,9 @@ sed -i \
 # Probably doesn't hurt anything, but might cause problems later.
 # More worrisome is missing crypt() prototype (causes implicit pointer
 # to int casts, baaaaad, especially on 64-bit).
+# 20240206 bkw: rather than try to figure out why #define _XOPEN_SOURCE
+# doesn't provide a prototype for strptime(), and #define _GNU_SOURCE
+# doesn't give us vasprintf(), just put the damn prototypes in the patch.
 patch -p1 < $CWD/fix_warnings.diff
 
 # Fix build (from Arch Linux' AUR).
diff --git a/network/bozohttpd/bozohttpd.info b/network/bozohttpd/bozohttpd.info
index 364d8e9c62..76a3cc5793 100644
--- a/network/bozohttpd/bozohttpd.info
+++ b/network/bozohttpd/bozohttpd.info
@@ -1,8 +1,8 @@
 PRGNAM="bozohttpd"
-VERSION="20220517"
-HOMEPAGE="http://www.eterna.com.au/bozohttpd/"
-DOWNLOAD="https://ftp.netbsd.org/pub/pkgsrc/distfiles/bozohttpd-20220517.tar.bz2"
-MD5SUM="70864a132f7e2f17ce5d284d8d776ecd"
+VERSION="20240126"
+HOMEPAGE="http://web.archive.org/web/20231024192649/http://www.eterna.com.au/bozohttpd/"
+DOWNLOAD="https://cdn.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/bozohttpd-20240126.tar.bz2"
+MD5SUM="be23cc851dc706dfe56ba186e9dae2bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/bozohttpd/fix_warnings.diff b/network/bozohttpd/fix_warnings.diff
index 72b566edf1..1a94ba656d 100644
--- a/network/bozohttpd/fix_warnings.diff
+++ b/network/bozohttpd/fix_warnings.diff
@@ -1,7 +1,7 @@
-diff -Naur bozohttpd-20170201/auth-bozo.c bozohttpd-20170201.patched/auth-bozo.c
---- bozohttpd-20170201/auth-bozo.c	2017-01-31 23:21:23.000000000 -0500
-+++ bozohttpd-20170201.patched/auth-bozo.c	2018-06-29 15:42:59.076820050 -0400
-@@ -34,9 +34,12 @@
+diff -Naur bozohttpd-20240126/auth-bozo.c bozohttpd-20240126.patched/auth-bozo.c
+--- bozohttpd-20240126/auth-bozo.c	2024-02-04 00:55:04.000000000 -0500
++++ bozohttpd-20240126.patched/auth-bozo.c	2024-02-06 23:34:21.493549206 -0500
+@@ -34,11 +34,15 @@
  
  #ifdef DO_HTPASSWD
  
@@ -13,24 +13,35 @@ diff -Naur bozohttpd-20170201/auth-bozo.c bozohttpd-20170201.patched/auth-bozo.c
 +#include <strings.h>
  #include <stdlib.h>
  #include <unistd.h>
++#include <crypt.h>
  
-diff -Naur bozohttpd-20170201/bozohttpd.c bozohttpd-20170201.patched/bozohttpd.c
---- bozohttpd-20170201/bozohttpd.c	2017-01-31 23:21:23.000000000 -0500
-+++ bozohttpd-20170201.patched/bozohttpd.c	2018-06-29 15:08:08.066873176 -0400
-@@ -132,6 +132,10 @@
+ #include "bozohttpd.h"
+ 
+diff -Naur bozohttpd-20240126/bozohttpd.c bozohttpd-20240126.patched/bozohttpd.c
+--- bozohttpd-20240126/bozohttpd.c	2024-02-04 00:55:04.000000000 -0500
++++ bozohttpd-20240126.patched/bozohttpd.c	2024-02-06 23:45:26.157486654 -0500
+@@ -122,6 +122,8 @@
   * And so it begins ..
   */
  
-+/* need this for vasprintf(): */
-+#define _GNU_SOURCE
 +#include <stdio.h>
 +
  #include <sys/param.h>
  #include <sys/socket.h>
  #include <sys/time.h>
-diff -Naur bozohttpd-20170201/lua-bozo.c bozohttpd-20170201.patched/lua-bozo.c
---- bozohttpd-20170201/lua-bozo.c	2017-01-31 23:21:23.000000000 -0500
-+++ bozohttpd-20170201.patched/lua-bozo.c	2018-06-29 15:43:38.424819051 -0400
+@@ -145,6 +147,9 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
++extern char *strptime(const char *restrict s, const char *restrict format, struct tm *restrict tm);
++extern int vasprintf(char **restrict strp, const char *restrict fmt, va_list ap);
++
+ #include "bozohttpd.h"
+ 
+ #ifndef SSL_TIMEOUT
+diff -Naur bozohttpd-20240126/lua-bozo.c bozohttpd-20240126.patched/lua-bozo.c
+--- bozohttpd-20240126/lua-bozo.c	2024-02-04 00:55:04.000000000 -0500
++++ bozohttpd-20240126.patched/lua-bozo.c	2024-02-06 23:16:22.339650764 -0500
 @@ -32,6 +32,9 @@
  
  #ifndef NO_LUA_SUPPORT
@@ -41,9 +52,9 @@ diff -Naur bozohttpd-20170201/lua-bozo.c bozohttpd-20170201.patched/lua-bozo.c
  #include <sys/param.h>
  
  #include <lua.h>
-diff -Naur bozohttpd-20170201/ssl-bozo.c bozohttpd-20170201.patched/ssl-bozo.c
---- bozohttpd-20170201/ssl-bozo.c	2017-01-31 23:21:23.000000000 -0500
-+++ bozohttpd-20170201.patched/ssl-bozo.c	2018-06-29 15:07:50.813873614 -0400
+diff -Naur bozohttpd-20240126/ssl-bozo.c bozohttpd-20240126.patched/ssl-bozo.c
+--- bozohttpd-20240126/ssl-bozo.c	2024-02-04 00:55:04.000000000 -0500
++++ bozohttpd-20240126.patched/ssl-bozo.c	2024-02-06 23:16:22.339650764 -0500
 @@ -32,6 +32,9 @@
  
  /* this code implements SSL and backend IO for bozohttpd */
@@ -53,4 +64,4 @@ diff -Naur bozohttpd-20170201/ssl-bozo.c bozohttpd-20170201.patched/ssl-bozo.c
 +
  #include <stdarg.h>
  #include <stdio.h>
- #include <syslog.h>
+ #include <string.h>