nostromo: upgrade to 1.9.6

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: nostromo: upgrade to 1.9.6
From: ast <ast%NetBSD.org@localhost>
Date: Sat, 10 Feb 2018 11:14:19 +0000
Module Name:	pkgsrc-wip
Committed By:	ast <ast%NetBSD.org@localhost>
Pushed By:	ast
Date:		Sat Feb 10 12:14:19 2018 +0100
Changeset:	260f3187092359842b8f555f77635b70dce392fa

Modified Files:
	nostromo/Makefile
	nostromo/PLIST
	nostromo/distinfo
Removed Files:
	nostromo/patches/patch-src-http_path-extern
	nostromo/patches/patch-src-http_path-http
	nostromo/patches/patch-src-http_path-main
	nostromo/patches/patch-src-libmy-strb64d

Log Message:
nostromo: upgrade to 1.9.6

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

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

diffstat:
 nostromo/Makefile                           | 63 ++++++++++-------------------
 nostromo/PLIST                              | 16 ++++----
 nostromo/distinfo                           | 12 ++----
 nostromo/patches/patch-src-http_path-extern | 14 -------
 nostromo/patches/patch-src-http_path-http   | 15 -------
 nostromo/patches/patch-src-http_path-main   | 27 -------------
 nostromo/patches/patch-src-libmy-strb64d    | 23 -----------
 7 files changed, 34 insertions(+), 136 deletions(-)

diffs:
diff --git a/nostromo/Makefile b/nostromo/Makefile
index c6512fccc1..986b663403 100644
--- a/nostromo/Makefile
+++ b/nostromo/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-DISTNAME=	nostromo-1.9.5
-PKGREVISION=	2
+DISTNAME=	nostromo-1.9.6
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.nazgul.ch/dev/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -12,51 +12,32 @@ COMMENT=	Fast, secure HTTP/1.1 CGI/1.1 SSL IPv4/IPv6 webserver
 LICENSE=	modified-bsd
 
 USE_TOOLS+=	sed
-USE_TOOLS+=	perl
-REPLACE_PERL=	htdocs/cgi-bin/printenv
+MAKE_FILE=	GNUmakefile
 
 RCD_SCRIPTS=	nostromo
-EGDIR=		${DESTDIR}/${PREFIX}/nostromo
+EGDIR=		share/examples/nostromo
 
-USR_LOCAL=	/usr/local
-VAR_NOSTROMO=	/var/nostromo
-
-INSTALLATION_DIRS=	sbin
-INSTALLATION_DIRS+=	var/nostromo
-INSTALLATION_DIRS+=	${PKGMANDIR}/man8
+INSTALLATION_DIRS=	sbin share/examples/rc.d ${PKGMANDIR}/man8
 INSTALLATION_DIRS+=	${EGDIR}
-INSTALLATION_DIRS+=	${EGDIR}/logs
+INSTALLATION_DIRS+=	${EGDIR}/conf
 INSTALLATION_DIRS+=	${EGDIR}/icons
-INSTALLATION_DIRS+=	${EGDIR}/htdocs
-INSTALLATION_DIRS+=	${EGDIR}/htdocs/cgi-bin
+INSTALLATION_DIRS+=	${EGDIR}/htdocs ${EGDIR}/htdocs/cgi-bin
 
 SUBST_CLASSES+=		nostromo
