This patch is wrong, we should not disable md5sum checking, instead, fix the way deltarpms are generated.
Anas On Thu, Jul 14, 2011 at 4:05 AM, Zhang Qiang <[email protected]>wrote: > Hi, > I have made the following changes to deltarpm in project > MeeGo:1.1:Core:Update:Testing. Please review and accept ASAP. > > Thank You, > Zhang Qiang > > [This message was auto-generated] > > --- > > Request #22755: > > submit: > home:xiaoqiang:branches:MeeGo:1.1:Core:Update:Testing/deltarpm(r3)(cleanup) > -> MeeGo:1.1:Core:Update:Testing/deltarpm > > > Message: > Add Meego-ignore-md5-check.patch to fix BMC#10113 > > State: new 2011-07-13T20:05:49 xiaoqiang > Comment: None > > > > changes files: > -------------- > --- deltarpm.changes > +++ deltarpm.changes > @@ -0,0 +1,3 @@ > +* Fri Jun 10 2011 Zhang Qiang<[email protected]> - 3.5 > +- Disable md5 check while applying rpms, fix BMC#10113 > + > > new: > ---- > meego-disable-md5-check-while-applying.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-while-applying.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-while-applying.patch (new) > --- meego-disable-md5-check-while-applying.patch > +++ meego-disable-md5-check-while-applying.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-06-10 > 13:33:53.442515921 +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
