w3c-httpd: newly created package for W3C httpd

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: w3c-httpd: newly created package for W3C httpd
From: NishiOwO <nishi%e3t.cc@localhost>
Date: Tue, 26 Sep 2023 17:05:53 +0000
Module Name:	pkgsrc-wip
Committed By:	NishiOwO <nishi%e3t.cc@localhost>
Pushed By:	nishi
Date:		Wed Sep 27 02:05:53 2023 +0900
Changeset:	ae576fbf93b732f068de518d0c208a3f19d0fb8f

Added Files:
	w3c-httpd/DESCR
	w3c-httpd/Makefile
	w3c-httpd/PLIST
	w3c-httpd/distinfo
	w3c-httpd/files/httpd.conf
	w3c-httpd/patches/patch-BUILD
	w3c-httpd/patches/patch-BUILD.SH
	w3c-httpd/patches/patch-Daemon_Implementation_CommonMakefile
	w3c-httpd/patches/patch-Daemon_Implementation_HTDaemon.c
	w3c-httpd/patches/patch-Daemon_Implementation_HTgc.c
	w3c-httpd/patches/patch-Library_Implementation_HTFile.h
	w3c-httpd/patches/patch-Library_Implementation_HTString.c
	w3c-httpd/patches/patch-Library_Implementation_HTString.h
	w3c-httpd/patches/patch-Library_Implementation_HTTCP.c

Log Message:
w3c-httpd: newly created package for W3C httpd

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ae576fbf93b732f068de518d0c208a3f19d0fb8f

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

diffstat:
 w3c-httpd/DESCR                                    |  4 ++
 w3c-httpd/Makefile                                 | 45 ++++++++++++++++++++++
 w3c-httpd/PLIST                                    |  7 ++++
 w3c-httpd/distinfo                                 | 14 +++++++
 w3c-httpd/files/httpd.conf                         | 10 +++++
 w3c-httpd/patches/patch-BUILD                      | 14 +++++++
 w3c-httpd/patches/patch-BUILD.SH                   | 14 +++++++
 .../patch-Daemon_Implementation_CommonMakefile     | 15 ++++++++
 .../patches/patch-Daemon_Implementation_HTDaemon.c | 15 ++++++++
 .../patches/patch-Daemon_Implementation_HTgc.c     | 16 ++++++++
 .../patches/patch-Library_Implementation_HTFile.h  | 16 ++++++++
 .../patch-Library_Implementation_HTString.c        | 22 +++++++++++
 .../patch-Library_Implementation_HTString.h        | 17 ++++++++
 .../patches/patch-Library_Implementation_HTTCP.c   | 17 ++++++++
 14 files changed, 226 insertions(+)

