diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2010-05-10 19:13:05 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2010-05-10 19:13:05 +0000 |
| commit | 2913059e85f52ba2ef958611f99f93707a21c866 (patch) | |
| tree | b46b294ae960f92d6966f64378ad8848b1e46cdb /net-misc/cfengine/files | |
| parent | add comment (diff) | |
| download | gentoo-2-2913059e85f52ba2ef958611f99f93707a21c866.tar.gz gentoo-2-2913059e85f52ba2ef958611f99f93707a21c866.tar.bz2 gentoo-2-2913059e85f52ba2ef958611f99f93707a21c866.zip | |
Revision bump, fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696 and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/cfengine/files')
| -rw-r--r-- | net-misc/cfengine/files/511666-segfault.patch | 20 | ||||
| -rw-r--r-- | net-misc/cfengine/files/admit-noclass-520696.patch | 15 |
2 files changed, 35 insertions, 0 deletions
diff --git a/net-misc/cfengine/files/511666-segfault.patch b/net-misc/cfengine/files/511666-segfault.patch new file mode 100644 index 000000000000..ea3ae9686254 --- /dev/null +++ b/net-misc/cfengine/files/511666-segfault.patch @@ -0,0 +1,20 @@ +Fix a bug involving CheckFriendReliability (see bug #482439) + +Index: cfengine2-2.2.9/src/instrument.c +=================================================================== +--- cfengine2-2.2.9.orig/src/instrument.c 2009-03-06 21:25:59.000000000 +0000 ++++ cfengine2-2.2.9/src/instrument.c 2009-03-06 21:26:31.000000000 +0000 +@@ -716,11 +716,11 @@ + key.data = timekey; + key.size = strlen(timekey)+1; + +- if ((errno = dbp->get(dbp,NULL,&key,&value,0)) != 0) ++ if ((errno = dbpent->get(dbpent,NULL,&key,&value,0)) != 0) + { + if (errno != DB_NOTFOUND) + { +- dbp->err(dbp,errno,NULL); ++ dbpent->err(dbpent,errno,NULL); + exit(1); + } + } diff --git a/net-misc/cfengine/files/admit-noclass-520696.patch b/net-misc/cfengine/files/admit-noclass-520696.patch new file mode 100644 index 000000000000..1e5d8594aaed --- /dev/null +++ b/net-misc/cfengine/files/admit-noclass-520696.patch @@ -0,0 +1,15 @@ +Fix a bug with admit/grant that let cfengine2 fails when the class +of a cfengine fragment does not exist and more than a host or IP +ranges are specified for a path (see #520696) + +--- a/src/install.c ++++ b/src/install.c +@@ -6561,7 +6561,7 @@ + if (!IsDefinedClass(classes)) + { + Debug1("Not installing Auth path, no match\n"); +- InitializeAction(); ++// InitializeAction(); + return; + } + |