finnicky patch

Mark Foster mark at foster.cc
Wed Mar 9 11:19:42 PST 2005


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 <mark at foster.cc>  http://mark.foster.cc/



More information about the freebsd-ports mailing list