rpms/deltarpm/EL-5 deltarpm-system-zlib.patch, 1.1, 1.2 deltarpm.spec, 1.12, 1.13 sources, 1.3, 1.4 deltarpm-3.4-multilib-include-colored.patch, 1.1, NONE deltarpm-3.4-multilib-workaround.patch, 1.1, NONE deltarpm-3.4-no-skip-doc.patch, 1.1, NONE deltarpm-3.4-prelink-bugfix.patch, 1.1, NONE
Jonathan Dieter
jdieter at fedoraproject.org
Sun Nov 15 19:13:25 UTC 2009
Author: jdieter
Update of /cvs/extras/rpms/deltarpm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2116
Modified Files:
deltarpm-system-zlib.patch deltarpm.spec sources
Removed Files:
deltarpm-3.4-multilib-include-colored.patch
deltarpm-3.4-multilib-workaround.patch
deltarpm-3.4-no-skip-doc.patch
deltarpm-3.4-prelink-bugfix.patch
Log Message:
Update to 3.5git so we can work with xz-compressed rpms
deltarpm-system-zlib.patch:
Makefile | 27 +++++++++++++++------------
cfile.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 63 insertions(+), 24 deletions(-)
Index: deltarpm-system-zlib.patch
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/EL-5/deltarpm-system-zlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- deltarpm-system-zlib.patch 1 Oct 2009 06:31:51 -0000 1.1
+++ deltarpm-system-zlib.patch 15 Nov 2009 19:13:24 -0000 1.2
@@ -1,28 +1,31 @@
-Index: deltarpm-3.4/Makefile
+Index: deltarpm-git-20090913/Makefile
===================================================================
---- deltarpm-3.4.orig/Makefile
-+++ deltarpm-3.4/Makefile
-@@ -3,29 +3,32 @@ bindir=$(prefix)/bin
+--- deltarpm-git-20090913.orig/Makefile
++++ deltarpm-git-20090913/Makefile
+@@ -4,9 +4,12 @@ libdir=$(prefix)/lib
mandir=$(prefix)/man
rpmdumpheader=$(bindir)/rpmdumpheader
zlibdir=zlib-1.2.2.f-rsyncable
+zlibbundled=$(zlibdir)/libz.a
+zlibldflags=$(zlibbundled)
+zlibcppflags=-I$(zlibdir)
- CFLAGS = -O2 -Wall -g
--CPPFLAGS = -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I$(zlibdir)
--LDLIBS = -lbz2 $(zlibdir)/libz.a
-+CPPFLAGS = -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" $(zlibcppflags)
-+LDLIBS = -lbz2 $(zlibldflags)
+ CFLAGS = -fPIC -O2 -Wall -g
+-CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I$(zlibdir)
+-LDLIBS = -lbz2 $(zlibdir)/libz.a -llzma
++CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" $(zlibcppflags)
++LDLIBS = -lbz2 $(zlibldflags) -llzma
LDFLAGS =
+ PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
- all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
+@@ -14,31 +17,31 @@ all: makedeltarpm applydeltarpm rpmdumph
+
+ python: _deltarpmmodule.so
-makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibdir)/libz.a
+makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibbundled)
--applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
-+applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibbundled)
+-applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
++applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibbundled)
-combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibdir)/libz.a
+combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibbundled)
@@ -30,8 +33,8 @@ Index: deltarpm-3.4/Makefile
rpmdumpheader: rpmdumpheader.o
$(CC) $(LDFLAGS) $^ -lrpm -o $@
--makedeltaiso: makedeltaiso.o delta.o rpmoffs.o util.o md5.o cfile.o $(zlibdir)/libz.a
-+makedeltaiso: makedeltaiso.o delta.o rpmoffs.o util.o md5.o cfile.o $(zlibbundled)
+-makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
++makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
-applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
+applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
@@ -39,16 +42,28 @@ Index: deltarpm-3.4/Makefile
-fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibdir)/libz.a
+fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibbundled)
+-_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
++_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
+ for ver in $(PYTHONVERS) ; do \
+ if [ ! -f "$$ver/$@" ]; then \
+ mkdir -p $$ver ;\
+- $(CC) $(CFLAGS) -I/usr/include/$$ver -I$(zlibdir) -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
+- $(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(zlibdir)/libz.a -llzma -lbz2; \
++ $(CC) $(CFLAGS) -I/usr/include/$$ver $(zlibcppflag) -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
++ $(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS); \
+ fi; \
+ done
+
-$(zlibdir)/libz.a:
+$(zlibbundled):
- cd $(zlibdir) ; make CFLAGS="$(CFLAGS)" libz.a
+ cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
clean:
-Index: deltarpm-3.4/cfile.c
+Index: deltarpm-git-20090913/cfile.c
===================================================================
---- deltarpm-3.4.orig/cfile.c
-+++ deltarpm-3.4/cfile.c
-@@ -712,8 +712,6 @@ crunread_un(struct cfile *f, void *buf,
+--- deltarpm-git-20090913.orig/cfile.c
++++ deltarpm-git-20090913/cfile.c
+@@ -888,8 +888,6 @@ crunread_un(struct cfile *f, void *buf,
}
@@ -57,7 +72,7 @@ Index: deltarpm-3.4/cfile.c
int
cfile_detect_rsync(struct cfile *f)
{
-@@ -743,10 +741,22 @@ cfile_detect_rsync(struct cfile *f)
+@@ -919,10 +917,22 @@ cfile_detect_rsync(struct cfile *f)
}
for (i = 0; i < 2; i++)
{
@@ -80,7 +95,7 @@ Index: deltarpm-3.4/cfile.c
{
if (i)
deflateEnd(&cstrm[0]);
-@@ -788,6 +798,23 @@ cfile_detect_rsync(struct cfile *f)
+@@ -964,6 +974,23 @@ cfile_detect_rsync(struct cfile *f)
{
for (i = 0; i < 2 && !done; i++)
{
@@ -104,7 +119,7 @@ Index: deltarpm-3.4/cfile.c
cstrm[i].avail_in = sizeof(dbuf) - dstrm.avail_out;
cstrm[i].next_in = dbuf;
while (cstrm[i].avail_in)
-@@ -795,14 +822,23 @@ cfile_detect_rsync(struct cfile *f)
+@@ -971,14 +998,23 @@ cfile_detect_rsync(struct cfile *f)
cstrm[i].avail_out = sizeof(cbuf);
cstrm[i].next_out = cbuf;
ret = deflate(&cstrm[i], dret == Z_STREAM_END ? Z_FINISH : Z_NO_FLUSH);
@@ -128,7 +143,7 @@ Index: deltarpm-3.4/cfile.c
if (memcmp(b + p[i], cbuf, sizeof(cbuf) - cstrm[i].avail_out))
{
comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
-@@ -811,6 +847,14 @@ cfile_detect_rsync(struct cfile *f)
+@@ -987,6 +1023,14 @@ cfile_detect_rsync(struct cfile *f)
}
p[i] += sizeof(cbuf) - cstrm[i].avail_out;
}
@@ -143,7 +158,7 @@ Index: deltarpm-3.4/cfile.c
if (cstrm[i].avail_in && ret == BZ_STREAM_END)
{
comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
-@@ -835,7 +879,9 @@ cfile_detect_rsync(struct cfile *f)
+@@ -1011,7 +1055,9 @@ cfile_detect_rsync(struct cfile *f)
b = b2;
}
deflateEnd(&cstrm[0]);
@@ -153,7 +168,7 @@ Index: deltarpm-3.4/cfile.c
inflateEnd(&dstrm);
f->bufN = -1;
f->strm.gz.avail_in = 0;
-@@ -877,16 +923,6 @@ cfile_detect_rsync(struct cfile *f)
+@@ -1053,16 +1099,6 @@ cfile_detect_rsync(struct cfile *f)
return comp == -1 ? -1 : 0;
}
Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/EL-5/deltarpm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- deltarpm.spec 1 Oct 2009 06:31:51 -0000 1.12
+++ deltarpm.spec 15 Nov 2009 19:13:24 -0000 1.13
@@ -1,23 +1,25 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
Summary: Create deltas between rpms
Name: deltarpm
-Version: 3.4
-Release: 8%{?dist}.1
+Version: 3.5
+Release: 0.5.20090913git%{?dist}
License: BSD
Group: System Environment/Base
-URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html
-
-Source: ftp://ftp.suse.com/pub/projects/%{name}/%{name}-%{version}.tar.bz2
+URL: http://gitorious.org/deltarpm/deltarpm
+# Generate source by doing:
+# git clone git://gitorious.org/deltarpm/deltarpm
+# cd deltarpm
+# git archive --format=tar --prefix="deltarpm-git-20090913" f716bb7 | \
+# bzip2 > deltarpm-git-20090831.1.tar.bz2
+Source: %{name}-git-20090913.tar.bz2
+# Build with system zlib
+Patch0: deltarpm-system-zlib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: bzip2-devel, rpm-devel, popt
+BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt
BuildRequires: zlib-devel
-
-Patch0: deltarpm-3.4-multilib-workaround.patch
-Patch1: deltarpm-3.4-multilib-include-colored.patch
-Patch2: deltarpm-3.4-prelink-bugfix.patch
-Patch3: deltarpm-3.4-no-skip-doc.patch
-# Build with system zlib
-Patch5: deltarpm-system-zlib.patch
+BuildRequires: python-devel
%description
A deltarpm contains the difference between an old
@@ -26,19 +28,45 @@ to recreate the new rpm from the deltarp
one. You don't have to have a copy of the old rpm,
deltarpms can also work with installed rpms.
+%package -n drpmsync
+Summary: Sync a file tree with deltarpms
+Group: System Environment/Base
+Requires: deltarpm = %{version}-%{release}
+
+%description -n drpmsync
+This package contains a tool to sync a file tree with
+deltarpms.
+
+%package -n deltaiso
+Summary: Create deltas between isos containing rpms
+Group: System Environment/Base
+Requires: deltarpm = %{version}-%{release}
+
+%description -n deltaiso
+This package contains tools for creating and using deltasisos,
+a difference between an old and a new iso containing rpms.
+
+%package -n python-deltarpm
+Summary: Python bindings for deltarpm
+Group: System Environment/Base
+Requires: deltarpm = %{version}-%{release}
+
+%description -n python-deltarpm
+This package contains python bindings for deltarpm.
+
%prep
-%setup -q
-%patch0 -p0 -b .multilib
-%patch1 -p1 -b .multicolor
-%patch2 -p1 -b .prelink
-%patch3 -p1 -b .nodoc
+%setup -q -n %{name}-git-20090913
# Build with system zlib
-%patch5 -p1 -b .zlib
+%patch0 -p1 -b .zlib
%build
%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
zlibbundled='' zlibldflags='-lz' zlibcppflags=''
+%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
+ bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
+ zlibbundled='' zlibldflags='-lz' zlibcppflags='' \
+ python
%install
%{__rm} -rf %{buildroot}
@@ -50,24 +78,117 @@ deltarpms can also work with installed r
%files
%defattr(-, root, root, 0755)
%doc LICENSE.BSD README
-%doc %{_mandir}/man8/*
-%{_bindir}/applydeltaiso
+%doc %{_mandir}/man8/applydeltarpm*
+%doc %{_mandir}/man8/makedeltarpm*
+%doc %{_mandir}/man8/combinedeltarpm*
%{_bindir}/applydeltarpm
%{_bindir}/combinedeltarpm
-%{_bindir}/drpmsync
-%{_bindir}/fragiso
-%{_bindir}/makedeltaiso
%{_bindir}/makedeltarpm
%{_bindir}/rpmdumpheader
+%files -n deltaiso
+%defattr(-, root, root, 0755)
+%doc LICENSE.BSD README
+%doc %{_mandir}/man8/applydeltaiso*
+%doc %{_mandir}/man8/makedeltaiso*
+%{_bindir}/applydeltaiso
+%{_bindir}/fragiso
+%{_bindir}/makedeltaiso
+
+%files -n drpmsync
+%defattr(-, root, root, 0755)
+%doc LICENSE.BSD README
+%doc %{_mandir}/man8/drpmsync*
+%{_bindir}/drpmsync
+
+%files -n python-deltarpm
+%defattr(-, root, root, 0755)
+%doc LICENSE.BSD
+%{python_sitearch}/*
+
%changelog
-* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.4-8.1
-- Build against the system zlib, not the bundled library. This remedies the
- fact that the included zlib is affected by CAN-2005-1849.
+* Sun Nov 15 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.5.20090913git
+- Fix for EL-5
+
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.4.20090913git
+- Update patch to properly detect when an rpm is built with an rsync-friendly
+ zlib and bail out.
+
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.3.20090913git
+- Make building with system zlib selectable at build time.
- Fix cfile_detect_rsync() to detect rsync even if we don't have a zlib capable
of making rsync-friendly compressed files.
-* Wed Aug 29 2007 Jonathan Dieter <jdieter at gmail.com> - 3.4.6
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.2.20090913git
+- Correct prerelease rlease numbering.
+- Build against the system zlib, not the bundled library. This remedies the
+ fact that the included zlib is affected by CAN-2005-1849.
+
+* Sun Sep 13 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090913
+- Merge python error patch upstream
+
+* Thu Sep 10 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.4
+- fix python bindings to not require kernel >= 2.6.27
+
+* Wed Sep 9 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.3
+- fix python bindings to:
+ - call _exit(), not exit()
+ - properly pythonize errors
+ - not leak file descriptors
+
+* Mon Aug 31 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090831.1
+- Add python bindings sub-package
+- Fix build error
+
+* Mon Aug 17 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5-0.git.20090729.1
+- Explain where we get the source from
+- Split *deltaiso commands into deltaiso subpackage (#501953)
+
+* Wed Jul 29 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5-0.git.20090729
+- Fix bug in writing Fedora's xz-compressed rpms (surely that's the last one)
+
+* Mon Jul 27 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5-0.git.20090727.1
+- Fix bug in reading Fedora's xz-compressed rpms
+
+* Mon Jul 27 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5-0.git.20090727
+- Update to current upstream git repository
+- Add upstream xz compression support
+- Drop all patches (they're now in upstream)
+- Fix spelling mistakes (#505713)
+- Fix url error (#506179)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Apr 22 2009 Jonathan Dieter <jdieter at gmail.com> - 3.4-16
+- Split drpmsync into a separate subpackage (#489231)
+
+* 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
+
+* Fri Mar 06 2009 Jesse Keating <jkeating at redhat.com> - 3.4-13
+- Rebuild for new rpm libs
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jul 13 2008 Jonathan Dieter <jdieter at gmail.com> - 3.4-11
+- Rebuild for rpm 4.6
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.4-10
+- Autorebuild for GCC 4.3
+
+* Mon Jan 7 2008 Jonathan Dieter <jdieter at gmail.com> - 3.4-9
+- Add patch that allows deltarpm to rebuild rpms from deltarpms that have
+ had the rpm signature added after their creation. The code came from
+ upstream.
+- Drop nodoc patch added in 3.4-4 as most packages in repository have been
+ updated since April-May 2007 and this patch was supposed to be temporary.
+
+* Wed Aug 29 2007 Jonathan Dieter <jdieter at gmail.com> - 3.4-6
- Bring in popt-devel in BuildRequires to fix build in x86_64
* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.4-5
@@ -75,7 +196,7 @@ deltarpms can also work with installed r
* Wed Jul 11 2007 Jonathan Dieter <jdieter at gmail.com> - 3.4-4
- Fix prelink bug
-- Ignore verify bits on %doc files as they were set incorrectly in older
+- Ignore verify bits on doc files as they were set incorrectly in older
versions of rpm. Without this patch, deltarpm will not delta doc files
in rpm created before April-May 2007
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 26 Mar 2007 14:23:18 -0000 1.3
+++ sources 15 Nov 2009 19:13:24 -0000 1.4
@@ -1 +1 @@
-cac779a18a1bc256fb6497526a83ac82 deltarpm-3.4.tar.bz2
+d83662fbd6745b3eab85543d2ac7b6b4 deltarpm-git-20090913.tar.bz2
--- deltarpm-3.4-multilib-include-colored.patch DELETED ---
--- deltarpm-3.4-multilib-workaround.patch DELETED ---
--- deltarpm-3.4-no-skip-doc.patch DELETED ---
--- deltarpm-3.4-prelink-bugfix.patch DELETED ---
More information about the scm-commits
mailing list