CVS commit: pkgsrc/www/lighttpd

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Feb 29 18:42:30 UTC 2024

Modified Files:
        pkgsrc/www/lighttpd: distinfo
        pkgsrc/www/lighttpd/patches: patch-src_ls-hpack_lshpack.h

Log Message:
lighttpd: use upstream sys/queue.h portability patch. NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/www/lighttpd/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/lighttpd/patches/patch-src_ls-hpack_lshpack.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/lighttpd/distinfo
diff -u pkgsrc/www/lighttpd/distinfo:1.80 pkgsrc/www/lighttpd/distinfo:1.81
--- pkgsrc/www/lighttpd/distinfo:1.80   Wed Feb 21 21:32:13 2024
+++ pkgsrc/www/lighttpd/distinfo        Thu Feb 29 18:42:29 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.80 2024/02/21 21:32:13 schmonz Exp $
+$NetBSD: distinfo,v 1.81 2024/02/29 18:42:29 schmonz Exp $
 
 BLAKE2s (lighttpd-1.4.74.tar.xz) = b674d61d6b12e18d9a78f7e7db5a8b116b62a8d213ef1e808e0d082e4a10883d
 SHA512 (lighttpd-1.4.74.tar.xz) = 96ae90885898ec0a13441f135209a1e7c447b74b1dfbc16e75bdabcba30a4a4dd26878c205feed7f78311bcbc81b54602635cc0a64ea7fb8fe5e081f136fae2d
 Size (lighttpd-1.4.74.tar.xz) = 1098796 bytes
 SHA1 (patch-doc_config_lighttpd.conf) = 50f9529ea7ecfae741ca47f0514175dbf1aa52d9
 SHA1 (patch-doc_lighttpd.8) = e08ac362784aebaca566d0f65380b70a829d6b4e
-SHA1 (patch-src_ls-hpack_lshpack.h) = 1539bd9585a745c93d2dc98b39e1ba592d5a9014
+SHA1 (patch-src_ls-hpack_lshpack.h) = caafa73634b4d1a16e496992802e8e6a04a02f44

Index: pkgsrc/www/lighttpd/patches/patch-src_ls-hpack_lshpack.h
diff -u pkgsrc/www/lighttpd/patches/patch-src_ls-hpack_lshpack.h:1.1 pkgsrc/www/lighttpd/patches/patch-src_ls-hpack_lshpack.h:1.2
--- pkgsrc/www/lighttpd/patches/patch-src_ls-hpack_lshpack.h:1.1        Wed Feb 21 21:32:13 2024
+++ pkgsrc/www/lighttpd/patches/patch-src_ls-hpack_lshpack.h    Thu Feb 29 18:42:29 2024
@@ -1,22 +1,24 @@
-$NetBSD: patch-src_ls-hpack_lshpack.h,v 1.1 2024/02/21 21:32:13 schmonz Exp $
+$NetBSD: patch-src_ls-hpack_lshpack.h,v 1.2 2024/02/29 18:42:29 schmonz Exp $
 
-The compat file isn't present; unconditionally include.
+Apply upstream (106c4b147b) macOS sys/queue.h portability patch.
 
---- src/ls-hpack/lshpack.h.orig        2024-02-21 21:28:48.938352829 +0000
+--- src/ls-hpack/lshpack.h.orig        2024-02-20 04:42:50.000000000 +0000
 +++ src/ls-hpack/lshpack.h
-@@ -219,15 +219,7 @@ lshpack_dec_set_max_capacity (struct lsh
-  * These structures are not very complicated.
-  */
+@@ -225,6 +225,8 @@ lshpack_dec_set_max_capacity (struct lsh
+ #endif
+ #endif
  
--#ifdef __has_include
--#if __has_include(<sys/queue.h>)
- #include <sys/queue.h>
--#endif
--#endif
--
--#ifndef SIMPLEQ_FOREACH
--#include "../compat/sys/queue.h"
--#endif
++#ifndef STAILQ_FOREACH
++
+ #ifndef SIMPLEQ_FOREACH
+ #include "../compat/sys/queue.h"
+ #endif
+@@ -243,6 +245,8 @@ lshpack_dec_set_max_capacity (struct lsh
+ #define STAILQ_FOREACH          SIMPLEQ_FOREACH
+ #endif
  
- /* OpenBSD and older MacOSX might not define STAILQ,
-  * but ls-hpack usage could use SIMPLEQ as alternative */
++#endif
++
+ #if defined(STAILQ_FIRST) && defined(STAILQ_NEXT) && !defined(STAILQ_FOREACH)
+ #define STAILQ_FOREACH(var, head, field)                                \
+         for((var) = STAILQ_FIRST((head));                               \