diffs:
diff --git a/w3c-httpd/DESCR b/w3c-httpd/DESCR
new file mode 100644
index 0000000000..682d861580
--- /dev/null
+++ b/w3c-httpd/DESCR
@@ -0,0 +1,4 @@
+This is a small upgrade release of the CERN server (a.k.a. W3C
+httpd). It includes a set of bug fixes and some improvements. The
+release comes ASIS - that is - there is _no_ support available. Take
+it or leave it :-)
diff --git a/w3c-httpd/Makefile b/w3c-httpd/Makefile
new file mode 100644
index 0000000000..60761959f4
--- /dev/null
+++ b/w3c-httpd/Makefile
@@ -0,0 +1,45 @@
+# $NetBSD$
+
+DISTNAME=	w3c-httpd-3.0A
+CATEGORIES=	www
+MASTER_SITES=	https://www.w3.org/Daemon/httpd/
+
+MAINTAINER=	nishi@nishi.boats
+HOMEPAGE=	https://www.w3.org/Daemon
+COMMENT=	CERN httpd
+LICENSE=	mit
+
+USE_TOOLS+=	gmake
+
+WRKSRC=	${WRKDIR} # TODO: one of All Daemon Library server_root, or leave it as-is
+
+post-extract:
+
+do-build:
+	cd ${WRKSRC} && gmake CFLAGS="-DGOT_READ_DIR" LFLAGS="-lcrypt" RULE_FILE="${PREFIX}/etc/httpd.conf" BINDIR="${PREFIX}/bin"
+	cd ${WRKSRC} && mkdir ${WRKSRC}/.destdir/${PREFIX}/lib
+	cd ${WRKSRC} && mkdir ${WRKSRC}/.destdir/${PREFIX}/bin
+	cd ${WRKSRC} && mkdir ${WRKSRC}/.destdir/${PREFIX}/etc
+	cd ${WRKSRC} && cp Library/netbsd/libwww.a ${WRKSRC}/.destdir/${PREFIX}/lib
+	cd ${WRKSRC} && cp Daemon/netbsd/cgiparse ${WRKSRC}/.destdir/${PREFIX}/bin
+	cd ${WRKSRC} && cp Daemon/netbsd/cgiutils ${WRKSRC}/.destdir/${PREFIX}/bin
+	cd ${WRKSRC} && cp Daemon/netbsd/htadm ${WRKSRC}/.destdir/${PREFIX}/bin
+	cd ${WRKSRC} && cp Daemon/netbsd/htimage ${WRKSRC}/.destdir/${PREFIX}/bin
+	cd ${WRKSRC} && cp Daemon/netbsd/httpd ${WRKSRC}/.destdir/${PREFIX}/bin
+	${CP} ${FILESDIR}/httpd.conf ${WRKSRC}/.destdir/${PREFIX}/etc
+
+print-PLIST:
+	@${ECHO} @comment $$\NetBSD$$
+	@cd ${WRKSRC}/.destdir/${PREFIX} && find * -type f | grep -vE "^etc\/"
+
+do-install:
+	mkdir -p ${PREFIX}/lib ${PREFIX}/bin ${PREFIX}/etc
+	cd ${WRKSRC} && ${INSTALL_LIB} Library/netbsd/libwww.a ${PREFIX}/lib/
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} Daemon/netbsd/cgiparse ${PREFIX}/bin/
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} Daemon/netbsd/cgiutils ${PREFIX}/bin/
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} Daemon/netbsd/htadm ${PREFIX}/bin/
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} Daemon/netbsd/htimage ${PREFIX}/bin/
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} Daemon/netbsd/httpd ${PREFIX}/bin/
+	${INSTALL_DATA} ${FILESDIR}/httpd.conf ${PREFIX}/etc
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/w3c-httpd/PLIST b/w3c-httpd/PLIST
new file mode 100644
index 0000000000..751e04b8e6
--- /dev/null
+++ b/w3c-httpd/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD$
+bin/cgiparse
+bin/cgiutils
+bin/htadm
+bin/htimage
+bin/httpd
+lib/libwww.a
diff --git a/w3c-httpd/distinfo b/w3c-httpd/distinfo
new file mode 100644
index 0000000000..b1c35065ec
--- /dev/null
+++ b/w3c-httpd/distinfo
@@ -0,0 +1,14 @@
+$NetBSD$
+
+BLAKE2s (w3c-httpd-3.0A.tar.gz) = 85d732e34520765e698eaf010517e2fe216e7222c03fdb56dff23d4e796e4df5
+SHA512 (w3c-httpd-3.0A.tar.gz) = 173c697d3ba40e5591f371d8c9b8c356ca4a3ba7cc7dca5da64c6b2b826f28ad842e55a19212300a970d13259b9d6df92d61149c34bbf79e9327e6078108fcc1
+Size (w3c-httpd-3.0A.tar.gz) = 627144 bytes
+SHA1 (patch-BUILD) = c9e554686482d520c3921e977cc40fba446a6077
+SHA1 (patch-BUILD.SH) = e1dcfa5f3f7c7d2f0f949843f2cfeca94a383818
+SHA1 (patch-Daemon_Implementation_CommonMakefile) = c3ac2fcd8fdf91d189ff29c9549b1b4103716456
+SHA1 (patch-Daemon_Implementation_HTDaemon.c) = 7efbc52583a7e3d2273e565bac10277feeda925a
+SHA1 (patch-Daemon_Implementation_HTgc.c) = 6c3a5efc249f20ac3d01a62a999f397a262b9d68
+SHA1 (patch-Library_Implementation_HTFile.h) = 04adb1925db938e3b7ec6e8f2006cb4e5c3e313f
+SHA1 (patch-Library_Implementation_HTString.c) = 089c9060f3184240ed60a28c274d145e98aa64ef
+SHA1 (patch-Library_Implementation_HTString.h) = 3c695c5e35f176ef3ba18c5d13917e0c19c51b76
+SHA1 (patch-Library_Implementation_HTTCP.c) = ef8fa14d048e53ee399dd9313504ccc91be42f3f
diff --git a/w3c-httpd/files/httpd.conf b/w3c-httpd/files/httpd.conf
new file mode 100644
index 0000000000..1e1950289b
--- /dev/null
+++ b/w3c-httpd/files/httpd.conf
@@ -0,0 +1,10 @@
+ServerRoot /var/www
+Port 80
+
+Welcome index.html
+
+UserId www
+GroupId www
+
+LogFormat Common
+LogTime LocalTime
diff --git a/w3c-httpd/patches/patch-BUILD b/w3c-httpd/patches/patch-BUILD
new file mode 100644
index 0000000000..42ce9a2d92
--- /dev/null
+++ b/w3c-httpd/patches/patch-BUILD
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Adding NetBSD target.
+
+--- BUILD.orig	2023-09-26 14:04:46.783172503 +0000
++++ BUILD
+@@ -57,6 +57,7 @@ if ($UNAME == "AIX")    	setenv WWW_MACH
+ if ($UNAME == "OSF1")   	setenv WWW_MACH	osf1
+ if ($UNAME == "BSD/386")	setenv WWW_MACH	unix
+ if ($UNAME == "Linux")		setenv WWW_MACH	linux
++if ($UNAME == "NetBSD")		setenv WWW_MACH	netbsd
+ if ($UNAME == "A/UX")		setenv WWW_MACH	aux
+ if ($UNAME == "SMP_DC.SOx")	setenv WWW_MACH	pyramid
+ if ($UNAME == "uts") then
diff --git a/w3c-httpd/patches/patch-BUILD.SH b/w3c-httpd/patches/patch-BUILD.SH
new file mode 100644
index 0000000000..e9e1919e7c
--- /dev/null
+++ b/w3c-httpd/patches/patch-BUILD.SH
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Adding NetBSD target.
+
+--- BUILD.SH.orig	2023-09-26 14:04:43.583274833 +0000
++++ BUILD.SH
+@@ -58,6 +58,7 @@ if [ "$UNAME" = "AIX" ]; then		WWW_MACH=
+ if [ "$UNAME" = "OSF1" ]; then		WWW_MACH=osf1;export WWW_MACH;fi
+ if [ "$UNAME" = "BSD/386" ]; then	WWW_MACH=unix;export WWW_MACH;fi
+ if [ "$UNAME" = "Linux" ]; then		WWW_MACH=linux;export WWW_MACH;fi
++if [ "$UNAME" = "NetBSD" ]; then	WWW_MACH=netbsd;export WWW_MACH;fi
+ if [ "$UNAME" = "A/UX" ]; then		WWW_MACH=aux;export WWW_MACH;fi
+ if [ "$UNAME" = "SMP_DC.SOx" ]; then	WWW_MACH=pyramid;export WWW_MACH;fi
+ 
diff --git a/w3c-httpd/patches/patch-Daemon_Implementation_CommonMakefile b/w3c-httpd/patches/patch-Daemon_Implementation_CommonMakefile
new file mode 100644
index 0000000000..e7ea62e351
--- /dev/null
+++ b/w3c-httpd/patches/patch-Daemon_Implementation_CommonMakefile
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fixed syntax error.
+
+--- Daemon/Implementation/CommonMakefile.orig	1996-06-21 19:35:05.000000000 +0000
++++ Daemon/Implementation/CommonMakefile
+@@ -160,7 +160,7 @@ everything : inc $(PROD) htadm htimage c
+ PURIFY_CACHE = /home2/frystyk/purify-cache
+ 
+ PURIFY = purify \
+-	-logfile=$(HOME)/purify.log
++	-logfile=$(HOME)/purify.log \
+ 	-cache-dir=$(PURIFY_CACHE)
+ 
+ #
diff --git a/w3c-httpd/patches/patch-Daemon_Implementation_HTDaemon.c b/w3c-httpd/patches/patch-Daemon_Implementation_HTDaemon.c
new file mode 100644
index 0000000000..16c36baf88
--- /dev/null
+++ b/w3c-httpd/patches/patch-Daemon_Implementation_HTDaemon.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Adjusted to the pkgsrc path.
+
+--- Daemon/Implementation/HTDaemon.c.orig	1996-07-15 07:37:49.000000000 +0900
++++ Daemon/Implementation/HTDaemon.c	2023-09-27 01:42:30.288380200 +0900
+@@ -97,7 +97,7 @@
+ #ifdef VMS
+ #define RULE_FILE               "httpd_dir:httpd.conf"
+ #else /* not VMS */
+-#define RULE_FILE               "/etc/httpd.conf"
++#define RULE_FILE               PREFIX "/etc/httpd.conf"
+ #endif /* not VMS */
+ #endif
+ 
diff --git a/w3c-httpd/patches/patch-Daemon_Implementation_HTgc.c b/w3c-httpd/patches/patch-Daemon_Implementation_HTgc.c
new file mode 100644
index 0000000000..f491c65ac7
--- /dev/null
+++ b/w3c-httpd/patches/patch-Daemon_Implementation_HTgc.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+In NetBSD it's dirent.
+
+--- Daemon/Implementation/HTgc.c.orig	1994-07-12 14:52:08.000000000 +0000
++++ Daemon/Implementation/HTgc.c
+@@ -13,6 +13,9 @@
+ **
+ */
+ 
++#include <dirent.h>
++#define STRUCT_DIRENT struct dirent
++
+ #include <string.h>
+ #include <stdio.h>
+ #ifdef VMS
diff --git a/w3c-httpd/patches/patch-Library_Implementation_HTFile.h b/w3c-httpd/patches/patch-Library_Implementation_HTFile.h
new file mode 100644
index 0000000000..ef90d527b3
--- /dev/null
+++ b/w3c-httpd/patches/patch-Library_Implementation_HTFile.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+In NetBSD it's dirent.
+
+--- Library/Implementation/HTFile.h.orig	2023-09-26 14:25:18.286011859 +0000
++++ Library/Implementation/HTFile.h
+@@ -14,6 +14,9 @@
+    
+  */
+ 
++#include <dirent.h>
++#define STRUCT_DIRENT struct dirent
++
+ #ifndef HTFILE_H
+ #define HTFILE_H
+ 
diff --git a/w3c-httpd/patches/patch-Library_Implementation_HTString.c b/w3c-httpd/patches/patch-Library_Implementation_HTString.c
new file mode 100644
index 0000000000..a3bfe78328
--- /dev/null
+++ b/w3c-httpd/patches/patch-Library_Implementation_HTString.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Our libc has that.
+
+--- Library/Implementation/HTString.c.orig	1994-09-25 13:53:36.000000000 +0000
++++ Library/Implementation/HTString.c
+@@ -61,6 +61,7 @@ PUBLIC int strncasecomp ARGS3(CONST char
+ /*
+  * strcasestr(s1,s2) -- like strstr(s1,s2) but case-insensitive.
+  */
++/*
+ PUBLIC char * strcasestr ARGS2(char *,	s1,
+ 			       char *,	s2)
+ {
+@@ -90,6 +91,7 @@ PUBLIC char * strcasestr ARGS2(char *,	s
+ 	   s1,s2);
+     return NULL;
+ }
++*/
+ 
+ 
+ 
diff --git a/w3c-httpd/patches/patch-Library_Implementation_HTString.h b/w3c-httpd/patches/patch-Library_Implementation_HTString.h
new file mode 100644
index 0000000000..1ec73e2410
--- /dev/null
+++ b/w3c-httpd/patches/patch-Library_Implementation_HTString.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Our libc has that.
+
+--- Library/Implementation/HTString.h.orig	1994-09-25 14:15:24.000000000 +0000
++++ Library/Implementation/HTString.h
+@@ -30,8 +30,10 @@ Case-insensitive string inside another s
+    
+  */
+ 
++/*
+ PUBLIC char * strcasestr PARAMS((char * s1,
+                                  char * s2));
++*/
+ 
+ /*
+ 
diff --git a/w3c-httpd/patches/patch-Library_Implementation_HTTCP.c b/w3c-httpd/patches/patch-Library_Implementation_HTTCP.c
new file mode 100644
index 0000000000..982c6ed278
--- /dev/null
+++ b/w3c-httpd/patches/patch-Library_Implementation_HTTCP.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Our includes have that.
+
+--- Library/Implementation/HTTCP.c.orig	1996-06-21 15:47:26.000000000 +0000
++++ Library/Implementation/HTTCP.c
+@@ -117,8 +117,8 @@ extern int errno;
+ #ifndef VMS
+ #ifndef NeXT
+ #ifndef THINK_C
+-extern char *sys_errlist[];		/* see man perror on cernvax */
+-extern int sys_nerr;
++/*extern char *sys_errlist[];*/		/* see man perror on cernvax */
++/*extern int sys_nerr;*/
+ #endif  /* think c */
+ #endif	/* NeXT */
+ #endif  /* VMS */
Prev by Date: pkg-check: Only warn about DESCR lines longer than 70 chars
Next by Date: 64tass: remove, imported to pkgsrc/cross
Previous by Thread: pkg-check: Only warn about DESCR lines longer than 70 chars
Next by Thread: 64tass: remove, imported to pkgsrc/cross
Indexes:
Home | Main Index | Thread Index | Old Index