Attachment 53372 Details for Bug 80731 – patch-webfs

patch-webfs

patch-webfs (text/plain), 5.00 KB, created by Oliver Lehmann on 2005-05-07 13:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Lehmann

Created: 2005-05-07 13:20:01 UTC

Size: 5.00 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /usr/local/cvsroot/ports/www/webfs/Makefile,v
>retrieving revision 1.18
>diff -u -r1.18 Makefile
>--- Makefile	4 Feb 2004 05:09:37 -0000	1.18
>+++ Makefile	7 May 2005 12:09:56 -0000
>@@ -6,15 +6,16 @@
> #
> 
> PORTNAME=	webfs
>-PORTVERSION=	1.20
>-PORTREVISION=	1
>+PORTVERSION=	1.21
>+PORTREVISION=	0
> CATEGORIES=	www ipv6
>-MASTER_SITES=	http://bytesex.org/misc/
>-DISTNAME=	${PORTNAME}_${PORTVERSION}
>+MASTER_SITES=	http://dl.bytesex.org/releases/webfs/
> 
> MAINTAINER=	jedgar@FreeBSD.org
> COMMENT=	A simple http server for static content
> 
>+RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
>+
> WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
> USE_REINPLACE=	yes
> USE_GMAKE=	yes
>@@ -25,7 +26,7 @@
> MAKE_ENV+=	LDLIBS="-lssl -lcrypto" USE_DIET=no
> 
> MAN1=		webfsd.1
>-MIMEFILE?=	${PREFIX}/etc/webfsd/mime.types
>+MIMEFILE?=	${LOCALBASE}/etc/mime.types
> 
> .include <bsd.port.pre.mk>
> 
>@@ -42,7 +43,7 @@
> 	@${ECHO_CMD} "==========================================="
> 	@${ECHO_CMD} ""
> 
>-do-configure:
>+post-patch:
> 	@${REINPLACE_CMD} -e 's|/etc/mime.types|${MIMEFILE}|' ${WRKSRC}/GNUmakefile
> 	@${REINPLACE_CMD} -e 's|/etc/mime.types|${MIMEFILE}|' ${WRKSRC}/webfsd.man
> .if defined(WITHOUT_OPENSSL)
>@@ -52,9 +53,5 @@
> do-install:
> 	@${INSTALL_PROGRAM} ${WRKSRC}/webfsd ${PREFIX}/sbin
> 	@${INSTALL_MAN} ${WRKSRC}/webfsd.man ${PREFIX}/man/man1/webfsd.1
>-.if !exists(${PREFIX}/etc/webfsd/mime.types)
>-	@${MKDIR} ${PREFIX}/etc/webfsd
>-	@${ECHO_CMD} "# Insert mime types here" > ${PREFIX}/etc/webfsd/mime.types
>-.endif
> 
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>RCS file: /usr/local/cvsroot/ports/www/webfs/distinfo,v
>retrieving revision 1.12
>diff -u -r1.12 distinfo
>--- distinfo	31 Mar 2004 03:12:31 -0000	1.12
>+++ distinfo	7 May 2005 12:09:56 -0000
>@@ -1,2 +1,2 @@
>-MD5 (webfs_1.20.tar.gz) = 90c54905e4312eb45ad38d010a127208
>-SIZE (webfs_1.20.tar.gz) = 50998
>+MD5 (webfs-1.21.tar.gz) = 6dc125fe160479404147e7bbfc781dbc
>+SIZE(webfs-1.21.tar.gz) = 44249
>Index: pkg-plist
>===================================================================
>RCS file: /usr/local/cvsroot/ports/www/webfs/pkg-plist,v
>retrieving revision 1.1.1.1
>diff -u -r1.1.1.1 pkg-plist
>--- pkg-plist	26 Nov 1999 19:34:11 -0000	1.1.1.1
>+++ pkg-plist	7 May 2005 12:09:56 -0000
>@@ -1,3 +1 @@
>-etc/webfsd/mime.types
> sbin/webfsd
>-@dirrm etc/webfsd
>Index: files/patch-response.c
>===================================================================
>RCS file: /home/pcvs/ports/www/webfs/files/patch-response.c,v
>retrieving revision 1.1
>diff -u -r1.1 patch-response.c
>--- files/patch-response.c	30 Jan 2002 13:42:51 -0000	1.1
>+++ files/patch-response.c	7 May 2005 12:20:58 -0000
>@@ -1,53 +1,13 @@
>---- response.c.orig	Fri Oct 12 11:48:48 2001
>-+++ response.c	Wed Jan 30 08:28:59 2002
>-@@ -201,12 +201,12 @@
>-     req->r_hlen[i] = sprintf(req->r_head+i*BR_HEADER,
>- 			     "\r\n--" BOUNDARY "\r\n"
>- 			     "Content-type: %s\r\n"
>--			     "Content-range: bytes %ld-%ld/%ld\r\n"
>-+			     "Content-range: bytes %lld-%lld/%lld\r\n"
>- 			     "\r\n",
>- 			     now, req->mime,
>- 			     req->r_start[i],req->r_end[i]-1,req->bst.st_size);
>-     if (debug > 1)
>--	fprintf(stderr,"%03d: send range: %ld-%ld/%ld (%ld byte)\n",
>-+	fprintf(stderr,"%03d: send range: %lld-%lld/%lld (%lld byte)\n",
>- 		req->fd,
>- 		req->r_start[i],req->r_end[i],req->bst.st_size,
>- 		req->r_end[i]-req->r_start[i]);
>-@@ -230,14 +230,14 @@
>-     if (req->ranges == 0) {
>- 	req->lres += sprintf(req->hres+req->lres,
>- 			     "Content-Type: %s\r\n"
>--			     "Content-Length: %ld\r\n",
>-+			     "Content-Length: %lld\r\n",
>- 			     req->mime,
>- 			     req->body ? req->lbody : req->bst.st_size);
>-     } else if (req->ranges == 1) {
>- 	req->lres += sprintf(req->hres+req->lres,
>- 			     "Content-Type: %s\r\n"
>--			     "Content-Range: bytes %ld-%ld/%ld\r\n"
>--			     "Content-Length: %ld\r\n",
>-+			     "Content-Range: bytes %lld-%lld/%lld\r\n"
>-+			     "Content-Length: %lld\r\n",
>- 			     req->mime,
>- 			     req->r_start[0],req->r_end[0]-1,req->bst.st_size,
>- 			     req->r_end[0]-req->r_start[0]);
>-@@ -253,7 +253,7 @@
>- 	req->lres += sprintf(req->hres+req->lres,
>- 			     "Content-Type: multipart/byteranges;"
>- 			     " boundary=" BOUNDARY "\r\n"
>--			     "Content-Length: %ld\r\n",
>-+			     "Content-Length: %lld\r\n",
>- 			     now,len);
>-     }
>-     if (mtime != -1) {
>-@@ -388,7 +388,7 @@
>- 		return;
>- 	    default:
>- 		if (debug > 1)
>--		    fprintf(stderr,"%03d: %ld/%ld (%ld%%)\r",req->fd,
>-+		    fprintf(stderr,"%03d: %lld/%lld (%lld%%)\r",req->fd,
>- 			    req->written,req->bst.st_size,
>- 			    req->written*100/req->bst.st_size);
>- 		req->written += rc;
>+--- response.c.orig	Thu Jun 10 11:45:50 2004
>++++ response.c	Sat May  7 14:16:57 2005
>+@@ -17,6 +17,10 @@
>+ 
>+ #include "httpd.h"
>+ 
>++#ifndef PRId64
>++# define PRId64 "lld"
>++#endif
>++
>+ /* ---------------------------------------------------------------------- */
>+ /* os-specific sendfile() wrapper                                         */
>+

Actions: View

Attachments on bug 80731: 53372