rpms/elektra/devel elektra-0.6.10-open.patch, 1.1, 1.2 elektra.spec, 1.2, 1.3
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Sat Aug 25 14:05:40 UTC 2007
Author: pertusus
Update of /cvs/extras/rpms/elektra/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25468
Modified Files:
elektra-0.6.10-open.patch elektra.spec
Log Message:
correct open patch
elektra-0.6.10-open.patch:
Index: elektra-0.6.10-open.patch
===================================================================
RCS file: /cvs/extras/rpms/elektra/devel/elektra-0.6.10-open.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elektra-0.6.10-open.patch 25 Aug 2007 13:42:11 -0000 1.1
+++ elektra-0.6.10-open.patch 25 Aug 2007 14:05:37 -0000 1.2
@@ -1,21 +1,21 @@
diff -up elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c.open elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c
---- elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c.open 2007-08-25 15:34:49.000000000 +0200
-+++ elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c 2007-08-25 15:35:34.000000000 +0200
+--- elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c.open 2007-03-08 12:58:41.000000000 +0100
++++ elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c 2007-08-25 15:59:39.000000000 +0200
@@ -509,14 +509,14 @@ DBTree *dbTreeNew(KDBHandle handle,const
errno=KDB_RET_EBACKEND;
return 0;
}
- ret=newDB->db.keyValuePairs->open(newDB->db.keyValuePairs,NULL,keyvalueFile,
-+ ret=newDB->db.keyValuePairs->(open)(newDB->db.keyValuePairs,NULL,keyvalueFile,
++ ret=(newDB->db.keyValuePairs->open)(newDB->db.keyValuePairs,NULL,keyvalueFile,
DB_KEYVALUE, DB_BTREE, DB_CREATE | DB_EXCL | DB_THREAD, 0);
if (ret == EEXIST || ret == EACCES) {
/* DB already exist. Only open it */
- ret=newDB->db.keyValuePairs->open(newDB->db.keyValuePairs,NULL, keyvalueFile,
-+ ret=newDB->db.keyValuePairs->(open)(newDB->db.keyValuePairs,NULL, keyvalueFile,
++ ret=(newDB->db.keyValuePairs->open)(newDB->db.keyValuePairs,NULL, keyvalueFile,
DB_KEYVALUE, DB_BTREE, DB_THREAD, 0);
if (ret == EACCES)
- ret=newDB->db.keyValuePairs->open(newDB->db.keyValuePairs,NULL,
-+ ret=newDB->db.keyValuePairs->(open)(newDB->db.keyValuePairs,NULL,
++ ret=(newDB->db.keyValuePairs->open)(newDB->db.keyValuePairs,NULL,
keyvalueFile, DB_KEYVALUE, DB_BTREE, DB_THREAD | DB_RDONLY, 0);
} else newlyCreated=1;
@@ -24,16 +24,16 @@
if (ret != 0) fprintf(stderr, "set_flags: %s: %d\n",DB_PARENTINDEX,ret);
- ret = newDB->db.parentIndex->open(newDB->db.parentIndex,
-+ ret = newDB->db.parentIndex->(open)(newDB->db.parentIndex,
++ ret = (newDB->db.parentIndex->open)(newDB->db.parentIndex,
NULL, parentsFile, DB_PARENTINDEX, DB_BTREE, DB_CREATE | DB_EXCL | DB_THREAD, 0);
if (ret == EEXIST || ret == EACCES) {
/* DB already exist. Only open it */
- ret=newDB->db.parentIndex->open(newDB->db.parentIndex,NULL, parentsFile,
-+ ret=newDB->db.parentIndex->(open)(newDB->db.parentIndex,NULL, parentsFile,
++ ret=(newDB->db.parentIndex->open)(newDB->db.parentIndex,NULL, parentsFile,
DB_PARENTINDEX, DB_BTREE, DB_THREAD, 0);
if (ret == EACCES)
- ret=newDB->db.parentIndex->open(newDB->db.parentIndex,NULL,
-+ ret=newDB->db.parentIndex->(open)(newDB->db.parentIndex,NULL,
++ ret=(newDB->db.parentIndex->open)(newDB->db.parentIndex,NULL,
parentsFile, DB_PARENTINDEX, DB_BTREE, DB_THREAD | DB_RDONLY, 0);
}
Index: elektra.spec
===================================================================
RCS file: /cvs/extras/rpms/elektra/devel/elektra.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- elektra.spec 25 Aug 2007 13:42:11 -0000 1.2
+++ elektra.spec 25 Aug 2007 14:05:37 -0000 1.3
@@ -1,7 +1,7 @@
Summary: A key/value pair database to store software configurations
Name: elektra
Version: 0.6.10
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: System Environment/Libraries
License: BSD
URL: http://www.libelektra.org
@@ -172,8 +172,8 @@
%changelog
-* Sat Aug 25 2007 Patrice Dumas <pertusus at free.fr> 0.6.10-3
-- protect ->(open) calls
+* Sat Aug 25 2007 Patrice Dumas <pertusus at free.fr> 0.6.10-4
+- protect ->open calls
* Mon Mar 12 2007 kwizart < kwizart at gmail.com > - 0.6.10-2
- Disable static packages
More information about the scm-commits
mailing list