-SUBST_FILES.nostromo=	src/nhttpd/nhttpd.8 \
-                        src/nhttpd/main.c \
-                        conf/nhttpd.conf-dist
-SUBST_SED.nostromo+=	-e 's,${VAR_NOSTROMO},${PREFIX}/nostromo,g'
-SUBST_SED.nostromo+=	-e 's,${USR_LOCAL},${PREFIX},g'
-SUBST_STAGE.nostromo=	post-patch
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/src/nhttpd/nhttpd \
-            ${DESTDIR}${PREFIX}/sbin/
-	${INSTALL_SCRIPT} ${WRKSRC}/src/tools/crypt \
-            ${DESTDIR}${PREFIX}/sbin/
-	${INSTALL_MAN} ${WRKSRC}/src/nhttpd/nhttpd.8 \
-            ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
-	${MKDIR} -m 0775 ${EGDIR}/logs
-	${MKDIR} ${EGDIR}/conf
-	${INSTALL_DATA} ${WRKSRC}/conf/mimes ${EGDIR}/conf/
-	${INSTALL_DATA} ${WRKSRC}/conf/nhttpd.conf-dist ${EGDIR}/conf/
-	${MKDIR} ${EGDIR}/htdocs
-	${INSTALL_DATA} ${WRKSRC}/htdocs/index.html ${EGDIR}/htdocs/
-	${INSTALL_DATA} ${WRKSRC}/htdocs/nostromo.gif ${EGDIR}/htdocs/
-	${MKDIR} ${EGDIR}/htdocs/cgi-bin
-	${INSTALL_SCRIPT} ${WRKSRC}/htdocs/cgi-bin/printenv \
-            ${EGDIR}/htdocs/cgi-bin/
-	${MKDIR} ${EGDIR}/icons
-	${INSTALL_DATA} ${WRKSRC}/icons/dir.gif ${EGDIR}/icons/
-	${INSTALL_DATA} ${WRKSRC}/icons/file.gif ${EGDIR}/icons/
+SUBST_MESSAGE.nostromo=	Fixing GNUmakefile src/nhttpd/GNUmakefile
+SUBST_STAGE.nostromo=	pre-patch
+SUBST_FILES.nostromo=	GNUmakefile \
+			src/nhttpd/GNUmakefile \
+			src/tools/GNUmakefile \
+			src/libbsd/GNUmakefile \
+			src/libmy/GNUmakefile
+SUBST_SED.nostromo+=	-e '/install -d -o root -g daemon -m 755/d'
+SUBST_SED.nostromo+=	-e 's,cc ${CCFLAGS},${CC} ${CCFLAGS},g'
+SUBST_SED.nostromo+=	-e 's,install -c -o root -g bin -m 555,${INSTALL},g'
+SUBST_SED.nostromo+=	-e 's,install -c -o root -g bin -m 444,${INSTALL_MAN},g'
+SUBST_SED.nostromo+=	-e 's,install -c -o root -g bin -m 644,${INSTALL_DATA},g'
+SUBST_SED.nostromo+=	-e 's,/usr/local,${DESTDIR}${PREFIX},g'
+SUBST_SED.nostromo+=	-e 's,/usr/share/man,${DESTDIR}${PREFIX}/${PKGMANDIR},g'
+SUBST_SED.nostromo+=	-e 's,/var/nostromo,${DESTDIR}${PREFIX}/${EGDIR},g'
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/nostromo/PLIST b/nostromo/PLIST
index e116f587a8..60bd599055 100644
--- a/nostromo/PLIST
+++ b/nostromo/PLIST
@@ -1,12 +1,12 @@
 @comment $NetBSD$
-man/man8/nhttpd.8
-nostromo/conf/mimes
-nostromo/conf/nhttpd.conf-dist
-nostromo/htdocs/cgi-bin/printenv
-nostromo/htdocs/index.html
-nostromo/htdocs/nostromo.gif
-nostromo/icons/dir.gif
-nostromo/icons/file.gif
 sbin/crypt
 sbin/nhttpd
+man/man8/nhttpd.8
 share/examples/rc.d/nostromo
+share/examples/nostromo/conf/mimes
+share/examples/nostromo/conf/nhttpd.conf-dist
+share/examples/nostromo/htdocs/cgi-bin/printenv
+share/examples/nostromo/htdocs/index.html
+share/examples/nostromo/htdocs/nostromo.gif
+share/examples/nostromo/icons/dir.gif
+share/examples/nostromo/icons/file.gif
diff --git a/nostromo/distinfo b/nostromo/distinfo
index b7a6d6fb26..e0444f7e78 100644
--- a/nostromo/distinfo
+++ b/nostromo/distinfo
@@ -1,10 +1,6 @@
 $NetBSD$
 
