Sat Apr 11 16:16:54 2015 UTC ()
updated www/mini_httpd to 1.21. See mini_httpd website for changes from
previous releases.


(schwarz)
diff -r1.1737 -r1.1738 pkgsrc/doc/CHANGES-2015
diff -r1.23 -r1.24 pkgsrc/www/mini_httpd/Makefile
diff -r1.8 -r1.9 pkgsrc/www/mini_httpd/distinfo
diff -r1.3 -r1.4 pkgsrc/www/mini_httpd/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/www/mini_httpd/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/www/mini_httpd/patches/patch-ac
diff -r1.1 -r0 pkgsrc/www/mini_httpd/patches/patch-ad
cvs diff -r1.1737 -r1.1738 pkgsrc/doc/CHANGES-2015 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2015 2015/04/11 12:43:28 1.1737
+++ pkgsrc/doc/CHANGES-2015 2015/04/11 16:16:54 1.1738
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2015,v 1.1737 2015/04/11 12:43:28 adam Exp $ 1$NetBSD: CHANGES-2015,v 1.1738 2015/04/11 16:16:54 schwarz Exp $
2 2
3Changes to the packages collection and infrastructure in 2015: 3Changes to the packages collection and infrastructure in 2015:
4 4
5 Updated www/p5-Catalyst-Engine-JobQueue-POE to 0.0.4 [mef 2015-01-01] 5 Updated www/p5-Catalyst-Engine-JobQueue-POE to 0.0.4 [mef 2015-01-01]
6 Updated lang/gcc46 to 4.6.4nb3 [ryoon 2015-01-01] 6 Updated lang/gcc46 to 4.6.4nb3 [ryoon 2015-01-01]
7 Added lang/gcc46-libs version 4.6.4nb4 [ryoon 2015-01-01] 7 Added lang/gcc46-libs version 4.6.4nb4 [ryoon 2015-01-01]
8 Updated www/p5-Catalyst-Plugin-Authorization-ACL to 0.16 [mef 2015-01-01] 8 Updated www/p5-Catalyst-Plugin-Authorization-ACL to 0.16 [mef 2015-01-01]
9 Updated www/p5-Catalyst-Plugin-ConfigLoader to 0.34 [mef 2015-01-01] 9 Updated www/p5-Catalyst-Plugin-ConfigLoader to 0.34 [mef 2015-01-01]
10 Updated www/p5-Catalyst-Plugin-Static-Simple to 0.33 [mef 2015-01-01] 10 Updated www/p5-Catalyst-Plugin-Static-Simple to 0.33 [mef 2015-01-01]
11 Updated www/p5-Catalyst-Plugin-StatusMessage to 1.002000 [mef 2015-01-01] 11 Updated www/p5-Catalyst-Plugin-StatusMessage to 1.002000 [mef 2015-01-01]
12 Updated www/p5-Catalyst-View-Mason to 0.19 [mef 2015-01-01] 12 Updated www/p5-Catalyst-View-Mason to 0.19 [mef 2015-01-01]
13 Updated www/p5-Catalyst-View-TT to 0.42 [mef 2015-01-01] 13 Updated www/p5-Catalyst-View-TT to 0.42 [mef 2015-01-01]
14 Updated www/p5-CatalystX-CRUD-Controller-REST to 0.004 [mef 2015-01-01] 14 Updated www/p5-CatalystX-CRUD-Controller-REST to 0.004 [mef 2015-01-01]
@@ -2384,13 +2384,14 @@ Changes to the packages collection and i @@ -2384,13 +2384,14 @@ Changes to the packages collection and i
2384 Updated lang/opensource-cobol to 1.4.0J [ryoon 2015-04-11] 2384 Updated lang/opensource-cobol to 1.4.0J [ryoon 2015-04-11]
2385 Updated textproc/aspell-da to 1.7.42 [mef 2015-04-11] 2385 Updated textproc/aspell-da to 1.7.42 [mef 2015-04-11]
2386 Updated textproc/aspell-en to 7.1.0 [mef 2015-04-11] 2386 Updated textproc/aspell-en to 7.1.0 [mef 2015-04-11]
2387 Updated devel/ctemplate to 2.3 [rodent 2015-04-11] 2387 Updated devel/ctemplate to 2.3 [rodent 2015-04-11]
2388 Updated math/libsvm to 3.20 [rodent 2015-04-11] 2388 Updated math/libsvm to 3.20 [rodent 2015-04-11]
2389 Updated sysutils/ruby-childprocess to 0.5.6 [rodent 2015-04-11] 2389 Updated sysutils/ruby-childprocess to 0.5.6 [rodent 2015-04-11]
2390 Updated x11/c++-gtk-utils to 2.2.11 [ryoon 2015-04-11] 2390 Updated x11/c++-gtk-utils to 2.2.11 [ryoon 2015-04-11]
2391 Updated editors/emacs24 to 24.5 [wiz 2015-04-11] 2391 Updated editors/emacs24 to 24.5 [wiz 2015-04-11]
2392 Updated editors/emacs24-nox11 to 24.5 [wiz 2015-04-11] 2392 Updated editors/emacs24-nox11 to 24.5 [wiz 2015-04-11]
2393 Updated net/lldpd to 0.7.14 [mef 2015-04-11] 2393 Updated net/lldpd to 0.7.14 [mef 2015-04-11]
2394 Updated databases/sqlite3 to 3.8.9 [adam 2015-04-11] 2394 Updated databases/sqlite3 to 3.8.9 [adam 2015-04-11]
2395 Updated databases/sqlite3-docs to 3.8.9 [adam 2015-04-11] 2395 Updated databases/sqlite3-docs to 3.8.9 [adam 2015-04-11]
2396 Updated databases/sqlite3-tcl to 3.8.9 [adam 2015-04-11] 2396 Updated databases/sqlite3-tcl to 3.8.9 [adam 2015-04-11]
 2397 Updated www/mini_httpd to 1.21 [schwarz 2015-04-11]
