Date: Sun, 14 Jan 2007 14:53:50 +0100 (CET) From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/107911: [Maintainer] www/gatling: adapt to changes in devel/libowfat Message-ID: <200701141353.l0EDro1C004121@hardy.tmseck.homedns.org> Resent-Message-ID: <200701141430.l0EEUH9i035035@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 107911 >Category: ports >Synopsis: [Maintainer] www/gatling: adapt to changes in devel/libowfat >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jan 14 14:30:16 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of Jan 14, 2007. >Description: - chase API changes in devel/libowfat - make the port depend on libowfat >= 0.25 - bump PORTREVISION Added files: files/patch-dl.c files/patch-gatling.c >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/gatling) (revision 1069) +++ Makefile (.../local/gatling) (revision 1069) @@ -7,13 +7,14 @@ PORTNAME= gatling PORTVERSION= 0.8 +PORTREVISION= 1 CATEGORIES= www benchmarks ftp ipv6 MASTER_SITES= http://dl.fefe.de/ MAINTAINER= tmseck@netcologne.de COMMENT= A high performance webserver with scalability benchmark tools -BUILD_DEPENDS= ${LOCALBASE}/lib/libowfat.a:${PORTSDIR}/devel/libowfat +BUILD_DEPENDS= libowfat>=0.25:${PORTSDIR}/devel/libowfat USE_BZIP2= yes USE_GMAKE= yes Index: files/patch-gatling.c =================================================================== --- files/patch-gatling.c (.../www/gatling) (revision 0) +++ files/patch-gatling.c (.../local/gatling) (revision 1069) @@ -0,0 +1,47 @@ +--- gatling.c.orig Sat Jan 13 15:37:09 2007 ++++ gatling.c Sat Jan 13 15:47:04 2007 +@@ -865,7 +865,7 @@ static inline int issafe(unsigned char c + return (c!='"' && c!='%' && c>=' ' && c!='+'); + } + +-unsigned long fmt_urlencoded(char* dest,const char* src,unsigned long len) { ++size_t fmt_urlencoded(char* dest,const char* src,size_t len) { + register const unsigned char* s=(const unsigned char*) src; + unsigned long written=0,i; + for (i=0; i<len; ++i) { +@@ -1011,7 +1011,7 @@ username2:password2 + * authentication was OK or -1 if authentication is needed (the HTTP + * response was then already written to the iob). */ + int http_dohtaccess(struct http_data* h) { +- unsigned long filesize; ++ size_t filesize; + char* map; + char* s; + char* auth; +@@ -1031,7 +1031,7 @@ int http_dohtaccess(struct http_data* h) + char* username,* password; + char* decoded; + int i; +- unsigned long l,dl,ul; ++ size_t l,dl,ul; + auth+=6; + while (*auth==' ' || *auth=='\t') ++auth; + i=str_chr(auth,'\n'); +@@ -1103,7 +1103,7 @@ int64 http_openfile(struct http_data* h, + char* dir=0; + char* s; + char* args; +- unsigned long i; ++ size_t i; + int64 fd; + int doesgzip,doesbzip2; + +@@ -2948,7 +2948,7 @@ void forkslave(int fd,buffer* in) { + j=str_chr(x,'\n'); if (j && x[j-1]=='\r') { --j; } + k=str_chr(x,' '); + if (k<j) { +- unsigned long dl; ++ size_t dl; + remoteuser=alloca(20+k-j); + i=fmt_str(remoteuser,"REMOTE_USER="); + scan_base64(x+k+1,remoteuser+i,&dl); Index: files/patch-dl.c =================================================================== --- files/patch-dl.c (.../www/gatling) (revision 0) +++ files/patch-dl.c (.../local/gatling) (revision 1069) @@ -0,0 +1,11 @@ +--- dl.c.orig Sat Jan 13 15:30:02 2007 ++++ dl.c Sat Jan 13 15:36:34 2007 +@@ -188,7 +188,7 @@ static inline int issafe(unsigned char c + return (c!='"' && c>=' ' && c!='+'); + } + +-unsigned long fmt_urlencoded(char* dest,const char* src,unsigned long len) { ++size_t fmt_urlencoded(char* dest,const char* src,size_t len) { + register const unsigned char* s=(const unsigned char*) src; + unsigned long written=0,i; + for (i=0; i<len; ++i) { >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701141353.l0EDro1C004121>