updated www/mini_httpd to 1.21. See mini_httpd website for changes from

previous releases.

6 files changed, 55 insertions, 68 deletions

diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile
index d4108087fb6..c5500bdbc5a 100644
--- a/www/mini_httpd/Makefile
+++ b/www/mini_httpd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2014/02/12 23:18:46 tron Exp $
+# $NetBSD: Makefile,v 1.24 2015/04/11 16:16:54 schwarz Exp $
 
-DISTNAME=	mini_httpd-1.19
-PKGREVISION=	8
+DISTNAME=	mini_httpd-1.21
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/mini_httpd/
 
diff --git a/www/mini_httpd/distinfo b/www/mini_httpd/distinfo
index f4b688b8738..d45131f5e9b 100644
--- a/www/mini_httpd/distinfo
+++ b/www/mini_httpd/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.8 2010/06/19 21:09:10 asau Exp $
+$NetBSD: distinfo,v 1.9 2015/04/11 16:16:54 schwarz Exp $
 
-SHA1 (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = b156a5e0b9b6e2169ed772a5890fc63d8ed60514
-RMD160 (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = 4e8ec41bd9238d49481354bcf9404fb11519a667
-Size (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = 42063 bytes
-SHA1 (patch-aa) = 1bf0a30eae6303e7692f768227daf1751c73c389
-SHA1 (patch-ab) = bf74dd6f6a921024e0dde08eeff39fdf64706414
-SHA1 (patch-ac) = ccbd255aa5b3580426276e8f2fe211deea3feae5
-SHA1 (patch-ad) = 17fea4bef22eb4f89d442b86378b3b567afa7300
+SHA1 (mini_httpd-1.21/mini_httpd-1.21.tar.gz) = affd3e73f54ddf89c8ee82afdecf046eaabf755b
+RMD160 (mini_httpd-1.21/mini_httpd-1.21.tar.gz) = 7fae61ee60cece845c9ccb7aa7507acdfe30683d
+Size (mini_httpd-1.21/mini_httpd-1.21.tar.gz) = 43351 bytes
+SHA1 (patch-aa) = 9156d0f4a7d8b727db34bdf8b7691509f51f9e31
+SHA1 (patch-ab) = bf0f1cc373c0b7da4c4f4f4f0001ba357c16510a
+SHA1 (patch-ac) = c0587f2efa9a349cf739eafdeb2ee54f1fa44629
diff --git a/www/mini_httpd/patches/patch-aa b/www/mini_httpd/patches/patch-aa
index a961510baff..ae604330ecc 100644
--- a/www/mini_httpd/patches/patch-aa
+++ b/www/mini_httpd/patches/patch-aa
@@ -1,52 +1,60 @@
-$NetBSD: patch-aa,v 1.3 2009/07/07 19:05:23 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2015/04/11 16:16:54 schwarz Exp $
 
---- Makefile.orig	Fri Nov  1 23:02:57 2002
-+++ Makefile
-@@ -14,21 +14,23 @@ CRYPT_LIB =    -lcrypt
+--- Makefile.orig	2014-10-19 08:33:43.000000000 +0200
++++ Makefile	2015-04-11 18:09:33.000000000 +0200
+@@ -7,26 +7,29 @@
+ # CONFIGURE: Some systems don't need -lcrypt, and indeed they get an
+ # error if you try to link with it.  If you get an error about libcrypt
+ # not found, try commenting out this definition.
+-CRYPT_LIB =    -lcrypt
++#CRYPT_LIB =    -lcrypt
+ 
+ # CONFIGURE: If you want to compile in support for https, uncomment these
+ # definitions.  You will need to have already built OpenSSL, available at
  # http://www.openssl.org/  Make sure the SSL_TREE definition points to the
  # tree with your OpenSSL installation - depending on how you installed it,
  # it may be in /usr/local instead of /usr/local/ssl.
 -#SSL_TREE =	/usr/local/ssl
 -#SSL_DEFS =	-DUSE_SSL
--#SSL_INC =	-I${SSL_TREE}/include
--#SSL_LIBS =	-L${SSL_TREE}/lib -lssl -lcrypto
+-#SSL_INC =	-I$(SSL_TREE)/include
+-#SSL_LIBS =	-L$(SSL_TREE)/lib -lssl -lcrypto
 +SSL_TREE =	${PREFIX}
 +SSL_DEFS =	-DUSE_SSL
-+SSL_INC =	-I${SSL_TREE}/include
-+SSL_LIBS =	-L${SSL_TREE}/lib -lssl -lcrypto
++SSL_INC =	-I$(SSL_TREE)/include
++SSL_LIBS =	-L$(SSL_TREE)/lib -lssl -lcrypto
  
  
 -BINDIR =	/usr/local/sbin
 -MANDIR =	/usr/local/man
+-CC =		cc
 +BINDIR =	${PREFIX}/sbin
 +MANDIR =	${PREFIX}/${PKGMANDIR}
- CC =		gcc
- CDEFS =		${SSL_DEFS} ${SSL_INC}
--CFLAGS =	-O ${CDEFS}
-+#CFLAGS =	-O ${CDEFS}
- #CFLAGS =	-g ${CDEFS}
++#CC =		cc
+ CDEFS =		$(SSL_DEFS) $(SSL_INC)
+-CFLAGS =	-O $(CDEFS) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long
 -LDFLAGS =	-s
+-LDLIBS =	$(CRYPT_LIB) $(SSL_LIBS) $(SYSV_LIBS)
++#CFLAGS =	-O $(CDEFS) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long
 +CFLAGS =	${PKG_CFLAGS} ${CDEFS}
 +#LDFLAGS =	-s
- #LDFLAGS =	-g
--LDLIBS =	${SSL_LIBS} ${SYSV_LIBS} ${CRYPT_LIB}
 +LDFLAGS =	${PKG_LDFLAGS}
++#LDLIBS =	$(CRYPT_LIB) $(SSL_LIBS) $(SYSV_LIBS)
 +LDLIBS =	${SSL_LIBS} ${SYSV_LIBS} ${CRYPT_LIB} ${PKG_LIBS}
  
  all:		mini_httpd htpasswd
  
-@@ -72,14 +74,13 @@ mini_httpd.pem:	mini_httpd.cnf
+@@ -70,14 +73,13 @@
  
  
  install:	all
--	rm -f ${BINDIR}/mini_httpd ${BINDIR}/htpasswd
--	-mkdir -p ${BINDIR}
--	cp mini_httpd htpasswd ${BINDIR}
--	rm -f ${MANDIR}/man8/mini_httpd.8 ${MANDIR}/man1/htpasswd.1
--	-mkdir -p ${MANDIR}/man8
--	cp mini_httpd.8 ${MANDIR}/man8
--	-mkdir -p ${MANDIR}/man1
--	cp htpasswd.1 ${MANDIR}/man1
+-	rm -f $(BINDIR)/mini_httpd $(BINDIR)/htpasswd
+-	-mkdir -p $(BINDIR)
+-	cp mini_httpd htpasswd $(BINDIR)
+-	rm -f $(MANDIR)/man8/mini_httpd.8 $(MANDIR)/man1/htpasswd.1
+-	-mkdir -p $(MANDIR)/man8
+-	cp mini_httpd.8 $(MANDIR)/man8
+-	-mkdir -p $(MANDIR)/man1
+-	cp htpasswd.1 $(MANDIR)/man1
 +	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${BINDIR}
 +	${BSD_INSTALL_PROGRAM} mini_httpd ${DESTDIR}${BINDIR}/mini_httpd
 +	${BSD_INSTALL_PROGRAM} htpasswd ${DESTDIR}${BINDIR}/mhtpasswd
@@ -57,3 +65,8 @@ $NetBSD: patch-aa,v 1.3 2009/07/07 19:05:23 joerg Exp $
  
  clean:
  	rm -f mini_httpd mime_encodings.h mime_types.h htpasswd mini_httpd.rnd *.o core core.* *.core
+@@ -92,3 +94,4 @@
+ 	  tar cf $$name.tar $$name ; \
+ 	  rm -rf $$name ; \
+ 	  gzip $$name.tar
++
diff --git a/www/mini_httpd/patches/patch-ab b/www/mini_httpd/patches/patch-ab
index e5dde3dbbd7..2fa7df41e4c 100644
--- a/www/mini_httpd/patches/patch-ab
+++ b/www/mini_httpd/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2005/12/08 17:11:58 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2015/04/11 16:16:54 schwarz Exp $
 
---- port.h.orig	2005-12-08 17:07:17.000000000 +0000
-+++ port.h
+--- port.h.orig	2014-08-02 20:04:01.000000000 +0200
++++ port.h	2015-04-11 17:53:12.000000000 +0200
 @@ -1,6 +1,6 @@
  /* port.h - portability defines */
  
@@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.1 2005/12/08 17:11:58 joerg Exp $
  # define OS_FreeBSD
  # define ARCH "FreeBSD"
  #elif defined(__OpenBSD__)
-@@ -39,7 +39,7 @@
- # define HAVE_INT64T
+@@ -40,7 +40,7 @@
+ # define HAVE_SRANDOMDEV
  # ifdef SO_ACCEPTFILTER
  #  define HAVE_ACCEPT_FILTERS
 -#  if ( __FreeBSD_version >= 411000 )
diff --git a/www/mini_httpd/patches/patch-ac b/www/mini_httpd/patches/patch-ac
index 742ae1ed5bb..1b107561292 100644
--- a/www/mini_httpd/patches/patch-ac
+++ b/www/mini_httpd/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2007/01/18 16:28:08 reed Exp $
+$NetBSD: patch-ac,v 1.2 2015/04/11 16:16:54 schwarz Exp $
 
---- mini_httpd.c.orig	2006-12-31 03:00:18.000000000 +0900
-+++ mini_httpd.c	2007-01-05 11:40:35.000000000 +0900
-@@ -822,6 +822,10 @@
+--- mini_httpd.c.orig	2014-10-19 08:33:10.000000000 +0200
++++ mini_httpd.c	2015-04-11 17:54:03.000000000 +0200
+@@ -833,6 +833,10 @@
  	    if ( errno == EPROTO )
  		continue;	/* try again */
  #endif /* EPROTO */
diff --git a/www/mini_httpd/patches/patch-ad b/www/mini_httpd/patches/patch-ad
deleted file mode 100644
index 6739cedacbd..00000000000
--- a/www/mini_httpd/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/06/19 21:09:11 asau Exp $
-
-Avoid clash: getline exists in NetBSD already.
-
---- htpasswd.c.orig	2001-12-19 03:08:10.000000000 +0300
-+++ htpasswd.c	2010-06-20 01:02:53.000000000 +0400
-@@ -49,7 +49,7 @@
-     while((line[y++] = line[x++]));
- }
- 
--static int getline(char *s, int n, FILE *f) {
-+static int get_line(char *s, int n, FILE *f) {
-     register int i=0;
- 
-     while(1) {
-@@ -189,7 +189,7 @@
-     strcpy(user,argv[2]);
- 
-     found = 0;
--    while(!(getline(line,MAX_STRING_LEN,f))) {
-+    while(!(get_line(line,MAX_STRING_LEN,f))) {
-         if(found || (line[0] == '#') || (!line[0])) {
-             putline(tfp,line);
-             continue;