cvs diff -r1.23 -r1.24 pkgsrc/www/mini_httpd/Makefile (expand / switch to unified diff)

--- pkgsrc/www/mini_httpd/Makefile 2014/02/12 23:18:46 1.23
+++ pkgsrc/www/mini_httpd/Makefile 2015/04/11 16:16:54 1.24
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.23 2014/02/12 23:18:46 tron Exp $ 1# $NetBSD: Makefile,v 1.24 2015/04/11 16:16:54 schwarz Exp $
2 2
3DISTNAME= mini_httpd-1.19 3DISTNAME= mini_httpd-1.21
4PKGREVISION= 8 
5CATEGORIES= www 4CATEGORIES= www
6MASTER_SITES= http://www.acme.com/software/mini_httpd/ 5MASTER_SITES= http://www.acme.com/software/mini_httpd/
7 6
8MAINTAINER= reed@reedmedia.net 7MAINTAINER= reed@reedmedia.net
9HOMEPAGE= http://www.acme.com/software/mini_httpd/ 8HOMEPAGE= http://www.acme.com/software/mini_httpd/
10COMMENT= Small, forking webserver with IPv6 and SSL support 9COMMENT= Small, forking webserver with IPv6 and SSL support
11 10
12DIST_SUBDIR= ${PKGNAME_NOREV} 11DIST_SUBDIR= ${PKGNAME_NOREV}
13 12
14USE_FEATURES= snprintf 13USE_FEATURES= snprintf
15 14
16MAKE_ENV+= PKG_CFLAGS=${CFLAGS:Q} 15MAKE_ENV+= PKG_CFLAGS=${CFLAGS:Q}
17MAKE_ENV+= PKG_LDFLAGS=${LDFLAGS:Q} 16MAKE_ENV+= PKG_LDFLAGS=${LDFLAGS:Q}
cvs diff -r1.8 -r1.9 pkgsrc/www/mini_httpd/distinfo (expand / switch to unified diff)

