From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 30 21:30:31 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB02716A42B for ; Sun, 30 Oct 2005 21:30:31 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE46243D49 for ; Sun, 30 Oct 2005 21:30:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j9ULU51Y091146 for ; Sun, 30 Oct 2005 21:30:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9ULU5jZ091145; Sun, 30 Oct 2005 21:30:05 GMT (envelope-from gnats) Resent-Date: Sun, 30 Oct 2005 21:30:05 GMT Resent-Message-Id: <200510302130.j9ULU5jZ091145@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Boris B. Samorodov" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C91316A41F for ; Sun, 30 Oct 2005 21:20:33 +0000 (GMT) (envelope-from bsam@mi.ipt.ru) Received: from mi.ipt.ru (gw.ipt.ru [80.253.10.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BF1943D45 for ; Sun, 30 Oct 2005 21:20:32 +0000 (GMT) (envelope-from bsam@mi.ipt.ru) Received: from mi.ipt.ru (localhost [127.0.0.1]) by mi.ipt.ru (8.13.4/8.13.4) with ESMTP id j9ULLIdc039611 for ; Mon, 31 Oct 2005 00:21:18 +0300 (MSK) (envelope-from bsam@mi.ipt.ru) Received: (from bsam@localhost) by mi.ipt.ru (8.13.4/8.13.3/Submit) id j9ULLHR2039610; Mon, 31 Oct 2005 00:21:17 +0300 (MSK) (envelope-from bsam) Message-Id: <200510302121.j9ULLHR2039610@mi.ipt.ru> Date: Mon, 31 Oct 2005 00:21:17 +0300 (MSK) From: "Boris B. Samorodov" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/88253: [update] devel/mime: unbreak compiling on FreeBSD >= 6.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Boris B. Samorodov" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Oct 2005 21:30:32 -0000 >Number: 88253 >Category: ports >Synopsis: [update] devel/mime: unbreak compiling on FreeBSD >= 6.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Oct 30 21:30:04 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Boris B. Samorodov >Release: FreeBSD 6.0-RC1 i386 >Organization: InPharmTech, Co. >Environment: System: FreeBSD mi.ipt.ru 6.0-RC1 FreeBSD 6.0-RC1 #0: Thu Oct 20 21:31:03 MSD 2005 bsam@mi.ipt.ru:/usr/obj/usr/src/sys/PROBA1 i386 >Description: The port devel/mime does not compile on FreeBSD >= 6.0: http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/e.7.2005100423/mime-1.1_1.log >How-To-Repeat: >Fix: The memmem port's vatiable conflicts with one form the system. The port's one is changed to memmemory. The patch should be applied to /usr/ports/devel: # cd /usr/ports/devel # patch -p0 < the_patch --- devel-mime.patch begins here --- diff -ruN mime.orig/Makefile mime/Makefile --- mime.orig/Makefile Fri Feb 11 12:18:32 2005 +++ mime/Makefile Sun Oct 30 23:45:34 2005 @@ -7,7 +7,7 @@ PORTNAME= mime PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://resnet.uoregon.edu/~gurney_j/jmpc/dist/ diff -ruN /dev/null mime/files/patch-header.c --- /dev/null Thu Jan 1 03:00:00 1970 +++ mime/files/patch-header.c Sun Oct 30 23:41:30 2005 @@ -0,0 +1,20 @@ +--- header.c.orig Sun Oct 30 23:37:49 2005 ++++ header.c Sun Oct 30 23:38:13 2005 +@@ -67,7 +67,7 @@ + alc = 0; + + while (value < end) { +- crlf = memmem(value, end - value, crlfpair, strlen(crlfpair)); ++ crlf = memmemory(value, end - value, crlfpair, strlen(crlfpair)); + if (crlf == NULL) + goto fv_error; + +@@ -123,7 +123,7 @@ + * header line + */ + colon = memchr(header, ':', end - header); +- crlf = memmem(header, end - header, crlfpair, strlen(crlfpair)); ++ crlf = memmemory(header, end - header, crlfpair, strlen(crlfpair)); + + if (colon == NULL || crlf == NULL || colon > crlf) + goto mph_error; diff -ruN mime.orig/files/patch-message.c mime/files/patch-message.c --- mime.orig/files/patch-message.c Sun Jun 13 00:24:01 2004 +++ mime/files/patch-message.c Sun Oct 30 23:40:49 2005 @@ -1,5 +1,25 @@ ---- message.c.orig Sat Jun 12 22:24:35 2004 -+++ message.c Sat Jun 12 22:24:52 2004 +--- message.c.orig Tue Sep 16 03:37:19 2003 ++++ message.c Sun Oct 30 23:38:44 2005 +@@ -89,7 +89,7 @@ + * XXX - need to be fixed to support "\r\n" + */ + bdcm = bd_makenorm(bd, crlfpair); +- bdlc = memmem(pos, len - (pos - msg), bdcm, strlen(bdcm)); ++ bdlc = memmemory(pos, len - (pos - msg), bdcm, strlen(bdcm)); + free(bdcm); + + if (bdlc != pos) { +@@ -146,8 +146,8 @@ + for (;;) { + ret = realloc(ret, sizeof *ret * *cnt + 1); + +- if ((next = memmem(msg, len, bdnorm, bdnormlen)) == NULL) +- next = memmem(msg, len, bdtail, bdtaillen); ++ if ((next = memmemory(msg, len, bdnorm, bdnormlen)) == NULL) ++ next = memmemory(msg, len, bdtail, bdtaillen); + + ret[(*cnt)++] = mime_readmessage(msg, next - msg, crlfpair); + @@ -272,6 +272,7 @@ eqcnt++; break; diff -ruN /dev/null mime/files/patch-util.c --- /dev/null Thu Jan 1 03:00:00 1970 +++ mime/files/patch-util.c Sun Oct 30 23:41:55 2005 @@ -0,0 +1,20 @@ +--- util.c.orig Sun Oct 30 23:38:55 2005 ++++ util.c Sun Oct 30 23:39:26 2005 +@@ -31,7 +31,7 @@ + + #if 0 + char * +-memmem(const char *big, int blen, const char *lit, int llen) ++memmemory(const char *big, int blen, const char *lit, int llen) + { + const char *pos; + +@@ -61,7 +61,7 @@ + } + + const char * +-memmem(const char *T, size_t n, const char *P, size_t m) ++memmemory(const char *T, size_t n, const char *P, size_t m) + { + static unsigned int q = 4294967291u; + static unsigned int d = 256; diff -ruN /dev/null mime/files/patch-util.h --- /dev/null Thu Jan 1 03:00:00 1970 +++ mime/files/patch-util.h Sun Oct 30 23:42:21 2005 @@ -0,0 +1,10 @@ +--- util.h.orig Sun Oct 30 23:39:40 2005 ++++ util.h Sun Oct 30 23:39:56 2005 +@@ -30,6 +30,6 @@ + #ifndef _UTIL_H_ + #define _UTIL_H_ + +-char *memmem(const char *, int, const char *, int); ++char *memmemory(const char *, int, const char *, int); + + #endif --- devel-mime.patch ends here --- WBR -- bsam >Release-Note: >Audit-Trail: >Unformatted: