From nobody@FreeBSD.org  Tue Jun 13 15:07:59 2006
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0002516A585
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 13 Jun 2006 15:07:58 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C02C443D45
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 13 Jun 2006 15:07:58 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k5DF7whL085042
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 13 Jun 2006 15:07:58 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id k5DF7wmZ085041;
	Tue, 13 Jun 2006 15:07:58 GMT
	(envelope-from nobody)
Message-Id: <200606131507.k5DF7wmZ085041@www.freebsd.org>
Date: Tue, 13 Jun 2006 15:07:58 GMT
From: "Elisey O. Savateev" <b3k@mail.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] www/c-icap: update to 030606rc1
X-Send-Pr-Version: www-2.3

>Number:         98903
>Category:       ports
>Synopsis:       [PATCH] www/c-icap: update to 030606rc1
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 13 15:10:13 GMT 2006
>Closed-Date:    Thu Jun 15 11:19:41 GMT 2006
>Last-Modified:  Thu Jun 15 11:19:41 GMT 2006
>Originator:     Elisey O. Savateev
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
FreeBSD beastie 6.1-STABLE FreeBSD 6.1-STABLE #20: Sun Jun  4 21:19:04 YEKST
>Description:
- Contains fixes for a bug which causes segmentation fault to the c-icap server
>How-To-Repeat:

>Fix:
--- c-icap-030606_1,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/c-icap/Makefile /usr/home/bio3k/my_proj/ports/c-icap/c-icap/Makefile
--- /usr/ports/www/c-icap/Makefile	Tue Jun 13 20:52:46 2006
+++ /usr/home/bio3k/my_proj/ports/c-icap/c-icap/Makefile	Tue Jun 13 21:00:22 2006
@@ -2,17 +2,18 @@
 # Date created:				30 January 2006
 # Whom:					Elisey Savateev <b3k@mail.ru>
 #
-# $FreeBSD: ports/www/c-icap/Makefile,v 1.3 2006/06/11 08:33:02 pav Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	c-icap
 PORTVERSION=	030606
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 				http://bio3k.softboard.ru/uploads/arch/
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	c_icap-${PORTVERSION}
+DISTNAME=	c_icap-${PORTVERSION}rc1
 
 MAINTAINER=	b3k@mail.ru
 COMMENT=	An implementation of an ICAP server
diff -ruN --exclude=CVS /usr/ports/www/c-icap/distinfo /usr/home/bio3k/my_proj/ports/c-icap/c-icap/distinfo
--- /usr/ports/www/c-icap/distinfo	Tue Jun 13 20:52:46 2006
+++ /usr/home/bio3k/my_proj/ports/c-icap/c-icap/distinfo	Tue Jun 13 20:59:41 2006
@@ -1,3 +1,3 @@
-MD5 (c_icap-030606.tar.gz) = 539625e3bc95340043761b0c70a98f57
-SHA256 (c_icap-030606.tar.gz) = 554bb95d1d9e26960e8091c7db9796282fd9c116177dc6d6d6cc585dd4a7de3c
-SIZE (c_icap-030606.tar.gz) = 413457
+MD5 (c_icap-030606rc1.tar.gz) = 4e851db7fb03570b2420cf8a78b48223
+SHA256 (c_icap-030606rc1.tar.gz) = bcf7e3fa6461cdcba66b61e035ab00a41a3652b3c4a46025a36a1e625c991471
+SIZE (c_icap-030606rc1.tar.gz) = 413570
--- c-icap-030606_1,1.patch ends here ---
>Release-Note:
>Audit-Trail:

From: Sergey Matveychuk <sem@FreeBSD.org>
To: bug-followup@FreeBSD.org,  b3k@mail.ru
Cc:  
Subject: Re: ports/98903: [PATCH] www/c-icap: update to 030606rc1
Date: Wed, 14 Jun 2006 19:20:39 +0400

 Does not build on 4.11:
  cc -DHAVE_CONFIG_H -I. -I. -I. -Iinclude/ -DCI_BUILD_LIB -D_REENTRANT
 -I/usr/local/include -Wall -c request_common.c
 -Wp,-MD,.deps/libicapapi_la-request_common.TPlo  -fPIC -DPIC -o
 .libs/libicapapi_la-request_common.o
 request_common.c: In function `client_parse_icap_header':
 request_common.c:658: syntax error before `char'
 request_common.c:661: `end' undeclared (first use in this function)
 request_common.c:661: (Each undeclared identifier is reported only once
 request_common.c:661: for each function it appears in.)
 request_common.c:671: `buf' undeclared (first use in this function)
 *** Error code 1
 
 -- 
 Dixi.
 Sem.
State-Changed-From-To: open->feedback 
State-Changed-By: itetcu 
State-Changed-When: Wed Jun 14 22:34:43 UTC 2006 
State-Changed-Why:  
Ask for submitter fix. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=98903 

Adding to audit trail from misfiled PR ports/98970:

The following patch must fix build failure on 4.x. Please, place it into
files/patch-request_common.c before commit.
 
 --- patch-request_common.c begins here ---
 --- request_common.c.bak	Thu Jun 15 08:42:50 2006
 +++ request_common.c	Thu Jun 15 08:43:02 2006
 @@ -654,7 +654,7 @@
  
  
  int client_parse_icap_header(request_t *req,ci_headers_list_t *h){
 -     int readed=0,eoh=0;;
 +     int readed=0,eoh=0;
       char *buf,*end;
       if(req->pstrblock_read_len<4)/*we need 4 bytes for the end of headers "\r\n\r\n" string*/
  	  return CI_NEEDS_MORE;
 --- patch-request_common.c ends here ---
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Thu Jun 15 03:46:43 UTC 2006 
State-Changed-Why:  
Maintainer replied (see audit-trail). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=98903 
State-Changed-From-To: open->closed 
State-Changed-By: sem 
State-Changed-When: Thu Jun 15 11:19:39 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=98903 
>Unformatted:
