Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1635585246208320"
MIME-Version: 1.0
Date: Sat, 30 Oct 2021 09:14:06 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/www/superscript-shttpd
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20211030091406.09F5AFA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1635585246208320
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Sat Oct 30 09:14:05 UTC 2021

Added Files:
	pkgsrc/www/superscript-shttpd: DESCR Makefile PLIST distinfo
	pkgsrc/www/superscript-shttpd/patches: patch-Makefile
	    patch-leapsecs__read.c

Log Message:
Add superscript-httpd, some HTTP daemons designed to complement publicfile.

cgi-httpd, cgiuser-httpd, constant-httpd, echo-httpd, and redir-httpd
are HTTP daemons designed to complement publicfile.

Each instance of an shttpd daemon listens on a separate address, in a
chroot directory (except for cgiuser-httpd), typically running as a
nonprivileged user.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/www/superscript-shttpd/DESCR \
    pkgsrc/www/superscript-shttpd/Makefile \
    pkgsrc/www/superscript-shttpd/PLIST \
    pkgsrc/www/superscript-shttpd/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/superscript-shttpd/patches/patch-Makefile \
    pkgsrc/www/superscript-shttpd/patches/patch-leapsecs__read.c

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


--_----------=_1635585246208320
Content-Disposition: inline
Content-Length: 5383
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Added files:

Index: pkgsrc/www/superscript-shttpd/DESCR
diff -u /dev/null pkgsrc/www/superscript-shttpd/DESCR:1.1
--- /dev/null	Sat Oct 30 09:14:05 2021
+++ pkgsrc/www/superscript-shttpd/DESCR	Sat Oct 30 09:14:05 2021
@@ -0,0 +1,6 @@
+cgi-httpd, cgiuser-httpd, constant-httpd, echo-httpd, and redir-httpd
+are HTTP daemons designed to complement publicfile.
+
+Each instance of an shttpd daemon listens on a separate address, in a
+chroot directory (except for cgiuser-httpd), typically running as a
+nonprivileged user.
Index: pkgsrc/www/superscript-shttpd/Makefile
diff -u /dev/null pkgsrc/www/superscript-shttpd/Makefile:1.1
--- /dev/null	Sat Oct 30 09:14:05 2021
+++ pkgsrc/www/superscript-shttpd/Makefile	Sat Oct 30 09:14:05 2021
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2021/10/30 09:14:05 schmonz Exp $
+
+DISTNAME=		shttpd-0.53
+PKGNAME=		superscript-${DISTNAME}
+CATEGORIES=		www
+MASTER_SITES=		${MASTER_SITE_GITHUB:=SuperScript/shttpd/raw/179e52631ce26d2e3b6137596466b1764ba276ea/dist/}
+
+MAINTAINER=		schmonz@NetBSD.org
+HOMEPAGE=		https://web.archive.org/web/20120908072828/http://www.superscript.com/shttpd/index.html
+COMMENT=		HTTP daemons designed to complement publicfile
+#LICENSE=		# TODO: (see mk/license.mk)
+
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	do-configure
+SUBST_FILES.paths=	leapsecs_read.c
+SUBST_VARS.paths=	PKG_SYSCONFDIR
+
+post-configure:
+	cd ${WRKSRC} && cp conf-ld conf-lds
+
+.include "../../mk/djbware.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/superscript-shttpd/PLIST
diff -u /dev/null pkgsrc/www/superscript-shttpd/PLIST:1.1
--- /dev/null	Sat Oct 30 09:14:05 2021
+++ pkgsrc/www/superscript-shttpd/PLIST	Sat Oct 30 09:14:05 2021
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST,v 1.1 2021/10/30 09:14:05 schmonz Exp $
+bin/cgi-config
+bin/cgi-dispatch
+bin/cgi-httpd
+bin/cgi-success
+bin/cgiuser-config
+bin/cgiuser-httpd
+bin/constant-config
+bin/constant-httpd
+bin/echo-config
+bin/echo-httpd
+bin/redir-config
+bin/redir-data
+bin/redir-httpd
Index: pkgsrc/www/superscript-shttpd/distinfo
diff -u /dev/null pkgsrc/www/superscript-shttpd/distinfo:1.1
--- /dev/null	Sat Oct 30 09:14:05 2021
+++ pkgsrc/www/superscript-shttpd/distinfo	Sat Oct 30 09:14:05 2021
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2021/10/30 09:14:05 schmonz Exp $
+
+BLAKE2s (shttpd-0.53.tar.gz) = 60a35da5985a0a68ec7d47a19f2aef7b4b05858f2ba0b15b51f8a8b051c1bee3
+SHA512 (shttpd-0.53.tar.gz) = 35cbe2cd85a90c55c2ada2b13f75b8cf06f0123abfb4609271134c2d7deff99dc9752db37fb3ca1ae2b7131da53285c7a4f5a996edb37cebcdab912396c0b599
+Size (shttpd-0.53.tar.gz) = 54439 bytes
+SHA1 (patch-Makefile) = 7ee8313d7cd38cdb1153c8b5965d018ee27bf769
+SHA1 (patch-leapsecs__read.c) = 395d516f5fa737802903bfde3fa6b479d82da2dc