--- pkgsrc/www/mini_httpd/distinfo 2010/06/19 21:09:10 1.8
+++ pkgsrc/www/mini_httpd/distinfo 2015/04/11 16:16:54 1.9
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1$NetBSD: distinfo,v 1.8 2010/06/19 21:09:10 asau Exp $ 1$NetBSD: distinfo,v 1.9 2015/04/11 16:16:54 schwarz Exp $
2 2
3SHA1 (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = b156a5e0b9b6e2169ed772a5890fc63d8ed60514 3SHA1 (mini_httpd-1.21/mini_httpd-1.21.tar.gz) = affd3e73f54ddf89c8ee82afdecf046eaabf755b
4RMD160 (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = 4e8ec41bd9238d49481354bcf9404fb11519a667 4RMD160 (mini_httpd-1.21/mini_httpd-1.21.tar.gz) = 7fae61ee60cece845c9ccb7aa7507acdfe30683d
5Size (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = 42063 bytes 5Size (mini_httpd-1.21/mini_httpd-1.21.tar.gz) = 43351 bytes
6SHA1 (patch-aa) = 1bf0a30eae6303e7692f768227daf1751c73c389 6SHA1 (patch-aa) = 9156d0f4a7d8b727db34bdf8b7691509f51f9e31
7SHA1 (patch-ab) = bf74dd6f6a921024e0dde08eeff39fdf64706414 7SHA1 (patch-ab) = bf0f1cc373c0b7da4c4f4f4f0001ba357c16510a
8SHA1 (patch-ac) = ccbd255aa5b3580426276e8f2fe211deea3feae5 8SHA1 (patch-ac) = c0587f2efa9a349cf739eafdeb2ee54f1fa44629
9SHA1 (patch-ad) = 17fea4bef22eb4f89d442b86378b3b567afa7300 
cvs diff -r1.3 -r1.4 pkgsrc/www/mini_httpd/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/mini_httpd/patches/patch-aa 2009/07/07 19:05:23 1.3
+++ pkgsrc/www/mini_httpd/patches/patch-aa 2015/04/11 16:16:54 1.4
@@ -1,59 +1,72 @@ @@ -1,59 +1,72 @@
1$NetBSD: patch-aa,v 1.3 2009/07/07 19:05:23 joerg Exp $ 1$NetBSD: patch-aa,v 1.4 2015/04/11 16:16:54 schwarz Exp $
2 2
3--- Makefile.orig Fri Nov 1 23:02:57 2002 3--- Makefile.orig 2014-10-19 08:33:43.000000000 +0200
4+++ Makefile 4+++ Makefile 2015-04-11 18:09:33.000000000 +0200
5@@ -14,21 +14,23 @@ CRYPT_LIB = -lcrypt 5@@ -7,26 +7,29 @@
 6 # CONFIGURE: Some systems don't need -lcrypt, and indeed they get an
 7 # error if you try to link with it. If you get an error about libcrypt
 8 # not found, try commenting out this definition.
 9-CRYPT_LIB = -lcrypt
 10+#CRYPT_LIB = -lcrypt
 11
 12 # CONFIGURE: If you want to compile in support for https, uncomment these
 13 # definitions. You will need to have already built OpenSSL, available at
6 # http://www.openssl.org/ Make sure the SSL_TREE definition points to the 14 # http://www.openssl.org/ Make sure the SSL_TREE definition points to the
7 # tree with your OpenSSL installation - depending on how you installed it, 15 # tree with your OpenSSL installation - depending on how you installed it,
8 # it may be in /usr/local instead of /usr/local/ssl. 16 # it may be in /usr/local instead of /usr/local/ssl.
9-#SSL_TREE = /usr/local/ssl 17-#SSL_TREE = /usr/local/ssl
10-#SSL_DEFS = -DUSE_SSL 18-#SSL_DEFS = -DUSE_SSL
11-#SSL_INC = -I${SSL_TREE}/include 19-#SSL_INC = -I$(SSL_TREE)/include
12-#SSL_LIBS = -L${SSL_TREE}/lib -lssl -lcrypto 20-#SSL_LIBS = -L$(SSL_TREE)/lib -lssl -lcrypto
13+SSL_TREE = ${PREFIX} 21+SSL_TREE = ${PREFIX}
14+SSL_DEFS = -DUSE_SSL 22+SSL_DEFS = -DUSE_SSL
15+SSL_INC = -I${SSL_TREE}/include 23+SSL_INC = -I$(SSL_TREE)/include
16+SSL_LIBS = -L${SSL_TREE}/lib -lssl -lcrypto 24+SSL_LIBS = -L$(SSL_TREE)/lib -lssl -lcrypto
17  25
18  26
19-BINDIR = /usr/local/sbin 27-BINDIR = /usr/local/sbin
20-MANDIR = /usr/local/man 28-MANDIR = /usr/local/man
 29-CC = cc
21+BINDIR = ${PREFIX}/sbin 30+BINDIR = ${PREFIX}/sbin
22+MANDIR = ${PREFIX}/${PKGMANDIR} 31+MANDIR = ${PREFIX}/${PKGMANDIR}
23 CC = gcc 32+#CC = cc
24 CDEFS = ${SSL_DEFS} ${SSL_INC} 33 CDEFS = $(SSL_DEFS) $(SSL_INC)
25-CFLAGS = -O ${CDEFS} 34-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
26+#CFLAGS = -O ${CDEFS} 
27 #CFLAGS = -g ${CDEFS} 
28-LDFLAGS = -s 35-LDFLAGS = -s
 36-LDLIBS = $(CRYPT_LIB) $(SSL_LIBS) $(SYSV_LIBS)
 37+#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
29+CFLAGS = ${PKG_CFLAGS} ${CDEFS} 38+CFLAGS = ${PKG_CFLAGS} ${CDEFS}
30+#LDFLAGS = -s 39+#LDFLAGS = -s
31 #LDFLAGS = -g 
32-LDLIBS = ${SSL_LIBS} ${SYSV_LIBS} ${CRYPT_LIB} 
33+LDFLAGS = ${PKG_LDFLAGS} 40+LDFLAGS = ${PKG_LDFLAGS}
 41+#LDLIBS = $(CRYPT_LIB) $(SSL_LIBS) $(SYSV_LIBS)
34+LDLIBS = ${SSL_LIBS} ${SYSV_LIBS} ${CRYPT_LIB} ${PKG_LIBS} 42+LDLIBS = ${SSL_LIBS} ${SYSV_LIBS} ${CRYPT_LIB} ${PKG_LIBS}
35  43
36 all: mini_httpd htpasswd 44 all: mini_httpd htpasswd
37  45
38@@ -72,14 +74,13 @@ mini_httpd.pem: mini_httpd.cnf 46@@ -70,14 +73,13 @@
39  47
40  48
41 install: all 49 install: all
42- rm -f ${BINDIR}/mini_httpd ${BINDIR}/htpasswd 50- rm -f $(BINDIR)/mini_httpd $(BINDIR)/htpasswd
43- -mkdir -p ${BINDIR} 51- -mkdir -p $(BINDIR)
44- cp mini_httpd htpasswd ${BINDIR} 52- cp mini_httpd htpasswd $(BINDIR)
45- rm -f ${MANDIR}/man8/mini_httpd.8 ${MANDIR}/man1/htpasswd.1 53- rm -f $(MANDIR)/man8/mini_httpd.8 $(MANDIR)/man1/htpasswd.1
46- -mkdir -p ${MANDIR}/man8 54- -mkdir -p $(MANDIR)/man8
47- cp mini_httpd.8 ${MANDIR}/man8 55- cp mini_httpd.8 $(MANDIR)/man8
48- -mkdir -p ${MANDIR}/man1 56- -mkdir -p $(MANDIR)/man1
49- cp htpasswd.1 ${MANDIR}/man1 57- cp htpasswd.1 $(MANDIR)/man1
50+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${BINDIR} 58+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${BINDIR}
51+ ${BSD_INSTALL_PROGRAM} mini_httpd ${DESTDIR}${BINDIR}/mini_httpd 59+ ${BSD_INSTALL_PROGRAM} mini_httpd ${DESTDIR}${BINDIR}/mini_httpd
52+ ${BSD_INSTALL_PROGRAM} htpasswd ${DESTDIR}${BINDIR}/mhtpasswd 60+ ${BSD_INSTALL_PROGRAM} htpasswd ${DESTDIR}${BINDIR}/mhtpasswd
53+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man8 61+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man8
54+ ${BSD_INSTALL_MAN} mini_httpd.8 ${DESTDIR}${MANDIR}/man8/mini_httpd.8 62+ ${BSD_INSTALL_MAN} mini_httpd.8 ${DESTDIR}${MANDIR}/man8/mini_httpd.8
55+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man1 63+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man1
56+ ${BSD_INSTALL_MAN} htpasswd.1 ${DESTDIR}${MANDIR}/man1/mhtpasswd.1 64+ ${BSD_INSTALL_MAN} htpasswd.1 ${DESTDIR}${MANDIR}/man1/mhtpasswd.1
57  65
58 clean: 66 clean:
59 rm -f mini_httpd mime_encodings.h mime_types.h htpasswd mini_httpd.rnd *.o core core.* *.core 67 rm -f mini_httpd mime_encodings.h mime_types.h htpasswd mini_httpd.rnd *.o core core.* *.core
 68@@ -92,3 +94,4 @@
 69 tar cf $$name.tar $$name ; \
 70 rm -rf $$name ; \
 71 gzip $$name.tar
 72+
cvs diff -r1.1 -r1.2 pkgsrc/www/mini_httpd/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/www/mini_httpd/patches/patch-ab 2005/12/08 17:11:58 1.1
+++ pkgsrc/www/mini_httpd/patches/patch-ab 2015/04/11 16:16:54 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-ab,v 1.1 2005/12/08 17:11:58 joerg Exp $ 1$NetBSD: patch-ab,v 1.2 2015/04/11 16:16:54 schwarz Exp $
2 2
3--- port.h.orig 2005-12-08 17:07:17.000000000 +0000 3--- port.h.orig 2014-08-02 20:04:01.000000000 +0200
4+++ port.h 4+++ port.h 2015-04-11 17:53:12.000000000 +0200
5@@ -1,6 +1,6 @@ 5@@ -1,6 +1,6 @@
6 /* port.h - portability defines */ 6 /* port.h - portability defines */
7  7
8-#if defined(__FreeBSD__) 8-#if defined(__FreeBSD__)
9+#if defined(__FreeBSD__) || defined(__DragonFly__) 9+#if defined(__FreeBSD__) || defined(__DragonFly__)
10 # define OS_FreeBSD 10 # define OS_FreeBSD
11 # define ARCH "FreeBSD" 11 # define ARCH "FreeBSD"
12 #elif defined(__OpenBSD__) 12 #elif defined(__OpenBSD__)
13@@ -39,7 +39,7 @@ 13@@ -40,7 +40,7 @@
14 # define HAVE_INT64T 14 # define HAVE_SRANDOMDEV
15 # ifdef SO_ACCEPTFILTER 15 # ifdef SO_ACCEPTFILTER
16 # define HAVE_ACCEPT_FILTERS 16 # define HAVE_ACCEPT_FILTERS
17-# if ( __FreeBSD_version >= 411000 ) 17-# if ( __FreeBSD_version >= 411000 )
18+# if ( defined(__FreeBSD_version) && __FreeBSD_version >= 411000 ) 18+# if ( defined(__FreeBSD_version) && __FreeBSD_version >= 411000 )
19 # define ACCEPT_FILTER_NAME "httpready" 19 # define ACCEPT_FILTER_NAME "httpready"
20 # else 20 # else
21 # define ACCEPT_FILTER_NAME "dataready" 21 # define ACCEPT_FILTER_NAME "dataready"
cvs diff -r1.1 -r1.2 pkgsrc/www/mini_httpd/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/www/mini_httpd/patches/patch-ac 2007/01/18 16:28:08 1.1
+++ pkgsrc/www/mini_httpd/patches/patch-ac 2015/04/11 16:16:54 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ac,v 1.1 2007/01/18 16:28:08 reed Exp $ 1$NetBSD: patch-ac,v 1.2 2015/04/11 16:16:54 schwarz Exp $
2 2
3--- mini_httpd.c.orig 2006-12-31 03:00:18.000000000 +0900 3--- mini_httpd.c.orig 2014-10-19 08:33:10.000000000 +0200
4+++ mini_httpd.c 2007-01-05 11:40:35.000000000 +0900 4+++ mini_httpd.c 2015-04-11 17:54:03.000000000 +0200
5@@ -822,6 +822,10 @@ 5@@ -833,6 +833,10 @@
6 if ( errno == EPROTO ) 6 if ( errno == EPROTO )
7 continue; /* try again */ 7 continue; /* try again */
8 #endif /* EPROTO */ 8 #endif /* EPROTO */
9+#ifdef ECONNABORTED 9+#ifdef ECONNABORTED
10+ if ( errno == ECONNABORTED ) 10+ if ( errno == ECONNABORTED )
11+ continue; /* try again */ 11+ continue; /* try again */
12+#endif /* ECONNABORTED */ 12+#endif /* ECONNABORTED */
13 syslog( LOG_CRIT, "accept - %m" ); 13 syslog( LOG_CRIT, "accept - %m" );
14 perror( "accept" ); 14 perror( "accept" );
15 exit( 1 ); 15 exit( 1 );
File Deleted: pkgsrc/www/mini_httpd/patches/Attic/patch-ad