[.joined/pkgsrc/trunk]: .joined/pkgsrc/www/httpfile Update to 20220101. From ...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/.joined/pkgsrc/rev/c06a394f71f3
branches:  trunk
changeset: 371104:c06a394f71f3
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Tue Jan 04 22:35:24 2022 +0000

description:
Update to 20220101. From the changelog:

- Rework from scratch
- Instead of separate directories for regular files and gzipped content,
  use one directory for all (as publicfile did)
- Add manual page

diffstat:

 www/httpfile/DESCR                  |  14 ++++--------
 www/httpfile/Makefile               |  20 +++++++++++++-----
 www/httpfile/PLIST                  |  11 ++-------
 www/httpfile/distinfo               |  10 ++++----
 www/httpfile/patches/patch-Makefile |  39 -------------------------------------
 www/httpfile/patches/patch-limits.c |  22 ++++++++++++++++++++
 6 files changed, 49 insertions(+), 67 deletions(-)

diffs (153 lines):

diff -r a41e3ef0b43b -r c06a394f71f3 www/httpfile/DESCR
--- a/www/httpfile/DESCR        Tue Jan 04 22:10:37 2022 +0000
+++ b/www/httpfile/DESCR        Tue Jan 04 22:35:24 2022 +0000
@@ -1,11 +1,7 @@
 httpfile is a secure HTTP server derived from publicfile-0.52:
 
-- removed ftpd
-- added "Content-Encoding: gzip"
-- added more 'default' filetypes
-- case insensitive filetype checking
-- upgraded alloc library, added memory limit
-- added request timeout
-- added basic authentication as a simple protection against robots
-- added 301 redirect for directories
-- added range support
+* reworked from scratch
+* removed ftpd
+* added range support
+* added 301 redirect for directories
+* added basic authentication as a simple protection against robots
diff -r a41e3ef0b43b -r c06a394f71f3 www/httpfile/Makefile
--- a/www/httpfile/Makefile     Tue Jan 04 22:10:37 2022 +0000
+++ b/www/httpfile/Makefile     Tue Jan 04 22:35:24 2022 +0000
@@ -1,16 +1,24 @@
-# $NetBSD: Makefile,v 1.1 2021/10/21 20:38:35 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2022/01/04 22:35:24 schmonz Exp $
 
-DISTNAME=              httpfile-20151206
+GITHUB_PROJECT=                httpfile
+GITHUB_TAG=            20220101
+DISTNAME=              ${GITHUB_PROJECT}
+PKGNAME=               ${GITHUB_PROJECT}-${GITHUB_TAG}
 CATEGORIES=            www
-MASTER_SITES=          ${HOMEPAGE}
-EXTRACT_SUFX=          .tar.bz2
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=janmojzis/}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              https://mojzis.com/software/httpfile/
 COMMENT=               Secure HTTP server derived from publicfile
 LICENSE=               djb-nonlicense
 
-DJB_BUILD_TARGETS=     install instcheck
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
+
+TEST_TARGET=           rts
 
-.include "../../mk/djbware.mk"
+do-install:
+       cd ${WRKSRC}; \
+       ${INSTALL_PROGRAM} httpfile ${DESTDIR}${PREFIX}/bin; \
+       ${INSTALL_MAN} man/httpfile.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
 .include "../../mk/bsd.pkg.mk"
diff -r a41e3ef0b43b -r c06a394f71f3 www/httpfile/PLIST
--- a/www/httpfile/PLIST        Tue Jan 04 22:10:37 2022 +0000
+++ b/www/httpfile/PLIST        Tue Jan 04 22:35:24 2022 +0000
@@ -1,8 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2021/10/21 20:38:35 schmonz Exp $
-bin/httpfile-access
-bin/httpfile-conf
-bin/httpfile-getmtime
-bin/httpfile-gzip
-bin/httpfile-httpd
-bin/httpfile-setlock
-bin/httpfile-setmtime
+@comment $NetBSD: PLIST,v 1.2 2022/01/04 22:35:24 schmonz Exp $
+bin/httpfile
+man/man1/httpfile.1
diff -r a41e3ef0b43b -r c06a394f71f3 www/httpfile/distinfo
--- a/www/httpfile/distinfo     Tue Jan 04 22:10:37 2022 +0000
+++ b/www/httpfile/distinfo     Tue Jan 04 22:35:24 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2021/11/15 18:18:56 wiz Exp $
+$NetBSD: distinfo,v 1.3 2022/01/04 22:35:24 schmonz Exp $
 