-SHA1 (nostromo-1.9.5.tar.gz) = fae4a2655749d7ca04c5b87bead55578ec6705cc
-RMD160 (nostromo-1.9.5.tar.gz) = 8b9c17c854f7ed5c721d188c3cd3bd0510fb841f
-SHA512 (nostromo-1.9.5.tar.gz) = 04ce045a75c44a02f70a8281aff3d8ada8275f99cd4728b81dca57dbcb7dbd895ae25d6b9f017c6ad13b669cf5254baad4a913a66b97bca4244c60452db28edf
-Size (nostromo-1.9.5.tar.gz) = 47798 bytes
-SHA1 (patch-src-http_path-extern) = 73cbbc5dc9c4d9cd1c5afeef39048de41ef9f471
-SHA1 (patch-src-http_path-http) = 23b5bcfc73ba55897b444bbf8e08ec6def97a1f5
-SHA1 (patch-src-http_path-main) = f3060eef5c01fb348f5eed02d7b1bfb77ea4d712
-SHA1 (patch-src-libmy-strb64d) = 4e58fd82a299e269c404870165daa7677e1e6e76
+SHA1 (nostromo-1.9.6.tar.gz) = 6f3d8ebc15486398f819ac55a9d2a9ac14c3b35e
+RMD160 (nostromo-1.9.6.tar.gz) = 6817ac77c7645ab2bef3e73469d2f376448af868
+SHA512 (nostromo-1.9.6.tar.gz) = baf68f492653937b80629f1281a1243026ee2def9f5b092934474148f97306ef0796c4fecffb3d6061907d8fdc1beb0a34333dfe8738dec70acdd3975347d6ea
+Size (nostromo-1.9.6.tar.gz) = 50937 bytes
diff --git a/nostromo/patches/patch-src-http_path-extern b/nostromo/patches/patch-src-http_path-extern
deleted file mode 100644
index 21e8dfc01a..0000000000
--- a/nostromo/patches/patch-src-http_path-extern
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-http_path is not needed (PATH is responsibility of cgi-bin programs)
-
---- src/nhttpd/extern.h.orig	2011-03-19 21:55:46.000000000 +0100
-+++ src/nhttpd/extern.h	2013-09-15 09:57:12.000000000 +0200
-@@ -90,7 +90,6 @@
- extern char http_url[128];
- extern char http_urls[128];
- extern char http_sig[128];
--extern char http_path[128];
- 
- /*
-  * server configuration values
diff --git a/nostromo/patches/patch-src-http_path-http b/nostromo/patches/patch-src-http_path-http
deleted file mode 100644
index 431d320d3f..0000000000
--- a/nostromo/patches/patch-src-http_path-http
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-http_path is not needed (PATH is responsibility of cgi-bin programs)
-
---- src/nhttpd/http.c.orig	2011-05-31 18:48:32.000000000 +0200
-+++ src/nhttpd/http.c	2013-09-15 09:57:07.000000000 +0200
-@@ -483,8 +483,6 @@
- 			    rh->rq_docrootv);
- 			cgienv[i++] = sys_benv("GATEWAY_INTERFACE=%s",
- 			    http_fv_cgi);
--			cgienv[i++] = sys_benv("PATH=%s",
--			    http_path);
- 			cgienv[i++] = sys_benv("REMOTE_ADDR=%s",
- 			    c[sfd].ip);
- 			cgienv[i++] = sys_benv("REMOTE_PORT=%s",
diff --git a/nostromo/patches/patch-src-http_path-main b/nostromo/patches/patch-src-http_path-main
deleted file mode 100644
index bdb0471cd0..0000000000
--- a/nostromo/patches/patch-src-http_path-main
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-http_path is not needed (PATH is responsibility of cgi-bin programs)
-
---- src/nhttpd/main.c.orig	2011-05-29 18:13:31.000000000 +0200
-+++ src/nhttpd/main.c	2013-09-15 09:57:04.000000000 +0200
-@@ -128,7 +128,6 @@
- char	http_url[128];
- char	http_urls[128];
- char	http_sig[128];
--char	http_path[128];
- 
- struct cfg		config;
- struct connection	c[CON_MAX];
-@@ -683,10 +682,9 @@
- 	sys_mime(http_fv_cte, sizeof(http_fv_cte), mimes, mimes_size, "html");
- 
- 	/*
--	 * clear all environment variables and save PATH
-+	 * Empty environment for security
- 	 */
--	strlcpy(http_path, getenv("PATH"), sizeof(http_path));
--	memset(environ, 0, sizeof(environ));
-+	*environ = NULL;
- 
- 	/*
- 	 * get servers IP adress(es)
diff --git a/nostromo/patches/patch-src-libmy-strb64d b/nostromo/patches/patch-src-libmy-strb64d
deleted file mode 100644
index 9e2fe57047..0000000000
--- a/nostromo/patches/patch-src-libmy-strb64d
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-Better C style; clang failed to compile here
-
---- src/libmy/strb64d.c.orig	2013-09-10 09:58:37.814139989 +0200
-+++ src/libmy/strb64d.c	2013-09-10 10:00:47.489957357 +0200
-@@ -47,14 +47,14 @@
- int
- strb64d(char *dst, const char *src, const int dsize)
- {
--	int		ch, i, j = 0;
-+	int		ch, i, j;
- 	char		out[3];
- 	unsigned char	in_a[4], in_b[4];
- 
- 	dst[0] = '\0';
- 
- 	while (1) {
--		for (i = 0, j = j; i < 4; i++, j++) {
-+		for (i = 0, j = 0; i < 4; i++, j++) {
- 			if (src[j] == '\0')
- 				goto quit;
- 			ch = src[j];
Prev by Date: gnucash-devel: fix build with cmake.
Next by Date: Update libvips to 8.6.2
Previous by Thread: gnucash-devel: fix build with cmake.
Next by Thread: Update libvips to 8.6.2
Indexes:
Home | Main Index | Thread Index | Old Index