diff options
Diffstat (limited to 'network/bozohttpd')
| -rw-r--r-- | network/bozohttpd/bozohttpd.SlackBuild | 11 | ||||
| -rw-r--r-- | network/bozohttpd/bozohttpd.info | 8 | ||||
| -rw-r--r-- | network/bozohttpd/fix_warnings.diff | 45 |
3 files changed, 38 insertions, 26 deletions
diff --git a/network/bozohttpd/bozohttpd.SlackBuild b/network/bozohttpd/bozohttpd.SlackBuild index bea3645dbe..18e3d5e69a 100644 --- a/network/bozohttpd/bozohttpd.SlackBuild +++ b/network/bozohttpd/bozohttpd.SlackBuild @@ -24,6 +24,8 @@ # 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. # 20191201 bkw: Update for v20190228. @@ -50,7 +52,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bozohttpd -VERSION=${VERSION:-20210227} +VERSION=${VERSION:-20240126} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -74,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 @@ -198,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 11a6b2afcc..b8e85c3dae 100644 --- a/network/bozohttpd/bozohttpd.info +++ b/network/bozohttpd/bozohttpd.info @@ -1,8 +1,8 @@ PRGNAM="bozohttpd" -VERSION="20210227" -HOMEPAGE="http://www.eterna.com.au/bozohttpd/" -DOWNLOAD="http://www.eterna.com.au/bozohttpd/bozohttpd-20210227.tar.bz2" -MD5SUM="40d847aacfc54cd586facae9e6a39e20" +VERSION="20240126" +HOMEPAGE="http://eterna23.net/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> |