-BLAKE2s (httpfile-20151206.tar.bz2) = 9789610dc851a7d5e1c5012cf6e942399b1c927f06ea8dac9ba1dae2d56af4e9
-SHA512 (httpfile-20151206.tar.bz2) = 1768a647f16026e8a928432bd21a6a8673d5993b8a913375a91fa0f62aac382bd32efc13cebc31bf275b298883d083f2485d4fe1a74f87907b29ceb721677d00
-Size (httpfile-20151206.tar.bz2) = 29502 bytes
-SHA1 (patch-Makefile) = 3739cf9cec613dbd9b823b9bca15b3e656497bb8
+BLAKE2s (httpfile-20220101.tar.gz) = aaa9fa6930587cb5fbd9c15415c2f539fe76654aa103ccae3db6ce0e0e3048f9
+SHA512 (httpfile-20220101.tar.gz) = d2ef40c8b154ef5285706b8ac710d084d3d6784655350766d5fd08d5f0c08a954a52ea4bf880e619cadfbf4e63fd5bffffd26d984259fccf3e5c3c449f9c8d22
+Size (httpfile-20220101.tar.gz) = 27232 bytes
+SHA1 (patch-limits.c) = f53c322b18fe5d6702e2251c8f4903b2197481aa
diff -r a41e3ef0b43b -r c06a394f71f3 www/httpfile/patches/patch-Makefile
--- a/www/httpfile/patches/patch-Makefile       Tue Jan 04 22:10:37 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2021/10/21 20:38:35 schmonz Exp $
-
-DESTDIR support.
-
---- Makefile.orig      2013-11-24 14:38:10.000000000 +0000
-+++ Makefile
-@@ -757,6 +757,14 @@ auto-str: \
- load auto-str.o library.a
-       ./load auto-str library.a
- 
-+auto_destdir.c: \
-+auto-str conf-destdir
-+      ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c
-+
-+auto_destdir.o: \
-+compile auto_destdir.c
-+      ./compile auto_destdir.c
-+
- auto_home.c: \
- auto-str conf-home
-       ./auto-str auto_home `head -1 conf-home` > auto_home.c
-@@ -770,13 +778,12 @@ load httpfile-conf.o auto_home.o library
-       ./load httpfile-conf auto_home.o library.a
- 
- install: \
--load install.o auto_home.o library.a
--      ./load install auto_home.o library.a
--      ./install
-+load install.o auto_destdir.o library.a
-+      ./load install auto_destdir.o library.a
- 
- instcheck: \
--load instcheck.o auto_home.o library.a
--      ./load instcheck auto_home.o library.a
-+load instcheck.o auto_destdir.o library.a
-+      ./load instcheck auto_destdir.o library.a
- 
- httpfile-gzip: \
- warn-auto.sh httpfile-gzip.sh conf-home
diff -r a41e3ef0b43b -r c06a394f71f3 www/httpfile/patches/patch-limits.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/httpfile/patches/patch-limits.c       Tue Jan 04 22:35:24 2022 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-limits.c,v 1.1 2022/01/04 22:35:24 schmonz Exp $
+
+Work around "unable to set RLIMIT_DATA to 0" on macOS.
+
+--- limits.c.orig      2021-12-28 09:09:06.000000000 +0000
++++ limits.c
+@@ -41,6 +41,7 @@ int limits(void) {
+ /* if memory limit is greater than 64MB */
+ /* set memory limit to 128MB            */
+ #define DATAMAX 134217728
++#ifndef __APPLE__
+ #ifdef RLIMIT_DATA
+     if (getrlimit(RLIMIT_DATA, &r) == -1) {
+         log_e1("unable to get RLIMIT_DATA");
+@@ -55,6 +56,7 @@ int limits(void) {
+         log_t2("setrlimit RLIMIT_DATA set to ", lognum(DATAMAX));
+     }
+ #endif
++#endif
+ 
+     ret = 1;
+ cleanup: