rpms/deltarpm/devel deltarpm-3.4-sha256.patch, 1.1, 1.2 deltarpm.spec, 1.16, 1.17
Jonathan Dieter
jdieter at fedoraproject.org
Thu Mar 26 06:46:00 UTC 2009
Author: jdieter
Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23918
Modified Files:
deltarpm-3.4-sha256.patch deltarpm.spec
Log Message:
Fix bug when checking sequence with new sha256 rpms
deltarpm-3.4-sha256.patch:
Index: deltarpm-3.4-sha256.patch
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm-3.4-sha256.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deltarpm-3.4-sha256.patch 24 Mar 2009 07:34:34 -0000 1.1
+++ deltarpm-3.4-sha256.patch 26 Mar 2009 06:45:30 -0000 1.2
@@ -1,6 +1,6 @@
-diff -urb --new-file deltarpm-3.4/applydeltarpm.c deltarpm-3.4.new/applydeltarpm.c
---- deltarpm-3.4/applydeltarpm.c 2009-03-15 19:55:02.367149343 +0200
-+++ deltarpm-3.4.new/applydeltarpm.c 2009-03-18 14:22:22.899493311 +0200
+diff -urb --new-file deltarpm-3.4/applydeltarpm.c deltarpm-3.4b/applydeltarpm.c
+--- deltarpm-3.4/applydeltarpm.c 2009-03-26 08:29:23.000000000 +0200
++++ deltarpm-3.4b/applydeltarpm.c 2009-03-26 08:29:43.000000000 +0200
@@ -24,6 +24,8 @@
#include "util.h"
@@ -157,17 +157,6 @@
}
if (fd != -1)
close(fd);
-@@ -1378,8 +1419,8 @@
- }
- if (!d.h)
- {
-- unsigned char *hmd5 = headbin(h, 1004, 16);
-- if (!hmd5 || memcmp(hmd5, d.seq, 16) != 0)
-+ unsigned char *hdigest = headbin(h, 1004, 16);
-+ if (!hdigest || memcmp(hdigest, d.seq, 16) != 0)
- seqmatches = 0;
- if (seqcheck)
- {
@@ -1413,7 +1454,7 @@
}
if (d.h || seqcheck)
@@ -186,9 +175,9 @@
else if ((checkflags & SEQCHECK_SIZE) != 0)
checkfunc = checkfilesize;
sdesc = expandseq(d.seq, d.seql, &nsdesc, &fb, checkfunc);
-diff -urb --new-file deltarpm-3.4/deltarpm.h deltarpm-3.4.new/deltarpm.h
+diff -urb --new-file deltarpm-3.4/deltarpm.h deltarpm-3.4b/deltarpm.h
--- deltarpm-3.4/deltarpm.h 2005-06-13 20:47:38.000000000 +0300
-+++ deltarpm-3.4.new/deltarpm.h 2009-03-15 20:24:56.756147799 +0200
++++ deltarpm-3.4b/deltarpm.h 2009-03-26 08:29:43.000000000 +0200
@@ -21,8 +21,9 @@
unsigned int *filemodes;
unsigned int *filesizes;
@@ -209,9 +198,9 @@
void readdeltarpm(char *n, struct deltarpm *d, struct cfile **cfp);
/* from writedeltarpm.c */
-diff -urb --new-file deltarpm-3.4/digest.c deltarpm-3.4.new/digest.c
+diff -urb --new-file deltarpm-3.4/digest.c deltarpm-3.4b/digest.c
--- deltarpm-3.4/digest.c 1970-01-01 02:00:00.000000000 +0200
-+++ deltarpm-3.4.new/digest.c 2009-03-18 14:21:43.392509611 +0200
++++ deltarpm-3.4b/digest.c 2009-03-26 08:29:43.000000000 +0200
@@ -0,0 +1,74 @@
+/* digest.c
+ *
@@ -287,9 +276,9 @@
+}
+
+
-diff -urb --new-file deltarpm-3.4/digest.h deltarpm-3.4.new/digest.h
+diff -urb --new-file deltarpm-3.4/digest.h deltarpm-3.4b/digest.h
--- deltarpm-3.4/digest.h 1970-01-01 02:00:00.000000000 +0200
-+++ deltarpm-3.4.new/digest.h 2009-03-15 20:24:56.757150075 +0200
++++ deltarpm-3.4b/digest.h 2009-03-26 08:29:43.000000000 +0200
@@ -0,0 +1,13 @@
+/* digest.h
+ *
@@ -304,9 +293,9 @@
+void digest_update32(void *cntx, unsigned int digestalgo, unsigned int i);
+void digest_final(void *cntx, unsigned int digestalgo, unsigned char *digest);
+
-diff -urb --new-file deltarpm-3.4/makedeltarpm.c deltarpm-3.4.new/makedeltarpm.c
---- deltarpm-3.4/makedeltarpm.c 2009-03-15 19:54:45.110416239 +0200
-+++ deltarpm-3.4.new/makedeltarpm.c 2009-03-15 20:24:56.759163777 +0200
+diff -urb --new-file deltarpm-3.4/makedeltarpm.c deltarpm-3.4b/makedeltarpm.c
+--- deltarpm-3.4/makedeltarpm.c 2009-03-26 08:29:14.000000000 +0200
++++ deltarpm-3.4b/makedeltarpm.c 2009-03-26 08:29:43.000000000 +0200
@@ -18,6 +18,8 @@
#include "util.h"
@@ -469,9 +458,9 @@
filerdevs = xfree(filerdevs);
filesizes = xfree(filesizes);
filemodes = xfree(filemodes);
-diff -urb --new-file deltarpm-3.4/Makefile deltarpm-3.4.new/Makefile
---- deltarpm-3.4/Makefile 2009-03-15 19:54:45.110416239 +0200
-+++ deltarpm-3.4.new/Makefile 2009-03-18 13:54:34.602445762 +0200
+diff -urb --new-file deltarpm-3.4/Makefile deltarpm-3.4b/Makefile
+--- deltarpm-3.4/Makefile 2009-03-26 08:29:14.000000000 +0200
++++ deltarpm-3.4b/Makefile 2009-03-26 08:29:43.000000000 +0200
@@ -10,9 +10,9 @@
all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
@@ -511,9 +500,9 @@
+readdeltarpm.o: readdeltarpm.c deltarpm.h util.h md5.h sha256.h digest.h rpmhead.h cfile.h
+writedeltarpm.o: readdeltarpm.c deltarpm.h md5.h sha256.h digest.h rpmhead.h cfile.h
fragiso.o: fragiso.c util.h md5.h rpmhead.h cfile.h
-diff -urb --new-file deltarpm-3.4/readdeltarpm.c deltarpm-3.4.new/readdeltarpm.c
+diff -urb --new-file deltarpm-3.4/readdeltarpm.c deltarpm-3.4b/readdeltarpm.c
--- deltarpm-3.4/readdeltarpm.c 2005-06-14 16:49:21.000000000 +0300
-+++ deltarpm-3.4.new/readdeltarpm.c 2009-03-15 20:31:05.432169439 +0200
++++ deltarpm-3.4b/readdeltarpm.c 2009-03-26 08:29:43.000000000 +0200
@@ -18,6 +18,8 @@
#include "util.h"
@@ -602,9 +591,9 @@
}
sd[n].off = off;
off += sd[n].cpiolen + sd[n].datalen;
-diff -urb --new-file deltarpm-3.4/rpmhead.h deltarpm-3.4.new/rpmhead.h
---- deltarpm-3.4/rpmhead.h 2009-03-15 19:54:45.110416239 +0200
-+++ deltarpm-3.4.new/rpmhead.h 2009-03-15 20:24:56.761164138 +0200
+diff -urb --new-file deltarpm-3.4/rpmhead.h deltarpm-3.4b/rpmhead.h
+--- deltarpm-3.4/rpmhead.h 2009-03-26 08:29:14.000000000 +0200
++++ deltarpm-3.4b/rpmhead.h 2009-03-26 08:29:43.000000000 +0200
@@ -15,7 +15,7 @@
#define TAG_FILEMODES 1030
#define TAG_FILERDEVS 1033
@@ -622,9 +611,9 @@
#define SIGTAG_SIZE 1000
#define SIGTAG_MD5 1004
-diff -urb --new-file deltarpm-3.4/rpml.c deltarpm-3.4.new/rpml.c
+diff -urb --new-file deltarpm-3.4/rpml.c deltarpm-3.4b/rpml.c
--- deltarpm-3.4/rpml.c 2005-02-03 20:41:51.000000000 +0200
-+++ deltarpm-3.4.new/rpml.c 2009-03-15 20:24:56.761164138 +0200
++++ deltarpm-3.4b/rpml.c 2009-03-26 08:29:43.000000000 +0200
@@ -103,14 +103,33 @@
unsigned int buildtime;
int patchescnt, filec, i;
@@ -694,9 +683,9 @@
+ filedigestalgo = xfree(filedigestalgo);
return nevr;
}
-diff -urb --new-file deltarpm-3.4/rpml.h deltarpm-3.4.new/rpml.h
+diff -urb --new-file deltarpm-3.4/rpml.h deltarpm-3.4b/rpml.h
--- deltarpm-3.4/rpml.h 2005-02-03 20:41:51.000000000 +0200
-+++ deltarpm-3.4.new/rpml.h 2009-03-15 20:24:56.761164138 +0200
++++ deltarpm-3.4b/rpml.h 2009-03-26 08:29:43.000000000 +0200
@@ -11,7 +11,9 @@
char *name;
unsigned int mode;
@@ -708,10 +697,10 @@
};
extern char *rpmlread(FILE *fp, char *fn, int nomagic, struct rpmlfile **filesp, int *nfilesp);
-diff -urb --new-file deltarpm-3.4/sha256.c deltarpm-3.4.new/sha256.c
+diff -urb --new-file deltarpm-3.4/sha256.c deltarpm-3.4b/sha256.c
--- deltarpm-3.4/sha256.c 1970-01-01 02:00:00.000000000 +0200
-+++ deltarpm-3.4.new/sha256.c 2009-03-18 14:23:29.984508813 +0200
-@@ -0,0 +1,221 @@
++++ deltarpm-3.4b/sha256.c 2009-03-26 08:29:43.000000000 +0200
+@@ -0,0 +1,216 @@
+/*
+ * Implementation of SHA-256, based on Adam Back's sha-1 implementation.
+ * This software is in the public domain as per
@@ -832,14 +821,11 @@
+
+ for ( t = 0; t < 64; t++ )
+ {
-+printf ("i = %2d ", t);
-+printf ("%08x %08x %08x %08x %08x %08x %08x %08x\n", A,B,C,D,E,F,G,H);
-+
-+ T1 = H + SIG1(E) + Ch(E,F,G) + K[t] + W[t];
-+ T2 = SIG0(A) + Maj(A,B,C);
-+ H = G;
-+ G = F;
-+ F = E;
++ T1 = H + SIG1(E) + Ch(E,F,G) + K[t] + W[t];
++ T2 = SIG0(A) + Maj(A,B,C);
++ H = G;
++ G = F;
++ F = E;
+ E = D + T1;
+ D = C;
+ C = B;
@@ -847,8 +833,6 @@
+ A = T1 + T2;
+ }
+
-+printf ("i = %2d ", t);
-+printf ("%08x %08x %08x %08x %08x %08x %08x %08x\n", A,B,C,D,E,F,G,H);
+
+ ctx->H[ 0 ] += A;
+ ctx->H[ 1 ] += B;
@@ -933,9 +917,9 @@
+ d[3] = i;
+ SHA256_update(ctx, d, 4);
+}
-diff -urb --new-file deltarpm-3.4/sha256.h deltarpm-3.4.new/sha256.h
+diff -urb --new-file deltarpm-3.4/sha256.h deltarpm-3.4b/sha256.h
--- deltarpm-3.4/sha256.h 1970-01-01 02:00:00.000000000 +0200
-+++ deltarpm-3.4.new/sha256.h 2009-03-18 14:23:47.267670780 +0200
++++ deltarpm-3.4b/sha256.h 2009-03-26 08:29:43.000000000 +0200
@@ -0,0 +1,23 @@
+/*
+ * This software is in the public domain as per
@@ -960,9 +944,9 @@
+void SHA256_digest( SHA256_ctx *ctx, unsigned char *digest);
+
+#endif
-diff -urb --new-file deltarpm-3.4/util.c deltarpm-3.4.new/util.c
+diff -urb --new-file deltarpm-3.4/util.c deltarpm-3.4b/util.c
--- deltarpm-3.4/util.c 2005-06-13 20:14:32.000000000 +0300
-+++ deltarpm-3.4.new/util.c 2009-03-15 20:24:56.763165826 +0200
++++ deltarpm-3.4b/util.c 2009-03-26 08:29:44.000000000 +0200
@@ -153,3 +153,18 @@
exit(1);
}
@@ -982,9 +966,9 @@
+ exit(1);
+ }
+}
-diff -urb --new-file deltarpm-3.4/util.h deltarpm-3.4.new/util.h
+diff -urb --new-file deltarpm-3.4/util.h deltarpm-3.4b/util.h
--- deltarpm-3.4/util.h 2005-06-13 20:12:14.000000000 +0300
-+++ deltarpm-3.4.new/util.h 2009-03-15 20:24:56.763165826 +0200
++++ deltarpm-3.4b/util.h 2009-03-26 08:29:44.000000000 +0200
@@ -14,3 +14,4 @@
extern ssize_t xread(int fd, void *buf, size_t l);
extern int parsehex(char *s, unsigned char *buf, int len);
Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- deltarpm.spec 24 Mar 2009 07:34:34 -0000 1.16
+++ deltarpm.spec 26 Mar 2009 06:45:30 -0000 1.17
@@ -1,7 +1,7 @@
Summary: Create deltas between rpms
Name: deltarpm
Version: 3.4
-Release: 14%{?dist}
+Release: 15%{?dist}
License: BSD
Group: System Environment/Base
URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html
@@ -57,6 +57,9 @@
%{_bindir}/rpmdumpheader
%changelog
+* Thu Mar 26 2009 Jonathan Dieter <jdieter at gmail.com> - 3.4-15
+- Fix bug when checking sequence with new sha256 file digests
+
* Tue Mar 24 2009 Jonathan Dieter <jdieter at gmail.com> - 3.4-14
- Add support for rpms with sha256 file digests
More information about the fedora-extras-commits
mailing list