Is this right solution for the bug? Peter
> -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Zhang Qiang > Sent: Tuesday, March 22, 2011 4:21 PM > To: [email protected] > Subject: [meego-commits] 15085: Changes to Trunk:Testing/deltarpm > > Hi, > I have made the following changes to deltarpm in project Trunk:Testing. Please > review and accept ASAP. > > Thank You, > Zhang Qiang > > [This message was auto-generated] > > --- > > Request #15085: > > submit: home:xiaoqiang:branches:Trunk/deltarpm(r2) -> > Trunk:Testing/deltarpm > > > Message: > Add a patch to disable md5 check for applydeltarpm. with out this patch > applydeltarpm always fails with apply deltarpm fails, and deltarpm feature > can't work. fix BMC#14789 > > State: new 2011-03-22T01:20:44 xiaoqiang > Comment: None > > > > changes files: > -------------- > --- deltarpm.changes > +++ deltarpm.changes > @@ -0,0 +1,4 @@ > +* Tue Mar 22 2011 Zhang Qiang <[email protected]> - 3.5 > +- Add a patch to disable md5 check for applydeltarpm. > + fix BMC#14789 > + > > new: > ---- > MeeGo-disable-MD5-check.patch > > spec files: > ----------- > --- deltarpm.spec > +++ deltarpm.spec > @@ -15,6 +15,7 @@ > Source: %{name}-git-20090913.tar.bz2 > # Build with system zlib > Patch0: deltarpm-system-zlib.patch > +Patch1: MeeGo-disable-MD5-check.patch > BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) > > BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt-devel > @@ -55,6 +56,7 @@ > %setup -q -n %{name}-git-20090913 > # Build with system zlib > %patch0 -p1 -b .zlib > +%patch1 -p1 > > %build > %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ > > other changes: > -------------- > > ++++++ MeeGo-disable-MD5-check.patch (new) > --- MeeGo-disable-MD5-check.patch > +++ MeeGo-disable-MD5-check.patch > +diff -uNr deltarpm-git-20090913/applydeltarpm.c > deltarpm-git-20090913.new/applydeltarpm.c > +--- deltarpm-git-20090913/applydeltarpm.c 2009-09-13 22:22:40.000000000 > +0800 > ++++ deltarpm-git-20090913.new/applydeltarpm.c 2011-03-22 > 16:28:59.073581551 +0800 > +@@ -1833,10 +1833,12 @@ > + xfree(dsigh); > + } > + } > ++#if 0 > + else if (memcmp(wrmd5res, d.targetmd5, 16) != 0) > + { > + fprintf(stderr, "%s: md5 mismatch of result\n", deltarpm); > + exit(1); > + } > ++#endif > + exit(0); > + } > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
