rpms/compat-db/devel db4-db_load.patch, NONE, 1.1 compat-db.spec, 1.17, 1.18

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/compat-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20550

Modified Files:
	compat-db.spec 
Added Files:
	db4-db_load.patch 
Log Message:
* Tue Feb 14 2006 Jindrich Novy <jnovy at redhat.com> 4.2.52-4
- clarify pointer usage in db_load.c (#110697)


db4-db_load.patch:
 db-4.1.25/db_load/db_load.c               |    2 +-
 db-4.2.52/build_vxworks/db_load/db_load.c |    2 +-
 db-4.2.52/db_load/db_load.c               |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE db4-db_load.patch ---
--- compat-db-4.2.52/db-4.1.25/db_load/db_load.c.db_load	2002-08-08 06:26:54.000000000 +0200
+++ compat-db-4.2.52/db-4.1.25/db_load/db_load.c	2006-02-14 14:53:35.000000000 +0100
@@ -895,7 +895,7 @@ convprintable(dbenv, instr, outstrp)
 				continue;
 			}
 			c = digitize(dbenv, *instr, &e1) << 4;
-			c |= digitize(dbenv, *++instr, &e2);
+			c |= digitize(dbenv, *(++instr), &e2);
 			if (e1 || e2) {
 				badend(dbenv);
 				return (EINVAL);
--- compat-db-4.2.52/db-4.2.52/db_load/db_load.c.db_load	2003-10-16 19:51:08.000000000 +0200
+++ compat-db-4.2.52/db-4.2.52/db_load/db_load.c	2006-02-14 14:53:02.000000000 +0100
@@ -939,7 +939,7 @@ convprintable(dbenv, instr, outstrp)
 				continue;
 			}
 			c = digitize(dbenv, *instr, &e1) << 4;
-			c |= digitize(dbenv, *++instr, &e2);
+			c |= digitize(dbenv, *(++instr), &e2);
 			if (e1 || e2) {
 				badend(dbenv);
 				return (EINVAL);
--- compat-db-4.2.52/db-4.2.52/build_vxworks/db_load/db_load.c.db_load	2003-10-22 05:23:34.000000000 +0200
+++ compat-db-4.2.52/db-4.2.52/build_vxworks/db_load/db_load.c	2006-02-14 14:51:41.000000000 +0100
@@ -954,7 +954,7 @@ db_load_convprintable(dbenv, instr, outs
 				continue;
 			}
 			c = db_load_digitize(dbenv, *instr, &e1) << 4;
-			c |= db_load_digitize(dbenv, *++instr, &e2);
+			c |= db_load_digitize(dbenv, *(++instr), &e2);
 			if (e1 || e2) {
 				db_load_badend(dbenv);
 				return (EINVAL);


Index: compat-db.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-db/devel/compat-db.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- compat-db.spec	11 Feb 2006 02:16:28 -0000	1.17
+++ compat-db.spec	14 Feb 2006 14:09:06 -0000	1.18
@@ -16,12 +16,14 @@
 Summary: The Berkeley DB database library for Red Hat Linux 7.x compatibility.
 Name: compat-db
 Version: 4.2.52
-Release: 3.2.1
+Release: 4
 # Tarball taken from glibc 2.1.3  
 #Source0: http://www.sleepycat.com/update/2.7.7/db-2.7.7.tar.gz  
 Source0: http://www.sleepycat.com/update/4.1.25/db-4.1.25.tar.gz
 Source1: http://www.sleepycat.com/update/4.2.52/db-4.2.52.tar.gz
 
+Patch1: db4-db_load.patch
+
 Patch17: patch.4.1.25.1
 Patch18: patch.4.1.25.2
 
@@ -48,6 +50,8 @@
 %prep
 %setup -q -c -a 1
 
+%patch1 -p1 -b .db-load
+
 pushd db-4.1.25
 %patch17 -p0
 %patch18 -p0
@@ -168,6 +172,9 @@
 %{_bindir}/db*_verify
 
 %changelog
+* Tue Feb 14 2006 Jindrich Novy <jnovy at redhat.com> 4.2.52-4
+- clarify pointer usage in db_load.c (#110697)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.52-3.2.1
 - bump again for double-long bug on ppc(64)