[Midnightbsd-cvs] mports [19908] thttpd 2.26
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Aug 20 21:47:50 EDT 2015
Revision: 19908
http://svnweb.midnightbsd.org/mports/?rev=19908
Author: laffer1
Date: 2015-08-20 21:47:49 -0400 (Thu, 20 Aug 2015)
Log Message:
-----------
thttpd 2.26
Modified Paths:
--------------
trunk/www/thttpd/Makefile
trunk/www/thttpd/distinfo
trunk/www/thttpd/files/patch-libhttpd.c
trunk/www/thttpd/files/patch-mmc.c
trunk/www/thttpd/files/patch-thttpd.c
trunk/www/thttpd/files/pkg-message.in
trunk/www/thttpd/files/thttpd.conf.sample.in
trunk/www/thttpd/pkg-descr
trunk/www/thttpd/pkg-plist
Added Paths:
-----------
trunk/www/thttpd/files/patch-CVE-2005-3124
trunk/www/thttpd/files/patch-Makefile.in
trunk/www/thttpd/files/patch-cgi-src_Makefile.in
trunk/www/thttpd/files/patch-extras_Makefile.in
trunk/www/thttpd/files/patch-extras_htpasswd.c
trunk/www/thttpd/files/patch-extras_makeweb.1
trunk/www/thttpd/files/patch-extras_makeweb.c
Removed Paths:
-------------
trunk/www/thttpd/files/patch-ab
trunk/www/thttpd/files/patch-ac
trunk/www/thttpd/files/patch-ad
Property Changed:
----------------
trunk/www/thttpd/files/extra-patch-config.h
trunk/www/thttpd/files/patch-libhttpd.c
trunk/www/thttpd/files/patch-libhttpd.h
trunk/www/thttpd/files/patch-mmc.c
trunk/www/thttpd/files/patch-thttpd.c
trunk/www/thttpd/files/pkg-message.in
trunk/www/thttpd/files/thttpd.conf.sample.in
trunk/www/thttpd/pkg-descr
Modified: trunk/www/thttpd/Makefile
===================================================================
--- trunk/www/thttpd/Makefile 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/Makefile 2015-08-21 01:47:49 UTC (rev 19908)
@@ -1,14 +1,10 @@
# $MidnightBSD$
PORTNAME= thttpd
-PORTVERSION= 2.25b
-PORTREVISION= 4
+PORTVERSION= 2.26
+PORTREVISION= 1
CATEGORIES= www ipv6
-MASTER_SITES= http://www.acme.com/software/thttpd/ \
- http://atreides.freenix.no/~anders/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} notes.html
-DIST_SUBDIR= ${PORTNAME}
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES= http://www.acme.com/software/thttpd/
MAINTAINER= ports at MidnightBSD.org
COMMENT= Tiny/turbo/throttling HTTP server
@@ -15,52 +11,41 @@
LICENSE= bsd2
+USES= cpe gmake # parallel builds (-jX) are broken with BSD make(1)
+GNU_CONFIGURE= yes
+MAKE_ARGS= WEBDIR=${WWWDIR}
+USE_RC_SUBR= ${PORTNAME}
+SUB_FILES= pkg-message thttpd.conf.sample
+SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+CPE_VENDOR= acme
+
MAKE_JOBS_UNSAFE= yes
-IGNOREFILES= notes.html
+OPTIONS_DEFINE= SENDFILE IPREAL INDEXES
+OPTIONS_DEFAULT= SENDFILE IPREAL
-GNU_CONFIGURE= yes
+SENDFILE_DESC= Use sendfile(2) to serve files
+IPREAL_DESC= Respect (pass on) "X-Forwarded-For" header
+INDEXES_DESC= Generate index pages for directories
-USE_RC_SUBR= thttpd
-SUB_FILES= pkg-message thttpd.conf.sample
-SUB_LIST= WWWOWN=${WWWOWN}
-PORTDOCS= notes.html
+SENDFILE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-config.h
+IPREAL_EXTRA_PATCHES= ${FILESDIR}/extra-patch-ip_real
-MAN1= makeweb.1 thttpdpasswd.1
-MAN8= thttpd.8 redirect.8 ssi.8 syslogtocern.8
+.include <bsd.mport.options.mk>
-.include <bsd.port.pre.mk>
-
post-patch:
-.for f in extras/htpasswd.1 extras/htpasswd.c thttpd.8 extras/Makefile.in
- @${REINPLACE_CMD} -e \
- 's|htpasswd|thttpdpasswd|g;s|\.thttpdpasswd|.htpasswd|g' ${WRKSRC}/${f}
+# To avoid conflict with other ports that also install htpasswd(1)
+.for f in extras/htpasswd.1 extras/htpasswd.c thttpd.8
+ @${REINPLACE_CMD} -e '/\.htpasswd/!s|htpasswd|t&|g' ${WRKSRC}/${f}
.endfor
- ${MV} ${WRKSRC}/extras/htpasswd.1 ${WRKSRC}/extras/thttpdpasswd.1
- ${MV} ${WRKSRC}/extras/htpasswd.c ${WRKSRC}/extras/thttpdpasswd.c
+ @${REINPLACE_CMD} -e 's|/var/www|${WWWDIR}|' \
+ ${WRKSRC}/extras/makeweb.1
+.if ! ${PORT_OPTIONS:MINDEXES}
+ @${REINPLACE_CMD} -e '/GENERATE_INDEXES/s|.*|/* & */|' \
+ ${WRKSRC}/config.h
+.endif
-post-configure:
- @cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-config.h
+post-install:
+ ${INSTALL_DATA} ${WRKDIR}/thttpd.conf.sample ${STAGEDIR}${PREFIX}/etc
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/thttpd ${PREFIX}/sbin
- ${INSTALL_MAN} ${WRKSRC}/thttpd.8 ${PREFIX}/man/man8
- @${MKDIR} ${PREFIX}/www/data ${PREFIX}/www/cgi-bin
- ${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/redirect ${PREFIX}/www/cgi-bin
- ${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/ssi ${PREFIX}/www/cgi-bin
- ${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/phf ${PREFIX}/www/cgi-bin
- ${INSTALL_MAN} ${WRKSRC}/cgi-src/redirect.8 ${PREFIX}/man/man8
- ${INSTALL_MAN} ${WRKSRC}/cgi-src/ssi.8 ${PREFIX}/man/man8
- ${INSTALL_PROGRAM} ${WRKSRC}/extras/makeweb ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/extras/thttpdpasswd ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/extras/syslogtocern ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/extras/makeweb.1 ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/extras/thttpdpasswd.1 ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/extras/syslogtocern.8 ${PREFIX}/man/man8
- ${INSTALL_DATA} ${WRKDIR}/thttpd.conf.sample ${PREFIX}/etc
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/notes.html ${DOCSDIR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/www/thttpd/distinfo
===================================================================
--- trunk/www/thttpd/distinfo 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/distinfo 2015-08-21 01:47:49 UTC (rev 19908)
@@ -1,3 +1,2 @@
-SHA256 (thttpd/thttpd-2.25b.tar.gz) = 07719b08b1cff6a21c08697a7bcb4395425b07ee753106262fb62a03a7d32360
-SIZE (thttpd/thttpd-2.25b.tar.gz) = 132275
-SHA256 (thttpd/notes.html) = IGNORE
+SHA256 (thttpd-2.26.tar.gz) = 4693d7c421fe1bd25553a8891cbb447d2bab3e0df01c029dadd79596b9bdb4c5
+SIZE (thttpd-2.26.tar.gz) = 133224
Index: trunk/www/thttpd/files/extra-patch-config.h
===================================================================
--- trunk/www/thttpd/files/extra-patch-config.h 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/files/extra-patch-config.h 2015-08-21 01:47:49 UTC (rev 19908)
Property changes on: trunk/www/thttpd/files/extra-patch-config.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Added: trunk/www/thttpd/files/patch-CVE-2005-3124
===================================================================
--- trunk/www/thttpd/files/patch-CVE-2005-3124 (rev 0)
+++ trunk/www/thttpd/files/patch-CVE-2005-3124 2015-08-21 01:47:49 UTC (rev 19908)
@@ -0,0 +1,18 @@
+--- extras/syslogtocern.orig 2005-06-29 19:50:23.000000000 +0200
++++ extras/syslogtocern 2008-09-25 10:42:27.000000000 +0200
+@@ -31,8 +31,8 @@ if [ $# -lt 1 ] ; then
+ exit 1
+ fi
+
+-tmp1=/tmp/stc1.$$
+-rm -f $tmp1
++tmp1=`mktemp -t stc1.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1; }
++trap "[ -f \"$tmp1\" ] && /bin/rm -f -- \"$tmp1\"" 0 1 2 3 13 15
+
+ # Gather up all the thttpd entries.
+ egrep -h ' thttpd\[' "$@" > $tmp1
+@@ -65,4 +65,3 @@ awk < $tmp1 '{if ( ! ( NF >= 15 && $7 ==
+ sed -e "s,\([A-Z][a-z][a-z] [0-9 ][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\) [^ ]* thttpd\[[0-9]*\]: \(.*\),[\1 ${year}] \2," > error_log
+
+ # Done.
+-rm -f $tmp1
Property changes on: trunk/www/thttpd/files/patch-CVE-2005-3124
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/thttpd/files/patch-Makefile.in
===================================================================
--- trunk/www/thttpd/files/patch-Makefile.in (rev 0)
+++ trunk/www/thttpd/files/patch-Makefile.in 2015-08-21 01:47:49 UTC (rev 19908)
@@ -0,0 +1,62 @@
+--- Makefile.in.orig Tue Apr 24 19:21:06 2001
++++ Makefile.in Tue Apr 24 19:21:33 2001
+@@ -47,7 +47,7 @@ CGIBINDIR = $(WEBDIR)/cgi-bin
+ # You shouldn't need to edit anything below here.
+
+ CC = @CC@
+-CCOPT = @V_CCOPT@
++CCOPT = @CFLAGS@
+ DEFS = @DEFS@
+ INCLS = -I.
+ CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
+@@ -96,9 +96,7 @@ mime_types.h: mime_types.txt
+
+ subdirs:
+ for i in $(SUBDIRS) ; do ( \
+- cd $$i ; \
+- pwd ; \
+- $(MAKE) $(MFLAGS) \
++ $(MAKE) -C $$i $(MFLAGS) \
+ WEBDIR=$(WEBDIR) \
+ CGIBINDIR=$(CGIBINDIR) \
+ MANDIR=$(MANDIR) \
+@@ -110,17 +108,15 @@ install: installthis install-man install
+
+ installthis:
+ -mkdir -p $(DESTDIR)$(BINDIR)
+- $(INSTALL) -m 555 -o bin -g bin thttpd $(DESTDIR)$(BINDIR)
++ $(INSTALL) -s -m 555 thttpd $(DESTDIR)$(BINDIR)
+
+ install-man:
+ -mkdir -p $(DESTDIR)$(MANDIR)/man8
+- $(INSTALL) -m 444 -o bin -g bin thttpd.8 $(DESTDIR)$(MANDIR)/man8
++ $(INSTALL) -m 444 thttpd.8 $(DESTDIR)$(MANDIR)/man8
+
+ installsubdirs:
+ for i in $(SUBDIRS) ; do ( \
+- cd $$i ; \
+- pwd ; \
+- $(MAKE) $(MFLAGS) \
++ $(MAKE) -C $$i $(MFLAGS) \
+ WEBDIR=$(WEBDIR) \
+ CGIBINDIR=$(CGIBINDIR) \
+ MANDIR=$(MANDIR) \
+@@ -137,16 +133,12 @@ distclean: distcleansubdirs
+
+ cleansubdirs:
+ for i in $(SUBDIRS) ; do ( \
+- cd $$i ; \
+- pwd ; \
+- $(MAKE) $(MFLAGS) clean \
++ $(MAKE) -C $$i $(MFLAGS) clean \
+ ) ; done
+
+ distcleansubdirs:
+ for i in $(SUBDIRS) ; do ( \
+- cd $$i ; \
+- pwd ; \
+- $(MAKE) $(MFLAGS) distclean \
++ $(MAKE) -C $$i $(MFLAGS) distclean \
+ ) ; done
+
+ tags:
Property changes on: trunk/www/thttpd/files/patch-Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/www/thttpd/files/patch-ab
===================================================================
--- trunk/www/thttpd/files/patch-ab 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/files/patch-ab 2015-08-21 01:47:49 UTC (rev 19908)
@@ -1,11 +0,0 @@
---- Makefile.in.orig Tue Apr 24 19:21:06 2001
-+++ Makefile.in Tue Apr 24 19:21:33 2001
-@@ -47,7 +47,7 @@
- # You shouldn't need to edit anything below here.
-
- CC = @CC@
--CCOPT = @V_CCOPT@
-+CCOPT = @CFLAGS@
- DEFS = @DEFS@
- INCLS = -I.
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
Deleted: trunk/www/thttpd/files/patch-ac
===================================================================
--- trunk/www/thttpd/files/patch-ac 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/files/patch-ac 2015-08-21 01:47:49 UTC (rev 19908)
@@ -1,11 +0,0 @@
---- cgi-src/Makefile.in.orig Tue Apr 24 19:44:12 2001
-+++ cgi-src/Makefile.in Tue Apr 24 19:44:25 2001
-@@ -31,7 +31,7 @@
- MANDIR = @mandir@
-
- CC = @CC@
--CCOPT = @V_CCOPT@
-+CCOPT = @CFLAGS@
- DEFS = @DEFS@
- INCLS = -I..
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
Deleted: trunk/www/thttpd/files/patch-ad
===================================================================
--- trunk/www/thttpd/files/patch-ad 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/files/patch-ad 2015-08-21 01:47:49 UTC (rev 19908)
@@ -1,11 +0,0 @@
---- extras/Makefile.in.orig Tue Apr 24 19:46:03 2001
-+++ extras/Makefile.in Tue Apr 24 19:46:13 2001
-@@ -32,7 +32,7 @@
- MANDIR = @mandir@
-
- CC = @CC@
--CCOPT = @V_CCOPT@
-+CCOPT = @CFLAGS@
- DEFS = @DEFS@
- INCLS = -I..
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
Added: trunk/www/thttpd/files/patch-cgi-src_Makefile.in
===================================================================
--- trunk/www/thttpd/files/patch-cgi-src_Makefile.in (rev 0)
+++ trunk/www/thttpd/files/patch-cgi-src_Makefile.in 2015-08-21 01:47:49 UTC (rev 19908)
@@ -0,0 +1,40 @@
+--- cgi-src/Makefile.in.orig Tue Apr 24 19:44:12 2001
++++ cgi-src/Makefile.in Tue Apr 24 19:44:25 2001
+@@ -31,7 +31,7 @@
+ MANDIR = @mandir@
+
+ CC = @CC@
+-CCOPT = @V_CCOPT@
++CCOPT = @CFLAGS@
+ DEFS = @DEFS@
+ INCLS = -I..
+ CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
+@@ -67,17 +67,17 @@
+ cd .. ; $(MAKE) $(MFLAGS) strerror.o
+
+ install: all
+- -mkdir -p $(CGIBINDIR)
+- rm -f $(CGIBINDIR)/redirect
+- cp redirect $(CGIBINDIR)/redirect
+- rm -f $(MANDIR)/man8/redirect.8
+- cp redirect.8 $(MANDIR)/man8/redirect.8
+- rm -f $(CGIBINDIR)/ssi
+- cp ssi $(CGIBINDIR)/ssi
+- rm -f $(MANDIR)/man8/ssi.8
+- cp ssi.8 $(MANDIR)/man8/ssi.8
+- rm -f $(CGIBINDIR)/phf
+- cp phf $(CGIBINDIR)/phf
++ -mkdir -p $(DESTDIR)$(CGIBINDIR)
++ rm -f $(DESTDIR)$(CGIBINDIR)/redirect
++ $(INSTALL) -s -m 555 redirect $(DESTDIR)$(CGIBINDIR)/redirect
++ rm -f $(DESTDIR)$(MANDIR)/man8/redirect.8
++ $(INSTALL) -m 444 redirect.8 $(DESTDIR)$(MANDIR)/man8/redirect.8
++ rm -f $(DESTDIR)$(CGIBINDIR)/ssi
++ $(INSTALL) -s -m 555 ssi $(DESTDIR)$(CGIBINDIR)/ssi
++ rm -f $(DESTDIR)$(MANDIR)/man8/ssi.8
++ $(INSTALL) -m 444 ssi.8 $(DESTDIR)$(MANDIR)/man8/ssi.8
++ rm -f $(DESTDIR)$(CGIBINDIR)/phf
++ $(INSTALL) -s -m 555 phf $(DESTDIR)$(CGIBINDIR)/phf
+
+ clean:
+ rm -f $(CLEANFILES)
Property changes on: trunk/www/thttpd/files/patch-cgi-src_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/thttpd/files/patch-extras_Makefile.in
===================================================================
--- trunk/www/thttpd/files/patch-extras_Makefile.in (rev 0)
+++ trunk/www/thttpd/files/patch-extras_Makefile.in 2015-08-21 01:47:49 UTC (rev 19908)
@@ -0,0 +1,40 @@
+--- extras/Makefile.in.orig Tue Apr 24 19:46:03 2001
++++ extras/Makefile.in Tue Apr 24 19:46:13 2001
+@@ -32,7 +32,7 @@
+ MANDIR = @mandir@
+
+ CC = @CC@
+-CCOPT = @V_CCOPT@
++CCOPT = @CFLAGS@
+ DEFS = @DEFS@
+ INCLS = -I..
+ CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
+@@ -66,18 +66,16 @@
+
+
+ install: all
+- rm -f $(BINDIR)/makeweb $(BINDIR)/htpasswd $(BINDIR)/syslogtocern
+- cp makeweb $(BINDIR)/makeweb
+- chgrp $(WEBGROUP) $(BINDIR)/makeweb
+- chmod 2755 $(BINDIR)/makeweb
+- cp htpasswd $(BINDIR)/htpasswd
+- cp syslogtocern $(BINDIR)/syslogtocern
+- rm -f $(MANDIR)/man1/makeweb.1
+- cp makeweb.1 $(MANDIR)/man1/makeweb.1
+- rm -f $(MANDIR)/man1/htpasswd.1
+- cp htpasswd.1 $(MANDIR)/man1/htpasswd.1
+- rm -f $(MANDIR)/man8/syslogtocern.8
+- cp syslogtocern.8 $(MANDIR)/man8/syslogtocern.8
++ rm -f $(DESTDIR)$(BINDIR)/makeweb $(DESTDIR)$(BINDIR)/thtpasswd $(DESTDIR)$(BINDIR)/syslogtocern
++ $(INSTALL) -s -m 555 makeweb $(DESTDIR)$(BINDIR)/makeweb
++ $(INSTALL) -s -m 555 htpasswd $(DESTDIR)$(BINDIR)/thtpasswd
++ $(INSTALL) -m 555 syslogtocern $(DESTDIR)$(BINDIR)/syslogtocern
++ rm -f $(DESTDIR)$(MANDIR)/man1/makeweb.1
++ $(INSTALL) -m 444 makeweb.1 $(DESTDIR)$(MANDIR)/man1/makeweb.1
++ rm -f $(DESTDIR)$(MANDIR)/man1/thtpasswd.1
++ $(INSTALL) -m 444 htpasswd.1 $(DESTDIR)$(MANDIR)/man1/thtpasswd.1
++ rm -f $(DESTDIR)$(MANDIR)/man8/syslogtocern.8
++ $(INSTALL) -m 444 syslogtocern.8 $(DESTDIR)$(MANDIR)/man8/syslogtocern.8
+
+ clean:
+ rm -f $(CLEANFILES)
Property changes on: trunk/www/thttpd/files/patch-extras_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/thttpd/files/patch-extras_htpasswd.c
===================================================================
--- trunk/www/thttpd/files/patch-extras_htpasswd.c (rev 0)
+++ trunk/www/thttpd/files/patch-extras_htpasswd.c 2015-08-21 01:47:49 UTC (rev 19908)
@@ -0,0 +1,199 @@
+--- extras/htpasswd.c.orig 2001-12-19 00:08:08 UTC
++++ extras/htpasswd.c
+@@ -19,7 +19,12 @@
+ #define LF 10
+ #define CR 13
+
++#define CPW_LEN 13
++
++/* ie 'string' + '\0' */
+ #define MAX_STRING_LEN 256
++/* ie 'maxstring' + ':' + cpassword */
++#define MAX_LINE_LEN MAX_STRING_LEN+1+CPW_LEN
+
+ int tfd;
+ char temp_template[] = "/tmp/htp.XXXXXX";
+@@ -135,8 +140,9 @@ add_password( char* user, FILE* f )
+ }
+
+ static void usage(void) {
+- fprintf(stderr,"Usage: htpasswd [-c] passwordfile username\n");
+- fprintf(stderr,"The -c flag creates a new file.\n");
++ fprintf(stderr,"Usage: htpasswd [-c] passwordfile username\n"
++ "The -c flag creates a new file.\n"
++ "Will prompt for password, unless given on stdin.\n");
+ exit(1);
+ }
+
+@@ -149,51 +155,128 @@ void interrupted(int signo) {
+ int main(int argc, char *argv[]) {
+ FILE *tfp,*f;
+ char user[MAX_STRING_LEN];
+- char line[MAX_STRING_LEN];
+- char l[MAX_STRING_LEN];
++ char pwfilename[MAX_STRING_LEN];
++ char line[MAX_LINE_LEN];
++ char l[MAX_LINE_LEN];
+ char w[MAX_STRING_LEN];
+- char command[MAX_STRING_LEN];
+- int found;
++ int found,u;
+
+ tfd = -1;
++ u = 2; /* argv[u] is username, unless... */
+ signal(SIGINT,(void (*)(int))interrupted);
+ if(argc == 4) {
++ u = 3;
+ if(strcmp(argv[1],"-c"))
+ usage();
++ if((f=fopen(argv[2],"r")) != NULL) {
++ fclose(f);
++ fprintf(stderr,
++ "Password file %s already exists.\n"
++ "Delete it first, if you really want to overwrite it.\n",
++ argv[2]);
++ exit(1);
++ }
++ } else if(argc != 3) usage();
++ /* check uname length; underlying system will take care of pwdfile
++ name too long */
++ if (strlen(argv[u]) >= MAX_STRING_LEN) {
++ fprintf(stderr,"Username too long (max %i): %s\n",
++ MAX_STRING_LEN-1, argv[u]);
++ exit(1);
++ }
++
++ if(argc == 4) {
+ if(!(tfp = fopen(argv[2],"w"))) {
+ fprintf(stderr,"Could not open passwd file %s for writing.\n",
+ argv[2]);
+ perror("fopen");
+ exit(1);
+ }
++ if (strlen(argv[2]) > (sizeof(pwfilename) - 1)) {
++ fprintf(stderr, "%s: filename is too long\n", argv[0]);
++ exit(1);
++ }
++ if (((strchr(argv[2], ';')) != NULL) || ((strchr(argv[2], '>')) != NULL)) {
++ fprintf(stderr, "%s: filename contains an illegal character\n",
++ argv[0]);
++ exit(1);
++ }
++ if (strlen(argv[3]) > (sizeof(user) - 1)) {
++ fprintf(stderr, "%s: username is too long\n", argv[0]);
++ exit(1);
++ }
++ if ((strchr(argv[3], ':')) != NULL) {
++ fprintf(stderr, "%s: username contains an illegal character\n",
++ argv[0]);
++ exit(1);
++ }
+ printf("Adding password for %s.\n",argv[3]);
+ add_password(argv[3],tfp);
+ fclose(tfp);
+ exit(0);
+- } else if(argc != 3) usage();
++ }
+
+- tfd = mkstemp(temp_template);
+- if(!(tfp = fdopen(tfd,"w"))) {
+- fprintf(stderr,"Could not open temp file.\n");
++ if (strlen(argv[1]) > (sizeof(pwfilename) - 1)) {
++ fprintf(stderr, "%s: filename is too long\n", argv[0]);
++ exit(1);
++ }
++ if (((strchr(argv[1], ';')) != NULL) || ((strchr(argv[1], '>')) != NULL)) {
++ fprintf(stderr, "%s: filename contains an illegal character\n",
++ argv[0]);
++ exit(1);
++ }
++ if (strlen(argv[2]) > (sizeof(user) - 1)) {
++ fprintf(stderr, "%s: username is too long\n", argv[0]);
++ exit(1);
++ }
++ if ((strchr(argv[2], ':')) != NULL) {
++ fprintf(stderr, "%s: username contains an illegal character\n",
++ argv[0]);
+ exit(1);
+ }
+-
+ if(!(f = fopen(argv[1],"r"))) {
+ fprintf(stderr,
+ "Could not open passwd file %s for reading.\n",argv[1]);
+ fprintf(stderr,"Use -c option to create new one.\n");
+ exit(1);
+ }
++ if(freopen(argv[1],"a",f) == NULL) {
++ fprintf(stderr,
++ "Could not open passwd file %s for writing!.\n"
++ "Changes would be lost.\n",argv[1]);
++ exit(1);
++ }
++ f = freopen(argv[1],"r",f);
++
++ /* pwdfile is there, go on with tempfile now ... */
++ tfd = mkstemp(temp_template);
++ if(!(tfp = fdopen(tfd,"w"))) {
++ fprintf(stderr,"Could not open temp file.\n");
++ exit(1);
++ }
++ /* already checked for boflw ... */
+ strcpy(user,argv[2]);
+
+ found = 0;
+- while(!(my_getline(line,MAX_STRING_LEN,f))) {
++ /* line we get is username:pwd, or possibly any other cruft */
++ while(!(my_getline(line,MAX_LINE_LEN,f))) {
++ char *i;
++
+ if(found || (line[0] == '#') || (!line[0])) {
+ putline(tfp,line);
+ continue;
+ }
+- strcpy(l,line);
+- getword(w,l,':');
++ i = index(line,':');
++ w[0] = '\0';
++ /* actually, cpw is CPW_LEN chars and never null, hence ':' should
++ always be at line[strlen(line)-CPW_LEN-1] in a valid user:cpw line
++ Here though we may allow for pre-hancrafted pwdfile (!)...
++ But still need to check for length limits.
++ */
++ if (i != 0 && i-line <= MAX_STRING_LEN-1) {
++ strcpy(l,line);
++ getword(w,l,':');
++ }
+ if(strcmp(user,w)) {
+ putline(tfp,line);
+ continue;
+@@ -208,10 +291,28 @@ int main(int argc, char *argv[]) {
+ printf("Adding user %s\n",user);
+ add_password(user,tfp);
+ }
++ /* close, rewind & copy */
++ fclose(f);
++ fclose(tfp);
++ f = fopen(argv[1],"w");
++ if(f==NULL) {
++ fprintf(stderr,"Failed re-opening %s!?\n",argv[1]);
++ exit(1);
++ }
++ tfp = fopen(temp_template,"r");
++ if(tfp==NULL) {
++ fprintf(stderr,"Failed re-opening tempfile!?\n");
++ exit(1);
++ }
++ {
++ int c;
++ while((c=fgetc(tfp))!=EOF && !feof(tfp)) {
++ fputc(c,f);
++ /* fputc(c,stderr); */
++ }
++ }
+ fclose(f);
+ fclose(tfp);
+- sprintf(command,"cp %s %s",temp_template,argv[1]);
+- system(command);
+ unlink(temp_template);
+ exit(0);
+ }
Property changes on: trunk/www/thttpd/files/patch-extras_htpasswd.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/thttpd/files/patch-extras_makeweb.1
===================================================================
--- trunk/www/thttpd/files/patch-extras_makeweb.1 (rev 0)
+++ trunk/www/thttpd/files/patch-extras_makeweb.1 2015-08-21 01:47:49 UTC (rev 19908)
@@ -0,0 +1,21 @@
+--- extras/makeweb.1.orig 2005-06-29 17:53:22 UTC
++++ extras/makeweb.1
+@@ -2,11 +2,17 @@
+ .SH NAME
+ makeweb - create user web directory
+ .SH SYNOPSIS
+-.B makeweb
++.B makeweb
++[\fI -d webdir \fR]
+ .SH DESCRIPTION
+ .PP
+ This program allows users to create their own web subdirectories off
+ of the main web directory.
++.PP
++.TP
++\fB\-d\fR
++Specify the root directory for new user directories. The default directory
++is /var/www
+ .SH "SEE ALSO
+ thttpd(8)
+ .SH AUTHOR
Property changes on: trunk/www/thttpd/files/patch-extras_makeweb.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/thttpd/files/patch-extras_makeweb.c
===================================================================
--- trunk/www/thttpd/files/patch-extras_makeweb.c (rev 0)
+++ trunk/www/thttpd/files/patch-extras_makeweb.c 2015-08-21 01:47:49 UTC (rev 19908)
@@ -0,0 +1,54 @@
+--- extras/makeweb.c.orig 2005-06-29 17:53:25 UTC
++++ extras/makeweb.c
+@@ -48,6 +48,11 @@
+
+ static char* argv0;
+
++static void
++usage( void )
++{
++ fprintf( stderr, "usage: %s [-d webdir]\n", argv0 );
++}
+
+ static void
+ check_room( int size, int len )
+@@ -126,17 +131,27 @@ main( int argc, char** argv )
+ struct passwd* pwd;
+ char* username;
+ char* homedir;
++ int opts;
+ char dirname[5000];
+ char linkname[5000];
+ char linkbuf[5000];
+ struct stat sb;
+
+ argv0 = argv[0];
+- if ( argc != 1 )
++
++#ifndef TILDE_MAP_2
++ webdir = WEBDIR;
++#endif /* TILDE_MAP_2 */
++
++ if ( (opts = getopt(argc, argv, "d:h")) != -1 )
++ {
++ switch (opts)
+ {
+- (void) fprintf( stderr, "usage: %s\n", argv0 );
+- exit( 1 );
++ case 'd': webdir = strdup(optarg); break;
++ case 'h':
++ default: usage(); return 1; break;
+ }
++ }
+
+ pwd = getpwuid( getuid() );
+ if ( pwd == (struct passwd*) 0 )
+@@ -162,8 +177,6 @@ main( int argc, char** argv )
+
+ #else /* TILDE_MAP_2 */
+
+- /* Gather the pieces. */
+- webdir = WEBDIR;
+ #ifdef TILDE_MAP_1
+ prefix = TILDE_MAP_1;
+ #else /* TILDE_MAP_1 */
Property changes on: trunk/www/thttpd/files/patch-extras_makeweb.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/www/thttpd/files/patch-libhttpd.c
===================================================================
--- trunk/www/thttpd/files/patch-libhttpd.c 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/files/patch-libhttpd.c 2015-08-21 01:47:49 UTC (rev 19908)
@@ -1,6 +1,56 @@
--- libhttpd.c.orig Mon May 27 01:22:26 2002
+++ libhttpd.c Sun Oct 20 23:49:58 2002
-@@ -3816,6 +3816,9 @@
+@@ -1483,7 +1483,7 @@
+ httpd_realloc_str( &checked, &maxchecked, checkedlen );
+ (void) strcpy( checked, path );
+ /* Trim trailing slashes. */
+- while ( checked[checkedlen - 1] == '/' )
++ while ( checkedlen && checked[checkedlen - 1] == '/' )
+ {
+ checked[checkedlen - 1] = '\0';
+ --checkedlen;
+@@ -1502,7 +1502,7 @@
+ restlen = strlen( path );
+ httpd_realloc_str( &rest, &maxrest, restlen );
+ (void) strcpy( rest, path );
+- if ( rest[restlen - 1] == '/' )
++ if ( restlen && rest[restlen - 1] == '/' )
+ rest[--restlen] = '\0'; /* trim trailing slash */
+ if ( ! tildemapped )
+ /* Remove any leading slashes. */
+@@ -2348,8 +2348,11 @@
+ {
+ int i;
+ i = strlen( hc->origfilename ) - strlen( hc->pathinfo );
+- if ( i > 0 && strcmp( &hc->origfilename[i], hc->pathinfo ) == 0 )
+- hc->origfilename[i - 1] = '\0';
++ if ( strcmp( &hc->origfilename[i], hc->pathinfo ) == 0 )
++ {
++ if ( i == 0 ) hc->origfilename[0] = '\0';
++ else hc->origfilename[i - 1] = '\0';
++ }
+ }
+
+ /* If the expanded filename is an absolute path, check that it's still
+@@ -2571,7 +2574,7 @@
+ size_t ext_len, encodings_len;
+ int i, top, bot, mid;
+ int r;
+- char* default_type = "text/plain; charset=%s";
++ char* default_type = "application/octet-stream";
+
+ /* Peel off encoding extensions until there aren't any more. */
+ n_me_indexes = 0;
+@@ -3312,7 +3315,7 @@
+ cp += strcspn( cp, " \t" );
+ status = atoi( cp );
+ }
+- if ( ( cp = strstr( headers, "Location:" ) ) != (char*) 0 &&
++ else if ( ( cp = strstr( headers, "Location:" ) ) != (char*) 0 &&
+ cp < br &&
+ ( cp == headers || *(cp-1) == '\012' ) )
+ status = 302;
+@@ -3889,6 +3892,9 @@
httpd_send_err( hc, 500, err500title, "", err500form, hc->encodedurl );
return -1;
}
Property changes on: trunk/www/thttpd/files/patch-libhttpd.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/thttpd/files/patch-libhttpd.h
===================================================================
--- trunk/www/thttpd/files/patch-libhttpd.h 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/files/patch-libhttpd.h 2015-08-21 01:47:49 UTC (rev 19908)
Property changes on: trunk/www/thttpd/files/patch-libhttpd.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/thttpd/files/patch-mmc.c
===================================================================
--- trunk/www/thttpd/files/patch-mmc.c 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/files/patch-mmc.c 2015-08-21 01:47:49 UTC (rev 19908)
@@ -1,7 +1,7 @@
---- mmc.c.orig Tue Oct 22 09:42:01 2002
-+++ mmc.c Fri Nov 14 12:26:39 2003
-@@ -74,6 +74,9 @@
- time_t ctime;
+--- mmc.c.orig 2014-12-10 20:53:22 UTC
++++ mmc.c
+@@ -83,6 +83,9 @@ typedef struct MapStruct {
+ time_t ct;
int refcount;
time_t reftime;
+#ifdef USE_SENDFILE
@@ -10,7 +10,7 @@
void* addr;
unsigned int hash;
int hash_idx;
-@@ -140,7 +143,11 @@
+@@ -149,7 +152,11 @@ mmc_map( char* filename, struct stat* sb
/* Yep. Just return the existing map */
++m->refcount;
m->reftime = now;
@@ -22,7 +22,7 @@
}
/* Open the file. */
-@@ -186,7 +193,9 @@
+@@ -195,7 +202,9 @@ mmc_map( char* filename, struct stat* sb
else
{
size_t size_size = (size_t) m->size; /* loses on files >2GB */
@@ -33,7 +33,7 @@
/* Map the file into memory. */
m->addr = mmap( 0, size_size, PROT_READ, MAP_PRIVATE, fd, 0 );
if ( m->addr == (void*) -1 && errno == ENOMEM )
-@@ -234,8 +243,9 @@
+@@ -243,8 +252,9 @@ mmc_map( char* filename, struct stat* sb
}
#endif /* HAVE_MMAP */
}
@@ -44,7 +44,7 @@
/* Put the Map into the hash table. */
if ( add_hash( m ) < 0 )
{
-@@ -253,8 +263,12 @@
+@@ -262,8 +272,12 @@ mmc_map( char* filename, struct stat* sb
/* Update the total byte count. */
mapped_bytes += m->size;
@@ -57,7 +57,7 @@
}
-@@ -267,14 +281,18 @@
+@@ -276,14 +290,18 @@ mmc_unmap( void* addr, struct stat* sbP,
if ( sbP != (struct stat*) 0 )
{
m = find_hash( sbP->st_ino, sbP->st_dev, sbP->st_size, sbP->st_ctime );
@@ -76,14 +76,23 @@
if ( m == (Map*) 0 )
syslog( LOG_ERR, "mmc_unmap failed to find entry!" );
else if ( m->refcount <= 0 )
-@@ -363,7 +381,9 @@
+@@ -372,7 +390,9 @@ really_unmap( Map** mm )
m = *mm;
if ( m->size != 0 )
{
-#ifdef HAVE_MMAP
+#ifdef USE_SENDFILE
-+ close(m->fd);
++ close(m->fd);
+#elif defined(HAVE_MMAP)
if ( munmap( m->addr, m->size ) < 0 )
syslog( LOG_ERR, "munmap - %m" );
#else /* HAVE_MMAP */
+@@ -523,7 +543,7 @@ void
+ mmc_logstats( long secs )
+ {
+ syslog(
+- LOG_NOTICE, " map cache - %d allocated, %d active (%lld bytes), %d free; hash size: %d; expire age: %ld",
++ LOG_NOTICE, " map cache - %d allocated, %d active (%lld bytes), %d free; hash size: %d; expire age: %d",
+ alloc_count, map_count, (long long) mapped_bytes, free_count, hash_size,
+ expire_age );
+ if ( map_count + free_count != alloc_count )
Property changes on: trunk/www/thttpd/files/patch-mmc.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/thttpd/files/patch-thttpd.c
===================================================================
--- trunk/www/thttpd/files/patch-thttpd.c 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/files/patch-thttpd.c 2015-08-21 01:47:49 UTC (rev 19908)
@@ -1,6 +1,42 @@
--- thttpd.c.orig Wed Jun 29 19:50:59 2005
+++ thttpd.c Sun Jun 17 21:30:11 2007
-@@ -1723,12 +1723,45 @@
+@@ -331,6 +331,7 @@
+ re_open_logfile( void )
+ {
+ FILE* logfp;
++ int retchmod;
+
+ if ( no_log || hs == (httpd_server*) 0 )
+ return;
+@@ -340,7 +341,8 @@
+ {
+ syslog( LOG_NOTICE, "re-opening logfile" );
+ logfp = fopen( logfile, "a" );
+- if ( logfp == (FILE*) 0 )
++ retchmod = chmod( logfile, S_IRUSR|S_IWUSR|S_IRGRP );
++ if ( logfp == (FILE*) 0 || retchmod != 0 )
+ {
+ syslog( LOG_CRIT, "re-opening %.80s - %m", logfile );
+ return;
+@@ -360,6 +362,7 @@
+ gid_t gid = 32767;
+ char cwd[MAXPATHLEN+1];
+ FILE* logfp;
++ int retchmod;
+ int num_ready;
+ int cnum;
+ connecttab* c;
+@@ -429,7 +432,8 @@
+ else
+ {
+ logfp = fopen( logfile, "a" );
+- if ( logfp == (FILE*) 0 )
++ retchmod = chmod( logfile, S_IRUSR|S_IWUSR|S_IRGRP );
++ if ( logfp == (FILE*) 0 || retchmod != 0 )
+ {
+ syslog( LOG_CRIT, "%.80s - %m", logfile );
+ perror( logfile );
+@@ -1714,12 +1718,45 @@
if ( hc->responselen == 0 )
{
/* No, just write the file. */
@@ -15,7 +51,7 @@
+ sz = sbytes > 0 ? sbytes : -1;
+ else if (sz == 0)
+ sz = sbytes;
-+#else
++#else
sz = write(
hc->conn_fd, &(hc->file_address[c->next_byte_index]),
MIN( c->end_byte_index - c->next_byte_index, max_bytes ) );
@@ -42,11 +78,11 @@
+ sz = sbytes > 0 ? sbytes : -1;
+ else if (sz == 0)
+ sz = sbytes;
-+#else
++#else
/* Yes. We'll combine headers and file into a single writev(),
** hoping that this generates a single packet.
*/
-@@ -1739,6 +1772,7 @@
+@@ -1730,6 +1767,7 @@
iv[1].iov_base = &(hc->file_address[c->next_byte_index]);
iv[1].iov_len = MIN( c->end_byte_index - c->next_byte_index, max_bytes );
sz = writev( hc->conn_fd, iv, 2 );
@@ -54,7 +90,7 @@
}
if ( sz < 0 && errno == EINTR )
-@@ -1786,7 +1820,11 @@
+@@ -1777,7 +1815,11 @@
**
** And ECONNRESET isn't interesting either.
*/
Property changes on: trunk/www/thttpd/files/patch-thttpd.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/www/thttpd/files/pkg-message.in
===================================================================
--- trunk/www/thttpd/files/pkg-message.in 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/files/pkg-message.in 2015-08-21 01:47:49 UTC (rev 19908)
@@ -2,8 +2,11 @@
If you want users to be able to create their own Web
subdirectories off of the main web directory, you need to:
- 1. Add a group for www admins
- 2. chgrp yourgroup %%PREFIX%%/bin/makeweb %%PREFIX%%/www
- 3. chmod 2755 %%PREFIX%%/bin/makeweb
- 4. Tell them about makeweb(1)
+ 1. Add a group for www admins (or use "%%WWWGRP%%")
+ 2. chgrp thatgroup %%PREFIX%%/bin/makeweb %%WWWDIR%%
+ 3. chmod g+sx %%PREFIX%%/bin/makeweb
+ 4. Tell users about makeweb(1)
+
+See http://www.acme.com/software/thttpd/notes.html for more
+detailed instructions.
-----------------------------------------------------------------
Property changes on: trunk/www/thttpd/files/pkg-message.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/thttpd/files/thttpd.conf.sample.in
===================================================================
--- trunk/www/thttpd/files/thttpd.conf.sample.in 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/files/thttpd.conf.sample.in 2015-08-21 01:47:49 UTC (rev 19908)
@@ -1,6 +1,6 @@
user=%%WWWOWN%%
-dir=%%PREFIX%%/www/data
+dir=%%WWWDIR%%
chroot
-cgipat=*.cgi
+cgipat=/cgi-bin/*
logfile=/var/log/thttpd.log
pidfile=/var/run/thttpd.pid
Property changes on: trunk/www/thttpd/files/thttpd.conf.sample.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/thttpd/pkg-descr
===================================================================
--- trunk/www/thttpd/pkg-descr 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/pkg-descr 2015-08-21 01:47:49 UTC (rev 19908)
@@ -1,18 +1,18 @@
thttpd is a simple, small, portable, fast, and secure HTTP server.
-Simple: It handles only the minimum necessary to implement HTTP/1.1.
+ - Simple: It handles only the minimum necessary to implement HTTP/1.1.
-Small: It also has a very small run-time size, since it does not fork and
-is very careful about memory allocation.
+ - Small: It also has a very small run-time size, since it does not fork
+ and is very careful about memory allocation.
-Portable: It compiles cleanly on SunOS 4.1.x, Solaris 2.x, BSD/OS 2.x,
-Linux 1.2.x, and OSF/1 (on a 64-bit Alpha).
+ - Portable: It compiles cleanly on SunOS 4.1.x, Solaris 2.x, BSD/OS 2.x,
+ Linux 1.2.x, and OSF/1 (on a 64-bit Alpha).
-Fast: In typical use it's about as fast as the best full-featured servers
-(Apache, NCSA, Netscape). Under extreme load it's much faster.
+ - Fast: In typical use it's about as fast as the best full-featured
+ servers (Apache, NCSA, Netscape). Under extreme load it's much faster.
-Secure: It goes to great lengths to protect the web server machine
-against attacks and breakins from other sites.
+ - Secure: It goes to great lengths to protect the web server machine
+ against attacks and breakins from other sites.
It also has one extremely useful feature (URL-traffic-based throttling) that
no other server currently has.
Property changes on: trunk/www/thttpd/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/www/thttpd/pkg-plist
===================================================================
--- trunk/www/thttpd/pkg-plist 2015-08-21 01:43:21 UTC (rev 19907)
+++ trunk/www/thttpd/pkg-plist 2015-08-21 01:47:49 UTC (rev 19908)
@@ -1,10 +1,14 @@
-bin/thttpdpasswd
-bin/makeweb
-bin/syslogtocern
-etc/thttpd.conf.sample
+ at sample etc/thttpd.conf.sample
+man/man1/makeweb.1.gz
+man/man1/thtpasswd.1.gz
+man/man8/redirect.8.gz
+man/man8/ssi.8.gz
+man/man8/syslogtocern.8.gz
+man/man8/thttpd.8.gz
+sbin/makeweb
+sbin/syslogtocern
sbin/thttpd
-www/cgi-bin/phf
-www/cgi-bin/redirect
-www/cgi-bin/ssi
- at dirrmtry www/cgi-bin
- at dirrmtry www/data
+sbin/thtpasswd
+%%WWWDIR%%/cgi-bin/phf
+%%WWWDIR%%/cgi-bin/redirect
+%%WWWDIR%%/cgi-bin/ssi
More information about the Midnightbsd-cvs
mailing list