From owner-freebsd-ports@FreeBSD.ORG Wed Mar 9 19:19:42 2005 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 018C316A4CE for ; Wed, 9 Mar 2005 19:19:42 +0000 (GMT) Received: from sccrmhc13.comcast.net (sccrmhc13.comcast.net [204.127.202.64]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6896643D3F for ; Wed, 9 Mar 2005 19:19:41 +0000 (GMT) (envelope-from mark@foster.cc) Received: from horton.foster.dmz (c-24-17-76-65.client.comcast.net[24.17.76.65]) by comcast.net (sccrmhc13) with ESMTP id <2005030919194001600hj0b9e>; Wed, 9 Mar 2005 19:19:40 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by horton.foster.dmz (Postfix) with ESMTP id AB86537D6E for ; Wed, 9 Mar 2005 11:14:12 -0800 (PST) Received: from horton.foster.dmz ([127.0.0.1]) by localhost (horton [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 28688-04 for ; Wed, 9 Mar 2005 11:14:11 -0800 (PST) Received: from [10.1.253.61] (unknown [198.134.96.9]) by horton.foster.dmz (Postfix) with ESMTP id 176733795E for ; Wed, 9 Mar 2005 11:14:11 -0800 (PST) Message-ID: <422F4B31.3070503@foster.cc> Date: Wed, 09 Mar 2005 11:14:57 -0800 From: Mark Foster User-Agent: Debian Thunderbird 1.0 (X11/20050116) X-Accept-Language: en-us, en MIME-Version: 1.0 To: ports@freebsd.org X-Enigmail-Version: 0.90.0.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at foster.cc X-Spam-Status: No, hits=0.0 tagged_above=-999.0 required=5.0 tests= X-Spam-Level: Subject: finnicky patch X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2005 19:19:42 -0000 Trying to prepare a patch to submit for updating cfengine2 to 2.1.13. I could use a little advice... as it doesn't apply clean to cfengine2/Makefile and it doesn't create cfengine2/files/patch-item.c although it say it is creating it. My understanding is that the -P flag to diff so it will create the previously nonexistent patch-item.c Thanks. diff -Pur sysutils/cfengine2.orig/Makefile sysutils/cfengine2/Makefile --- sysutils/cfengine2.orig/Makefile Fri Nov 12 06:08:36 2004 +++ sysutils/cfengine2/Makefile Mon Mar 7 14:18:20 2005 @@ -6,7 +6,7 @@ # PORTNAME= cfengine2 -PORTVERSION= 2.1.10 +PORTVERSION= 2.1.13 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \ ${MASTER_SITE_GNU} diff -Pur sysutils/cfengine2.orig/distinfo sysutils/cfengine2/distinfo --- sysutils/cfengine2.orig/distinfo Fri Nov 12 06:08:36 2004 +++ sysutils/cfengine2/distinfo Mon Mar 7 14:18:01 2005 @@ -1,2 +1,2 @@ -MD5 (cfengine-2.1.10.tar.gz) = 7a867c74ca3ad806a41b6f7339e67fa3 -SIZE (cfengine-2.1.10.tar.gz) = 3100323 +SIZE (cfengine-2.1.13.tar.gz) = 3153867 +MD5 (cfengine-2.1.13.tar.gz) = 2c002fc37f2fc9f87248ad8b9e899091 diff -Pur sysutils/cfengine2.orig/files/patch-item.c sysutils/cfengine2/files/patch-item.c --- sysutils/cfengine2.orig/files/patch-item.c Wed Dec 31 16:00:00 1969 +++ sysutils/cfengine2/files/patch-item.c Mon Mar 7 14:19:23 2005 @@ -0,0 +1,15 @@ +--- src/item.c.orig Mon Jan 24 13:57:15 2005 ++++ src/item.c Mon Mar 7 10:21:42 2005 +@@ -1036,10 +1036,10 @@ + { struct Item *args; + char *sp; + long cmp = -1, start = -1, end = -1; ++ char host_basename[CF_MAXVARSIZE]; + Debug("SRDEBUG in FuzzyHostMatch(): %s vs %s\n",s2,s1); + args = SplitStringAsItemList(s1,','); + sp = s2; +- char host_basename[CF_MAXVARSIZE]; + + for (sp = s2+strlen(s2)-1; sp > s2; sp--) + { + -- Some days it's just not worth chewing through the restraints... Mark D. Foster, CISSP http://mark.foster.cc/