Index: pkgsrc/www/superscript-shttpd/patches/patch-Makefile
diff -u /dev/null pkgsrc/www/superscript-shttpd/patches/patch-Makefile:1.1
--- /dev/null	Sat Oct 30 09:14:05 2021
+++ pkgsrc/www/superscript-shttpd/patches/patch-Makefile	Sat Oct 30 09:14:05 2021
@@ -0,0 +1,44 @@
+$NetBSD: patch-Makefile,v 1.1 2021/10/30 09:14:05 schmonz Exp $
+
+DESTDIR support.
+
+--- Makefile.orig	2001-07-01 19:19:52.000000000 +0000
++++ Makefile
+@@ -24,6 +24,13 @@ cgi-config.c \
+ strerr.h exit.h auto_home.h generic-conf.h buffer.h fmt.h
+ 	./compile cgi-config.c
+ 
++auto_destdir.o: compile \
++auto_destdir.c
++	./compile auto_destdir.c
++
++auto_destdir.c: auto-str conf-destdir
++	./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c
++
+ auto_home.o: compile \
+ auto_home.c
+ 	./compile auto_home.c
+@@ -852,9 +859,9 @@ prog: cgi-config cgi-env cgi-example cgi
+ cgiuser-config cgi-dispatch echo-config echo-httpd redir-config \
+ redir-httpd redir-data constant-config constant-httpd utime
+ 
+-install: load install.o hier.o auto_home.o stralloc.a alloc.a strerr.a \
++install: load install.o hier.o auto_destdir.o stralloc.a alloc.a strerr.a \
+ buffer.a open.a error.a str.a
+-	./load install hier.o auto_home.o stralloc.a alloc.a strerr.a buffer.a \
++	./load install hier.o auto_destdir.o stralloc.a alloc.a strerr.a buffer.a \
+ 	open.a error.a str.a 
+ 
+ constant-httpd: load constant-httpd.o pathdecode.o file.o filetype.o \
+@@ -904,9 +911,9 @@ rts: warn-auto.sh rts.sh conf-home
+ 	> rts
+ 	chmod 755 rts
+ 
+-instcheck: load instcheck.o hier.o auto_home.o strerr.a buffer.a error.a \
++instcheck: load instcheck.o hier.o auto_destdir.o strerr.a buffer.a error.a \
+ str.a
+-	./load instcheck hier.o auto_home.o strerr.a buffer.a error.a str.a 
++	./load instcheck hier.o auto_destdir.o strerr.a buffer.a error.a str.a 
+ 
+ instcheck.o: compile \
+ instcheck.c \
Index: pkgsrc/www/superscript-shttpd/patches/patch-leapsecs__read.c
diff -u /dev/null pkgsrc/www/superscript-shttpd/patches/patch-leapsecs__read.c:1.1
--- /dev/null	Sat Oct 30 09:14:05 2021
+++ pkgsrc/www/superscript-shttpd/patches/patch-leapsecs__read.c	Sat Oct 30 09:14:05 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-leapsecs__read.c,v 1.1 2021/10/30 09:14:05 schmonz Exp $
+
+PKG_SYSCONFDIR support.
+
+--- leapsecs_read.c.orig	1999-11-15 06:33:15.000000000 +0000
++++ leapsecs_read.c
+@@ -18,7 +18,7 @@ int leapsecs_read()
+   int i;
+   struct tai u;
+ 
+-  fd = open("/etc/leapsecs.dat",O_RDONLY | O_NDELAY);
++  fd = open("@PKG_SYSCONFDIR@/leapsecs.dat",O_RDONLY | O_NDELAY);
+   if (fd == -1) {
+     if (errno != ENOENT) return -1;
+     if (leapsecs) free(leapsecs);


--_----------=_1635585246208320--