CVS commit: pkgsrc/www/libmicrohttpd

["ng0" <ng0%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ng0
Date:           Fri Oct 18 08:36:19 UTC 2019

Modified Files:
        pkgsrc/www/libmicrohttpd: Makefile distinfo
Added Files:
        pkgsrc/www/libmicrohttpd/patches: patch-src_microhttpd_mhd_sockets.c

Log Message:
www/libmicrohttpd: fix build and functionality with some systems.

Add a patch from upstream which adds a previously missing return
for systems with TCP_NOPUSH and TCP_CORK.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/www/libmicrohttpd/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/www/libmicrohttpd/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/libmicrohttpd/patches/patch-src_microhttpd_mhd_sockets.c

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

Modified files:

Index: pkgsrc/www/libmicrohttpd/Makefile
diff -u pkgsrc/www/libmicrohttpd/Makefile:1.46 pkgsrc/www/libmicrohttpd/Makefile:1.47
--- pkgsrc/www/libmicrohttpd/Makefile:1.46      Thu Oct 17 17:25:50 2019
+++ pkgsrc/www/libmicrohttpd/Makefile   Fri Oct 18 08:36:19 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2019/10/17 17:25:50 ng0 Exp $
+# $NetBSD: Makefile,v 1.47 2019/10/18 08:36:19 ng0 Exp $
 
 DISTNAME=      libmicrohttpd-0.9.67
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GNU:=libmicrohttpd/}
 

Index: pkgsrc/www/libmicrohttpd/distinfo
diff -u pkgsrc/www/libmicrohttpd/distinfo:1.28 pkgsrc/www/libmicrohttpd/distinfo:1.29
--- pkgsrc/www/libmicrohttpd/distinfo:1.28      Thu Oct 17 17:25:50 2019
+++ pkgsrc/www/libmicrohttpd/distinfo   Fri Oct 18 08:36:19 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.28 2019/10/17 17:25:50 ng0 Exp $
+$NetBSD: distinfo,v 1.29 2019/10/18 08:36:19 ng0 Exp $
 
 SHA1 (libmicrohttpd-0.9.67.tar.gz) = 924a95746b95a5f6e432fc9af1cffc6ec5b070c5
 RMD160 (libmicrohttpd-0.9.67.tar.gz) = 9c83da4a10ed09184cf6e7e1aaf0e1d897dbcb7f
 SHA512 (libmicrohttpd-0.9.67.tar.gz) = 2a2a11e9a525024dada639b1622cc875bb9b59af266a53e2742d5bf92f544192713c4e1369a573b2e3796d27cf490a9a02ba360ccc91136b4780306769edb7ec
 Size (libmicrohttpd-0.9.67.tar.gz) = 1881973 bytes
+SHA1 (patch-src_microhttpd_mhd_sockets.c) = c5f18a031f1af8e05eb809da9d0398c0cee4dea2

Added files:

Index: pkgsrc/www/libmicrohttpd/patches/patch-src_microhttpd_mhd_sockets.c
diff -u /dev/null pkgsrc/www/libmicrohttpd/patches/patch-src_microhttpd_mhd_sockets.c:1.1
--- /dev/null   Fri Oct 18 08:36:19 2019
+++ pkgsrc/www/libmicrohttpd/patches/patch-src_microhttpd_mhd_sockets.c Fri Oct 18 08:36:19 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_microhttpd_mhd_sockets.c,v 1.1 2019/10/18 08:36:19 ng0 Exp $
+
+pick commit 093c83c2270e18294811f394c9af87a2cb56ea20
+as it adds a missing return on systems which do have
+TCP_CORK or TCP_NOPUSH.
+
+--- src/microhttpd/mhd_sockets.c~
++++ src/microhttpd/mhd_sockets.c
+@@ -530,6 +530,8 @@ MHD_socket_cork_ (MHD_socket sock,
+       return 0; /* even force flush failed!? */
+     return 1; /* success */
+   }
++#else
++  return 1; /* success */
+ #endif
+ #else
+   /* do not have MHD_TCP_CORK_NOPUSH at all */