Hello community, here is the log from the commit of package deltarpm checked in at Fri May 9 21:47:44 CEST 2008. -------- --- deltarpm/deltarpm.changes 2008-05-04 17:37:00.000000000 +0200 +++ deltarpm/deltarpm.changes 2008-05-09 18:10:37.984935000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 17:57:41 CEST 2008 - mls@suse.de + +- fix deltaisos with no rpms [bnc#386847] +- remove bogus write to fd3 that was added for debugging +- update drpmsync + +------------------------------------------------------------------- New: ---- deltarpm.norpms.diff drpmsync ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deltarpm.spec ++++++ --- /var/tmp/diff_new_pack.u12952/_old 2008-05-09 21:45:59.000000000 +0200 +++ /var/tmp/diff_new_pack.u12952/_new 2008-05-09 21:45:59.000000000 +0200 @@ -18,12 +18,13 @@ Group: System/Packages AutoReqProv: on Version: 3.4 -Release: 70 +Release: 74 Summary: Tools to Create and Apply deltarpms Source: deltarpm-3.4.tar.bz2 -#Source1: drpmsync +Source1: drpmsync Patch: patch.sles8 Patch2: deltarpm.lzma.diff +Patch3: deltarpm.norpms.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # we need to build against recent rpm, so avoid the new payload %define _binary_payload w9.bzdio @@ -47,7 +48,8 @@ %patch %endif %patch2 -#cp -p %SOURCE1 . +%patch3 +cp -p %SOURCE1 . %build make CFLAGS="$RPM_OPT_FLAGS" prefix="%{_prefix}" rpmdumpheader="/usr/lib/rpm/rpmdumpheader" @@ -66,6 +68,10 @@ %endif %changelog +* Fri May 09 2008 mls@suse.de +- fix deltaisos with no rpms [bnc#386847] +- remove bogus write to fd3 that was added for debugging +- update drpmsync * Sun May 04 2008 coolo@suse.de - make lzma deltarpm available on older distris * Tue Apr 22 2008 mls@suse.de ++++++ deltarpm.norpms.diff ++++++ --- ./fragiso.c.orig 2008-05-09 15:41:00.000000000 +0000 +++ ./fragiso.c 2008-05-09 15:41:36.000000000 +0000 @@ -921,7 +921,7 @@ assemble(char *fiso, char *dir, char *is } } o = pays[i].o; - sprintf(dbuf + dl, "%010llx:%08x", pays[i].o, pays[i].l); + sprintf(dbuf + dl, "%010llx:%08x", (unsigned long long)pays[i].o, pays[i].l); if ((rfp = fopen64(dbuf, "r")) == 0) { perror(dbuf); --- ./makedeltaiso.c.orig 2008-05-09 15:40:27.000000000 +0000 +++ ./makedeltaiso.c 2008-05-09 15:39:39.000000000 +0000 @@ -137,7 +137,7 @@ recode_instr(struct instr *instr, int in nb1 = nb2 = 0; j = 0; lastoff = 0; - left = pay ? pay[0].lx : 0; + left = pay && payn ? pay[0].lx : 0; payp = 0; for (i = 0; i < instrlen; i++) { --- ./makedeltarpm.c.orig 2008-05-09 16:08:47.000000000 +0000 +++ ./makedeltarpm.c 2008-05-09 16:08:55.000000000 +0000 @@ -813,7 +813,6 @@ main(int argc, char **argv) fprintf(vfp, "reading old rpm...\n"); if (rpmonly) { - write(3, oldcpio, oldcpiolen); while ((l = bfd->read(bfd, buf, sizeof(buf))) > 0) addtocpio(&oldcpio, &oldcpiolen, (unsigned char *)buf, l); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org