rpms/cfengine/F-12 cfengine-shellcommands-allclasses-svn_r629.patch, NONE, 1.1 cfengine.spec, 1.42, 1.43
Jeff Sheltren
sheltren at fedoraproject.org
Tue Dec 29 20:56:34 UTC 2009
Author: sheltren
Update of /cvs/pkgs/rpms/cfengine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17126
Modified Files:
cfengine.spec
Added Files:
cfengine-shellcommands-allclasses-svn_r629.patch
Log Message:
Add doc subpackage and patch for shellcommands defines
cfengine-shellcommands-allclasses-svn_r629.patch:
cf.extern.h | 1 +
globals.c | 1 +
install.c | 26 +++++++++++++-------------
parse.c | 1 +
4 files changed, 16 insertions(+), 13 deletions(-)
--- NEW FILE cfengine-shellcommands-allclasses-svn_r629.patch ---
Index: src/cf.extern.h
===================================================================
--- src/cf.extern.h (revision 628)
+++ src/cf.extern.h (revision 629)
@@ -198,6 +198,7 @@
extern char *CLASSBUFF;
extern char ALLCLASSBUFFER[4*CF_BUFSIZE];
extern char CHROOT[CF_BUFSIZE];
+extern char DEFINECLASSBUFFER[CF_BUFSIZE];
extern char ELSECLASSBUFFER[CF_BUFSIZE];
extern char FAILOVERBUFFER[CF_BUFSIZE];
extern char *LINKFROM;
Index: src/install.c
===================================================================
--- src/install.c (revision 628)
+++ src/install.c (revision 629)
@@ -1977,7 +1977,7 @@
DeleteSlash(buffer);
}
-ExpandVarstring(ALLCLASSBUFFER,buffer2,"");
+ExpandVarstring(DEFINECLASSBUFFER,buffer2,"");
if ((ptr = (struct Link *)malloc(sizeof(struct Link))) == NULL)
{
@@ -2099,7 +2099,7 @@
}
ExpandVarstring(from,ebuff,"");
-ExpandVarstring(ALLCLASSBUFFER,buffer,"");
+ExpandVarstring(DEFINECLASSBUFFER,buffer,"");
Build2DListFromVarstring(&tp,to,LISTSEPARATOR,false);
Set2DList(tp);
@@ -2241,7 +2241,7 @@
FatalError("Memory Allocation failed for InstallRequired() #2");
}
- ExpandVarstring(ALLCLASSBUFFER,buffer,"");
+ ExpandVarstring(DEFINECLASSBUFFER,buffer,"");
if ((ptr->define = strdup(buffer)) == NULL)
{
@@ -3601,7 +3601,7 @@
ptr->done = 'n';
ptr->scope = strdup(CONTEXTID);
- ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+ ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
if ((ptr->defines = strdup(ebuff)) == NULL)
{
@@ -3776,7 +3776,7 @@
ptr->done = 'n';
ptr->scope = strdup(CONTEXTID);
- ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+ ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
if ((ptr->defines = strdup(ebuff)) == NULL)
{
@@ -3837,7 +3837,7 @@
FatalError("Memory Allocation failed for AppendDisable() #2");
}
- ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+ ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
if ((ptr->defines = strdup(ebuff)) == NULL)
{
@@ -4313,7 +4313,7 @@
FatalError("Memory Allocation failed for InstallMakepath() #3");
}
- ExpandVarstring(ALLCLASSBUFFER,buffer,"");
+ ExpandVarstring(DEFINECLASSBUFFER,buffer,"");
if ((ptr->defines = strdup(buffer)) == NULL)
{
@@ -4801,7 +4801,7 @@
FatalError("Memory Allocation failed for InstallFileListItem() #3");
}
- ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+ ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
if ((ptr->defines = strdup(ebuff)) == NULL)
{
@@ -4930,7 +4930,7 @@
FatalError("Memory Allocation failed for InstallProcItem() #3");
}
-ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
if ((ptr->defines = strdup(ebuff)) == NULL)
{
@@ -5114,7 +5114,7 @@
FatalError("Memory Allocation failed for InstallPackageItem() #4");
}
-ExpandVarstring(ALLCLASSBUFFER,buffer,"");
+ExpandVarstring(DEFINECLASSBUFFER,buffer,"");
if ((ptr->defines = strdup(buffer)) == NULL)
{
@@ -5321,7 +5321,7 @@
FatalError("Memory Allocation failed for InstallImageItem() #6");
}
- ExpandVarstring(ALLCLASSBUFFER,buf4,"");
+ ExpandVarstring(DEFINECLASSBUFFER,buf4,"");
if ((ptr->defines = strdup(buf4)) == NULL)
{
@@ -6050,7 +6050,7 @@
yyerror(OUTPUT);
}
*/
-strcpy(ALLCLASSBUFFER,value);
+strcpy(DEFINECLASSBUFFER,value);
for (sp = value; *sp != '\0'; sp++)
{
@@ -6772,7 +6772,7 @@
FatalError("Memory Allocation failed for PrependTidy() #2");
}
-ExpandVarstring(ALLCLASSBUFFER,buffer,"");
+ExpandVarstring(DEFINECLASSBUFFER,buffer,"");
if ((tp->defines = strdup(buffer)) == NULL)
{
Index: src/parse.c
===================================================================
--- src/parse.c (revision 628)
+++ src/parse.c (revision 629)
@@ -1279,6 +1279,7 @@
STRATEGYNAME[0] = '\0';
FILTERNAME[0] = '\0';
memset(ALLCLASSBUFFER,0,CF_BUFSIZE);
+ memset(DEFINECLASSBUFFER,0,CF_BUFSIZE);
memset(ELSECLASSBUFFER,0,CF_BUFSIZE);
strcpy(CFSERVER,"localhost");
Index: src/globals.c
===================================================================
--- src/globals.c (revision 628)
+++ src/globals.c (revision 629)
@@ -127,6 +127,7 @@
PUBLIC char VCURRENTFILE[CF_BUFSIZE];
PUBLIC char VLOGFILE[CF_BUFSIZE];
PUBLIC char ALLCLASSBUFFER[CF_ALLCLASSSIZE];
+ PUBLIC char DEFINECLASSBUFFER[CF_BUFSIZE];
PUBLIC char ELSECLASSBUFFER[CF_BUFSIZE];
PUBLIC char FAILOVERBUFFER[CF_BUFSIZE];
PUBLIC char CHROOT[CF_BUFSIZE];
Index: cfengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cfengine/F-12/cfengine.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- cfengine.spec 21 Aug 2009 12:43:23 -0000 1.42
+++ cfengine.spec 29 Dec 2009 20:56:34 -0000 1.43
@@ -1,13 +1,14 @@
Summary: A systems administration tool for networks
Name: cfengine
Version: 2.2.10
-Release: 3%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Group: Applications/System
Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.2.10.tar.gz
Source1: cfexecd
Source2: cfservd
Source3: cfenvd
+Patch0: cfengine-shellcommands-allclasses-svn_r629.patch
URL: http://www.cfengine.org/
BuildRequires: db4-devel,openssl-devel,bison,flex,m4,libacl-devel
BuildRequires: libselinux-devel,tetex-dvips,texinfo-tex
@@ -25,9 +26,19 @@ the configuration and maintenance of sys
configurations. Cfengine is designed to be a part of a computer immune
system.
+%package doc
+Summary: Documentation for cfengine
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+This package contains the documentation for cfengine.
+
%prep
%setup -q
+%patch0 -p0 -b .shellcommands
%build
@@ -112,22 +123,32 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
-%doc contrib
-%doc inputs
-%doc doc/*html
-%doc doc/*pdf
-%doc doc/*ps
%{_sbindir}/*
%{_libdir}/libcfengine*
%{_mandir}/man8/*
-%{_infodir}/cfengine*
%{_initrddir}/cfenvd
%{_initrddir}/cfexecd
%{_initrddir}/cfservd
%{_var}/%{name}
+%files doc
+%defattr(-,root,root,-)
+%{_infodir}/cfengine*
+%doc contrib
+%doc inputs
+%doc doc/*html
+%doc doc/*pdf
+%doc doc/*ps
+
+
%changelog
+* Tue Dec 29 2009 Jeff Sheltren <jeff at osuosl.org> - 2.2.10-5
+- Move docs into a -doc subpackage (#523538)
+
+* Sat Dec 12 2009 Jeff Sheltren <jeff at osuosl.org> - 2.2.10-4
+- Patch for class definitions using shellcommands (#530458)
+
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.10-3
- rebuilt with new openssl
More information about the fedora-extras-commits
mailing list