rpms/cfengine/devel cfengine-2.2.1-glibc-open.patch, NONE, 1.1 cfengine.spec, 1.27, 1.28
Jeff Sheltren (sheltren)
fedora-extras-commits at redhat.com
Sat Aug 25 18:12:38 UTC 2007
Author: sheltren
Update of /cvs/extras/rpms/cfengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32104
Modified Files:
cfengine.spec
Added Files:
cfengine-2.2.1-glibc-open.patch
Log Message:
Fix for 'open' using new glibc
Update license tag
cfengine-2.2.1-glibc-open.patch:
--- NEW FILE cfengine-2.2.1-glibc-open.patch ---
--- cfengine-2.2.1/src/cfenvd.c.open 2007-08-25 10:23:11.000000000 -0700
+++ cfengine-2.2.1/src/cfenvd.c 2007-08-25 10:24:08.000000000 -0700
@@ -369,9 +369,9 @@
}
#ifdef CF_OLD_DB
-if ((err_no = dbp->open(dbp,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((err_no = (dbp->open)(dbp,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((err_no = dbp->open(dbp,NULL,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((err_no = (dbp->open)(dbp,NULL,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
AGE = WAGE = 0;
@@ -568,9 +568,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp,filename,NULL,DB_BTREE,DB_RDONLY,0644)) != 0)
+if ((errno = (dbp->open)(dbp,filename,NULL,DB_BTREE,DB_RDONLY,0644)) != 0)
#else
-if ((errno = dbp->open(dbp,NULL,filename,NULL,DB_BTREE,DB_RDONLY,0644)) != 0)
+if ((errno = (dbp->open)(dbp,NULL,filename,NULL,DB_BTREE,DB_RDONLY,0644)) != 0)
#endif
{
printf("Couldn't open average database %s\n",filename);
@@ -1628,9 +1628,9 @@
}
#ifdef CF_OLD_DB
-if ((err_no = dbp->open(dbp,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((err_no = (dbp->open)(dbp,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((err_no = dbp->open(dbp,NULL,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((err_no = (dbp->open)(dbp,NULL,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
sprintf(OUTPUT,"Couldn't open average database %s\n",AVDB);
@@ -1695,9 +1695,9 @@
}
#ifdef CF_OLD_DB
-if ((err_no = dbp->open(dbp,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((err_no = (dbp->open)(dbp,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((err_no = dbp->open(dbp,NULL,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((err_no = (dbp->open)(dbp,NULL,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
sprintf(OUTPUT,"Couldn't open average database %s\n",AVDB);
--- cfengine-2.2.1/src/cfenvgraph.c.open 2007-08-25 10:24:29.000000000 -0700
+++ cfengine-2.2.1/src/cfenvgraph.c 2007-08-25 10:25:08.000000000 -0700
@@ -172,9 +172,9 @@
}
#ifdef CF_OLD_DB
-if ((ERRNO = DBP->open(DBP,FILENAME,NULL,DB_BTREE,DB_RDONLY,0644)) != 0)
+if ((ERRNO = (DBP->open)(DBP,FILENAME,NULL,DB_BTREE,DB_RDONLY,0644)) != 0)
#else
-if ((ERRNO = DBP->open(DBP,NULL,FILENAME,NULL,DB_BTREE,DB_RDONLY,0644)) != 0)
+if ((ERRNO = (DBP->open)(DBP,NULL,FILENAME,NULL,DB_BTREE,DB_RDONLY,0644)) != 0)
#endif
{
printf("Couldn't open average database %s\n",FILENAME);
@@ -265,9 +265,9 @@
}
#ifdef CF_OLD_DB
-if ((ERRNO = DBP->open(DBP,FILENAME,NULL,DB_BTREE,DB_RDONLY,0644)) != 0)
+if ((ERRNO = (DBP->open)(DBP,FILENAME,NULL,DB_BTREE,DB_RDONLY,0644)) != 0)
#else
-if ((ERRNO = DBP->open(DBP,NULL,FILENAME,NULL,DB_BTREE,DB_RDONLY,0644)) != 0)
+if ((ERRNO = (DBP->open)(DBP,NULL,FILENAME,NULL,DB_BTREE,DB_RDONLY,0644)) != 0)
#endif
{
printf("Couldn't open average database %s\n",FILENAME);
@@ -608,9 +608,9 @@
}
#ifdef CF_OLD_DB
- if ((ERRNO = dbp->open(dbp,database,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+ if ((ERRNO = (dbp->open)(dbp,database,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
- if ((ERRNO = dbp->open(dbp,NULL,database,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+ if ((ERRNO = (dbp->open)(dbp,NULL,database,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
printf("Couldn't open database %s\n",database);
--- cfengine-2.2.1/src/cfetool.c.open 2007-08-25 10:25:22.000000000 -0700
+++ cfengine-2.2.1/src/cfetool.c 2007-08-25 10:25:40.000000000 -0700
@@ -3182,9 +3182,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp, AVDB, NULL, DB_BTREE, flags, 0644)) != 0)
+if ((errno = (dbp->open)(dbp, AVDB, NULL, DB_BTREE, flags, 0644)) != 0)
#else
-if ((errno = dbp->open(dbp, NULL, AVDB, NULL, DB_BTREE, flags, 0644)) != 0)
+if ((errno = (dbp->open)(dbp, NULL, AVDB, NULL, DB_BTREE, flags, 0644)) != 0)
#endif
{
snprintf(OUTPUT, CF_BUFSIZE, "Couldn't open average database %s\n", AVDB);
--- cfengine-2.2.1/src/cfetoolgraph.c.open 2007-08-25 10:25:55.000000000 -0700
+++ cfengine-2.2.1/src/cfetoolgraph.c 2007-08-25 10:26:42.000000000 -0700
@@ -226,10 +226,10 @@
#ifdef CF_OLD_DB
if ((errno =
- DBP->open(DBP, FILENAME, NULL, DB_BTREE, DB_RDONLY, 0644)) != 0)
+ (DBP->open)(DBP, FILENAME, NULL, DB_BTREE, DB_RDONLY, 0644)) != 0)
#else
if ((errno =
- DBP->open(DBP, NULL, FILENAME, NULL, DB_BTREE, DB_RDONLY, 0644)) != 0)
+ (DBP->open)(DBP, NULL, FILENAME, NULL, DB_BTREE, DB_RDONLY, 0644)) != 0)
#endif
{
printf("Couldn't open average database %s\n", FILENAME);
@@ -334,10 +334,10 @@
#ifdef CF_OLD_DB
if ((errno =
- DBP->open(DBP, FILENAME, NULL, DB_BTREE, DB_RDONLY, 0644)) != 0)
+ (DBP->open)(DBP, FILENAME, NULL, DB_BTREE, DB_RDONLY, 0644)) != 0)
#else
if ((errno =
- DBP->open(DBP, NULL, FILENAME, NULL, DB_BTREE, DB_RDONLY, 0644)) != 0)
+ (DBP->open)(DBP, NULL, FILENAME, NULL, DB_BTREE, DB_RDONLY, 0644)) != 0)
#endif
{
printf("Couldn't open average database %s\n", FILENAME);
@@ -760,10 +760,10 @@
#ifdef CF_OLD_DB
if ((errno =
- DBP->open(DBP, FILENAME, NULL, DB_BTREE, DB_RDONLY, 0644)) != 0)
+ (DBP->open)(DBP, FILENAME, NULL, DB_BTREE, DB_RDONLY, 0644)) != 0)
#else
if ((errno =
- DBP->open(DBP, NULL, FILENAME, NULL, DB_BTREE, DB_RDONLY, 0644)) != 0)
+ (DBP->open)(DBP, NULL, FILENAME, NULL, DB_BTREE, DB_RDONLY, 0644)) != 0)
#endif
{
printf("Couldn't open average database %s\n", FILENAME);
--- cfengine-2.2.1/src/cfservd.c.open 2007-08-25 10:26:55.000000000 -0700
+++ cfengine-2.2.1/src/cfservd.c 2007-08-25 10:28:20.000000000 -0700
@@ -3392,9 +3392,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp,keydb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,keydb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((errno = dbp->open(dbp,NULL,keydb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,NULL,keydb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
sprintf(OUTPUT,"Couldn't open average database %s\n",keydb);
@@ -3478,9 +3478,9 @@
}
#ifdef CF_OLD_DB
- if ((errno = dbp->open(dbp,keydb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+ if ((errno = (dbp->open)(dbp,keydb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
- if ((errno = dbp->open(dbp,NULL,keydb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+ if ((errno = (dbp->open)(dbp,NULL,keydb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
sprintf(OUTPUT,"Couldn't open average database %s\n",keydb);
--- cfengine-2.2.1/src/cfshow.c.open 2007-08-25 10:28:30.000000000 -0700
+++ cfengine-2.2.1/src/cfshow.c 2007-08-25 10:31:08.000000000 -0700
@@ -223,9 +223,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((errno = dbp->open(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
printf("Couldn't open last-seen database %s\n",name);
@@ -322,8 +322,11 @@
perror("db_open");
return;
}
-
-if ((errno = dbp->open(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#ifdef CF_OLD_DB
+if ((errno = (dbp->open)(dbp,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#else
+if ((errno = (dbp->open)(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#endif
{
printf("Couldn't open last-seen database %s\n",name);
perror("db_open");
@@ -405,9 +408,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp,checksumdb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,checksumdb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((errno = dbp->open(dbp,NULL,checksumdb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,NULL,checksumdb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
printf("Couldn't open checksum database %s\n",checksumdb);
@@ -487,9 +490,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp,lockdb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,lockdb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((errno = dbp->open(dbp,NULL,lockdb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,NULL,lockdb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
printf("Couldn't open checksum database %s\n",lockdb);
--- cfengine-2.2.1/src/checksum_db.c.open 2007-08-25 10:32:09.000000000 -0700
+++ cfengine-2.2.1/src/checksum_db.c 2007-08-25 10:32:28.000000000 -0700
@@ -119,9 +119,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp,CHECKSUMDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,CHECKSUMDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((errno = dbp->open(dbp,NULL,CHECKSUMDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,NULL,CHECKSUMDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't open checksum database %s\n",CHECKSUMDB);
@@ -223,9 +223,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp,CHECKSUMDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,CHECKSUMDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((errno = dbp->open(dbp,NULL,CHECKSUMDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,NULL,CHECKSUMDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't open checksum database %s\n",CHECKSUMDB);
--- cfengine-2.2.1/src/do.c.open 2007-08-25 10:19:01.000000000 -0700
+++ cfengine-2.2.1/src/do.c 2007-08-25 10:22:47.000000000 -0700
@@ -1074,9 +1074,9 @@
}
#ifdef CF_OLD_DB
- if ((errno = dbp->open(dbp,database,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+ if ((errno = (dbp->open)(dbp,database,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
- if ((errno = dbp->open(dbp,NULL,database,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+ if ((errno = (dbp->open)(dbp,NULL,database,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't open database %s\n",database);
--- cfengine-2.2.1/src/instrument.c.open 2007-08-25 10:33:02.000000000 -0700
+++ cfengine-2.2.1/src/instrument.c 2007-08-25 10:34:27.000000000 -0700
@@ -62,7 +62,11 @@
return;
}
-if ((errno = dbp->open(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#ifdef CF_OLD_DB
+if ((errno = (dbp->open)(dbp,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#else
+if ((errno = (dbp->open)(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#endif
{
snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't open performance database %s\n",name);
CfLog(cferror,OUTPUT,"db_open");
@@ -137,9 +141,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((errno = dbp->open(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't open last-seen database %s\n",name);
@@ -261,9 +265,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((errno = dbp->open(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't open last-seen database %s\n",name);
--- cfengine-2.2.1/src/locks.c.open 2007-08-25 10:34:34.000000000 -0700
+++ cfengine-2.2.1/src/locks.c 2007-08-25 10:35:33.000000000 -0700
@@ -194,9 +194,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = DBP->open(DBP,LOCKDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (DBP->open)(DBP,LOCKDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((errno = DBP->open(DBP,NULL,LOCKDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (DBP->open)(DBP,NULL,LOCKDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't open lock database %s\n",LOCKDB);
--- cfengine-2.2.1/src/state.c.open 2007-08-25 10:35:49.000000000 -0700
+++ cfengine-2.2.1/src/state.c 2007-08-25 10:36:26.000000000 -0700
@@ -71,9 +71,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp,filename,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,filename,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((errno = dbp->open(dbp,NULL,filename,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,NULL,filename,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
snprintf(OUTPUT,CF_BUFSIZE,"Couldn't open average database %s\n",filename);
@@ -160,9 +160,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp,filename,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,filename,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((errno = dbp->open(dbp,NULL,filename,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,NULL,filename,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
snprintf(OUTPUT,CF_BUFSIZE,"Couldn't open average database %s\n",filename);
@@ -212,9 +212,9 @@
}
#ifdef CF_OLD_DB
-if ((errno = dbp->open(dbp,filename,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,filename,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#else
-if ((errno = dbp->open(dbp,NULL,filename,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+if ((errno = (dbp->open)(dbp,NULL,filename,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't open persistent state database %s\n",filename);
Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cfengine.spec 27 Jun 2007 13:00:33 -0000 1.27
+++ cfengine.spec 25 Aug 2007 18:12:03 -0000 1.28
@@ -1,14 +1,15 @@
Summary: A systems administration tool for networks
Name: cfengine
Version: 2.2.1
-Release: 3%{?dist}
-License: GPL
+Release: 4%{?dist}
+License: GPLv2+
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
+Patch1: cfengine-2.2.1-glibc-open.patch
URL: http://www.cfengine.org/
BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel
BuildRequires: libselinux-devel
@@ -30,6 +31,7 @@
%prep
%setup -q
%patch0 -p1 -b .hostrange
+%patch1 -p1 -b .open
%build
@@ -129,6 +131,10 @@
%changelog
+* Sat Aug 25 2007 Jeff Sheltren <sheltren at cs.ucsb.edu> 2.2.1-4
+- Patch for bug when using open with newer glibc
+- Update license tag in spec
+
* Tue Jun 26 2007 Jeff Sheltren <sheltren at cs.ucsb.edu> 2.2.1-3
- Update hostrange patch
More information about the fedora-extras-commits
mailing list