rpms/cfengine/devel cfengine-2.2.1-hostrange.patch, NONE, 1.1 cfengine.spec, 1.26, 1.27

Jeff Sheltren (sheltren) fedora-extras-commits at redhat.com
Wed Jun 27 13:01:08 UTC 2007


Author: sheltren

Update of /cvs/extras/rpms/cfengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16439

Modified Files:
	cfengine.spec 
Added Files:
	cfengine-2.2.1-hostrange.patch 
Log Message:
Fix bug in HostRange()


cfengine-2.2.1-hostrange.patch:

--- NEW FILE cfengine-2.2.1-hostrange.patch ---
--- cfengine-2.2.1/src/item.c.hostrange	2007-06-26 13:03:02.000000000 -0700
+++ cfengine-2.2.1/src/item.c	2007-06-26 13:10:55.000000000 -0700
@@ -1055,6 +1055,7 @@
 { struct Item *args;
   char *sp, refbase[CF_MAXVARSIZE];
   long cmp = -1, start = -1, end = -1;
+  char buf1[CF_BUFSIZE], buf2[CF_BUFSIZE];
 
 strncpy(refbase,refhost,strlen(refhost));
 sp = refbase + strlen(refbase) - 1;
@@ -1082,9 +1083,11 @@
    return 1;
    }
 
-if (strcmp(refbase,ToUpperStr(arg0)) != 0)
+strncpy(buf1,ToLowerStr(refbase),strlen(refbase));
+strncpy(buf2,ToLowerStr(arg0),strlen(arg0));
+if (strcmp(buf1,buf2) != 0)
    {
-   Debug("SRDEBUG Failed on name (%s != %s)\n",refbase,ToUpperStr(arg0));
+   Debug("SRDEBUG Failed on name (%s != %s)\n",buf1,buf2);
    return 1;
    }
 


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cfengine.spec	31 May 2007 13:55:14 -0000	1.26
+++ cfengine.spec	27 Jun 2007 13:00:33 -0000	1.27
@@ -1,13 +1,14 @@
 Summary: A systems administration tool for networks
 Name: cfengine
 Version: 2.2.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.2.1.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
+Patch0: cfengine-2.2.1-hostrange.patch
 URL: http://www.cfengine.org/
 BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel
 BuildRequires: libselinux-devel
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .hostrange
 
 
 %build
@@ -127,6 +129,12 @@
 
 
 %changelog
+* Tue Jun 26 2007 Jeff Sheltren <sheltren at cs.ucsb.edu> 2.2.1-3
+- Update hostrange patch
+
+* Mon Jun 25 2007 Jeff Sheltren <sheltren at cs.ucsb.edu> 2.2.1-2
+- Fix hostrange bug (patch from SVN r397)
+
 * Wed May 30 2007 Jeff Sheltren <sheltren at cs.ucsb.edu> 2.2.1-1
 - Update to upstream 2.2.1
 - Remove SELinux patch (included upstream)




More information about the fedora-extras-commits mailing list